Browse Source

解决钉钉节假日也提醒漏填的问题

seyason 1 year ago
parent
commit
61c759d0ed

+ 13 - 0
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/task/TimingTask.java

@@ -1531,11 +1531,24 @@ public class TimingTask {
                 Long agentId = null;
                 String alertMsg = null;
                 List<String> dingUid = new ArrayList<>();
+
                 int count = 0;
+                HashMap<Integer, Boolean> compWorkDayMap = new HashMap<>();
                 for (int i=0;i<curUserList.size(); i++) {
                     count++;
                     Map<String, Object> item = curUserList.get(i);
                     Integer curCompanyId = (Integer)item.get("companyId");
+
+                    //节假日不提醒,判断当前是否是工作日
+                    if (compWorkDayMap.get(curCompanyId) == null) {
+                        Boolean workDay = timeTypeService.isWorkDay(curCompanyId, localDate);
+                        compWorkDayMap.put(curCompanyId, workDay);
+                    }
+                    Boolean workDay = compWorkDayMap.get(curCompanyId);
+                    if (!workDay){
+                        continue;
+                    }
+
                     dingUid.add((String)item.get("dingdingUserid"));
                     if (companyId == null) {
                         companyId = curCompanyId;