Merge remote-tracking branch 'origin/dev' into dev

application-facade/src/main/java/com/factory/controller/web/PreventMistakeController.java

@@ -213,7 +213,7 @@ public class PreventMistakeController {
 	@ApiOperation(value = "修改巡检项目检查结果")
 	@PostMapping("/editItemResult")
 	@ApiOperationSupport(order = 21)
-	public ResponseBean editItemResult(@RequestBody EditItemResultListReq req) {
+	public ResponseBean<Void> editItemResult(@RequestBody EditItemResultListReq req) {
 		return preventMistakeService.editItemResult(req);
 	}
 	
@@ -241,7 +241,7 @@ public class PreventMistakeController {
     @ApiOperation(value = "重检前清空之前的点检结果")
     @PostMapping("/setPmRepeatResult")
     @ApiOperationSupport(order = 25)
-    public ResponseBean setPmRepeatResult(@RequestBody SearchTaskReq req) {
+    public ResponseBean<Void> setPmRepeatResult(@RequestBody SearchTaskReq req) {
         preventMistakeService.setPmRepeatResult(req.getOnsiteTaskId());
         return ResponseBeanBuilder.ok();
     }

application-facade/src/main/java/com/factory/web/entity/pm/req/SearchAbnormalListReq.java

@@ -1,6 +1,9 @@
 package com.factory.web.entity.pm.req;
 
+import java.time.LocalDate;
+
 import com.fasterxml.jackson.annotation.JsonInclude;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -23,6 +26,6 @@ import lombok.NoArgsConstructor;
 public class SearchAbnormalListReq {
 
     @ApiModelProperty(value = "年月日", example = "2021-06-08")
-    private String checkDate;
+    private LocalDate checkDate;
 
 }

application-facade/src/main/java/com/factory/web/entity/pm/req/SearchAbnormalReq.java

@@ -1,6 +1,9 @@
 package com.factory.web.entity.pm.req;
 
+import java.time.LocalDate;
+
 import com.fasterxml.jackson.annotation.JsonInclude;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -23,7 +26,7 @@ import lombok.NoArgsConstructor;
 public class SearchAbnormalReq {
 
     @ApiModelProperty(value = "年月日", example = "2021-06-08")
-    private String checkDate;
+    private LocalDate checkDate;
 
     @ApiModelProperty(value = "工作站id")
     private Long workshopId;

application-facade/src/main/java/com/factory/web/entity/pm/res/AbnormalTaskInfoRes.java

@@ -58,7 +58,7 @@ public class AbnormalTaskInfoRes implements Serializable {
 
     @ApiModelProperty(value = "任务id")
     private Long taskId;
-
+    
     @ApiModelProperty(value = "工作站")
     private List<AbnormalWorkshopRes> abnormalWorkshopList;
 

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

@@ -20,10 +20,10 @@ import com.factory.web.entity.fa.FirstArticleTaskHisBlob;
 public interface FirstArticleTaskHisBlobMapper extends BaseMapper<FirstArticleTaskHisBlob> {
 
 	@Select({
-		"select h.created_time createdTime",
+		"select t.task_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} group by h.first_article_task_id"
+		" join first_article_task t on t.id = h.first_article_task_id and t.`status` not in (0,2)",
+		" where t.task_time between #{sday} and #{eday} group by t.id"
 	})
 	List<FirstArticleTaskHisBlob> getFinishRecheckTask(@Param("sday")LocalDateTime sday,@Param("eday")LocalDateTime wday);
 }

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

@@ -20,10 +20,10 @@ import com.factory.web.entity.pm.OnsiteTaskHisBlob;
 public interface OnsiteTaskHisBlobMapper extends BaseMapper<OnsiteTaskHisBlob> {
 	
 	@Select({
-		"select h.created_time createdTime",
+		"select t.task_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} group by h.onsite_task_id"
+		" join onsite_task t on t.id = h.onsite_task_id and t.`status` not in (0,2)",
+		" where t.task_time between #{sday} and #{eday} group by t.id"
 	})
 	List<OnsiteTaskHisBlob> getFinishRecheckTask(@Param("sday")LocalDateTime sday,@Param("eday")LocalDateTime wday);
 

application-facade/src/main/java/com/factory/wx/entity/res/AbnormalPlanRes.java

@@ -28,5 +28,8 @@ public class AbnormalPlanRes {
 
     @ApiModelProperty(value = "异常类型 1已重检 2已放行")
     private int abnormalType;
+    
+    @ApiModelProperty(value = "任务ID")
+    private Long taskId;
 
 }

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

@@ -9,6 +9,7 @@
         bp.id AS plan_id,
         bp.`name` AS plan_name,
         bp.plan_type,
+        ot.id as taskId,
         2 AS abnormal_type
         FROM
         onsite_task ot,
@@ -30,6 +31,7 @@
         bp.id AS plan_id,
         bp.`name` AS plan_name,
         bp.plan_type,
+        ot.id as taskId,
         2 AS abnormal_type
         FROM
         first_article_task ot,
@@ -54,6 +56,7 @@
         oc.benteler_plan_id AS plan_id,
         bp.`name` AS plan_name,
         bp.plan_type,
+        ot.id as taskId,
         1 AS abnormal_type
         FROM
         onsite_task ot,
@@ -63,7 +66,7 @@
         WHERE
         othb.onsite_task_id = ot.id
         AND ot.onsite_calendar_id = oc.id
-        AND oc.benteler_plan_id = bp.id and ot.`status` <> 0
+        AND oc.benteler_plan_id = bp.id and ot.`status` not in (0,2)
         <if test="name != ''">
             AND bp.`name` LIKE CONCAT('%',#{name},'%')
         </if>
@@ -73,6 +76,7 @@
         fac.benteler_plan_id AS plan_id,
         bp.`name` AS plan_name,
         bp.plan_type,
+        fat.id  as taskId,
         1 AS abnormal_type
         FROM
         first_article_task fat,
@@ -82,7 +86,7 @@
         WHERE
         fathb.first_article_task_id = fat.id
         AND fat.first_article_calendar_id = fac.id
-        AND fac.benteler_plan_id = bp.id and fat.`status` &lt;&gt; 0
+        AND fac.benteler_plan_id = bp.id and fat.`status` not in (0,2)
         <if test="name != ''">
             AND bp.`name` LIKE CONCAT('%',#{name},'%')
         </if>

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

@@ -338,10 +338,10 @@
 
     <!--取得审批人 如果是待生产审核  则显示质量经理的审核信息-->
     <select id="getLatestApprovalInfo" resultType="com.factory.web.entity.pm.OnsiteApprovalPlan"><![CDATA[
-        SELECT oap.benteler_plan_id,
-               oap.approval_level,
+        SELECT oap.benteler_plan_id bentelerPlanId,
+               oap.approval_level approvalLevel,
                oap.`status`,
-               a.approval_user_id,
+               a.approval_user_id approvalUserId,
                a.reason,
                a.updated_time,
                uu.username as approvalPerson
@@ -404,17 +404,17 @@
 
     <!-- 取得防错放行 -->
     <select id="getPmReleaseList" resultType="com.factory.web.entity.pm.res.AbnormalTaskInfoRes">
-        SELECT oc.benteler_plan_id,
-               bp.`name`   AS benteler_plan_name,
-               bp.plan_type,
-               oat.approval_level,
+        SELECT oc.benteler_plan_id bentelerPlanId,
+               bp.`name`   AS bentelerPlanName,
+               bp.plan_type planType,
+               oat.approval_level approvalLevel,
                uu.username AS person,
                1           AS method,
                oat.reason,
-               oat.updated_time,
+               oat.updated_time updatedTime,
                ot.`status`,
-               oc.type_flag,
-               ot.id       AS task_id
+               oc.type_flag typeFlag,
+               ot.id       AS taskId
         FROM onsite_task ot,
              onsite_calendar oc,
              benteler_plan bp,
@@ -426,39 +426,41 @@
           AND oat.approval_user_id = uu.id
           AND oat.`status` = 1
           AND ot.`status` = 2
-          AND DATE_FORMAT(ot.task_time, '%Y-%m-%d') = #{req.checkDate}
+          AND ot.task_time= #{req.checkDate}
+          group by ot.id<!-- 只管任务，不管多次重检 -->
     </select>
 
     <!-- 取得防错重检 -->
     <select id="getPmRepeatList" resultType="com.factory.web.entity.pm.res.AbnormalTaskInfoRes">
         SELECT distinct
-         	  oc.benteler_plan_id,
-               bp.`name`   AS benteler_plan_name,
-               bp.plan_type,
+         	  oc.benteler_plan_id bentelerPlanId,
+               bp.`name`   AS bentelerPlanName,
+               bp.plan_type planType,
                uu.username AS person,
                2           AS method,
                ot.`status`,
-               oc.type_flag,
-               ot.id       AS task_id
+               oc.type_flag typeFlag,
+               ot.id       AS taskId
         FROM onsite_task ot,
              onsite_calendar oc,
              benteler_plan bp,
              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 ot.onsite_calendar_id = oc.id  and ot.`status` not in (0,2)
           AND oc.benteler_plan_id = bp.id
           AND oc.user_id = uu.id
-          AND DATE_FORMAT(ot.task_time, '%Y-%m-%d') = #{req.checkDate}
+          AND ot.task_time = #{req.checkDate}
+          group by ot.id <!-- 只管任务，不管多次重检 -->
     </select>
 
     <!-- 取得防错工作站下的巡检项目和检查结果 -->
     <select id="getPmAbnormalItemList" resultType="com.factory.web.entity.pm.res.AbnormalItemRes">
-        SELECT oir.onsite_item_id AS item_id,
-               oi.item_content,
+        SELECT oir.onsite_item_id AS itemId,
+               oi.item_content itemContent,
                oir.result,
                oir.abnormal,
-               oir.created_time   AS item_result_create_time
+               oir.created_time   AS itemResultCreateTime
         FROM onsite_item_result oir,
              onsite_item oi
         WHERE oir.onsite_item_id = oi.id
@@ -469,17 +471,17 @@
 
     <!-- 取得首件放行 -->
     <select id="getFaReleaseList" resultType="com.factory.web.entity.pm.res.AbnormalTaskInfoRes">
-        SELECT fac.benteler_plan_id,
-               bp.`name`   AS benteler_plan_name,
-               bp.plan_type,
-               faat.approval_level,
+        SELECT fac.benteler_plan_id bentelerPlanId,
+               bp.`name`   AS bentelerPlanName,
+               bp.plan_type planType,
+               faat.approval_level approvalLevel,
                uu.username AS person,
                1           AS method,
                faat.reason,
-               faat.updated_time,
+               faat.updated_time updatedTime,
                fat.`status`,
-               fat.type_flag,
-               fat.id      AS task_id
+               fat.type_flag typeFlag,
+               fat.id      AS taskId
         FROM first_article_task fat,
              first_article_calendar fac,
              benteler_plan bp,
@@ -491,30 +493,32 @@
           AND faat.approval_user_id = uu.id
           AND faat.`status` = 1
           AND fat.`status` = 2
-          AND DATE_FORMAT(fat.task_time, '%Y-%m-%d') = #{req.checkDate}
+          AND fat.task_time = #{req.checkDate}
+          group by fat.id <!-- 只管任务，不管多次重检 -->
     </select>
 
     <!-- 取得首件重检 -->
     <select id="getFaRepeatList" resultType="com.factory.web.entity.pm.res.AbnormalTaskInfoRes">
         SELECT distinct
-        	   fac.benteler_plan_id,
-               bp.`name`   AS benteler_plan_name,
-               bp.plan_type,
+        	   fac.benteler_plan_id bentelerPlanId,
+               bp.`name`   AS bentelerPlanName,
+               bp.plan_type planType,
                uu.username AS person,
                2           AS method,
                fat.`status`,
-               fat.type_flag,
-               fat.id      AS task_id
+               fat.type_flag typeFlag,
+               fat.id      AS taskId
         FROM first_article_task fat,
              first_article_calendar fac,
              benteler_plan bp,
              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 fat.first_article_calendar_id = fac.id and fat.`status` not in (0,2)
           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}
+          AND fat.task_time = #{req.checkDate}
+          group by fat.id <!-- 只管任务，不管多次重检 -->
     </select>
 
     <!-- 取得首件工作站下的巡检项目 -->