From 3534b13391b2a6152d0f91b72fda343b13a947cb Mon Sep 17 00:00:00 2001 From: ludc <ludc@vci-tech.com> Date: 星期三, 22 一月 2025 15:55:27 +0800 Subject: [PATCH] 分类码段码值管理查询去除null的情况，分类码段生成编码时去除码值为null的情况 --- Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeBasicSecService.java | 178 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 172 insertions(+), 6 deletions(-) diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeBasicSecService.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeBasicSecService.java index a955f4d..7ff557a 100644 --- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeBasicSecService.java +++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeBasicSecService.java @@ -1,12 +1,25 @@ package com.vci.ubcs.code.service; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import com.vci.ubcs.code.dto.CodeBasicSecDTO; +import com.vci.ubcs.code.dto.CodeOrderDTO; +import com.vci.ubcs.code.dto.CodeRuleDTO; import com.vci.ubcs.code.entity.CodeBasicSec; +import com.vci.ubcs.code.vo.CodeReferConfigVO; import com.vci.ubcs.code.vo.pagemodel.CodeBasicSecVO; -import com.vci.ubcs.com.vci.starter.exception.VciBaseException; -import com.vci.ubcs.com.vci.starter.web.pagemodel.KeyValue; +import com.vci.ubcs.code.vo.pagemodel.CodeRuleVO; +import com.vci.ubcs.starter.exception.VciBaseException; +import com.vci.ubcs.starter.web.pagemodel.*; +import org.springblade.core.mp.support.Query; +import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.BeanUtil; +import org.springframework.util.CollectionUtils; +import org.springframework.web.bind.annotation.RequestBody; + +import java.rmi.ServerException; +import java.util.*; /** * 鍥哄畾鐮佹鐨勭爜鍊兼湇鍔℃帴鍙� @@ -18,19 +31,19 @@ /** * 鏌ヨ鎵�鏈夌殑鐮佹鍩虹淇℃伅 - * @param codeBasicSecVO 鏌ヨ鏉′欢 - * @param page 鍒嗛〉鍜屾帓搴� + * @param conditionMap 鏌ヨ鏉′欢 + * @param query 鍒嗛〉瀵硅薄 * @return 鎵ц缁撴灉 * @throws VciBaseException 鏌ヨ鏉′欢鍜屽垎椤靛嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父 */ - IPage<CodeBasicSecVO> gridCodeBasicSec(IPage<CodeBasicSecVO> page, CodeBasicSecVO codeBasicSecVO) throws VciBaseException; + IPage<CodeBasicSecVO> gridCodeBasicSec(Query query, Map<String,Object> conditionMap) throws VciBaseException; /** * 鏍规嵁缂栫爜瑙勫垯鎵归噺鍒犻櫎鐮佹鍩烘湰淇℃伅 * @param codeRuleOid 缂栫爜瑙勫垯涓婚敭 * @return 鎵ц缁撴灉 */ - boolean batchDeleteSecByCodeRuleOid(String codeRuleOid); + boolean batchDeleteSecByCodeRuleOid(String codeRuleOid)throws VciBaseException; /** * 鏍规嵁鐮佹鍒嗙被鐨勭被鍨嬪垽鏂睘鎬ф槸鍚︽槸绌虹殑 @@ -48,5 +61,158 @@ */ boolean addSave(CodeBasicSecDTO codeBasicSecDTO) throws VciBaseException; + /** + * 淇敼鐮佹鍩虹淇℃伅 + * @param codeBasicSecDTO 鐮佹鍩虹淇℃伅鏁版嵁浼犺緭瀵硅薄 + * @return 鎵ц缁撴灉 + * @throws VciBaseException 鍙傛暟涓虹┖锛屽敮涓�椤癸紝蹇呰緭椤逛笉閫氳繃鏃朵細鎶涘嚭寮傚父 + */ + boolean editSave(CodeBasicSecDTO codeBasicSecDTO) throws VciBaseException, ServerException; + /** + * 鍒犻櫎鐮佹鍩虹淇℃伅 + * @param codeBasicSecDTO 鐮佹鍩虹淇℃伅鏁版嵁浼犺緭瀵硅薄锛宱id鍜宼s闇�瑕佷紶杈� + * @return 鍒犻櫎缁撴灉鍙嶉锛氾細success锛氭垚鍔燂紝fail锛氬け璐� + * @throws VciBaseException 鍙傛暟涓虹┖锛岃寮曠敤鏃舵姏鍑哄紓甯� + */ + R deleteCodeBasicSec(CodeBasicSecDTO codeBasicSecDTO) throws VciBaseException; + + /** + * 涓婚敭鍒犻櫎鐮佹鍩虹淇℃伅 + * @param oid 鐮佹鍩虹淇℃伅涓婚敭 + * @return 鍒犻櫎缁撴灉鍙嶉锛氾細success锛氭垚鍔燂紝fail锛氬け璐� + * @throws VciBaseException 鍙傛暟涓虹┖锛岃寮曠敤鏃舵姏鍑哄紓甯� + */ + R deleteCodeBasicSecByPrimaryKey(String oid) throws VciBaseException; + + /** + * 涓婚敭鑾峰彇鐮佹鍩虹淇℃伅 + * @param oid 涓婚敭 + * @return 鐮佹鍩虹淇℃伅鏄剧ず瀵硅薄 + * @throws VciBaseException 鍙傛暟涓虹┖锛屾暟鎹笉瀛樺湪鏃朵細鎶涘嚭寮傚父 + */ + CodeBasicSecVO getObjectByOid(String oid) throws VciBaseException; + + /** + * 涓婚敭鎵归噺鑾峰彇鐮佹鍩虹淇℃伅 + * @param oidCollections 涓婚敭闆嗗悎锛屼絾鏄彈鎬ц兘褰卞搷锛屽缓璁竴娆℃煡璇笉瓒呰繃10000涓� + * @return 鐮佹鍩虹淇℃伅鏄剧ず瀵硅薄 + * @throws VciBaseException 鏌ヨ鍑虹幇寮傚父鏃朵細鎶涘嚭 + */ + Collection<CodeBasicSecVO> listCodeBasicSecByOids(Collection<String> oidCollections) throws VciBaseException; + + /** + * 鍙傜収鐮佹鍩虹淇℃伅鍒楄〃 + * @param conditionMap 鏌ヨ鏉′欢 + * @param query 鍒嗛〉鍜屾帓搴� + * @return 鐮佹鍩虹淇℃伅鏄剧ず瀵硅薄鍒楄〃锛岀敓鏁堢殑鍐呭 + * @throws VciBaseException 鏌ヨ鏉′欢鍜屽垎椤靛嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父 + */ + IPage<CodeBasicSecVO> refDataGridCodeBasicSec(Query query ,Map<String,Object> conditionMap) throws VciBaseException; + + /** + * 鍙傜収鍒嗙被鐨勭爜娈� + * @param conditionMap 鏌ヨ鏉′欢 + * @param query 鍒嗛〉鍜屾帓搴� + * @return 鐮佹鐨勫唴瀹� + */ + IPage<CodeBasicSecVO> refDataGridClassifySec(Query query ,Map<String,Object> conditionMap); + + /** + * 鍏嬮殕鐮佹淇℃伅 + * @param oidList 婧愮爜娈典俊鎭富閿泦鍚� + * @param pkCodeRule 鐩爣缂栫爜瑙勫垯 + * @return 鍏嬮殕缁撴灉鍙嶉锛氾細success锛氭垚鍔燂紝fail锛氬け璐� + */ + R cloneCodeBasicSec(List<String> oidList, String pkCodeRule) throws ServerException; + + /** + * 鏀瑰彉鐮佹涓埗鍒嗙被鐮佹鍜屽瓙鍒嗙被鐮佹涔嬮棿鐨勫叧鑱攐id涓烘柊鐨刼id,骞朵笖涓嶇牬鍧忓垎绫荤爜鍊肩殑鍏宠仈鍏崇郴 + * @param basicSecs + * @return + * @throws ServerException + */ + boolean changeParentOidAssnOid(List<CodeBasicSec> basicSecs) throws ServerException; + + /** + * 鏌ヨ鐩爣鍒嗙被鐮佹鎵�鍦ㄧ殑鏍戠粨鏋� + * @param oid 鐩爣鍒嗙被鐮佹涓婚敭 + * @return 鍒嗙被鐮佹鏍戠粨鏋� + */ + //List<Tree> gridCodeClassifySecTree(String oid); + + /** + * 涓婄Щ + * @param oid 涓婚敭 + */ + boolean upOrderNum(String oid); + + /** + * 涓嬬Щ + * @param oid 涓婚敭 + */ + boolean downOrderNum(String oid); + + /** + * 鏍戝舰缁撴瀯鏌ヨoid + * @param codeClassifySecOid + * @return + */ + List<String> getOidByCodeclassifysecOid(String codeClassifySecOid); + + /** + * 浣跨敤瑙勫垯鐨勪富閿幏鍙栧搴旂殑鐮佹鍐呭 + * @param ruleOid 瑙勫垯鐨勫唴瀹� + * @return 鐮佹鐨勫唴瀹� + */ + List<CodeBasicSecVO> listCodeBasicSecByRuleOid(String ruleOid); + + /** + * 鎵归噺鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞� + * + * @param codeBasicSecDOs 鏁版嵁瀵硅薄鍒楄〃 + * @param hasFixedValue 鏄惁鏈夊浐瀹氬�� + * @return 鏄剧ず瀵硅薄 + * @throws VciBaseException 鍙傛暟涓虹┖鎴栬�呬笉瀛樺湪鐨勬椂鍊欎細鎶涘嚭寮傚父 + */ + List<CodeBasicSecVO> codeBasicSecDO2VOs(Collection<CodeBasicSec> codeBasicSecDOs, boolean hasFixedValue) throws VciBaseException; + + /** + * 鎵归噺鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞� + * @param codeBasicSecDOs 鏁版嵁瀵硅薄鍒楄〃 + * @return 鏄剧ず瀵硅薄 + * @throws VciBaseException 鍙傛暟涓虹┖鎴栬�呬笉瀛樺湪鐨勬椂鍊欎細鎶涘嚭寮傚父 + */ + List<CodeBasicSecVO> codeBasicSecDO2VOs(Collection<CodeBasicSec> codeBasicSecDOs) throws VciBaseException; + + /** + * 鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞� + * @param codeBasicSecDO 鏁版嵁瀵硅薄 + * @return 鏄剧ず瀵硅薄 + * @throws VciBaseException 鎷疯礉灞炴�у嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父 + */ + CodeBasicSecVO codeBasicSecDO2VO(CodeBasicSec codeBasicSecDO) throws VciBaseException; + + /** + * 鏍规嵁缂栫爜瑙勫垯涓婚敭鑾峰彇缂栫爜涓嬬殑娴佹按渚濊禆鐮佹 + * @param oid 缂栫爜瑙勫垯涓婚敭 + * @return + * @throws VciBaseException + */ + CodeRuleVO getSerialNumberDepend(String oid) throws VciBaseException; + + /** + * 璁剧疆鏈�澶ф祦姘村彿 + * @param codeOrderDTO 缂栫爜鐢宠浼犺緭瀵硅薄 + * @return + * @throws VciBaseException + */ + String setMaxSerialNumberForCodeRule(CodeOrderDTO codeOrderDTO) throws VciBaseException; + /** + * 鏍规嵁娴佹按渚濊禆鑾峰彇鏈�澶ф祦姘村�� + * @param codeOrderDTO 缂栫爜鐢宠浼犺緭瀵硅薄 + * @return + * @throws VciBaseException + */ + Double getMaxSerialNumberForCodeRule(CodeOrderDTO codeOrderDTO); } -- Gitblit v1.9.3