实验任务判断

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/CycleTestTaskService2.java

@@ -600,6 +600,12 @@ public class CycleTestTaskService2 {
                 task.setFlagOut(BaseValue.YES);
                 task.setFlagApproach(BaseValue.NO);
                 // todo:消息中心 进行超期提醒
+
+                MesNotifyMessageEntity mesNotifyMessageEntity = new MesNotifyMessageEntity();
+                mesNotifyMessageEntity.setContent("您有实验任务超期");
+                mesNotifyMessageEntity.setReceiveUserId(task.getProcessUserId());
+                mesNotifyMessageClient.save(mesNotifyMessageEntity);
+
                 // 更新状态
                 service.updateById(task);
             }

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/util/JobExtUtil.java

@@ -159,31 +159,32 @@ public class JobExtUtil {
         } else if (type == YEAR) {
             String config = je.getJobTypeYearValue();
 
-            // 获取当月最后一天
+//            // 获取当月最后一天
-            LocalDate lastLD = LocalDate.of(today.getYear(), today.getMonth(), 1)
+//            LocalDate lastLD = LocalDate.of(today.getYear(), today.getMonth(), 1)
-                    .with(TemporalAdjusters.lastDayOfMonth());
+//                    .with(TemporalAdjusters.lastDayOfMonth());
-            log.info("当月最后一天:{}", lastLD);
+//            log.info("当月最后一天:{}", lastLD);
-            // 当月最多多少天
+//            // 当月最多多少天
-            Integer maxDay = lastLD.getDayOfMonth();
+//            Integer maxDay = lastLD.getDayOfMonth();
-
+//
-
+//
-            //如果超了就设置为最后一天
+//            //如果超了就设置为最后一天
-            List<String> list = Arrays.asList(config.split(","));
+//            List<String> list = Arrays.asList(config.split(","));
-            String str = "";
+//            String str = "";
-            for(String one : list){
+//            for(String one : list){
-
+//
-                String m = one.substring(0, 2);
+//                String m = one.substring(0, 2);
-                String d = one.substring(2);
+//                String d = one.substring(2);
-
+//
-                int month = Integer.parseInt(one.substring(0, 2));
+//                int month = Integer.parseInt(one.substring(0, 2));
-                int day = Integer.parseInt(one.substring(2));
+//                int day = Integer.parseInt(one.substring(2));
-                if(day>maxDay){
+//                if(day>maxDay){
-                    day = maxDay;
+//                    day = maxDay;
-                    d = day+"";
+//                    d = day+"";
-                }
+//                }
-                str = str+m+""+d+",";
+//                str = str+m+""+d+",";
-            }
+//            }
-            str = str.substring(0,str.length()-1);
+//            str = str.substring(0,str.length()-1);
+            String str = config;
             // 解析配置为年度目标日期（MonthDay 仅存月+日，不关联年份）
             Set<MonthDay> targetMonthDays = Arrays.stream(str.split(","))
                     .map(String::trim)