|
|
@@ -2167,8 +2167,6 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
|
|
|
String uid = (String)a.get("userId");
|
|
|
String corpwxUserid = (String)a.get("corpwxUserid");
|
|
|
String fillUserName = (String)a.get("fillUserName");
|
|
|
- String startTime=a.get("startTime")==null?"":(String)a.get("startTime");
|
|
|
- String endTime=a.get("endTime")==null?"":(String)a.get("endTime");
|
|
|
System.out.println("createDate=="+createDate + " name=="+name+" uid=="+uid+" corpwxUserid=="+corpwxUserid);
|
|
|
if (lastName == null || !(lastName.get("name").equals(name) && lastName.get("dateStr").equals(createDate))) {
|
|
|
lastName = new HashMap<String, Object>();
|
|
|
@@ -2177,8 +2175,6 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
|
|
|
lastName.put("userId", uid);
|
|
|
lastName.put("corpwxUserid", corpwxUserid);
|
|
|
lastName.put("fillUserName", fillUserName);
|
|
|
- lastName.put("startTime", startTime);
|
|
|
- lastName.put("endTime", endTime);
|
|
|
nameList.add(lastName);
|
|
|
userDailyReportList = new ArrayList<>();
|
|
|
lastName.put("data", userDailyReportList);
|
|
|
@@ -2298,6 +2294,8 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
|
|
|
double wh = first.get().getWorkHours();
|
|
|
//赋值打卡时长
|
|
|
map.put("cardHours", wh);
|
|
|
+ map.put("startTime", first.get().getStartTime());
|
|
|
+ map.put("endTime", first.get().getEndTime());
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
@@ -2316,6 +2314,8 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
|
|
|
double wh = first.get().getWorkHours();
|
|
|
//赋值打卡时长
|
|
|
map.put("cardHours", wh);
|
|
|
+ map.put("startTime", first.get().getStartTime());
|
|
|
+ map.put("endTime", first.get().getEndTime());
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
@@ -2334,6 +2334,8 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
|
|
|
double wh = first.get().getWorkHours();
|
|
|
//赋值打卡时长
|
|
|
map.put("cardHours", wh);
|
|
|
+ map.put("startTime", first.get().getStartTime());
|
|
|
+ map.put("endTime", first.get().getEndTime());
|
|
|
}
|
|
|
}
|
|
|
}
|
yusm