流程修改2

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

@@ -204,7 +204,7 @@ public class BillCleanBeforeServiceImpl extends ServiceImpl<BillCleanBeforeMappe
         String substring = status.substring(0, status.length() - 1);
 
         baseProcess.setCurrentStatus(substring + "1," + 0);
-        baseProcess.setCurrentFlowId(baseProcess.getCurrentLocationId() + "," + nextId);
+        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

@@ -901,7 +901,7 @@ 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.getCurrentLocationId() + "," + nextId);
+                baseProcess.setCurrentFlowId(baseProcess.getCurrentFlowId() + "," + nextId);
                 processMapper.updateById(baseProcess);
             } else {
                 billClean.setImgStatus(1);
@@ -1009,7 +1009,7 @@ 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.getCurrentLocationId() + "," + nextId);
+                    baseProcess.setCurrentFlowId(baseProcess.getCurrentFlowId() + "," + nextId);
 
                     processMapper.updateById(baseProcess);
                 } else {

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

@@ -406,6 +406,7 @@ public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> impl
                         billPcr.getAdmissionUserId(), billPcr.getVistitDate(), billPcr.getSubDate(),
                         billPcr.getProcessId(), billPcr.getFarmId(), billPcr.getTestLocation(), billPcr.getTestLocationId(),
                         billPcr.getVistitType(),billPcr.getPhone());
+                System.out.println("这里是pcr通过的下一个流程id：" + nextId);
                 if (nextId == 0) {
                     int index = allLocationId.indexOf(baseLocation.getId());
                     StringBuilder status = new StringBuilder(baseProcess.getAllLocationId());
@@ -509,7 +510,7 @@ public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> impl
                 String substring = status.substring(0, status.length() - 1);
 
                 baseProcess.setCurrentStatus(substring + "1," + 0);
-                baseProcess.setCurrentFlowId(baseProcess.getCurrentLocationId() + "," + nextId);
+                baseProcess.setCurrentFlowId(baseProcess.getCurrentFlowId() + "," + nextId);
                 processMapper.updateById(baseProcess);
                 pcrMapper.updateById(billPcr);
                 return new Result(10000, "修改成功！", true);

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

@@ -1353,7 +1353,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.getCurrentLocationId() + "," + nextId);
+        baseProcess.setCurrentFlowId(baseProcess.getCurrentFlowId() + "," + nextId);
 
 
         isolateMapper.updateById(billIsolate);

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

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