调整返回审批信息

application-facade/src/main/java/com/factory/web/entity/fa/FirstArticleItem.java

@@ -105,7 +105,7 @@ public class FirstArticleItem implements Serializable {
 
     @TableField(exist = false)
     @ApiModelProperty(value = "放行记录备注叠加")
-    private String permitDesc;
+    private List<FirstArticleApprovalTask> permitDesc;
 
     @TableField(exist = false)
     @ApiModelProperty(value = "任务信息-小程序用")

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

@@ -3,6 +3,7 @@ package com.factory.web.mapper.fa;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.factory.base.entity.po.benteler.BentelerPlan;
+import com.factory.web.entity.fa.FirstArticleApprovalTask;
 import com.factory.web.entity.fa.FirstArticleItemResult;
 import com.factory.web.entity.fa.FirstArticleTask;
 import com.factory.web.entity.fa.FirstArticleWorkshop;
@@ -158,7 +159,7 @@ public interface FirstArticleMapper extends BaseMapper<BentelerPlan> {
      */
     public int getFaItemReleaseCount(@Param("req") SearchFaItemReleaseCountReq req);
 
-    public String getFaItemRelease(@Param("req") SearchFaItemReleaseCountReq req);
+    public List<FirstArticleApprovalTask> getFaItemRelease(@Param("req") SearchFaItemReleaseCountReq req);
 
     /**
      * 取得点检人

application-facade/src/main/java/com/factory/web/service/impl/fa/FirstArticleServiceImpl.java

@@ -10,6 +10,7 @@ import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Function;
 import java.util.stream.Collectors;
@@ -1372,14 +1373,17 @@ public class FirstArticleServiceImpl extends ServiceImpl<FirstArticleMapper, Ben
 
                 List<String> frequencyList = new ArrayList<>();
                 boolean numType = item1.getValFlag().equals(0);
+                //检验方法
                 String greadScope = numType ? item1.getSnoStart().toString() + "Nm - " + item1.getSnoEnd().toString() + "Nm" : "OK/NoK";
                 beanMap.put("scop", greadScope);
-
+                //首件分数
                 if (item1.getFirstFlag().equals(1)) {
                     frequencyList.add("首件");
                     Map<Integer, List<FirstArticleItemResult>> fisWorkMap = item1.getFirstItemResultList().stream().collect(Collectors.groupingBy(FirstArticleItemResult::getSno));
                     String greads = worksNumList.stream().map(work -> {
                         return fisWorkMap.get(work) != null ? fisWorkMap.get(work).stream().map(result -> {
+                            //所有工位订单号相同  其实取一次就可以
+                            beanMap.put("firOrder", Optional.ofNullable(result.getOrderNumber()).orElse(null));
                             if (numType) {
                                 return result.getVal();
                             } else {
@@ -1391,11 +1395,14 @@ public class FirstArticleServiceImpl extends ServiceImpl<FirstArticleMapper, Ben
                 } else {
                     beanMap.put("inigread", "------未要求检测------");
                 }
+                //200分数
                 if (item1.getTwoHundredFlag().equals(1)) {
                     frequencyList.add("200件");
                     Map<Integer, List<FirstArticleItemResult>> fisWorkMap = item1.getTwoHundredItemResultList().stream().collect(Collectors.groupingBy(FirstArticleItemResult::getSno));
                     String greads = worksNumList.stream().map(work -> {
                         return fisWorkMap.get(work) != null ? fisWorkMap.get(work).stream().map(result -> {
+                            //所有工位订单号相同  其实取一次就可以
+                            beanMap.put("towOrder", Optional.ofNullable(result.getOrderNumber()).orElse(null));
                             if (numType) {
                                 return result.getVal();
                             } else {
@@ -1407,11 +1414,14 @@ public class FirstArticleServiceImpl extends ServiceImpl<FirstArticleMapper, Ben
                 } else {
                     beanMap.put("twoGread", "------未要求检测------");
                 }
+                //中断分数
                 if (item1.getCatchFlag().equals(1)) {
                     frequencyList.add("中断");
                     Map<Integer, List<FirstArticleItemResult>> fisWorkMap = item1.getCatchItemResultList().stream().collect(Collectors.groupingBy(FirstArticleItemResult::getSno));
                     String greads = worksNumList.stream().map(work -> {
                         return fisWorkMap.get(work) != null ? fisWorkMap.get(work).stream().map(result -> {
+                            //所有工位订单号相同  其实取一次就可以
+                            beanMap.put("breOrder", Optional.ofNullable(result.getOrderNumber()).orElse(null));
                             if (numType) {
                                 return result.getVal();
                             } else {
@@ -1424,9 +1434,13 @@ public class FirstArticleServiceImpl extends ServiceImpl<FirstArticleMapper, Ben
                     beanMap.put("breakOffgread", "------未要求检测------");
                 }
                 String collect = Stream.of(frequencyList.toArray(new String[frequencyList.size()])).collect(Collectors.joining("&"));
+                //频率 首件&200&中断
                 beanMap.put("frequency", collect);
-                beanMap.put("toolDesc", new Integer(1).equals(item1.getReleaseFlag()) ? "存在" : "无");
+                //放行记录
+                beanMap.put("permit", new Integer(1).equals(item1.getReleaseFlag()) ? "存在" : "无");
+                //工具
                 beanMap.put("tool", item1.getToolId().equals("-1") ? "非工具校验" : item1.getToolId() + item1.getToolDesc());
+                //序号 1-n
                 beanMap.put("id", String.valueOf(id.get()));
                 id.getAndIncrement();
                 arrayList.add(beanMap);

application-facade/src/main/java/com/factory/wx/entity/req/PlanApprovalTaskReq.java

@@ -25,7 +25,7 @@ public class PlanApprovalTaskReq {
     @ApiModelProperty(value = "任务ID")
     private Long taskId;
 
-    @ApiModelProperty(value = "审批状态")
+    @ApiModelProperty(value = "审批状态 1放行  2不放行")
     private int status;
 
     @ApiModelProperty(value = "审批意见")

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

@@ -191,7 +191,8 @@ public class PlanPassFAServiceImpl implements PlanPassFAService {
         //更新首件审批信息
         updateStatus = updateFirstArticleApprovalTask(planApprovalTaskReq);
         if (updateStatus > 0) {
-            settingApprovalTask(planApprovalTaskReq);
+
+            settingApprovalTask(planApprovalTaskReq);//审批通过，保存审批历史  审批不通过触发下一级别
             return ResponseBeanBuilder.ok();
         }else {
         	return ResponseBeanBuilder.fail("无权放行");

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

@@ -405,18 +405,17 @@
           AND fair.first_article_item_id = #{req.firstArticleItemId}
           AND DATE_FORMAT(fat.task_time, '%Y-%m-%d') = #{req.checkDate}
     </select>
-    <!-- 判断当前检查项目是否是放行 -->
-    <select id="getFaItemRelease" resultType="String">
-        SELECT group_concat(faat.reason)
-        FROM first_article_item_result fair,
-             first_article_task fat,
-             first_article_approval_task faat
-        WHERE fair.first_article_task_id = fat.id
-          and faat.first_article_task_id = fat.id
-          AND fat.`status` = 2
-          AND fair.result = 1
-          AND fair.first_article_item_id = #{req.firstArticleItemId}
-          AND DATE_FORMAT(fat.task_time, '%Y-%m-%d') = #{req.checkDate}
+    <!-- 获取放行记录 FirstArticleApprovalTask-->
+    <select id="getFaItemRelease" resultType="com.factory.web.entity.fa.FirstArticleApprovalTask">
+        select approval.*
+        from first_article_item_result result,
+             first_article_task task,
+             first_article_approval_task approval
+        where result.first_article_item_id = #{req.firstArticleItemId}
+          and result.result = 1
+          and result.first_article_task_id = task.id
+          and approval.first_article_task_id = task.id
+          and DATE_FORMAT(task.task_time, '%Y-%m-%d') = #{req.checkDate}
     </select>
 
     <!--取得点检人 -->