From 2876d18531c7a75d4184285d54740e4b77859c56 Mon Sep 17 00:00:00 2001
From: xiejun <xiejun@vci-tech.com>
Date: 星期三, 08 一月 2025 20:23:47 +0800
Subject: [PATCH] 产品型号集成，类型转换，人员组织加日志，申请接口引用码段值校验
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java | 6
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/apply/data.json | 58 +++++++++
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/person/org.json | 11 +
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/mdm/data.json | 105 +++++++---------
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/person/OrgMasterData.java | 18 ++
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/mdm/data1.json | 2
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/person/org..json | 13 +
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/person/PersonMasterData.java | 120 ++++++++++++++++++++
8 files changed, 265 insertions(+), 68 deletions(-)
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/apply/data.json b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/apply/data.json
new file mode 100644
index 0000000..dc3f4eb
--- /dev/null
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/apply/data.json
@@ -0,0 +1,58 @@
+{
+ "data": {
+ "classifys": {
+ "classify": [
+ {
+ "classCode": "020101",
+ "fullclsfNamePath": "",
+ "library": "wupin",
+ "objects": {
+ "object": [
+ {
+ "code": "",
+ "creator": "admin",
+ "id": "201",
+ "operate": "create",
+ "prop": [
+ {
+ "key": "name",
+ "text": "鍚嶇О",
+ "value": "HB1-221"
+ },
+ {
+ "key": "tuhao",
+ "text": "鍥惧彿",
+ "value": "t111"
+ },
+ {
+ "key": "xinghaoguige",
+ "text": "瑙勬牸鍨嬪彿",
+ "value": "test11"
+ }
+ ],
+ "status": "Published"
+ }
+ ]
+ },
+ "sections": {
+ "section": [
+ {
+ "name": "鍥哄畾鐮佹",
+ "value": "A"
+ },{
+ "name": "寮曠敤鐮佹",
+ "value": "106000000t1"
+ }
+ ]
+ }
+ }
+ ]
+ },
+ "systemId": "ERP",
+ "user": {
+ "ip": "0:0:0:0:0:0:0:1",
+ "trueName": "admin",
+ "userName": "admin"
+ }
+ }
+}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/mdm/data.json b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/mdm/data.json
index 6678097..0ae9039 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/mdm/data.json
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/mdm/data.json
@@ -1,62 +1,49 @@
-{ "msg":"瀹℃壒鎷掔粷鏃剁殑璇︽儏淇℃伅",
- "distributeToken": "2",
- "code":"0",
- "systemCode":"ERP",
- "mdType":"product_info",
- "action":"distribute_subseribe",
- "masterData": [
+{
+ "codeSrchCondConfigVOS": [],
+ "codeShowFieldConfigVOS": [
{
- "id": "xj000001",
- "dr": "0",
- "mdm_code": "xj000005",
- "industry": "",
- "product_family": "",
- "product_line": "product_line",
- "product_manu_symbol": "product_manu_symbol",
- "product_manufacture_code": "manufacture_code",
- "product_manufacture_name": "name",
- "product_model": "product_model",
- "product_model_name": "product_model_name",
- "product_model_symbol": "product_model_symbol",
- "product_type": "product_type",
- "project_code": "project_code",
- "project_name": "project_name",
- "project_symbol": "project_symbol",
- "pk_mdm": "xj0001",
- "mdm_version": "V1",
- "mdm_duplicate": "0",
- "creator": "zhangsan",
- "createtime": "2024-10-23",
- "modifier": "zhangsan",
- "modifytime": "2024-10-23",
- "mdm_datastatus": "3",
- "mdm_cleanstatus": "TRANSFER"
- },{
- "id": "xj000002",
- "dr": "0",
- "mdm_code": "xj_00006",
- "industry": "",
- "product_family": "",
- "product_line": "product_line",
- "product_manu_symbol": "product_manu_symbol1",
- "product_manufacture_code": "product_manufacture_code1",
- "product_manufacture_name": "product_manufacture_name1",
- "product_model": "product_model1",
- "product_model_name": "product_model_name1",
- "product_model_symbol": "product_model_symbol1",
- "product_type": "type",
- "project_code": "project_code1",
- "project_name": "project_name1",
- "project_symbol": "symbol",
- "pk_mdm": "xj0002",
- "mdm_version": "V1",
- "mdm_duplicate": "0",
- "creator": "zhangsan",
- "createtime": "2024-10-23",
- "modifier": "zhangsan",
- "modifytime": "2024-10-23",
- "mdm_datastatus": "3",
- "mdm_cleanstatus": "TRANSFER"
+ "field": "id",
+ "title": "缂栧彿",
+ "fieldType": "text",
+ "fieldTypeText": "鏂囨湰妗�",
+ "sort": true,
+ "attrSortField": "id",
+ "width": "150",
+ "isquery": true,
+ "$cellEdit": false,
+ "$index": 0,
+ "$fieldTypeText": "鏂囨湰妗�",
+ "$fixedPosition": ""
+ },
+ {
+ "field": "name",
+ "title": "鍚嶇О",
+ "fieldType": "text",
+ "fieldTypeText": "鏂囨湰妗�",
+ "sort": true,
+ "attrSortField": "name",
+ "width": "180",
+ "isquery": true,
+ "$cellEdit": false,
+ "$index": 1,
+ "$fieldTypeText": "鏂囨湰妗�",
+ "$fixedPosition": ""
}
- ]
+ ],
+ "referTypeName": "Part",
+ "referType": "part",
+ "textField": "id",
+ "valueField": "id",
+ "type": "default",
+ "url": "",
+ "backPath": "",
+ "method": "GET",
+ "height": "",
+ "useFormKey": "",
+ "paramForFormKey": "",
+ "isMuti": false,
+ "mapFields": "",
+ "isOpenGlobal": true,
+ "isPersistence": false,
+ "limit": "100"
}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/mdm/data1.json b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/mdm/data1.json
index 8660de3..73a740b 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/mdm/data1.json
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/mdm/data1.json
@@ -4,5 +4,5 @@
"systemCode":"ERP",
"mdType":"product_info",
"action":"distribute_subseribe",
- "masterData": "[{\"id\": \"xj000001\",\"dr\": \"0\",\"mdm_code\": \"xj000005\",\"industry\": \"\",\"product_family\": \"\",\"product_line\": \"product_line\",\"product_manu_symbol\": \"product_manu_symbol\",\"product_manufacture_code\": \"manufacture_code\",\"product_manufacture_name\": \"name\",\"product_model\": \"product_model\",\"product_model_name\": \"product_model_name\",\"product_model_symbol\": \"product_model_symbol\",\"product_type\": \"product_type\",\"project_code\": \"project_code\",\"project_name\": \"project_name\",\"project_symbol\": \"project_symbol\",\"pk_mdm\": \"xj0001\",\"mdm_version\": \"V1\",\"mdm_duplicate\": \"0\",\"creator\": \"zhangsan\",\"createtime\": \"2024-10-23\",\"modifier\": \"zhangsan\",\"modifytime\": \"2024-10-23\",\"mdm_datastatus\": \"3\",\"mdm_cleanstatus\": \"TRANSFER\"},{\"id\": \"xj000002\",\"dr\": \"0\",\"mdm_code\": \"xj_00006\",\"industry\": \"\",\"product_family\": \"\",\"product_line\": \"product_line\",\"product_manu_symbol\": \"product_manu_symbol1\",\"product_manufacture_code\": \"product_manufacture_code1\",\"product_manufacture_name\": \"product_manufacture_name1\",\"product_model\": \"product_model1\",\"product_model_name\": \"product_model_name1\",\"product_model_symbol\": \"product_model_symbol1\",\"product_type\": \"type\",\"project_code\": \"project_code1\",\"project_name\": \"project_name1\",\"project_symbol\": \"symbol\",\"pk_mdm\": \"xj0002\",\"mdm_version\": \"V1\",\"mdm_duplicate\": \"0\",\"creator\": \"zhangsan\",\"createtime\": \"2024-10-23\",\"modifier\": \"zhangsan\",\"modifytime\": \"2024-10-23\",\"mdm_datastatus\": \"3\",\"mdm_cleanstatus\": \"TRANSFER\"}]"
+ "masterData": "[{\"id\": \"xj000001\",\"dr\": true,\"mdm_code\": \"xj000005\",\"industry\": \"\",\"product_family\": \"\",\"product_line\": \"product_line\",\"product_manu_symbol\": \"product_manu_symbol\",\"product_manufacture_code\": \"manufacture_code\",\"product_manufacture_name\": \"name\",\"product_model\": \"product_model\",\"product_model_name\": \"product_model_name\",\"product_model_symbol\": \"product_model_symbol\",\"product_type\": \"product_type\",\"project_code\": \"project_code\",\"project_name\": \"project_name\",\"project_symbol\": \"project_symbol\",\"pk_mdm\": \"xj0001\",\"mdm_version\": \"V1\",\"mdm_duplicate\": \"0\",\"creator\": \"zhangsan\",\"createtime\": \"2024-10-23\",\"modifier\": \"zhangsan\",\"modifytime\": \"2024-10-23\",\"mdm_datastatus\": \"3\",\"mdm_cleanstatus\": \"TRANSFER\"},{\"id\": \"xj000002\",\"dr\": true,\"mdm_code\": \"xj_00006\",\"industry\": \"\",\"product_family\": \"\",\"product_line\": \"product_line\",\"product_manu_symbol\": \"product_manu_symbol1\",\"product_manufacture_code\": \"product_manufacture_code1\",\"product_manufacture_name\": \"product_manufacture_name1\",\"product_model\": \"product_model1\",\"product_model_name\": \"product_model_name1\",\"product_model_symbol\": \"product_model_symbol1\",\"product_type\": \"type\",\"project_code\": \"project_code1\",\"project_name\": \"project_name1\",\"project_symbol\": \"symbol\",\"pk_mdm\": \"xj0002\",\"mdm_version\": \"V1\",\"mdm_duplicate\": \"0\",\"creator\": \"zhangsan\",\"createtime\": \"2024-10-23\",\"modifier\": \"zhangsan\",\"modifytime\": \"2024-10-23\",\"mdm_datastatus\": \"3\",\"mdm_cleanstatus\": \"TRANSFER\"}]"
}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/person/OrgMasterData.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/person/OrgMasterData.java
index 2b61960..e0dd005 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/person/OrgMasterData.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/person/OrgMasterData.java
@@ -1,7 +1,10 @@
package com.vci.ubcs.code.vo.webserviceModel.person;
public class OrgMasterData {
-
+ /**
+ * 涓婚敭
+ */
+ private String id;
/**
* 闅跺睘鍗曚綅浠ｇ爜
*/
@@ -457,10 +460,19 @@
this.dr_ndm_code = dr_ndm_code;
}
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
@Override
public String toString() {
return "OrgMasterData{" +
- "company_code='" + company_code + '\'' +
+ "id='" + id + '\'' +
+ ", company_code='" + company_code + '\'' +
", company_name='" + company_name + '\'' +
", department_code='" + department_code + '\'' +
", department_name='" + department_name + '\'' +
@@ -479,6 +491,7 @@
", id_route='" + id_route + '\'' +
", name_route='" + name_route + '\'' +
", node_type='" + node_type + '\'' +
+ ", original_code='" + original_code + '\'' +
", creator='" + creator + '\'' +
", createtime='" + createtime + '\'' +
", modifier='" + modifier + '\'' +
@@ -489,7 +502,6 @@
", mdm_cleanstatus='" + mdm_cleanstatus + '\'' +
", link_fieldvalue='" + link_fieldvalue + '\'' +
", flow_middatastatus='" + flow_middatastatus + '\'' +
- ", original_code='" + original_code + '\'' +
", pk_mdm='" + pk_mdm + '\'' +
", mdm_duplicate='" + mdm_duplicate + '\'' +
", mdm_code='" + mdm_code + '\'' +
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/person/PersonMasterData.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/person/PersonMasterData.java
index 16381da..751e14d 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/person/PersonMasterData.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/person/PersonMasterData.java
@@ -269,6 +269,21 @@
private String ts;
+
+ private String graduatecolleges;
+ private String is_on_duty;
+ private String is_on_job;
+ private String leibie;
+ private String major;
+ private String position_code;
+
+ private String post_state_code;
+ private String post_state_name;
+ private String sort_num;
+ private String worktime;
+
+ private String workyear;
+
public String getId() {
return id;
}
@@ -773,6 +788,94 @@
this.ts = ts;
}
+ public String getGraduatecolleges() {
+ return graduatecolleges;
+ }
+
+ public void setGraduatecolleges(String graduatecolleges) {
+ this.graduatecolleges = graduatecolleges;
+ }
+
+ public String getIs_on_duty() {
+ return is_on_duty;
+ }
+
+ public void setIs_on_duty(String is_on_duty) {
+ this.is_on_duty = is_on_duty;
+ }
+
+ public String getIs_on_job() {
+ return is_on_job;
+ }
+
+ public void setIs_on_job(String is_on_job) {
+ this.is_on_job = is_on_job;
+ }
+
+ public String getLeibie() {
+ return leibie;
+ }
+
+ public void setLeibie(String leibie) {
+ this.leibie = leibie;
+ }
+
+ public String getMajor() {
+ return major;
+ }
+
+ public void setMajor(String major) {
+ this.major = major;
+ }
+
+ public String getPosition_code() {
+ return position_code;
+ }
+
+ public void setPosition_code(String position_code) {
+ this.position_code = position_code;
+ }
+
+ public String getPost_state_code() {
+ return post_state_code;
+ }
+
+ public void setPost_state_code(String post_state_code) {
+ this.post_state_code = post_state_code;
+ }
+
+ public String getPost_state_name() {
+ return post_state_name;
+ }
+
+ public void setPost_state_name(String post_state_name) {
+ this.post_state_name = post_state_name;
+ }
+
+ public String getSort_num() {
+ return sort_num;
+ }
+
+ public void setSort_num(String sort_num) {
+ this.sort_num = sort_num;
+ }
+
+ public String getWorktime() {
+ return worktime;
+ }
+
+ public void setWorktime(String worktime) {
+ this.worktime = worktime;
+ }
+
+ public String getWorkyear() {
+ return workyear;
+ }
+
+ public void setWorkyear(String workyear) {
+ this.workyear = workyear;
+ }
+
@Override
public String toString() {
return "PersonMasterData{" +
@@ -807,9 +910,15 @@
", position='" + position + '\'' +
", work_title='" + work_title + '\'' +
", worker_category='" + worker_category + '\'' +
+ ", worker_category_code='" + worker_category_code + '\'' +
", worker_duty='" + worker_duty + '\'' +
", worker_email='" + worker_email + '\'' +
", worker_level='" + worker_level + '\'' +
+ ", worker_level_code='" + worker_level_code + '\'' +
+ ", country_level_code='" + country_level_code + '\'' +
+ ", country_level_name='" + country_level_name + '\'' +
+ ", business_level_code='" + business_level_code + '\'' +
+ ", business_level_name='" + business_level_name + '\'' +
", worker_security_level='" + worker_security_level + '\'' +
", mdm_workflow=" + mdm_workflow +
", modifier='" + modifier + '\'' +
@@ -833,6 +942,17 @@
", pk_mdm='" + pk_mdm + '\'' +
", gender_name='" + gender_name + '\'' +
", ts='" + ts + '\'' +
+ ", graduatecolleges='" + graduatecolleges + '\'' +
+ ", is_on_duty='" + is_on_duty + '\'' +
+ ", is_on_job='" + is_on_job + '\'' +
+ ", leibie='" + leibie + '\'' +
+ ", major='" + major + '\'' +
+ ", position_code='" + position_code + '\'' +
+ ", post_state_code='" + post_state_code + '\'' +
+ ", post_state_name='" + post_state_name + '\'' +
+ ", sort_num='" + sort_num + '\'' +
+ ", worktime='" + worktime + '\'' +
+ ", workyear='" + workyear + '\'' +
'}';
}
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 1fbbea3..9eb7389 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
@@ -66,8 +66,17 @@
"worker_duty":"椋炴満鍙嬪姩鏈洪挘閲戝伐",
"marital_status":"鏈",
"mdm_version":"75,",
- "ts":"2025-08-t9 17:52:19.026"
-
+ "ts":"2025-08-t9 17:52:19.026",
+ "graduatecolleges": "222222",
+ "is_on_duty": "222222",
+ "leibie": "222222",
+ "major": "222222",
+ "position_code": "222222",
+ "post_state_code": "222222",
+ "post_state_name": "222222",
+ "sort_num": "222222",
+ "worktime": "2023-06-1201:39:40",
+ "workyear":"2222"
}],
"distributeToken":"",
"code":0,
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
new file mode 100644
index 0000000..887429f
--- /dev/null
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/person/org.json
@@ -0,0 +1,11 @@
+{
+ "msg": null,
+ "masterData": "[{\"country\":\"涓浗澶ч檰\",\"education\":\"澶у鏈\",\"mdm_workflow_status\":0,\"worker_category\":\"鍦ㄥ矖\",\"modifier\":\"涓绘暟鎹郴缁焅",\"mdm_datastatus\": 3,\"link_fieldvalue\": null,\"dr\": 0,\"flow_middatastatus\": null,\"employer\":\"棰嗙剨鍔犲伐鍘俓",\"parent_dept_code\":\"403000\",\"politiccountenance\": null,\"outer_email\": null,\"id_number\":\"210104198806062312\",\"worker_level\":\"鍒濈骇宸ャ�婂熀鏈敓浜с�媆",\"admin_division_code\": null,\"work_title\": null,\"mdm_duplicate\":0,\"employer_code\":\"403000\",\"birthplace\":\"杈藉畞鐪佹矆闃冲競\",\"nationality\":\"姹夋棌\",\"gender_entity\":{\"mdm_code\":\"1\",\"code\":\"5\",\"name\":\"鐢锋�",\"descript\":\"鐢峰コ锛岄泦鍥㈡爣鍑嗚姹�: 鐢锋�� 1鍜�5锛屽コ鎬�2鍜�6\"},\"name\":\"鐢拌嫍\",\"position\":\"椋炴満鍙戝姩鏈洪閲戝伐\",\"employment_type_entity\":{\"mdm_code\":\"1\",\"code\":\"1,\",\"name\":\"閮ㄩ棬涓昏亴\",\"descript\":\"1銆侀儴闂ㄧ帇鑱� 2銆侀儴闂ㄥ吋鑱孿"},\"parent_dept_name\":\"棰嗙剨鍔犲伐鍘俓",\"birthday\":\"1988-06-06\",\"employment_type\":\"1\",\"employment_type_nane\":\"閮ㄩ棬涓昏亴\",\"group_code\":\"19885013\",\"gender\":1,\"admin_division\":null,\"modifytime\" :\"2023-08-29\",\"worker_security_level\":null,\"mdm_cleanstatus\":\"WAITINC\",\"dr_mdm_code\":\"0\",\"mdm_parentcode\":null,\"mobile_phone\":\"15140256567\",\"id_type\":\"韬唤璇乗",\"dept_type\":\"鏈哄專鐏劙绛掑伐娈礬",\"worker_email\":null,\"pk_mdm\":\"1723S7091785C804868\",\"employment_form\":\"姝ｅ紡鍦ㄥ矖浜哄憳\",\"lm_code\":\"19885013\",\"creator\":\"涓绘暟鎹郴缁焅" ,\"createtime\":\"2023-06-1201:39:40\",\"office_telephone\":null,\"citizenship\":\"杈藉箍鐪佹矆闃冲競\",\"dept_name\":\"403002\",\"mdm_code\":\"16305\",\"gender_name\":\"鐢锋�",\"is_keyposion\":\"鏄痋",\"worker_duty\":\"椋炴満鍙嬪姩鏈洪挘閲戝伐\",\"marital_status\":\"鏈\",\"mdm_version\":\"75\",\"ts\":\"2025-08-t9 17:52:19.026\",\"graduatecolleges\": \"222222\",\"is_on_duty\": \"222222\",\"leibie\": \"222222\",\"major\": \"222222\",\"position_code\": \"222222\",\n \"post_state_code\": \"222222\",\"post_state_name\": \"222222\",\"sort_num\": \"222222\",\"worktime\": \"2023-06-1201:39:40\",\"workyear\":\"2222\"}]",
+
+
+ "distributeToken":"",
+ "code":0,
+ "systemCode":"mhperson",
+ "mdType": "person_basic",
+ "action": "distribute_subscribe"
+}
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 fd06dee..2817e78 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
@@ -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<>();
@@ -931,7 +931,7 @@
//瑙勫垯涔嬪畾涔変负鍙彉鐮佹瀛樺偍涓绘暟鎹紶閫掕繃鏉ョ殑鏁版嵁
CodeOrderSecDTO CodeOrderSecDTO = new CodeOrderSecDTO();
CodeOrderSecDTO.setSecOid(codeBasicSecVO.getOid());
- CodeOrderSecDTO.setSecValue(rowData.getOid());
+ CodeOrderSecDTO.setSecValue(rowData.getCode());
codeOrderSecDTOList.add(CodeOrderSecDTO);
}
});
--
Gitblit v1.9.3