From 66c462e45f64bd0eddaee39693e2de1ade7c977e Mon Sep 17 00:00:00 2001
From: Administrator <704728292@qq.com>
Date: Wed, 21 May 2025 14:09:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../organization/esb/SyncRzglPersonInfo.java  | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 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 3b143ac..92b6313 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
@@ -43,6 +43,9 @@ public class SyncRzglPersonInfo implements EsbServerlessRpcRemoteInterface {
         String sjid = null!=params.get("sjid")?String.valueOf(params.get("sjid").toString()):"";
         String rzlx = null!=params.get("rzlx")?String.valueOf(params.get("rzlx").toString()):"";
         String ygid = null!=params.get("ygid")?String.valueOf(params.get("ygid").toString()):"";
+        String form_id = null!=params.get("form_id")?String.valueOf(params.get("form_id").toString()):"";
+        String layout_id = null!=params.get("layout_id")?String.valueOf(params.get("layout_id").toString()):"";
+        String obj_id = null!=params.get("obj_id")?String.valueOf(params.get("obj_id").toString()):"";
         log.error("SyncRzglPersonInfo.lcid : [{}].rzlx:[{}].ygid:[{}]",sjid,rzlx,ygid);
         // 获取当前时间
         LocalDateTime now = LocalDateTime.now();
@@ -74,14 +77,15 @@ public class SyncRzglPersonInfo implements EsbServerlessRpcRemoteInterface {
                 map.remove("rzsqlc_obj");
                 map.remove("rzsqlc");
                 map.remove("sec_level");
-                log.error("SyncRzglPersonInfo88888.map:{}", map);
+                map.remove("form_data_id");
                 //跟换id值，然后主键冲突
                 ryid = createPrimarykey();
                 log.error("SyncRzglPersonInfo88888.primarykey:{}", ryid);
                 map.put("id",ryid);
+                map.put("form_data_id",ryid);
+                log.error("SyncRzglPersonInfo88888.map:{}", map);
                 code = insert("uf_jcl_employee_information",map);
                 log.error("SyncRzglPersonInfo.code:{}", code);
-                //ryid = String.valueOf(map.get("id"));
                 /**
                  * 员工信息明细表数据同步处理
                  */
@@ -90,12 +94,12 @@ public class SyncRzglPersonInfo implements EsbServerlessRpcRemoteInterface {
                 /**
                  * 写入表单引擎数据大表
                  */
-                insertFormdata(map);
+                insertFormdata(map,form_id,layout_id);
 
                 /**
                  * 写入EB表单数据大表
                  */
-                insertPhysical(map);
+                insertPhysical(map,obj_id);
 
             }
         }else{
@@ -142,10 +146,10 @@ public class SyncRzglPersonInfo implements EsbServerlessRpcRemoteInterface {
      * 写入表单引擎数据大表
      * @return
      */
-    public void insertFormdata(Map<String, Object> map){
+    public void insertFormdata(Map<String, Object> map,String form_id, String layout_id){
         String sql="insert into formdata(id, form_id, layout_id, data_status, tenant_key, operator, create_time, update_time, " +
                 " module, client, is_delete, creator, delete_type)" +
-                " values('" + map.get("id") + "','1109797752477335562','1113505082434510856','submit','" + map.get("tenant_key") + "','" + map.get("updater") + "','" + map.get("create_time") + "'," +
+                " values('" + map.get("id") + "','" + form_id + "','" + layout_id + "','submit','" + map.get("tenant_key") + "','" + map.get("updater") + "','" + map.get("create_time") + "'," +
                 " '" + map.get("update_time") + "','ebuilderform','pc','" + map.get("delete_type") + "','" + map.get("creator") + "','" + map.get("delete_type") + "')";
         log.error("insertFormdata.sql:{}", sql);
         Map<String, Object> rs = databaseUtils.execute("LOGIC", "weaver-ebuilder-form-service", sql);
@@ -157,9 +161,9 @@ public class SyncRzglPersonInfo implements EsbServerlessRpcRemoteInterface {
      * 写入EB表单数据大表
      * @return
      */
-    public void insertPhysical(Map<String, Object> map){
+    public void insertPhysical(Map<String, Object> map,String obj_id){
         String sql="insert into ebdf_physical_data(id, tenant_key, obj_id, name, form_data_id, form_table_id, is_flow, data_status, creator, create_time)" +
-                " values('" + map.get("id") + "','" + map.get("tenant_key") + "','1109797752477335559','" + map.get("name") + "','" + map.get("id") + "'," +
+                " values('" + map.get("id") + "','" + map.get("tenant_key") + "','" + obj_id + "','" + map.get("name") + "','" + map.get("id") + "'," +
                 " '" + map.get("id") + "','" + map.get("is_flow") + "','" + map.get("data_status") + "','" + map.get("creator") + "','" + map.get("create_time") + "')";
         log.error("insertPhysical.sql:{}", sql);
         Map<String, Object> rs = databaseUtils.execute("LOGIC", "weaver-ebuilder-form-service", sql);