修正bug

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

@@ -0,0 +1,32 @@
+package com.factory.web.entity.pm.res;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.time.LocalDateTime;
+
+/**
+ * @author sMArT
+ * @version 1.0
+ * @date 2021-08-06 8:01 上午
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class AbnormalApprovalTaskRes {
+    @ApiModelProperty(value = "操作人")
+    private String username;
+
+    @ApiModelProperty(value = "审批意见")
+    private String reason;
+
+    @ApiModelProperty(value = "审批时间")
+    private LocalDateTime updatedTime;
+
+    @ApiModelProperty(value = "0初始化 1待审核状态 2放行 3不通过 4通过")
+    private Integer status;
+}

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

@@ -68,4 +68,7 @@ public class AbnormalTaskInfoRes implements Serializable {
 	@ApiModelProperty(value = "工作站")
 	private List<AbnormalWorkshopRes> abnormalWorkshopList;
 
+	@ApiModelProperty(value = "任务审批记录-小程序")
+	private List<AbnormalApprovalTaskRes> abnormalApprovalTaskResList;
+
 }

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

@@ -3,21 +3,22 @@ package com.factory.wx.service.impl;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.factory.base.entity.po.benteler.BentelerPlan;
 import com.factory.base.util.res.ResponseBeanBuilder;
+import com.factory.web.entity.fa.FirstArticleApprovalTask;
 import com.factory.web.entity.fa.FirstArticleTitle;
 import com.factory.web.entity.fa.FirstArticleWorkshop;
+import com.factory.web.entity.pm.OnsiteApprovalTask;
 import com.factory.web.entity.pm.OnsiteTitle;
 import com.factory.web.entity.pm.OnsiteWorkshop;
 import com.factory.web.entity.pm.req.SearchAbnormalReq;
-import com.factory.web.entity.pm.res.AbnormalItemRes;
-import com.factory.web.entity.pm.res.AbnormalItemResultRes;
-import com.factory.web.entity.pm.res.AbnormalTaskInfoRes;
-import com.factory.web.entity.pm.res.AbnormalWorkshopRes;
+import com.factory.web.entity.pm.res.*;
 import com.factory.web.mapper.BentelerPlanMapper;
 import com.factory.web.mapper.FileMapper;
 import com.factory.web.mapper.pm.PreventMistakeMapper;
+import com.factory.web.service.fa.FirstArticleApprovalTaskService;
 import com.factory.web.service.fa.FirstArticleService;
 import com.factory.web.service.fa.FirstArticleWorkshopService;
 import com.factory.web.service.impl.FileEntry;
+import com.factory.web.service.pm.OnsiteApprovalTaskService;
 import com.factory.web.service.pm.OnsiteWorkshopService;
 import com.factory.web.service.pm.PreventMistakeService;
 import com.factory.wx.entity.req.AbnormalDetailReq;
@@ -62,6 +63,10 @@ public class AbnormalStatisticsServiceImpl implements AbnormalStatisticsService
     private PreventMistakeService preventMistakeService;
     @Autowired
     private WxPlanService wxPlanService;
+    @Autowired
+    private OnsiteApprovalTaskService onsiteApprovalTaskService;
+    @Autowired
+    private FirstArticleApprovalTaskService firstArticleApprovalTaskService;
 
     /**
      * 根据年月获取异常计划
@@ -128,7 +133,7 @@ public class AbnormalStatisticsServiceImpl implements AbnormalStatisticsService
     }
 
     /**
-     * 获取首件放行信息
+     * 获取首件信息
      *
      * @param abnormalDetailReq
      * @return
@@ -183,12 +188,38 @@ public class AbnormalStatisticsServiceImpl implements AbnormalStatisticsService
                 abnormalWorkshopList.get(i).setAbnormalItemList(abnormalItemList);
                 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()));
+                    List<AbnormalApprovalTaskRes> resultInfos = new ArrayList<>();
+                    for (FirstArticleApprovalTask t : approvalTasks) {
+                        AbnormalApprovalTaskRes o = new AbnormalApprovalTaskRes();
+                        o.setStatus(t.getStatus());
+                        o.setReason(t.getReason());
+                        o.setUpdatedTime(t.getUpdatedTime());
+                        o.setUsername(task.getPerson());
+                        resultInfos.add(o);
+                    }
+                    task.setAbnormalApprovalTaskResList(resultInfos);
+                }
+            }
+
         }
         return faList;
     }
 
     /**
-     * 获取防错放行信息
+     * 获取防错信息
      *
      * @param abnormalDetailReq
      * @return
@@ -203,7 +234,6 @@ public class AbnormalStatisticsServiceImpl implements AbnormalStatisticsService
             //放行内容
             pmList = abnormalStatisticsMapper.getPmReleaseListByPlanId(abnormalDetailReq.getPlanId());
         }
-
         for (AbnormalTaskInfoRes pmInfo : pmList) {
             List<OnsiteWorkshop> onsiteWorkshopList = onsiteWorkshopService.list(Wrappers.<OnsiteWorkshop>lambdaQuery()
                     .eq(OnsiteWorkshop::getBentelerPlanId, pmInfo.getBentelerPlanId()));
@@ -232,6 +262,23 @@ public class AbnormalStatisticsServiceImpl implements AbnormalStatisticsService
                 abnormalWorkshopList.get(i).setAbnormalItemList(abnormalItemList);
             }
 
+            if (abnormalDetailReq.getAbnormalType() == 1) {
+                for (AbnormalTaskInfoRes task : pmList) {
+                    List<OnsiteApprovalTask> taskList = onsiteApprovalTaskService.list(Wrappers.<OnsiteApprovalTask>lambdaQuery()
+                            .eq(OnsiteApprovalTask::getOnsiteTaskId, task.getTaskId()));
+                    List<AbnormalApprovalTaskRes> resultInfos = new ArrayList<>();
+                    for (OnsiteApprovalTask t : taskList) {
+                        AbnormalApprovalTaskRes o = new AbnormalApprovalTaskRes();
+                        o.setStatus(t.getStatus());
+                        o.setReason(t.getReason());
+                        o.setUpdatedTime(t.getUpdatedTime());
+                        o.setUsername(task.getPerson());
+                        resultInfos.add(o);
+                    }
+                    task.setAbnormalApprovalTaskResList(resultInfos);
+                }
+            }
+
             pmInfo.setAbnormalWorkshopList(abnormalWorkshopList.stream().filter(workshop -> workshop.getAbnormalItemList().size() > 0).collect(Collectors.toList()));
         }
         return pmList;

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

@@ -165,14 +165,11 @@
             bp.plan_type,
             uu.username AS person,
             2 AS method,
-            oat.reason,
-            oat.updated_time,
             ot.`status`,
             oc.type_flag,
             ot.id AS task_id
         FROM
             onsite_task ot,
-            onsite_approval_task oat,
             onsite_calendar oc,
             benteler_plan bp,
             us_user uu,
@@ -187,7 +184,6 @@
             ) r
         WHERE
             ot.id = r.onsite_task_id
-          AND oat.onsite_task_id = r.onsite_task_id
           AND ot.onsite_calendar_id = oc.id
           AND oc.benteler_plan_id = bp.id
           AND oc.user_id = uu.id
@@ -201,14 +197,11 @@
             bp.plan_type,
             uu.username AS person,
             2 AS method,
-            faat.reason,
-            faat.updated_time,
             fat.`status`,
             fac.type_flag,
             fat.id AS task_id
         FROM
             first_article_task fat,
-            first_article_approval_task faat,
             first_article_calendar fac,
             benteler_plan bp,
             us_user uu,
@@ -223,7 +216,6 @@
             ) r
         WHERE
             fat.id = r.first_article_task_id
-          AND faat.first_article_task_id = r.first_article_task_id
           AND fat.first_article_calendar_id = fac.id
           AND fac.benteler_plan_id = bp.id
           AND fac.user_id = uu.id