From 8a49d3f2507a2f811485dc7e21db30be14a50698 Mon Sep 17 00:00:00 2001
From: haha <lj7788@126.com>
Date: Thu, 28 Mar 2024 22:02:25 +0800
Subject: [PATCH] update code

---
 .../SurProjectAttendanceUserServiceImpl.java  |  6 ++-
 .../jh/project/task/AttendanceJgwTask.java    | 44 +++++++++++++++++++
 2 files changed, 49 insertions(+), 1 deletion(-)

diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectAttendanceUserServiceImpl.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectAttendanceUserServiceImpl.java
index 6b5cf092..f10b24c8 100644
--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectAttendanceUserServiceImpl.java
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectAttendanceUserServiceImpl.java
@@ -148,7 +148,11 @@ public class SurProjectAttendanceUserServiceImpl implements ISurProjectAttendanc
         if(list.size()==0){
             insertSurProjectAttendanceUser(user);
         }else{
-            user.setId(list.get(0).getId());
+            SurProjectAttendanceUser old=list.get(0);
+            if(user.getVendorsCode().equals("jgw")){
+                user.setCompanyId(old.getCompanyId());
+            }
+            user.setId(old.getId());
             updateSurProjectAttendanceUser(user);
         }
     }
diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/task/AttendanceJgwTask.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/task/AttendanceJgwTask.java
index 31a85d46..00d1f0a9 100644
--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/task/AttendanceJgwTask.java
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/task/AttendanceJgwTask.java
@@ -122,6 +122,7 @@ public class AttendanceJgwTask {
         //findDirectlyUnderTeam(appid,token,prjId,subcontractorId,0);
         //queryProject(appid,token,phone,0);;
         //findAddWorkerByProject(appid,token,prjId,0);
+        findUpdateWorkerByProject(appid,token,prjId,0);
         //findAttendanceByProject(appid,token,prjId);
         //findTeamByProjectId(appid,token,prjId);
         //findProContractorByProjectId(appid,token,prjId);
@@ -553,7 +554,49 @@ public class AttendanceJgwTask {
             //findAddWorkerByProject(appId, token, projectId, endId);
         }
     }
+    public static void findUpdateWorkerByProject(String appId,String token,String projectId,int startId){
+        String path="/webapi/project/findUpdateWorkerByProject";
+        String time = System.currentTimeMillis() + "";
+        String url=host+path+"?appId=" + appId + "&tokenSign=" + token +"&timestamp=" + time;
 
+        String tokenSign = Md5Utils.hash(url);
+
+        Map<String, Object> params = new HashMap<>();
+        params.put("appId",appId);
+        params.put("timestamp",time);
+        params.put("tokenSign",tokenSign);
+        params.put("projectId",projectId);
+        params.put("updateTime","2024-01-01 00:00:00");
+        //params.put("startId",startId);
+        params.put("startId","32150708");
+        Request request = new Request.Builder()
+                .url(host+path)
+                .post(toFormBody(params))
+                .build();
+        String data=AttendanceTask.getResult(request);
+        JSONObject jo= JSON.parseObject(data);
+        JSONObject joData= jo.getJSONObject("data");
+        //int endId= joData.getInteger("endId");
+        JSONArray arr=joData.getJSONArray("workerList");
+        if(arr.size()>0) {
+            int cnt=0;
+            for(int i=0;i<arr.size();i++){
+                JSONObject json=arr.getJSONObject(i);
+                String workerStatus= json.getString("workerStatus");
+                if("02".equals(workerStatus)){
+                    cnt++;
+                }
+                SurProjectAttendanceUser user=SurProjectAttendanceUser.createFromJgw(json);
+                if(user.getName().equals("李文国")){
+                    String k=user.getName();
+                    JSONArray arr2= json.getJSONArray("corpName");
+                    Object o=arr2.get(0);
+                }
+            }
+            System.out.println("cnt:"+cnt+","+arr.size());
+            //findAddWorkerByProject(appId, token, projectId, endId);
+        }
+    }
     /**
      * 同步人员信息
      */
@@ -580,6 +623,7 @@ public class AttendanceJgwTask {
                 }
             }
         }
+        syncWorkerByLeader();
     }
 
     /**