考勤时长,加上上下班时间

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ReportServiceImpl.java

@@ -2167,6 +2167,8 @@ 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>();
@@ -2175,6 +2177,8 @@ 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);