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 | 57 +++++++++++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 47 insertions(+), 10 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 3ca0dac..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,19 +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.code.vo.pagemodel.CodeRuleVO; import com.vci.ubcs.starter.exception.VciBaseException; -import com.vci.ubcs.starter.web.pagemodel.BladeQueryObject; -import com.vci.ubcs.starter.web.pagemodel.KeyValue; +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.util.Collection; -import java.util.List; -import java.util.Map; +import java.rmi.ServerException; +import java.util.*; /** * 鍥哄畾鐮佹鐨勭爜鍊兼湇鍔℃帴鍙� @@ -37,7 +43,7 @@ * @param codeRuleOid 缂栫爜瑙勫垯涓婚敭 * @return 鎵ц缁撴灉 */ - boolean batchDeleteSecByCodeRuleOid(String codeRuleOid); + boolean batchDeleteSecByCodeRuleOid(String codeRuleOid)throws VciBaseException; /** * 鏍规嵁鐮佹鍒嗙被鐨勭被鍨嬪垽鏂睘鎬ф槸鍚︽槸绌虹殑 @@ -61,7 +67,7 @@ * @return 鎵ц缁撴灉 * @throws VciBaseException 鍙傛暟涓虹┖锛屽敮涓�椤癸紝蹇呰緭椤逛笉閫氳繃鏃朵細鎶涘嚭寮傚父 */ - boolean editSave(CodeBasicSecDTO codeBasicSecDTO) throws VciBaseException; + boolean editSave(CodeBasicSecDTO codeBasicSecDTO) throws VciBaseException, ServerException; /** * 鍒犻櫎鐮佹鍩虹淇℃伅 @@ -118,7 +124,15 @@ * @param pkCodeRule 鐩爣缂栫爜瑙勫垯 * @return 鍏嬮殕缁撴灉鍙嶉锛氾細success锛氭垚鍔燂紝fail锛氬け璐� */ - R cloneCodeBasicSec(List<String> oidList, String pkCodeRule); + R cloneCodeBasicSec(List<String> oidList, String pkCodeRule) throws ServerException; + + /** + * 鏀瑰彉鐮佹涓埗鍒嗙被鐮佹鍜屽瓙鍒嗙被鐮佹涔嬮棿鐨勫叧鑱攐id涓烘柊鐨刼id,骞朵笖涓嶇牬鍧忓垎绫荤爜鍊肩殑鍏宠仈鍏崇郴 + * @param basicSecs + * @return + * @throws ServerException + */ + boolean changeParentOidAssnOid(List<CodeBasicSec> basicSecs) throws ServerException; /** * 鏌ヨ鐩爣鍒嗙被鐮佹鎵�鍦ㄧ殑鏍戠粨鏋� @@ -148,10 +162,10 @@ /** * 浣跨敤瑙勫垯鐨勪富閿幏鍙栧搴旂殑鐮佹鍐呭 - * @param conditionMap 瑙勫垯鐨勫唴瀹� + * @param ruleOid 瑙勫垯鐨勫唴瀹� * @return 鐮佹鐨勫唴瀹� */ - List<CodeBasicSecVO> listCodeBasicSecByRuleOid(Map<String,Object> conditionMap); + List<CodeBasicSecVO> listCodeBasicSecByRuleOid(String ruleOid); /** * 鎵归噺鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞� @@ -178,4 +192,27 @@ * @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