add

src/main/java/com/zfire/jiasm/syncdata/service/impl/GLPPGFWebsitWorkerServiceImpl.java

@@ -603,7 +603,6 @@ public class GLPPGFWebsitWorkerServiceImpl implements GLPPGFWebsitWorkerService
 
     private void getWorker(List<Worker> addWorkerRec, List<String> sfzens, ItfTblWangdianWxgDownload m,
                            Map<String, String> workerIdcardMap) {
-        Boolean uflag = Boolean.FALSE;
         Worker v = new Worker();
         Worker o = null;
 
@@ -618,7 +617,7 @@ public class GLPPGFWebsitWorkerServiceImpl implements GLPPGFWebsitWorkerService
             addWorkerInfo(addWorkerRec, m, v);
         } else {
             // 看有无修改的可能
-            upWorkerInfo(addWorkerRec, m, uflag, o);
+            upWorkerInfo(addWorkerRec, m, o);
         }
         sfzens.add(m.getSfzen() + m.getWxgmc() + m.getYddh());
     }
@@ -666,7 +665,10 @@ public class GLPPGFWebsitWorkerServiceImpl implements GLPPGFWebsitWorkerService
         addWorkerRec.add(v);
     }
 
-    private void upWorkerInfo(List<Worker> addWorkerRec, ItfTblWangdianWxgDownload m, Boolean uflag, Worker v) {
+    private void upWorkerInfo(List<Worker> addWorkerRec, ItfTblWangdianWxgDownload m, Worker v) {
+        Worker o = new Worker();
+        MyBeanUtils.copyProperties(v,o);
+        Boolean uflag = Boolean.FALSE;
         if (StringUtils.isNotEmpty(v.getWorkerName()) && StringUtils.isNotEmpty(m.getWxgmc())){
             if (! v.getWorkerName().equals(m.getWxgmc())){
                 v.setWorkerName(m.getWxgmc());
@@ -851,6 +853,12 @@ public class GLPPGFWebsitWorkerServiceImpl implements GLPPGFWebsitWorkerService
         }
 
         if (uflag){
+            log.info("旧:{}",JSONObject.toJSONString(o));
+            log.info("新:{}",JSONObject.toJSONString(v));
+            log.info("参:{}",JSONObject.toJSONString(m));
+
+            return ;
+
             v.setUpdateBy("system");
             v.setUpdateTime(new Date());
             if (m.getLastModifiedBy() != null){

src/main/java/com/zfire/jiasm/syncdata/test.java

@@ -1,6 +1,7 @@
 package com.zfire.jiasm.syncdata;
 
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
+import com.zfire.jiasm.syncdata.utils.MyBeanUtils;
 import lombok.Data;
 import org.springframework.beans.BeanUtils;
 
@@ -9,9 +10,7 @@ import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.UUID;
+import java.util.*;
 
 import static jdk.nashorn.internal.objects.NativeString.trim;
 
@@ -78,6 +77,31 @@ public class test {
 */
 
 
+        A a = new A();
+        A b = new A();
+        List<A> list = new ArrayList<>();
+
+
+        a.setId(1);
+        a.setWebsitId("A");
+        a.setOrderBaseId("A");
+
+        MyBeanUtils.copyProperties(a,b);
+        b.setId(2);
+
+        list.add(a);
+        list.add(b);
+
+        for (A i:list){
+            i.setId(0);
+        }
+
+        System.out.println(a);
+        System.out.println(b);
+
+
+
+
         long timeStamp = 1691132713 * 1000L; // 时间戳，单位：毫秒
         Date date = new Date(timeStamp);
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");