From d9183aa80ae17d36b79dda48c6b1d7fa22a80ee3 Mon Sep 17 00:00:00 2001 From: xiejun <xiejun@vci-tech.com> Date: 星期三, 22 一月 2025 11:20:41 +0800 Subject: [PATCH] 现场型号代号/人员/组织接口调试 --- Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/MdmEngineService.java | 54 +++++++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 47 insertions(+), 7 deletions(-) diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/MdmEngineService.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/MdmEngineService.java index 81d7ca2..60c8ec7 100644 --- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/MdmEngineService.java +++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/MdmEngineService.java @@ -5,9 +5,11 @@ import com.vci.ubcs.code.applyjtcodeservice.vo.BaseModelVO; import com.vci.ubcs.code.bo.CodeClassifyFullInfoBO; import com.vci.ubcs.code.bo.CodeTemplateAttrSqlBO; +import com.vci.ubcs.code.dto.CodeBZApplyDTO; import com.vci.ubcs.code.dto.CodeDeleteBatchDTO; import com.vci.ubcs.code.dto.CodeOrderDTO; import com.vci.ubcs.code.dto.datapush.BaseModelDTO; +import com.vci.ubcs.code.entity.CodeSynonym; import com.vci.ubcs.code.vo.CodeKeyAttrRepeatVO; import com.vci.ubcs.code.vo.pagemodel.UITableFieldVO; import com.vci.ubcs.code.vo.pagemodel.*; @@ -63,6 +65,13 @@ * @return 杩斿洖缂栫爜鐨勫唴瀹� */ String addSaveCode(CodeOrderDTO orderDTO) throws Exception; + /** + * 鐢宠鍗曚竴缂栫爜 + * @param orderDTO 鐢宠鐨勪俊鎭紝闇�瑕佸寘鍚睘鎬х殑鍐呭鍜岀爜娈电浉鍏崇殑鍐呭 + * @param authUser 鏄惁妯℃嫙鐧诲綍锛宼rue锛屼笉妯℃嫙锛宖alse鏄ā鎷� + * @return 杩斿洖缂栫爜鐨勫唴瀹� + */ + String addSaveCodeNotauthUser(CodeOrderDTO orderDTO, boolean authUser) throws Exception; /** * 鍒ゆ柇缂栫爜鐨勭爜娈垫槸鍚﹁緭鍏ユ垨鑰呴�夋嫨浜嗙爜鍊� @@ -76,6 +85,7 @@ * * @param value 褰撳墠鐨勫�� * @param keyRuleVO 鍏抽敭灞炴�х殑鎺у埗瑙勫垯锛屽彲浠ヤ负绌� + * @param codeSynonymMaps 杩戜箟璇嶆煡璇㈣鍒� * @param attrId 灞炴�х殑缂栧彿 * @param trim 鏄惁鍘婚櫎绌烘牸 * @param ignoreCase 鏄惁涓嶅尯鍒嗗ぇ灏忓啓 @@ -83,9 +93,17 @@ * @param trimAll 鏄惁蹇界暐鍏ㄩ儴绌烘牸 * @param conditionMap 鏌ヨ鏉′欢 */ - void wrapperKeyAttrConditionMap(String value, CodeKeyAttrRepeatVO keyRuleVO, String attrId, - boolean trim, boolean ignoreCase, boolean ignoreWidth, - boolean trimAll, Map<String, String> conditionMap); + void wrapperKeyAttrConditionMap(String value, CodeKeyAttrRepeatVO keyRuleVO, List<CodeSynonym> codeSynonymMaps, String attrId, + boolean trim, boolean ignoreCase, boolean ignoreWidth, + boolean trimAll, Map<String, String> conditionMap); + + /** + * 杩戜箟璇嶆煡璇㈣鍒欒浆鎹� + * @param codeSynonymMaps + * @param value + * @return + */ + String getValueToSynony(/*杩戜箟璇嶆煡璇㈣鍒�*/List<CodeSynonym> codeSynonymMaps,String value); /** * 鍒濆鍖栦笟鍔＄被鍨� @@ -159,6 +177,7 @@ * @param conditionMap 鏌ヨ鏉′欢 */ void wrapperResembleConditionMap(String value, CodeResembleRuleVO resembleRuleVO, String attrId, Map<String, String> conditionMap); + /** * 鑾峰彇浣跨敤鐨勭浉浼兼煡璇㈣鍒� * @@ -235,7 +254,6 @@ * @return 鎵ц缁撴灉 */ R batchUpdateCode(List<CodeOrderDTO> orderDTOList); - /** * 鏍囪娴佺▼涓笟鍔℃暟鎹槸鍚﹂�氳繃 @@ -395,6 +413,7 @@ * @return 澶勭悊鎴愬姛鏁版嵁鏉℃暟 */ Integer insertBatchByType(String btmType, List<BaseModel> baseModels); + /** * 浼犲叆涓氬姟绫诲瀷浠ュ強ID鏌ヨ涓氬姟琛ㄦ暟鎹槸鍚﹂噸澶� * @@ -421,7 +440,8 @@ * @param oids 闇�瑕佹煡璇㈢殑oid闆嗗悎 閫楀彿鍒嗗紑 * @return 鏌ヨ鍑虹殑鏁版嵁 */ - List<BaseModel> selectByTypeAndOid(String btmType, String oids) ; + List<BaseModel> selectByTypeAndOid(String btmType, String oids); + /** * 浼犲叆涓氬姟绫诲瀷浠ュ強鐩稿叧鏁版嵁杩涜鎵归噺鏇存柊鎿嶄綔 * @@ -438,7 +458,7 @@ * @param baseModels 澶勭悊鏁版嵁 * @return 澶勭悊鐘舵�� */ - public R<Integer>updateBatchBtypeDatas(String btmType, List<BaseModel> baseModels); + R<Integer>updateBatchBtypeDatas(String btmType, List<BaseModel> baseModels); /** * 榛樿鍒楄〃 @@ -480,7 +500,7 @@ * 鏍￠獙鍏抽敭灞炴�� * @param orderDTO 缂栫爜鐢宠鐨勭浉鍏崇殑淇℃伅 */ - public List<Map> checkKeyAttrOnOrderFordatas(CodeOrderDTO orderDTO) ; + List<Map> checkKeyAttrOnOrderFordatas(CodeOrderDTO orderDTO) ; /** * 鏍规嵁褰撳墠鐢宠缂栫爜鐨勫垎绫伙紝閫愬眰寰�涓婃牎楠屾槸鍚︾鍚堝睘浜庨厤缃殑涓殑鍒嗙被瀛愯妭鐐圭殑鍒� @@ -488,4 +508,24 @@ * @param parameter 浼犲叆鏁版嵁,classifyGroupCode:閰嶇疆鐨勪腑鐨勫垎绫婚《鑺傜偣锛宱id锛氶�夋嫨鑺傜偣鐨刼id */ R checkGroupCode(Map<String, String> parameter); + + /** + * 鏍囧噯鐢宠鍜屼慨璁㈢敤 + * @param codeBZApplyDTO 缂栫爜鐢宠鐩稿叧鐨勪俊鎭紝闇�瑕佹湁灞炴�у拰鐮佹鐩稿叧鐨勪俊鎭� + * @return 鎵ц缁撴灉 + */ + String addSaveBZ(CodeBZApplyDTO codeBZApplyDTO) throws Exception; + /** + * 鏍囧噯鐢宠鍜屼慨璁㈢敤 + * @param codeBZApplyDTO 缂栫爜鐢宠鐩稿叧鐨勪俊鎭紝闇�瑕佹湁灞炴�у拰鐮佹鐩稿叧鐨勪俊鎭� + * @param authUser 鏄惁妯℃嫙鐧诲綍锛宼rue锛屼笉妯℃嫙锛宖alse鏄ā鎷� + * @return 鎵ц缁撴灉 + */ + String addSaveBZCodeNotauthUser(CodeBZApplyDTO codeBZApplyDTO, boolean authUser) throws Exception; + /** + * 鑾峰彇缁熻鍒嗘瀽鏁版嵁 + * @param btmNames 涓氬姟绫诲瀷 + * @return 鏁版嵁闆� + */ + R getStatisticAnalysis(String btmNames); } -- Gitblit v1.9.3