瀏覽代碼

修改周末不提醒仅针对每日或者提醒昨天的设置

seyason 11 月之前
父節點
當前提交
177eab40b5

+ 4 - 2
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/task/TimingTask.java

@@ -1341,7 +1341,7 @@ public class TimingTask {
             if (str.equals(t.getAlertTime())) {
                 //节假日是否提醒
                 Boolean workDay = timeTypeService.isWorkDay(t.getCompanyId(), localDate);
-                if (!workDay){
+                if ((t.getAlertType() == 0 || t.getAlertType() == 1) && !workDay){
                     return;
                 }
                 //发送推送提醒
@@ -1455,6 +1455,9 @@ public class TimingTask {
                         if (u.get("corpwxUserid") != null){
                             //推送到企业微信
                             String corpUid = (String) u.get("corpwxUserid");
+                            if ("woy9TkCAAAyVAc5oXhGwCO-DFWF8SfKg".equals(corpUid)){
+                                System.out.println("发送给 【顾焕峰】漏填提醒");
+                            }
                             JSONObject json=new JSONObject();
                             JSONArray dataJson = new JSONArray();
                             JSONObject jsonObj = new JSONObject();
@@ -1497,7 +1500,6 @@ public class TimingTask {
                         companyDingdingService.sendFillReportAlertMsg(t.getCompanyId(), compDingding.getAgentId(), t.getAlertMsg(), idStr);
                     }
                 }
-
             }
         });
         if (isDev) {