定时任务都改成1分钟，修改统计Bug

application-facade/src/main/java/com/factory/web/mapper/fa/FirstArticleTaskHisBlobMapper.java

@@ -1,8 +1,14 @@
 package com.factory.web.mapper.fa;
 
+import java.time.LocalDateTime;
+import java.util.List;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.factory.web.entity.fa.FirstArticleTaskHisBlob;
-import org.apache.ibatis.annotations.Mapper;
 
 /**
  * 任务和巡检结果历史
@@ -13,4 +19,11 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface FirstArticleTaskHisBlobMapper extends BaseMapper<FirstArticleTaskHisBlob> {
 
+	@Select({
+		"select h.created_time createdTime",
+		" from first_article_task_his_blob h",
+		" join first_article_task t on t.id = h.first_article_task_id and t.`status`<>0",
+		" where h.created_time between #{sday} and #{eday}"
+	})
+	List<FirstArticleTaskHisBlob> getFinishRecheckTask(@Param("sday")LocalDateTime sday,@Param("eday")LocalDateTime wday);
 }

application-facade/src/main/java/com/factory/web/mapper/pm/OnsiteTaskHisBlobMapper.java

@@ -1,8 +1,14 @@
 package com.factory.web.mapper.pm;
 
+import java.time.LocalDateTime;
+import java.util.List;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.factory.web.entity.pm.OnsiteTaskHisBlob;
-import org.apache.ibatis.annotations.Mapper;
 
 /**
  * 任务和巡检结果历史
@@ -12,5 +18,13 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface OnsiteTaskHisBlobMapper extends BaseMapper<OnsiteTaskHisBlob> {
+	
+	@Select({
+		"select h.created_time createdTime",
+		" from onsite_task_his_blob h",
+		" join onsite_task t on t.id = h.onsite_task_id and t.`status`<>0",
+		" where h.created_time between #{sday} and #{eday}"
+	})
+	List<OnsiteTaskHisBlob> getFinishRecheckTask(@Param("sday")LocalDateTime sday,@Param("eday")LocalDateTime wday);
 
 }

application-facade/src/main/java/com/factory/web/service/impl/pm/PreventMistakeServiceImpl.java

@@ -650,11 +650,6 @@ public class PreventMistakeServiceImpl extends ServiceImpl<PreventMistakeMapper,
 	 */
 	private void checkCalendarEffect(Long planId,Set<Integer> typeSet) {
 		for(Integer type:typeSet) {
-			OnsiteCalendar onsiteCalendar = OnsiteCalendar.builder()
-					.bentelerPlanId(planId)
-					.typeFlag(type)
-					.effectFlag(true)
-					.build();
 			onsiteCalendarService.lambdaUpdate().eq(OnsiteCalendar::getBentelerPlanId, planId)
 			.eq(OnsiteCalendar::getTypeFlag, type)
 			.set(OnsiteCalendar::getEffectFlag, true)

application-facade/src/main/java/com/factory/web/service/impl/statistics/StatisticsServiceImpl.java

@@ -3,6 +3,7 @@ package com.factory.web.service.impl.statistics;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.factory.base.entity.aggregates.ResponseBean;
 import com.factory.base.util.res.ResponseBeanBuilder;
+import com.factory.base.util.time.TimeUtils;
 import com.factory.web.entity.fa.FirstArticleTask;
 import com.factory.web.entity.fa.FirstArticleTaskHisBlob;
 import com.factory.web.entity.pm.OnsiteTask;
@@ -19,6 +20,7 @@ import org.springframework.stereotype.Service;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -52,21 +54,18 @@ public class StatisticsServiceImpl implements StatisticsService {
 
         List<String> releasedDates = new ArrayList<>();
         List<String> recheckedDates = new ArrayList<>();
-
+        LocalDateTime[] se = TimeUtils.getStartAndEndDayTime(LocalDateTime.now(), 2, 0);
         //取首件放行状态数量
         List<FirstArticleTask> firstArticleTaskList = firstArticleTaskMapper.selectList(Wrappers.<FirstArticleTask>lambdaQuery()
                 .eq(FirstArticleTask::getStatus, 2)
                 .likeRight(FirstArticleTask::getTaskTime, month));
         firstArticleTaskList.forEach(firstArticleTask -> {
-            DateTimeFormatter fmt = DateTimeFormatter.ofPattern("yyyy-MM-dd");
-            releasedDates.add(firstArticleTask.getTaskTime().format(fmt));
+            releasedDates.add(TimeUtils.formatLocalDate(firstArticleTask.getTaskTime()));
         });
         //去首件重检数量
-        List<FirstArticleTaskHisBlob> firstArticleTaskHisBlobList = firstArticleTaskHisBlobMapper.selectList(Wrappers.<FirstArticleTaskHisBlob>lambdaQuery()
-                .likeRight(FirstArticleTaskHisBlob::getCreatedTime, month));
+        List<FirstArticleTaskHisBlob> firstArticleTaskHisBlobList = firstArticleTaskHisBlobMapper.getFinishRecheckTask(se[0],se[1]);
         firstArticleTaskHisBlobList.forEach(firstArticleTaskHisBlob -> {
-            DateTimeFormatter fmt = DateTimeFormatter.ofPattern("yyyy-MM-dd");
-            recheckedDates.add(firstArticleTaskHisBlob.getCreatedTime().format(fmt));
+            recheckedDates.add(TimeUtils.getDayString(firstArticleTaskHisBlob.getCreatedTime()));
         });
 
         //取防错放行状态
@@ -74,15 +73,12 @@ public class StatisticsServiceImpl implements StatisticsService {
                 .eq(OnsiteTask::getStatus, 2)
                 .likeRight(OnsiteTask::getTaskTime, month));
         onsiteTaskList.forEach(onsiteTask -> {
-            DateTimeFormatter fmt = DateTimeFormatter.ofPattern("yyyy-MM-dd");
-            releasedDates.add(onsiteTask.getTaskTime().format(fmt));
+            releasedDates.add(TimeUtils.formatLocalDate(onsiteTask.getTaskTime()));
         });
         //取防错重检数量
-        List<OnsiteTaskHisBlob> onsiteTaskHisBlobList = onsiteTaskHisBlobMapper.selectList(Wrappers.<OnsiteTaskHisBlob>lambdaQuery()
-                .likeRight(OnsiteTaskHisBlob::getCreatedTime, month));
+        List<OnsiteTaskHisBlob> onsiteTaskHisBlobList = onsiteTaskHisBlobMapper.getFinishRecheckTask(se[0],se[1]);
         onsiteTaskHisBlobList.forEach(onsiteTaskHisBlob -> {
-            DateTimeFormatter fmt = DateTimeFormatter.ofPattern("yyyy-MM-dd");
-            recheckedDates.add(onsiteTaskHisBlob.getCreatedTime().format(fmt));
+            recheckedDates.add(TimeUtils.getDayString(onsiteTaskHisBlob.getCreatedTime()));
         });
         //合并去重
         List<String> exceptionDays = Stream.of(recheckedDates, releasedDates)

application-facade/src/main/java/com/factory/wx/service/impl/AbnormalStatisticsServiceImpl.java

@@ -189,18 +189,12 @@ public class AbnormalStatisticsServiceImpl implements AbnormalStatisticsService
                 faInfo.setAbnormalWorkshopList(abnormalWorkshopList.stream().filter(workshop -> null != workshop.getAbnormalItemList() && workshop.getAbnormalItemList().size() > 0).collect(Collectors.toList()));
             }
 
-            if (abnormalDetailReq.getAbnormalType() == 1) {
-                for (AbnormalTaskInfoRes task : faList) {
-                    FirstArticleApprovalTask approvalTask = firstArticleApprovalTaskService.getOne(Wrappers.<FirstArticleApprovalTask>lambdaQuery()
-                            .eq(FirstArticleApprovalTask::getFirstArticleTaskId, task.getTaskId()));
-                    task.setReason(approvalTask.getReason());
-                    task.setUpdatedTime(approvalTask.getUpdatedTime());
-                }
-            }
             if (abnormalDetailReq.getAbnormalType() == 1) {
                 for (AbnormalTaskInfoRes task : faList) {
                     List<FirstArticleApprovalTask> approvalTasks = firstArticleApprovalTaskService.list(Wrappers.<FirstArticleApprovalTask>lambdaQuery()
-                            .eq(FirstArticleApprovalTask::getFirstArticleTaskId, task.getTaskId()));
+                            .eq(FirstArticleApprovalTask::getFirstArticleTaskId, task.getTaskId())
+                            .orderByAsc(FirstArticleApprovalTask::getApprovalLevel)
+                            );
                     List<AbnormalApprovalTaskRes> resultInfos = new ArrayList<>();
                     for (FirstArticleApprovalTask t : approvalTasks) {
                         AbnormalApprovalTaskRes o = new AbnormalApprovalTaskRes();
@@ -209,6 +203,10 @@ public class AbnormalStatisticsServiceImpl implements AbnormalStatisticsService
                         o.setUpdatedTime(t.getUpdatedTime());
                         o.setUsername(task.getPerson());
                         resultInfos.add(o);
+                        if(t.getStatus()==2) {
+                        	task.setReason(t.getReason());
+                            task.setUpdatedTime(t.getUpdatedTime());
+                        }
                     }
                     task.setAbnormalApprovalTaskResList(resultInfos);
                 }

application-task/src/main/resources/application.yml

@@ -30,14 +30,14 @@ wx:
 
 task:
   onsite:
-    cron: 0 */5 * * * ?
+    cron: 0 */1 * * * ?
     #执行job时间给还没做任务的计划创建任务
-    remind: 0 */5 * * * ? 
+    remind: 0 */1 * * * ? 
     #防错工作提醒:发送pad提醒
   first:
-    cron: 0 */5 * * * ?
+    cron: 0 */1 * * * ?
     #执行job时间给还没做任务的计划创建任务
-    remind: 0 */5 * * * ? 
+    remind: 0 */1 * * * ? 
     #首件工作提醒:发送pad提醒
   pass: 
     cron: 0 */1 * * * ? 

common-base/src/main/java/com/factory/base/util/time/TimeUtils.java

@@ -85,6 +85,13 @@ public class TimeUtils {
         }
         return time.format(timeFormatter);
     }
+    
+    public static String formatLocalDate(LocalDate date) {
+        if (date == null) {
+            return "";
+        }
+        return date.format(dayFormatter);
+    }
 
     public static String getDayString(LocalDateTime now) {
         return now.format(dayFormatter);