From 03fc4cfd7abfd125b942417284999a0aea7305d9 Mon Sep 17 00:00:00 2001
From: xiejun <xiejun@vci-tech.com>
Date: 星期三, 15 一月 2025 21:35:07 +0800
Subject: [PATCH] 产品型号集成，类型转换，人员组织加日志，申请接口引用码段值校验
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java | 40 ++++++++++++++++++++++------------------
1 files changed, 22 insertions(+), 18 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java
index 70b78a1..e47f645 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java
@@ -559,7 +559,7 @@
object.setOperate("create");
applyDataVOList.add(object);
}
- codeList.add(personMasterData.getLm_code());
+ codeList.add(object.getCode());
});
R<BtmTypeVO> r = btmTypeClient.getAllAttributeByBtmId(templateVO.getBtmTypeId());
@@ -614,8 +614,8 @@
DataObjectVO dataObjectVO = new DataObjectVO();
this.getConfigDatas(systemCode, personLibrary, editDatasVO, attrVOS, dataObjectVO);
log.info("start锛氫慨鏀规暟鎹墽琛屽畬姣�");
- boolean personApplyGroupCode =personAndDeptConfig.isPersonApplyGroupCode();
- mdmIOService.batchSyncEditDatas(codeClassifyVO,dataObjectVO, resultDataObjectDetailDOs,personApplyGroupCode);
+ // boolean personApplyGroupCode =personAndDeptConfig.isPersonApplyGroupCode();
+ mdmIOService.batchSyncEditDatas(codeClassifyVO,dataObjectVO, resultDataObjectDetailDOs,isPersonApplyGroupCode);
log.info("end锛氫慨鏀规暟鎹墽琛屽畬姣�");
}
if(applyDatasVO.getObject()!=null&&applyDatasVO.getObject().size()>0) {
@@ -806,10 +806,10 @@
List<ApplyDataVO> deleteDataVOList=new ArrayList<>();
orgMasterDataList.stream().forEach(orgMasterData -> {
ApplyDataVO object=new ApplyDataVO();
- object.setCode(orgMasterData.getMdm_code());//缂栫爜
+ object.setCode(orgMasterData.getDepartment_code());//缂栫爜
object.setCreator(orgMasterData.getCreator());//鍒涘缓鑰�
object.setEditor(orgMasterData.getModifier());//淇敼鑰�
- object.setId(orgMasterData.getDepartment_code());//涓婚敭
+ object.setId(orgMasterData.getId());//涓婚敭
object.setStatus(CodeDefaultLC.RELEASED.getValue());//鐘舵�佸垯闇�瑕佸垽鏂�
Map<String,String> dataMap= VciBaseUtil.objectToMapString(orgMasterData);
List<ProppertyVO> proppertyVOList = new ArrayList<>();
@@ -844,7 +844,7 @@
object.setOperate("create");
applyDataVOList.add(object);
}
- codeList.add(orgMasterData.getMdm_code());
+ codeList.add(object.getCode());
});
R<BtmTypeVO> r = btmTypeClient.getAllAttributeByBtmId(templateVO.getBtmTypeId());
@@ -899,7 +899,7 @@
DataObjectVO dataObjectVO = new DataObjectVO();
this.getConfigDatas(systemCode, deptLibrary, editDatasVO, attrVOS, dataObjectVO);
log.info("start锛氫慨鏀规暟鎹墽琛屽畬姣�");
- boolean personApplyGroupCode = personAndDeptConfig.isPersonApplyGroupCode();
+ boolean personApplyGroupCode = false;//personAndDeptConfig.isPersonApplyGroupCode();
mdmIOService.batchSyncEditDatas(codeClassifyVO,dataObjectVO, resultDataObjectDetailDOs,personApplyGroupCode);
log.info("end锛氫慨鏀规暟鎹墽琛屽畬姣�");
}
@@ -931,7 +931,7 @@
//瑙勫垯涔嬪畾涔変负鍙彉鐮佹瀛樺偍涓绘暟鎹紶閫掕繃鏉ョ殑鏁版嵁
CodeOrderSecDTO CodeOrderSecDTO = new CodeOrderSecDTO();
CodeOrderSecDTO.setSecOid(codeBasicSecVO.getOid());
- CodeOrderSecDTO.setSecValue(rowData.getOid());
+ CodeOrderSecDTO.setSecValue(rowData.getCode());
codeOrderSecDTOList.add(CodeOrderSecDTO);
}
});
@@ -964,6 +964,7 @@
}
}*/
} catch (Exception e) {
+ log.error( "閮ㄩ棬鏁版嵁鎺ユ敹澶辫触:",e);
mesg=e.getMessage();
e.printStackTrace();
throw new ServiceException(e.getMessage());
@@ -2474,17 +2475,21 @@
String buildSqlwhere="";
List<CodeSectionValueVO> codeSectionValueVOList=new ArrayList<>();
if(coderefersecSearchVO!=null) {
+ Map<String, Object> condtionMap = new HashMap<>();
+ String valueField= coderefersecSearchVO.getValueField();
+ if(StringUtils.isNotBlank(valueField)){
+ condtionMap.put(valueField,sectypeValue);
+ }
if (coderefersecSearchVO.getType().equals(CodeReferConfigTypeEnum.DEFAULT.getValue()) || coderefersecSearchVO.getType().equals(CodeReferConfigTypeEnum.GRID.getValue())) {//榛樿鏍峰紡/鍒楄〃
- Map<String, Object> condtionMap = new HashMap<>();
List<CodeSrchCondConfigVO> codeSrchCondConfigVOList = coderefersecSearchVO.getCodeSrchCondConfigVOS();
-
if (!CollectionUtils.isEmpty(codeSrchCondConfigVOList)) {
codeSrchCondConfigVOList.stream().forEach(codeSrchCondConfigVO -> {
condtionMap.put(codeSrchCondConfigVO.getFilterField() + codeSrchCondConfigVO.getFilterType(), codeSrchCondConfigVO.getFilterValue());
});
+ }
+ if(!CollectionUtils.isEmpty(condtionMap)) {
buildSqlwhere = UBCSSqlKeyword.buildSqlwhere(condtionMap);
}
-
//浣跨敤浼犲叆鐨勪笟鍔＄被鍨嬫煡璇㈣〃
R<List<BtmTypeVO>> listR = btmTypeClient.selectByIdCollection(Collections.singletonList(referBtmId));
if (!listR.isSuccess() || listR.getData().size() == 0) {
@@ -2499,7 +2504,7 @@
sb.append(buildSqlwhere);
}
List<Map> ListMap = commonsMapper.selectBySql(sb.toString());
- String valueField = coderefersecSearchVO.getValueField();
+ //String valueField = coderefersecSearchVO.getValueField();
String textField = coderefersecSearchVO.getTextField();
final int[] num = {0};
if (!CollectionUtils.isEmpty(ListMap)) {
@@ -2514,8 +2519,6 @@
});
}
}else if (coderefersecSearchVO.getType().equals(CodeReferConfigTypeEnum.TREE.getValue())) {//鏍戝舰
- Map<String, Object> condtionMap = new HashMap<>();
-
//浣跨敤浼犲叆鐨勪笟鍔＄被鍨嬫煡璇㈣〃
R<List<BtmTypeVO>> listR = btmTypeClient.selectByIdCollection(Collections.singletonList(referBtmId));
if (!listR.isSuccess() || listR.getData().size() == 0) {
@@ -2532,9 +2535,10 @@
codeSrchCondConfigVOList.stream().forEach(codeSrchCondConfigVO -> {
condtionMap.put(codeSrchCondConfigVO.getFilterField() + codeSrchCondConfigVO.getFilterType(), codeSrchCondConfigVO.getFilterValue());
});
+ }
+ if(!CollectionUtils.isEmpty(condtionMap)) {
buildSqlwhere = UBCSSqlKeyword.buildSqlwhere(condtionMap);
}
-
//if("all".equals(coderefersecSearchVO.getLoadType())) {
String parentOidSql = "";
if(StringUtils.isNotBlank(parentValue)){
@@ -2581,7 +2585,6 @@
sb.append(buildSqlwhere);
}
List<Map> ListMap = commonsMapper.selectBySql(sb.toString());
- String valueField = coderefersecSearchVO.getValueField();
String textField = coderefersecSearchVO.getTextField();
final int[] num = {0};
if (!CollectionUtils.isEmpty(ListMap)) {
@@ -2601,11 +2604,11 @@
if(!CollectionUtils.isEmpty(codeSectionValueVOList)){
Map<String, CodeSectionValueVO> codeSectionValueVOMap = codeSectionValueVOList.stream().collect(Collectors.toMap(s -> s.getValue(), t -> t, (o1, o2) -> o2));
if(!codeSectionValueVOMap.containsKey(sectypeValue)){
- message="浼犲叆鐨勭紪鐮佽鍒欑爜娈�:銆�"+name+"銆戜负"+CODE_REFER_SEC.getText()+",鍏跺搴旂殑鍊硷紝鍦ㄧ紪鐮佺郴缁熶笉瀛樺湪";
+ message="浼犲叆鐨勭紪鐮佽鍒欑爜娈�:銆�"+name+"銆戜负"+CODE_REFER_SEC.getText()+",鍏跺搴旂殑鍊笺��"+sectypeValue+"銆戯紝鍦ㄧ紪鐮佺郴缁熶笉瀛樺湪";
errorMap.put("error",errorMap.getOrDefault("error","")+";"+message);
}
}else{
- message="浼犲叆鐨勭紪鐮佽鍒欑爜娈�:銆�"+name+"銆戜负"+CODE_REFER_SEC.getText()+",鍏跺搴旂殑鍊硷紝鍦ㄧ紪鐮佺郴缁熶笉瀛樺湪";
+ message="浼犲叆鐨勭紪鐮佽鍒欑爜娈�:銆�"+name+"銆戜负"+CODE_REFER_SEC.getText()+",鍏跺搴旂殑鍊笺��"+sectypeValue+"銆戯紝鍦ㄧ紪鐮佺郴缁熶笉瀛樺湪";
errorMap.put("error",errorMap.getOrDefault("error","")+";"+message);
}
}
@@ -2728,6 +2731,7 @@
String dataValue = sourceKeyValueMap.get(sourceKey);
if (attrMapConfigMap.containsKey(sourceKey)) {
String targetKey = attrMapConfigMap.get(sourceKey);
+ log.info("xxxxx灞炴�ф槧灏勫��:sourceKey銆�"+sourceKey+"銆戔�斺�斻��+targetKey"+targetKey+":"+dataValue);
keyValueMap.put(targetKey, StringUtils.isBlank(dataValue)?"":dataValue);
}
});
--
Gitblit v1.9.3