diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectAttendanceUser.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectAttendanceUser.java index 7e2bcbc6..112859e6 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectAttendanceUser.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectAttendanceUser.java @@ -348,7 +348,7 @@ public class SurProjectAttendanceUser extends BaseEntity u.workTypeName=json.getString("workTypeName"); u.specWorkType=json.getBooleanValue("specWorkType",false)?1:0; u.hatCode=json.getString("hatCode"); - u.state=json.getLongValue("state",0); + u.state=json.getLongValue("status",0); u.enterDate=json.getString("enterDate"); u.exitDate=json.getString("exitDate"); u.companyId=""+json.getLongValue("companyId",0); diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/task/AttendanceTask.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/task/AttendanceTask.java index 79df7046..979d4023 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/task/AttendanceTask.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/task/AttendanceTask.java @@ -218,18 +218,19 @@ public class AttendanceTask { System.out.println("-------1--------->AttendanceUserTask.syncWorker"); Map params = new HashMap<>(); - params.put("projectId", "824959117494784"); - //params.put("start", "2023-10-06 00:00:00"); - //params.put("end", "2023-10-07 00:00:00"); + params.put("projectId", "709599705953792"); + params.put("start", "2000-01-01 00:00:00"); + params.put("end", "2099-01-01 00:00:00"); + params.put("pageNo","1"); + params.put("pageSize", "1000"); //params.put("pageNo", "1"); params.put("startId", "0"); - params.put("pageSize", "1000"); - params.put("appid","8fba899a21c64be4aa25bf0f3314ad5c"); - String sign = getSign(params,"426b3d8280620176d80a826eebef3579"); + params.put("appid","f24454233c5346fe82df6b8dd35e9d6d"); + String sign = getSign(params,"754619e2a33491b84a4d47838d2ffc0a"); System.out.println("--->"+sign); params.put("sign",sign); String host="https://glm.glodon.com/api/open"; - String path="/attendance/card"; + String path="/worker/new/allWorkerInfo"; HttpUrl.Builder urlBuilder = Objects.requireNonNull(HttpUrl.parse(host + path)).newBuilder(); params.forEach((s, o) -> { urlBuilder.addQueryParameter(s, (String) o); @@ -244,7 +245,7 @@ public class AttendanceTask { for(int i=0;i