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 1d3a3bf7..c63d0382 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 @@ -271,8 +271,8 @@ public class SurProjectAttendanceDataServiceImpl implements ISurProjectAttendanc for (Map map:list) { for(SurProjectAttendanceUser sau:datas){ if(Objects.equals(map.get("workerId").toString(),sau.getWorkerId())){ - map.put("inTime",sau.getInTime()); - map.put("outTime",sau.getOutTime()); + map.put("inTime",DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS,sau.getInTime())); + map.put("outTime",DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS,sau.getOutTime())); dataList.add(map); } } @@ -292,8 +292,8 @@ public class SurProjectAttendanceDataServiceImpl implements ISurProjectAttendanc for (Map map:list) { for(SurProjectAttendanceUser sau:datas){ if(Objects.equals(map.get("workerId").toString(),sau.getWorkerId())){ - map.put("inTime",sau.getInTime()); - map.put("outTime",sau.getOutTime()); + map.put("inTime",DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS,sau.getInTime())); + map.put("outTime",DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS,sau.getOutTime())); dataList.add(map); } }