diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectAttendanceDataServiceImpl.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectAttendanceDataServiceImpl.java index c66b795a..3620a50c 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectAttendanceDataServiceImpl.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectAttendanceDataServiceImpl.java @@ -125,6 +125,9 @@ public class SurProjectAttendanceDataServiceImpl implements ISurProjectAttendanc @Override public void add(SurProjectAttendanceData sdata) { + if(StringUtils.isEmpty(sdata.getWorkerId()) || StringUtils.isEmpty(sdata.getAttendanceTime())){ + return; + } SurProjectAttendanceData where=new SurProjectAttendanceData(); where.setVendorsCode(sdata.getVendorsCode()); where.setCfgid(sdata.getCfgid()); diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/task/AttendanceHuazhuTask.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/task/AttendanceHuazhuTask.java index c94f39f1..65288d57 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/task/AttendanceHuazhuTask.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/task/AttendanceHuazhuTask.java @@ -43,7 +43,7 @@ public class AttendanceHuazhuTask { .newBuilder(); long endTime=DateUtil.current(); - long startTime=endTime-3600*1000*24*90; + long startTime=endTime-3600*1000*24*0; Map headerParams=new HashMap<>(); headerParams.put("appId","8024283707153666851"); headerParams.put("appSecret","2070308b49399d94b401d98adeaa5b342aa81627"); @@ -62,7 +62,17 @@ public class AttendanceHuazhuTask { .post(toFormBody(params)).headers(setHeaderParams(headerParams)) .build(); String data=AttendanceTask.getResult(request); - System.out.println(data); + JSONObject jo= JSON.parseObject(data); + JSONObject joData= jo.getJSONObject("data"); + JSONArray arr=joData.getJSONArray("records"); + long pages=joData.getLong("pages"); + if(arr!=null && arr.size()>0){ + for(int i=0;i