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 | 10 +++++-----
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/person/org..json | 6 +++---
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/person/org..json b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/person/org..json
index 9eb7389..03e472b 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/person/org..json
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/person/org..json
@@ -56,12 +56,12 @@
"employment_form":"姝ｅ紡鍦ㄥ矖浜哄憳",
"lm_code":"19885013",
"creator":"涓绘暟鎹郴缁�" ,
- "createtime":"2023-06-1201:39:40",
+ "createtime":"2023-06-12 01:39:40",
"office_telephone":null,
"citizenship":"杈藉箍鐪佹矆闃冲競",
"dept_name":"403002",
"mdm_code":"16305",
- "gender_name":"鐢锋�р��,",
+ "gender_name":"鐢封��,",
"is_keyposion":"鏄�",
"worker_duty":"椋炴満鍙嬪姩鏈洪挘閲戝伐",
"marital_status":"鏈",
@@ -75,7 +75,7 @@
"post_state_code": "222222",
"post_state_name": "222222",
"sort_num": "222222",
- "worktime": "2023-06-1201:39:40",
+ "worktime": "2023-06-12 01:39:40",
"workyear":"2222"
}],
"distributeToken":"",
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 2817e78..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) {
@@ -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锛氫慨鏀规暟鎹墽琛屽畬姣�");
}
--
Gitblit v1.9.3