入场申请

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

@@ -153,17 +153,20 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
             allLocation = allLocation + "," + baseLocationMapper.selectById(baseWashoutPoint.getLocationId()).getLocationName();
             allLocationId = allLocationId + "," + baseWashoutPoint.getLocationId();
             allLocationStatus = allLocationStatus + "," + "0";
-            allFlowId = allFlowId + "0" + baseWashoutPoint.getFlowList();
+            allFlowId = allFlowId + "0," + baseWashoutPoint.getFlowList();
 
             allLocation = allLocation + "," + baseWashoutPoint.getTailLocationName();
             allLocationId = allLocationId + "," + "0";
             allLocationStatus = allLocationStatus + "," + "0";
+            if (!baseWashoutPoint.equals(baseWashoutPoints.get(baseWashoutPoints.size()-1))){
+                allFlowId = allFlowId + ",";
+            }
         }
         baseProcess.setAllLocation(allLocation);
         baseProcess.setAllLocationId(allLocationId);
         baseProcess.setAllLocationStatus(allLocationStatus);
         baseProcess.setAllFlowId(allFlowId);
-
+        baseProcess.setCurrentFlowId("0");
         baseProcess.setCurrentLocation("场外");
         baseProcess.setCurrentLocationId("0");
         baseProcess.setFarmId(Integer.parseInt(farmId));