周末提醒功能

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/TimeTypeController.java

@@ -64,6 +64,7 @@ public class TimeTypeController {
         }
         return httpRespMsg;
     }
+
     @RequestMapping("/changeUserReportType")
     public HttpRespMsg changeUserReportType(String id){
         User user = userMapper.selectById(id);

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/entity/TimeType.java

@@ -267,6 +267,12 @@ public class TimeType extends Model<TimeType> {
     @TableField("alert_type")
     private Integer alertType;
 
+    /**
+     * 0：节假日不提醒，1：节假日提醒
+     */
+    @TableField("alert_non_workday")
+    private Integer alertNonWorkday;
+
     /**
      * 0-工作内容非必填 1-工作内容必填
      */

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

@@ -857,11 +857,6 @@ public class TimingTask {
 //        if (!isPrivateDeploy) {
 //            checkDingDingSuiteTicket();
 //        }
-
-        //判断是否是工作日，非工作日不提醒
-        if (!WorkDayCalculateUtils.isWorkDay(localDate)) {
-            return;
-        }
         DateTimeFormatter dt = DateTimeFormatter.ofPattern("HH:mm");
         String str = dt.format(now);
         String date = DateTimeFormatter.ofPattern("yyyy-MM-dd").format(localDate);
@@ -869,6 +864,13 @@ public class TimingTask {
                 .ge("alert_time", str));
         typeList.forEach(t->{
             if (str.equals(t.getAlertTime())) {
+                //节假日是否提醒
+                if (t.getAlertNonWorkday().equals(0)){
+                    //判断是否是工作日，非工作日不提醒
+                    if (!WorkDayCalculateUtils.isWorkDay(localDate)) {
+                        return;
+                    }
+                }
                 //发送推送提醒
                 Company company = companyMapper.selectById(t.getCompanyId());
                 //开通了OA功能，有请假模块的，需要把当前请假的排除掉