产品质检UI交互方式修改

dao/src/main/resources/mapper/MajorProductionMapper.xml

@@ -87,7 +87,8 @@
         mp.small_worker_no,
         mp.work_start_date,
         mp.work_end_date,
-        mp.work_purpose
+        mp.work_purpose,
+        mp.not_record_reason
         FROM
             major_production mp
                 LEFT JOIN major m ON m.id = mp.major_id

domain/src/main/java/com/dayou/entity/BusinessProductionPerformance.java

@@ -7,6 +7,8 @@ import com.dayou.annotation.ExcelSheet;
 import com.dayou.annotation.ExportCell;
 import com.dayou.annotation.ImportCell;
 
+import java.util.List;
+
 /**
  * <p>
  * 业务产品绩效分配
@@ -83,5 +85,17 @@ public class BusinessProductionPerformance extends BaseEntity {
     private Boolean operation;
     @TableField(exist = false)
     private Boolean isRecord;
+    @TableField(exist = false)
+    private List<String> normalMistakes;
+    @TableField(exist = false)
+    private List<String> xNormalMistakes;
+    @TableField(exist = false)
+    private List<String> hardMistakes;
+    @TableField(exist = false)
+    private List<String> xHardMistakes;
+    @TableField(exist = false)
+    private List<String> fatalMistakes;
+    @TableField(exist = false)
+    private List<String> xFatalMistakes;
 
 }

domain/src/main/java/com/dayou/entity/MajorProduction.java

@@ -273,6 +273,11 @@ public class MajorProduction extends BaseEntity {
     @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String smallWorkerNo;
 
+    /**
+     * 不备案原因
+     */
+    private String notRecordReason;
+
 
     @TableField(exist = false)
     private List<Long> signatoryId;

service/src/main/java/com/dayou/service/impl/BusinessProductionPerformanceServiceImpl.java

@@ -1,6 +1,8 @@
 package com.dayou.service.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.dayou.common.BaseEntity;
 import com.dayou.dto.TaskRecordDTO;
@@ -18,6 +20,7 @@ import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -82,6 +85,31 @@ public class BusinessProductionPerformanceServiceImpl extends ServiceImpl<Busine
                         if (bpp.getId()==null){
                             bpp.setCheckLoop(performance.getCheckLoop());
                             bpp.setProductionId(bpp.getPId());
+                            bpp.setNormalMistakes(new ArrayList<>());
+                            bpp.setXNormalMistakes(new ArrayList<>());
+                            bpp.setHardMistakes(new ArrayList<>());
+                            bpp.setXHardMistakes(new ArrayList<>());
+                            bpp.setFatalMistakes(new ArrayList<>());
+                            bpp.setXFatalMistakes(new ArrayList<>());
+                        }else {
+                            bpp.setCheckLoop(performance.getCheckLoop());
+                            bpp.setProductionId(bpp.getPId());
+                            JSONObject jsonObject = JSON.parseObject(bpp.getReason());
+                            if (jsonObject!=null){
+                                bpp.setNormalMistakes((List<String>) jsonObject.get("normalMistakes"));
+                                bpp.setXNormalMistakes((List<String>) jsonObject.get("xnormalMistakes"));
+                                bpp.setHardMistakes((List<String>) jsonObject.get("hardMistakes"));
+                                bpp.setXHardMistakes((List<String>) jsonObject.get("xhardMistakes"));
+                                bpp.setFatalMistakes((List<String>) jsonObject.get("fatalMistakes"));
+                                bpp.setXFatalMistakes((List<String>) jsonObject.get("xfatalMistakes"));
+                            }else{
+                                bpp.setNormalMistakes(new ArrayList<>());
+                                bpp.setXNormalMistakes(new ArrayList<>());
+                                bpp.setHardMistakes(new ArrayList<>());
+                                bpp.setXHardMistakes(new ArrayList<>());
+                                bpp.setFatalMistakes(new ArrayList<>());
+                                bpp.setXFatalMistakes(new ArrayList<>());
+                            }
 
                         }
                         businessProductionPerformance.getInfo().add(bpp);

service/src/main/java/com/dayou/service/workflow/IWorkNodeService.java

@@ -78,7 +78,7 @@ public interface IWorkNodeService extends IService<WorkNode> {
      * @param doThirdCheck
      * @return
      */
-    WorkNodeDTO getNextWorkNodeByCheckState(Long flowId, String nodeCode,String doSecondCheck,String doThirdCheck,Integer skip);
+    WorkNodeDTO getNextWorkNodeByCheckState(Long flowId, String nodeCode,String doSecondCheck,String doThirdCheck);
 
     /**
      * 资产节点跳过判断方法

service/src/main/java/com/dayou/service/workflow/WorkNodeServiceImpl.java

@@ -275,7 +275,7 @@ public class WorkNodeServiceImpl extends ServiceImpl<WorkNodeMapper, WorkNode> i
     }
 
     @Override
-    public WorkNodeDTO getNextWorkNodeByCheckState(Long flowId, String nodeCode, String doSecondCheck, String doThirdCheck,Integer skip) {
+    public WorkNodeDTO getNextWorkNodeByCheckState(Long flowId, String nodeCode, String doSecondCheck, String doThirdCheck) {
         List<WorkNodeDTO> flowNodes = getFlowNodes(flowId);
         for (int i = 0; i < flowNodes.size(); i++) {
             if (nodeCode.equals(CHECK_STATEMENT.name()) && flowNodes.get(i).getCode().equals(nodeCode) && ReportStatus.不审.name().equals(doSecondCheck)) {
@@ -285,10 +285,10 @@ public class WorkNodeServiceImpl extends ServiceImpl<WorkNodeMapper, WorkNode> i
                 return flowNodes.get(i + 1);
             }
             if ((nodeCode.equals(CHECK_REPORT.name()) || nodeCode.equals(LAND_REPORT_NOT_RECORD_CHECK.name())) && flowNodes.get(i).getCode().equals(nodeCode) && ReportStatus.不审.name().equals(doSecondCheck)) {
-                return flowNodes.get(i + 3 + skip);
+                return flowNodes.get(i + 3 );
             }
             if ((nodeCode.equals(CHECK_REPORT.name()) || nodeCode.equals(LAND_REPORT_NOT_RECORD_CHECK.name())) && flowNodes.get(i).getCode().equals(nodeCode) && ReportStatus.待审核.name().equals(doSecondCheck)) {
-                return flowNodes.get(i + 1 + skip);
+                return flowNodes.get(i + 1 );
             }
             if (nodeCode.equals(CHECK_LETTER.name()) && flowNodes.get(i).getCode().equals(nodeCode) && ReportStatus.不审.name().equals(doSecondCheck)) {
                 return flowNodes.get(i + 3);
@@ -303,10 +303,16 @@ public class WorkNodeServiceImpl extends ServiceImpl<WorkNodeMapper, WorkNode> i
                 return flowNodes.get(i + 1);
             }
             if ((nodeCode.equals(CHECK_REPORT.name()) || nodeCode.equals(LAND_REPORT_NOT_RECORD_CHECK.name())) && flowNodes.get(i).getCode().equals(nodeCode) && ReportStatus.不审.name().equals(doThirdCheck)) {
-                return flowNodes.get(i + 2 + skip);
+                return flowNodes.get(i + 2 );
             }
             if ((nodeCode.equals(CHECK_REPORT.name()) || nodeCode.equals(LAND_REPORT_NOT_RECORD_CHECK.name())) && flowNodes.get(i).getCode().equals(nodeCode) && ReportStatus.待审核.name().equals(doThirdCheck)) {
-                return flowNodes.get(i + 1 + skip);
+                return flowNodes.get(i + 1 );
+            }
+            if (nodeCode.equals(RECHECK_REPORT.name()) && flowNodes.get(i).getCode().equals(nodeCode) && ReportStatus.不审.name().equals(doThirdCheck)) {
+                return flowNodes.get(i + 2);
+            }
+            if (nodeCode.equals(RECHECK_REPORT.name()) && flowNodes.get(i).getCode().equals(nodeCode) && ReportStatus.待审核.name().equals(doThirdCheck)) {
+                return flowNodes.get(i + 1);
             }
             if (nodeCode.equals(RECHECK_LETTER.name()) && flowNodes.get(i).getCode().equals(nodeCode) && ReportStatus.不审.name().equals(doThirdCheck)) {
                 return flowNodes.get(i + 2);

service/src/main/java/com/dayou/workflow/handler/MajorNodeHandler.java

@@ -90,7 +90,7 @@ public class MajorNodeHandler extends WorkNodeProcessable {
                     switch (callback){
                         case CHECK_PRODUCTION_CHECK:
                             nextWorkNode = workNodeService.getNextWorkNodeByCheckState(currentInstanceNode.getFlowId(),currentInstanceNode.getNodeCode(),
-                                    workNodeCommit.getDoSecondCheck(),workNodeCommit.getDoThirdCheck(),0);
+                                    workNodeCommit.getDoSecondCheck(),workNodeCommit.getDoThirdCheck());
                             break;
                         case CHECK_PRODUCTION_TYPE:
                             //1. 获取业务上出具的产品类型。

sql/update_sql.sql

@@ -722,4 +722,4 @@ ALTER TABLE `major_production` ADD small_worker_no varchar(64) NULL COMMENT '第
   修改人:吴长林
   未更新到test-env
  */
-ALTER TABLE `major_production` ADD second_check_id bigint(20) NULL COMMENT '复审人id';
+ALTER TABLE `major_production` ADD not_record_reason varchar(255) NULL COMMENT '不备案原因';