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/ICodeRuleService.java | 46 ++++++++++++++++++++++++++++++++++++---------- 1 files changed, 36 insertions(+), 10 deletions(-) diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeRuleService.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeRuleService.java index 3671ddb..576d705 100644 --- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeRuleService.java +++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeRuleService.java @@ -27,6 +27,7 @@ import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; +import java.rmi.ServerException; import java.util.Collection; import java.util.Map; @@ -45,28 +46,35 @@ * @param condtionMap * @return */ - IPage<CodeRuleVO> gridCodeRule(Query query, Map<String,Object> condtionMap); + IPage<CodeRuleVO> gridCodeRule(Query query, Map<String,Object> condtionMap) throws VciBaseException; + + /** + * 妫�鏌d缂栧彿鏄惁閲嶅 + * @param codeRuleDTO 褰撳墠鍒ゆ柇鏄惁閲嶅鐨勫璞� + * @return 杩斿洖false琛ㄧず鏈噸澶� + */ + boolean checkCodeRuleRepeat(CodeRuleDTO codeRuleDTO); /** * 鏍￠獙缂栫爜瑙勫垯鐨勭姸鎬佹槸鍚﹀彲浠ョ紪杈戞垨鍒犻櫎 * @param lcStatus 缂栫爜瑙勫垯 * @return true琛ㄧず鍙互缂栬緫鎴栧垹闄わ紝false琛ㄧず涓嶅彲浠� */ - boolean checkEditDelStatus(String lcStatus); + boolean checkEditDelStatus(String lcStatus) throws VciBaseException; /** * 澧炲姞涓绘暟鎹紪鐮佽鍒� * @param codeRuleDTO 涓绘暟鎹紪鐮佽鍒欐暟鎹紶杈撳璞� * @return 鎵ц缁撴灉 */ - boolean addSave(CodeRuleDTO codeRuleDTO) throws VciBaseException; + R addSave(CodeRuleDTO codeRuleDTO) throws VciBaseException; /** * 淇敼涓绘暟鎹紪鐮佽鍒� * @param codeRuleDTO 涓绘暟鎹紪鐮佽鍒欐暟鎹紶杈撳璞� * @return 鎵ц缁撴灉 */ - boolean editSave(CodeRuleDTO codeRuleDTO) throws VciBaseException; + R editSave(CodeRuleDTO codeRuleDTO) throws VciBaseException; /** * 鍒犻櫎涓绘暟鎹紪鐮佽鍒� @@ -81,14 +89,14 @@ * @param oid 缂栫爜瑙勫垯涓婚敭 * @return true琛ㄧず宸茬粡浣跨敤锛宖alse琛ㄧず鏈浣跨敤 */ - boolean isAlreadyInUse(String oid); + boolean isAlreadyInUse(String oid) throws VciBaseException; /** * 鏌ョ湅涓绘暟鎹紪鐮佽鍒欑殑浣跨敤鑼冨洿 * @param oid 缂栫爜瑙勫垯涓婚敭 * @return 涓婚搴撳垎绫讳娇鐢ㄥ埌璇ョ紪鐮佽鍒欑殑鎵�鏈夐泦鍚� */ - Collection<CodeClassifyVO> listUseRangeInCodeClassify(String oid); + Collection<CodeClassifyVO> listUseRangeInCodeClassify(String oid) throws VciBaseException; /** * 涓婚敭鑾峰彇涓绘暟鎹紪鐮佽鍒� @@ -107,6 +115,16 @@ Collection<CodeRuleVO> listCodeRuleByOids(Collection<String> oidCollections) throws VciBaseException; /** + * 涓婚敭鎵归噺鑾峰彇涓绘暟鎹紪鐮佽鍒� + * + * @param oidCollections 涓婚敭闆嗗悎锛屼絾鏄彈鎬ц兘褰卞搷锛屽缓璁竴娆℃煡璇笉瓒呰繃10000涓� + * @param hasSec 鏄惁鍖呭惈鐮佹 + * @return 涓绘暟鎹紪鐮佽鍒欐樉绀哄璞� + * @throws VciBaseException 鏌ヨ鍑虹幇寮傚父鏃朵細鎶涘嚭 + */ + Collection<CodeRuleVO> listCodeRuleByIds(Collection<String> oidCollections,boolean hasSec)throws VciBaseException ; + + /** * 鍙傜収涓绘暟鎹紪鐮佽鍒欏垪琛� * @param bladeQueryObject 鏌ヨ鏉′欢 * @return 涓绘暟鎹紪鐮佽鍒欐樉绀哄璞″垪琛紝鐢熸晥鐨勫唴瀹� @@ -120,26 +138,34 @@ * @param update enable:鍚敤 disable:鍋滅敤 release:鍙戝竷 * @return 鎵ц缁撴灉 */ - R updateStatus(String oid, String update); + R updateStatus(String oid, String update) throws VciBaseException; /** * 鍏嬮殕缂栫爜瑙勫垯 * @param codeRuleDTO 涓绘暟鎹紪鐮佽鍒欐暟鎹紶杈撳璞★紝oid鍜宼s闇�瑕佷紶杈� * @return 涓绘暟鎹紪鐮佽鍒欐樉绀哄璞� */ - R cloneCodeRule(CodeRuleDTO codeRuleDTO); + R cloneCodeRule(CodeRuleDTO codeRuleDTO) throws ServerException; /** * 缂栫爜瑙勫垯娓呯┖鎵�鏈夊凡鐢熸垚鐨勭紪鐮� * @param oid 缂栫爜瑙勫垯涓婚敭 * @return 鎵ц缁撴灉 */ - R clearAllCode(String oid); + R clearAllCode(String oid) throws VciBaseException; /** * 浣跨敤涓婚敭鑾峰彇缂栫爜瑙勫垯鐨勫唴瀹� * @param codeRuleOid 涓婚敭 * @return 瑙勫垯鐨勬樉绀哄璞� */ - CodeRuleVO getObjectHasSecByOid(String codeRuleOid); + CodeRuleVO getObjectHasSecByOid(String codeRuleOid) throws VciBaseException; + + /** + * 妫�鏌ョ浉浼肩紪鐮佽鍒欙紝骞惰繑鍥炲搴旂殑缁撴灉 + * @param oid 涓婚敭 + * @return 鎵ц缁撴灉 + */ + R checkLikeCodeRule(String oid) throws VciBaseException; + } -- Gitblit v1.9.3