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 9c921b1c..453c1a7f 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 @@ -272,6 +272,9 @@ public class SurProjectAttendanceDataServiceImpl implements ISurProjectAttendanc } } //upData.setAttendanceOutTime(sdata.getAttendanceTime()); + if("jgw".equals(upData.getVendorsCode())){ + upData.setRemark(sdata.getRemark()); + } updateSurProjectAttendanceData(upData); } } 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 645cb95e..98a19eae 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 @@ -326,7 +326,7 @@ public class AttendanceJgwTask { System.out.println(json.getString("machineType")); String photoUrl=getPhoto(appId,token,photo); SurProjectAttendanceData sdata = SurProjectAttendanceData.createFromJgw(json); - if(sdata.getWorkerId().equals("fb9c08a63b8e4846a3a2e05576213db8")){ + if(sdata.getWorkerId().equals("63e0e09858624979b97291977afe352b")){ System.out.println("--->"+sdata.getRemark()); } //sdata.setScanPhoto(photoUrl); @@ -1084,6 +1084,9 @@ public class AttendanceJgwTask { sdata.setScanPhoto(photoUrl); sdata.setCfgid(it.getId()); sdata.setAppId(appId); + if(sdata.getWorkerId().equals("63e0e09858624979b97291977afe352b")){ + System.out.println("--->"+sdata.getRemark()); + } sdata.setVendorsCode(it.getVendorsCode()); attendanceDataService.add(sdata); }