From ff6d5da87a876328ee25a8e85dff09f308355e95 Mon Sep 17 00:00:00 2001 From: Administrator <704728292@qq.com> Date: Wed, 21 May 2025 17:46:04 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E5=91=98=E5=B7=A5=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E8=A1=A8=E4=B8=8D=E5=AD=98=E5=9C=A8=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../organization/esb/SyncRzglPersonInfo.java | 46 +++++++++++++++---- .../organization/esb/SyncXxbgPersonInfo.java | 14 +++--- 2 files changed, 44 insertions(+), 16 deletions(-) diff --git a/jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/organization/esb/SyncRzglPersonInfo.java b/jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/organization/esb/SyncRzglPersonInfo.java index 637b438..422e682 100644 --- a/jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/organization/esb/SyncRzglPersonInfo.java +++ b/jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/organization/esb/SyncRzglPersonInfo.java @@ -89,7 +89,7 @@ public class SyncRzglPersonInfo implements EsbServerlessRpcRemoteInterface { /** * 员工信息明细表数据同步处理 */ - syncAllYgxxDetailInfo(sjid); + syncAllYgxxDetailInfo(sjid,ryid); /** * 写入表单引擎数据大表 @@ -118,6 +118,13 @@ public class SyncRzglPersonInfo implements EsbServerlessRpcRemoteInterface { map.remove("eb_workflow_id"); map.remove("current_step"); map.remove("name"); + + map.remove("rzzt_obj"); + map.remove("rzzt"); + map.remove("rzsqlc_obj"); + map.remove("rzsqlc"); + map.remove("sec_level"); + if(!map.isEmpty()){ //更新前先处理一下时间 cleanUpTime(map); @@ -436,7 +443,7 @@ public class SyncRzglPersonInfo implements EsbServerlessRpcRemoteInterface { * 数据同步处理明细表 * @return */ - public void syncAllYgxxDetailInfo(String ygxxid){ + public void syncAllYgxxDetailInfo(String ygxxid,String id){ log.error("syncAllYgxxDetailInfo.ygxxid:{}", ygxxid); /** * 工作履历表 @@ -461,6 +468,9 @@ public class SyncRzglPersonInfo implements EsbServerlessRpcRemoteInterface { //插入组织工作履历表 cleanUpTime(gzllInfo_new); gzllInfo_new.remove("hiredate"); + String detail_id = createPrimarykey(); + gzllInfo_new.put("id",detail_id); + gzllInfo_new.put("form_data_id",id); insert("uf_jcl_emp_gzll",gzllInfo_new); } } @@ -488,6 +498,9 @@ public class SyncRzglPersonInfo implements EsbServerlessRpcRemoteInterface { //插入教育经历表 cleanUpTime(jyjlInfo_new); jyjlInfo_new.remove("hiredate"); + String detail_id = createPrimarykey(); + jyjlInfo_new.put("id",detail_id); + jyjlInfo_new.put("form_data_id",id); insert("uf_jcl_emp_jyjl",jyjlInfo_new); } } @@ -515,6 +528,9 @@ public class SyncRzglPersonInfo implements EsbServerlessRpcRemoteInterface { //插入家庭信息表 cleanUpTime(jtxxInfo_new); jtxxInfo_new.remove("hiredate"); + String detail_id = createPrimarykey(); + jtxxInfo_new.put("id",detail_id); + jtxxInfo_new.put("form_data_id",id); insert("uf_jcl_emp_jtxx",jtxxInfo_new); } } @@ -541,6 +557,9 @@ public class SyncRzglPersonInfo implements EsbServerlessRpcRemoteInterface { } cleanUpTime(bzInfo_new); bzInfo_new.remove("hiredate"); + String detail_id = createPrimarykey(); + bzInfo_new.put("id",detail_id); + bzInfo_new.put("form_data_id",id); //插入家庭信息表 insert("uf_jcl_emp_bzyjl",bzInfo_new); } @@ -569,6 +588,9 @@ public class SyncRzglPersonInfo implements EsbServerlessRpcRemoteInterface { //插入培训表 cleanUpTime(pxInfo_new); pxInfo_new.remove("hiredate"); + String detail_id = createPrimarykey(); + pxInfo_new.put("id",detail_id); + pxInfo_new.put("form_data_id",id); insert("uf_jcl_emp_pxjl",pxInfo_new); } } @@ -596,6 +618,9 @@ public class SyncRzglPersonInfo implements EsbServerlessRpcRemoteInterface { //插入培训表 cleanUpTime(yyInfo_new); yyInfo_new.remove("hiredate"); + String detail_id = createPrimarykey(); + yyInfo_new.put("id",detail_id); + yyInfo_new.put("form_data_id",id); insert("uf_jcl_emp_yynl",yyInfo_new); } } @@ -623,6 +648,9 @@ public class SyncRzglPersonInfo implements EsbServerlessRpcRemoteInterface { //插入权威机构表 cleanUpTime(qwInfo_new); qwInfo_new.remove("hiredate"); + String detail_id = createPrimarykey(); + qwInfo_new.put("id",detail_id); + qwInfo_new.put("form_data_id",id); insert("uf_jcl_emp_qwjgzgrz",qwInfo_new); } } @@ -657,7 +685,7 @@ public class SyncRzglPersonInfo implements EsbServerlessRpcRemoteInterface { gzllInfo_new.put(key,getIgnoreCase(map, key)); } } - gzllInfo_new.put("FORM_DATA_ID",ygxxid); + gzllInfo_new.put("form_data_id",ygxxid); } //跟换id值，然后主键冲突 String primarykey = createPrimarykey(); @@ -692,7 +720,7 @@ public class SyncRzglPersonInfo implements EsbServerlessRpcRemoteInterface { jyjlInfo_new.put(key,getIgnoreCase(map, key)); } } - jyjlInfo_new.put("FORM_DATA_ID",ygxxid); + jyjlInfo_new.put("form_data_id",ygxxid); } //跟换id值，然后主键冲突 String primarykey = createPrimarykey(); @@ -727,7 +755,7 @@ public class SyncRzglPersonInfo implements EsbServerlessRpcRemoteInterface { jtxxInfo_new.put(key,getIgnoreCase(map, key)); } } - jtxxInfo_new.put("FORM_DATA_ID",ygxxid); + jtxxInfo_new.put("form_data_id",ygxxid); } //跟换id值，然后主键冲突 String primarykey = createPrimarykey(); @@ -762,7 +790,7 @@ public class SyncRzglPersonInfo implements EsbServerlessRpcRemoteInterface { bzInfo_new.put(key,getIgnoreCase(map, key)); } } - bzInfo_new.put("FORM_DATA_ID",ygxxid); + bzInfo_new.put("form_data_id",ygxxid); } //跟换id值，然后主键冲突 String primarykey = createPrimarykey(); @@ -797,7 +825,7 @@ public class SyncRzglPersonInfo implements EsbServerlessRpcRemoteInterface { pxInfo_new.put(key,getIgnoreCase(map, key)); } } - pxInfo_new.put("FORM_DATA_ID",ygxxid); + pxInfo_new.put("form_data_id",ygxxid); } //跟换id值，然后主键冲突 String primarykey = createPrimarykey(); @@ -832,7 +860,7 @@ public class SyncRzglPersonInfo implements EsbServerlessRpcRemoteInterface { yyInfo_new.put(key,getIgnoreCase(map, key)); } } - yyInfo_new.put("FORM_DATA_ID",ygxxid); + yyInfo_new.put("form_data_id",ygxxid); } //跟换id值，然后主键冲突 String primarykey = createPrimarykey(); @@ -867,7 +895,7 @@ public class SyncRzglPersonInfo implements EsbServerlessRpcRemoteInterface { qwInfo_new.put(key,getIgnoreCase(map, key)); } } - qwInfo_new.put("FORM_DATA_ID",ygxxid); + qwInfo_new.put("form_data_id",ygxxid); } //跟换id值，然后主键冲突 String primarykey = createPrimarykey(); diff --git a/jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/organization/esb/SyncXxbgPersonInfo.java b/jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/organization/esb/SyncXxbgPersonInfo.java index 2d6a124..808183c 100644 --- a/jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/organization/esb/SyncXxbgPersonInfo.java +++ b/jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/organization/esb/SyncXxbgPersonInfo.java @@ -360,7 +360,7 @@ public class SyncXxbgPersonInfo implements EsbServerlessRpcRemoteInterface { gzllInfo_new.put(key,getIgnoreCase(map, key)); } } - gzllInfo_new.put("FORM_DATA_ID",ygxxid); + gzllInfo_new.put("form_data_id",ygxxid); } //跟换id值，然后主键冲突 String primarykey = createPrimarykey(); @@ -392,7 +392,7 @@ public class SyncXxbgPersonInfo implements EsbServerlessRpcRemoteInterface { jyjlInfo_new.put(key,getIgnoreCase(map, key)); } } - jyjlInfo_new.put("FORM_DATA_ID",ygxxid); + jyjlInfo_new.put("form_data_id",ygxxid); } //跟换id值，然后主键冲突 String primarykey = createPrimarykey(); @@ -423,7 +423,7 @@ public class SyncXxbgPersonInfo implements EsbServerlessRpcRemoteInterface { jtxxInfo_new.put(key,getIgnoreCase(map, key)); } } - jtxxInfo_new.put("FORM_DATA_ID",ygxxid); + jtxxInfo_new.put("form_data_id",ygxxid); } //跟换id值，然后主键冲突 String primarykey = createPrimarykey(); @@ -455,7 +455,7 @@ public class SyncXxbgPersonInfo implements EsbServerlessRpcRemoteInterface { bzInfo_new.put(key,getIgnoreCase(map, key)); } } - bzInfo_new.put("FORM_DATA_ID",ygxxid); + bzInfo_new.put("form_data_id",ygxxid); } //跟换id值，然后主键冲突 String primarykey = createPrimarykey(); @@ -487,7 +487,7 @@ public class SyncXxbgPersonInfo implements EsbServerlessRpcRemoteInterface { pxInfo_new.put(key,getIgnoreCase(map, key)); } } - pxInfo_new.put("FORM_DATA_ID",ygxxid); + pxInfo_new.put("form_data_id",ygxxid); } //跟换id值，然后主键冲突 String primarykey = createPrimarykey(); @@ -519,7 +519,7 @@ public class SyncXxbgPersonInfo implements EsbServerlessRpcRemoteInterface { yyInfo_new.put(key,getIgnoreCase(map, key)); } } - yyInfo_new.put("FORM_DATA_ID",ygxxid); + yyInfo_new.put("form_data_id",ygxxid); } //跟换id值，然后主键冲突 String primarykey = createPrimarykey(); @@ -551,7 +551,7 @@ public class SyncXxbgPersonInfo implements EsbServerlessRpcRemoteInterface { qwInfo_new.put(key,getIgnoreCase(map, key)); } } - qwInfo_new.put("FORM_DATA_ID",ygxxid); + qwInfo_new.put("form_data_id",ygxxid); } //跟换id值，然后主键冲突 String primarykey = createPrimarykey();