Переглянути джерело

1.移动daunt查询未测量人员接口修改。
2.未测量提醒根据上下班区分提醒内容。

tomatozq 5 роки тому
батько
коміт
b4f3fa6645

+ 13 - 9
web/src/main/java/com/jpsoft/smart/modules/mobile/controller/PersonDeviceFilterLogController.java

@@ -190,24 +190,28 @@ public class PersonDeviceFilterLogController {
                 }
             }
 
-            String dateStr = new DateTime(queryDate).toString("yyyy-MM-dd");
+            DateTime queryTime = new DateTime(queryDate);
+            String dateStr = queryTime.toString("yyyy-MM-dd");
+            int weekday = queryTime.getDayOfWeek();
             SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
 
             List<Map> mapList = new ArrayList<>();
 
             if(configList!=null) {
                 for (AlarmConfig alarmConfig : configList) {
-                    Map<String, Object> map = new HashMap<>();
-                    DateTime startTime = new DateTime(sdf.parse(dateStr + " " + alarmConfig.getStartTime()));
-                    DateTime endTime = new DateTime(sdf.parse(dateStr + " " + alarmConfig.getEndTime()));
+                    if (alarmConfig.getWeekdays().indexOf(String.valueOf(weekday)) != -1) {
+                        Map<String, Object> map = new HashMap<>();
+                        DateTime startTime = new DateTime(sdf.parse(dateStr + " " + alarmConfig.getStartTime()));
+                        DateTime endTime = new DateTime(sdf.parse(dateStr + " " + alarmConfig.getEndTime()));
 
-                    List<PersonInfo> unmeasuredList = personDeviceLogService.queryUnAttendanceList(companyInfo.getCode() + "%", startTime.toDate(), endTime.toDate());
+                        List<PersonInfo> unmeasuredList = personDeviceLogService.queryUnAttendanceList(companyInfo.getCode() + "%", startTime.toDate(), endTime.toDate());
 
-                    map.put("startTime", alarmConfig.getStartTime());
-                    map.put("endTime", alarmConfig.getEndTime());
-                    map.put("list", unmeasuredList);
+                        map.put("startTime", alarmConfig.getStartTime());
+                        map.put("endTime", alarmConfig.getEndTime());
+                        map.put("list", unmeasuredList);
 
-                    mapList.add(map);
+                        mapList.add(map);
+                    }
                 }
             }