流程修改

huimv-receive/src/main/java/com/huimv/receive/service/impl/BillCleanBeforeServiceImpl.java

@@ -278,7 +278,6 @@ public class BillCleanBeforeServiceImpl extends ServiceImpl<BillCleanBeforeMappe
         String substring = status.substring(0, status.length() - 1);
 
         baseProcess.setCurrentStatus(substring + "1," + 0);
-        baseProcess.setCurrentFlowId(baseProcess.getCurrentFlowId() + "," + nextId);
         processMapper.updateById(baseProcess);
         billCleanBeforeMapper.updateById(cleanBefore);
         return new Result(10000, "修改成功！", true);

huimv-receive/src/main/java/com/huimv/receive/service/impl/BillCleanServiceImpl.java

@@ -966,7 +966,6 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                 String status = baseProcess.getCurrentStatus();
                 String substring = status.substring(0, status.length() - 1);
                 baseProcess.setCurrentStatus(substring + "1," + 0);
-                baseProcess.setCurrentFlowId(baseProcess.getCurrentFlowId() + "," + nextId);
                 processMapper.updateById(baseProcess);
             } else {
                 billClean.setImgStatus(1);
@@ -1149,7 +1148,6 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                     String status = baseProcess.getCurrentStatus();
                     String substring = status.substring(0, status.length() - 1);
                     baseProcess.setCurrentStatus(substring + "1," + 0);
-                    baseProcess.setCurrentFlowId(baseProcess.getCurrentFlowId() + "," + nextId);
 
                     processMapper.updateById(baseProcess);
                 } else {

huimv-receive/src/main/java/com/huimv/receive/service/impl/BillPersonnelAdmissionServiceImpl.java

@@ -1357,26 +1357,32 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
             //新增采样
             BillSampling billSampling = (BillSampling) newObject;
             samplingMapper.insert(billSampling);
+            baseProcess.setCurrentFlowId(baseProcess.getCurrentFlowId() + "," + nextId);
         }else if (nextId == 2) {
             //新增pcr
             BillPcr pcr = (BillPcr) newObject;
             pcrMapper.insert(pcr);
+            baseProcess.setCurrentFlowId(baseProcess.getCurrentFlowId() + "," + nextId);
         }else if (nextId == 3) {
             //新增洗澡
             BillClean pcr = (BillClean) newObject;
             cleanMapper.insert(pcr);
+            baseProcess.setCurrentFlowId(baseProcess.getCurrentFlowId() + "," + nextId);
         }else if (nextId == 4) {
             //新增隔离
             BillIsolate pcr = (BillIsolate) newObject;
             isolateMapper.insert(pcr);
+            baseProcess.setCurrentFlowId(baseProcess.getCurrentFlowId() + "," + nextId);
         }else if (nextId == 5) {
             BillDry pcr = (BillDry) newObject;
             dryMapper.insert(pcr);
+            baseProcess.setCurrentFlowId(baseProcess.getCurrentFlowId() + "," + nextId);
             //新增烘干
         }else if (nextId == 6) {
             //新增洗澡前拍照
             BillCleanBefore before = (BillCleanBefore) newObject;
             beforeMapper.insert(before);
+            baseProcess.setCurrentFlowId(baseProcess.getCurrentFlowId() + "," + nextId);
         }
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -1411,7 +1417,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
         String status = baseProcess.getCurrentStatus();
         String substring = status.substring(0, status.length() - 1);
         baseProcess.setCurrentStatus(substring + "1," + 0);
-        baseProcess.setCurrentFlowId(baseProcess.getCurrentFlowId() + "," + nextId);
+
 
 
         isolateMapper.updateById(billIsolate);

huimv-receive/src/main/java/com/huimv/receive/service/impl/BillSamplingServiceImpl.java

@@ -281,7 +281,6 @@ public class BillSamplingServiceImpl extends ServiceImpl<BillSamplingMapper, Bil
         String substring = status.substring(0, status.length() - 1);
 
         baseProcess.setCurrentStatus(substring + "1," + 0);
-        baseProcess.setCurrentFlowId(baseProcess.getCurrentFlowId() + "," + nextId);
         processMapper.updateById(baseProcess);
         billSamplingMapper.updateById(sampling);
         return new Result(10000, "修改成功!", true);