From f8d7a52f6dec66758fee52b0b71869a6c3e35f8c Mon Sep 17 00:00:00 2001
From: ws <ws@123.com>
Date: 星期三, 17 七月 2024 10:14:48 +0800
Subject: [PATCH] 修改人员信息同步

---
 src/main/java/com/fzzy/api/view/Api1209.view.xml             |    2 +-
 src/main/java/com/fzzy/api/view/pr/Api1202PR.java            |    2 +-
 src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1112.java |    3 ++-
 src/main/java/com/fzzy/api/view/Api1202.view.xml             |    8 ++++----
 src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java |    6 ++++++
 5 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/fzzy/api/view/Api1202.view.xml b/src/main/java/com/fzzy/api/view/Api1202.view.xml
index bae826b..cd2dc37 100644
--- a/src/main/java/com/fzzy/api/view/Api1202.view.xml
+++ b/src/main/java/com/fzzy/api/view/Api1202.view.xml
@@ -291,9 +291,9 @@
     </DataType>
     <DataType name="dtParam">
       <Property name="creationType">com.fzzy.api.data.ApiParam</Property>
-      <PropertyDef name="kqdm">
+      <PropertyDef name="hwdm">
         <Property></Property>
-        <Property name="label">鎵�灞炲簱鍖�</Property>
+        <Property name="label">鎵�灞炶揣浣�</Property>
       </PropertyDef>
       <PropertyDef name="start">
         <Property name="dataType">Date</Property>
@@ -449,8 +449,8 @@
       <Property name="labelSeparator">锛�</Property>
       <Property name="labelWidth">90</Property>
       <AutoFormElement>
-        <Property name="name">kqdm</Property>
-        <Property name="property">kqdm</Property>
+        <Property name="name">hwdm</Property>
+        <Property name="property">hwdm</Property>
         <Editor/>
       </AutoFormElement>
       <AutoFormElement>
diff --git a/src/main/java/com/fzzy/api/view/Api1209.view.xml b/src/main/java/com/fzzy/api/view/Api1209.view.xml
index 54a2485..a4fbbac 100644
--- a/src/main/java/com/fzzy/api/view/Api1209.view.xml
+++ b/src/main/java/com/fzzy/api/view/Api1209.view.xml
@@ -134,7 +134,7 @@
         <Property name="label">澶囨敞</Property>
       </PropertyDef>
       <PropertyDef name="sylx">
-        <Property/>
+        <Property></Property>
         <Property name="label">鎹熸孩绫诲瀷</Property>
         <Property name="mapping">
           <Property name="keyProperty">key</Property>
diff --git a/src/main/java/com/fzzy/api/view/pr/Api1202PR.java b/src/main/java/com/fzzy/api/view/pr/Api1202PR.java
index bec0153..b965587 100644
--- a/src/main/java/com/fzzy/api/view/pr/Api1202PR.java
+++ b/src/main/java/com/fzzy/api/view/pr/Api1202PR.java
@@ -75,7 +75,7 @@
                 List<Predicate> predicates = new ArrayList<>(); //鎵�鏈夌殑鏂█
 
                 if (StringUtils.isNotBlank(param.getKqdm())) {
-                    Predicate predicate1 = cb.equal(root.get("kqdm"), param.getKqdm());
+                    Predicate predicate1 = cb.equal(root.get("hwdm"), param.getKqdm());
                     predicates.add(predicate1);
                 }
 
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1112.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1112.java
index 5f08fc9..74949de 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1112.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1112.java
@@ -86,10 +86,11 @@
                 apiData.setDzyx(sysData.getDzyx());
                 apiData.setMz(sysData.getMz());
                 apiData.setZzmm(sysData.getZzmm());
-                apiData.setRylb(sysData.getZy());
+                apiData.setZy(sysData.getZy());
                 apiData.setQdzgzchzyzgsj(sysData.getQdzgzchzyzgsj());
                 apiData.setXl(StringUtils.isEmpty(sysData.getXl())?"3":sysData.getXl());
                 apiData.setZw(sysData.getZw());
+                apiData.setRylb(sysData.getRylb());
 
                 apiData.setZhgxsj(sysData.getUpdateTime());
                 apiData.setBizId(sysData.getSfzhm());
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java
index 88861f4..782b2de 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java
@@ -230,6 +230,12 @@
             //鎿嶄綔鏍囧織鍙婃渶鍚庢洿鏂版椂闂�
             apiData.setZhgxsj(sysData.getUpdateTime());
 
+            //鎵胯繍浜� 韬唤璇佸彿 鐢佃瘽
+            apiData.setSfzh(sysData.getUserId());
+            apiData.setCyr(sysData.getUserName());
+            apiData.setLxdh(sysData.getUserContact());
+
+
             //涓氬姟id銆佸簱鍖虹紪鐮併�佸悓姝ユ椂闂�
             apiData.setBizId(sysData.getId());
             apiData.setKqdm(kqdm);

--
Gitblit v1.9.3