提交代码
parent
04004b10ee
commit
5c90be5110
|
@ -271,8 +271,8 @@ public class SurProjectAttendanceDataServiceImpl implements ISurProjectAttendanc
|
||||||
for (Map<String,Object> map:list) {
|
for (Map<String,Object> map:list) {
|
||||||
for(SurProjectAttendanceUser sau:datas){
|
for(SurProjectAttendanceUser sau:datas){
|
||||||
if(Objects.equals(map.get("workerId").toString(),sau.getWorkerId())){
|
if(Objects.equals(map.get("workerId").toString(),sau.getWorkerId())){
|
||||||
map.put("inTime",sau.getInTime());
|
map.put("inTime",DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS,sau.getInTime()));
|
||||||
map.put("outTime",sau.getOutTime());
|
map.put("outTime",DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS,sau.getOutTime()));
|
||||||
dataList.add(map);
|
dataList.add(map);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -292,8 +292,8 @@ public class SurProjectAttendanceDataServiceImpl implements ISurProjectAttendanc
|
||||||
for (Map<String,Object> map:list) {
|
for (Map<String,Object> map:list) {
|
||||||
for(SurProjectAttendanceUser sau:datas){
|
for(SurProjectAttendanceUser sau:datas){
|
||||||
if(Objects.equals(map.get("workerId").toString(),sau.getWorkerId())){
|
if(Objects.equals(map.get("workerId").toString(),sau.getWorkerId())){
|
||||||
map.put("inTime",sau.getInTime());
|
map.put("inTime",DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS,sau.getInTime()));
|
||||||
map.put("outTime",sau.getOutTime());
|
map.put("outTime",DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS,sau.getOutTime()));
|
||||||
dataList.add(map);
|
dataList.add(map);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue