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 | 21 +++++++++++++++------ 1 files changed, 15 insertions(+), 6 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 418809c..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 @@ -9,6 +9,7 @@ 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.*; @@ -84,6 +85,7 @@ * * @param value 褰撳墠鐨勫�� * @param keyRuleVO 鍏抽敭灞炴�х殑鎺у埗瑙勫垯锛屽彲浠ヤ负绌� + * @param codeSynonymMaps 杩戜箟璇嶆煡璇㈣鍒� * @param attrId 灞炴�х殑缂栧彿 * @param trim 鏄惁鍘婚櫎绌烘牸 * @param ignoreCase 鏄惁涓嶅尯鍒嗗ぇ灏忓啓 @@ -91,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); /** * 鍒濆鍖栦笟鍔＄被鍨� @@ -244,7 +254,6 @@ * @return 鎵ц缁撴灉 */ R batchUpdateCode(List<CodeOrderDTO> orderDTOList); - /** * 鏍囪娴佺▼涓笟鍔℃暟鎹槸鍚﹂�氳繃 @@ -449,7 +458,7 @@ * @param baseModels 澶勭悊鏁版嵁 * @return 澶勭悊鐘舵�� */ - public R<Integer>updateBatchBtypeDatas(String btmType, List<BaseModel> baseModels); + R<Integer>updateBatchBtypeDatas(String btmType, List<BaseModel> baseModels); /** * 榛樿鍒楄〃 @@ -491,7 +500,7 @@ * 鏍￠獙鍏抽敭灞炴�� * @param orderDTO 缂栫爜鐢宠鐨勭浉鍏崇殑淇℃伅 */ - public List<Map> checkKeyAttrOnOrderFordatas(CodeOrderDTO orderDTO) ; + List<Map> checkKeyAttrOnOrderFordatas(CodeOrderDTO orderDTO) ; /** * 鏍规嵁褰撳墠鐢宠缂栫爜鐨勫垎绫伙紝閫愬眰寰�涓婃牎楠屾槸鍚︾鍚堝睘浜庨厤缃殑涓殑鍒嗙被瀛愯妭鐐圭殑鍒� -- Gitblit v1.9.3