修改统计数据

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

@@ -23,7 +23,7 @@ public interface FirstArticleTaskHisBlobMapper extends BaseMapper<FirstArticleTa
 		"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}"
+		" where h.created_time between #{sday} and #{eday} group by h.first_article_task_id"
 	})
 	List<FirstArticleTaskHisBlob> getFinishRecheckTask(@Param("sday")LocalDateTime sday,@Param("eday")LocalDateTime wday);
 }

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

@@ -23,7 +23,7 @@ public interface OnsiteTaskHisBlobMapper extends BaseMapper<OnsiteTaskHisBlob> {
 		"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}"
+		" where h.created_time between #{sday} and #{eday} group by h.onsite_task_id"
 	})
 	List<OnsiteTaskHisBlob> getFinishRecheckTask(@Param("sday")LocalDateTime sday,@Param("eday")LocalDateTime wday);
 

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

@@ -1,5 +1,16 @@
 package com.factory.web.service.impl.statistics;
 
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.factory.base.entity.aggregates.ResponseBean;
 import com.factory.base.util.res.ResponseBeanBuilder;
@@ -15,19 +26,8 @@ import com.factory.web.mapper.fa.FirstArticleTaskMapper;
 import com.factory.web.mapper.pm.OnsiteTaskHisBlobMapper;
 import com.factory.web.mapper.pm.OnsiteTaskMapper;
 import com.factory.web.service.statistics.StatisticsService;
-import org.springframework.beans.factory.annotation.Autowired;
-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;
-import java.util.Date;
-import java.util.List;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
+import lombok.extern.slf4j.Slf4j;
 
 /**
  * 异常统计
@@ -36,6 +36,7 @@ import java.util.stream.Stream;
  * @version 1.0
  * @date 2021-07-22 4:03 下午
  */
+@Slf4j
 @Service("statisticsService")
 public class StatisticsServiceImpl implements StatisticsService {
     @Autowired
@@ -50,15 +51,15 @@ public class StatisticsServiceImpl implements StatisticsService {
     @Override
     public ResponseBean<ExceptionCountRes> getExceptionsByMonth(StatisticsDateReq statisticsDateReq) {
 
-        String month = getMonth(statisticsDateReq);
-
+        LocalDateTime month = getMonth(statisticsDateReq);
+        
         List<String> releasedDates = new ArrayList<>();
         List<String> recheckedDates = new ArrayList<>();
-        LocalDateTime[] se = TimeUtils.getStartAndEndDayTime(LocalDateTime.now(), 2, 0);
+        LocalDateTime[] se = TimeUtils.getStartAndEndDayTime(month, 3, 1);
         //取首件放行状态数量
         List<FirstArticleTask> firstArticleTaskList = firstArticleTaskMapper.selectList(Wrappers.<FirstArticleTask>lambdaQuery()
                 .eq(FirstArticleTask::getStatus, 2)
-                .likeRight(FirstArticleTask::getTaskTime, month));
+                .between(FirstArticleTask::getTaskTime, se[0],se[1]));
         firstArticleTaskList.forEach(firstArticleTask -> {
             releasedDates.add(TimeUtils.formatLocalDate(firstArticleTask.getTaskTime()));
         });
@@ -71,7 +72,7 @@ public class StatisticsServiceImpl implements StatisticsService {
         //取防错放行状态
         List<OnsiteTask> onsiteTaskList = onsiteTaskMapper.selectList(Wrappers.<OnsiteTask>lambdaQuery()
                 .eq(OnsiteTask::getStatus, 2)
-                .likeRight(OnsiteTask::getTaskTime, month));
+                .between(OnsiteTask::getTaskTime, se[0],se[1]));
         onsiteTaskList.forEach(onsiteTask -> {
             releasedDates.add(TimeUtils.formatLocalDate(onsiteTask.getTaskTime()));
         });
@@ -98,14 +99,12 @@ public class StatisticsServiceImpl implements StatisticsService {
      * @param statisticsDateReq 默认2021-06
      * @return
      */
-    private String getMonth(StatisticsDateReq statisticsDateReq) {
-        String month = "2021-06";
+    private LocalDateTime getMonth(StatisticsDateReq statisticsDateReq) {
+    	LocalDateTime month = LocalDateTime.now();
         try {
-            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM");
-            Date date = simpleDateFormat.parse(statisticsDateReq.getMonth());
-            month = simpleDateFormat.format(date);
-        } catch (ParseException e) {
-            e.printStackTrace();
+            month = TimeUtils.paserMonthString(statisticsDateReq.getMonth());
+        } catch (Exception e) {
+            log.error("年月格式错误",e);
             ResponseBeanBuilder.fail("年月格式错误");
         }
         return month;

application-facade/src/main/resources/mapper/AbnormalStatisticsMapper.xml

@@ -59,19 +59,11 @@
         onsite_task ot,
         onsite_calendar oc,
         benteler_plan bp,
-        (
-        SELECT DISTINCT
-        othb.onsite_task_id
-        FROM
-        onsite_task_his_blob othb,
-        onsite_task ot
+        onsite_task_his_blob othb
         WHERE
         othb.onsite_task_id = ot.id
-        ) r
-        WHERE
-        ot.id = r.onsite_task_id
         AND ot.onsite_calendar_id = oc.id
-        AND oc.benteler_plan_id = bp.id
+        AND oc.benteler_plan_id = bp.id and ot.`status` <> 0
         <if test="name != ''">
             AND bp.`name` LIKE CONCAT('%',#{name},'%')
         </if>
@@ -86,19 +78,11 @@
         first_article_task fat,
         first_article_calendar fac,
         benteler_plan bp,
-        (
-        SELECT DISTINCT
-        fathb.first_article_task_id
-        FROM
-        first_article_task_his_blob fathb,
-        first_article_task fat
+        first_article_task_his_blob fathb
         WHERE
         fathb.first_article_task_id = fat.id
-        ) r
-        WHERE
-        fat.id = r.first_article_task_id
         AND fat.first_article_calendar_id = fac.id
-        AND fac.benteler_plan_id = bp.id
+        AND fac.benteler_plan_id = bp.id and fat.`status` &lt;&gt; 0
         <if test="name != ''">
             AND bp.`name` LIKE CONCAT('%',#{name},'%')
         </if>

application-facade/src/main/resources/mapper/PreventMistakeMapper.xml

@@ -431,7 +431,8 @@
 
     <!-- 取得防错重检 -->
     <select id="getPmRepeatList" resultType="com.factory.web.entity.pm.res.AbnormalTaskInfoRes">
-        SELECT oc.benteler_plan_id,
+        SELECT distinct
+         	  oc.benteler_plan_id,
                bp.`name`   AS benteler_plan_name,
                bp.plan_type,
                uu.username AS person,
@@ -442,15 +443,10 @@
         FROM onsite_task ot,
              onsite_calendar oc,
              benteler_plan bp,
-             us_user uu,
-             (
-                 SELECT DISTINCT othb.onsite_task_id
-                 FROM onsite_task_his_blob othb,
-                      onsite_task ot
-                 WHERE othb.onsite_task_id = ot.id
-             ) r
-        WHERE ot.id = r.onsite_task_id
-          AND ot.onsite_calendar_id = oc.id
+             onsite_task_his_blob othb,
+             us_user uu
+        WHERE othb.onsite_task_id = ot.id
+          AND ot.onsite_calendar_id = oc.id  and ot.`status` != 0 
           AND oc.benteler_plan_id = bp.id
           AND oc.user_id = uu.id
           AND DATE_FORMAT(ot.task_time, '%Y-%m-%d') = #{req.checkDate}
@@ -500,7 +496,8 @@
 
     <!-- 取得首件重检 -->
     <select id="getFaRepeatList" resultType="com.factory.web.entity.pm.res.AbnormalTaskInfoRes">
-        SELECT fac.benteler_plan_id,
+        SELECT distinct
+        	   fac.benteler_plan_id,
                bp.`name`   AS benteler_plan_name,
                bp.plan_type,
                uu.username AS person,
@@ -511,16 +508,11 @@
         FROM first_article_task fat,
              first_article_calendar fac,
              benteler_plan bp,
-             us_user uu,
-             (
-                 SELECT DISTINCT fathb.first_article_task_id
-                 FROM first_article_task_his_blob fathb,
-                      first_article_task fat
-                 WHERE fathb.first_article_task_id = fat.id
-             ) r
-        WHERE fat.id = r.first_article_task_id
-          AND fat.first_article_calendar_id = fac.id
-          AND fac.benteler_plan_id = bp.id
+             first_article_task_his_blob fathb,
+             us_user uu
+        WHERE fathb.first_article_task_id = fat.id
+          AND fat.first_article_calendar_id = fac.id and fat.`status` != 0 
+          AND fac.benteler_plan_id = bp.id 
           AND (fac.principal_one_id = uu.id or fac.principal_two_id = uu.id)
           AND DATE_FORMAT(fat.task_time, '%Y-%m-%d') = #{req.checkDate}
     </select>