|
@@ -188,9 +188,16 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
|
|
|
allFlowId = allFlowId + ",";
|
|
|
}
|
|
|
}
|
|
|
- baseProcess.setAllLocation(allLocation);
|
|
|
- baseProcess.setAllLocationId(allLocationId);
|
|
|
- baseProcess.setAllLocationStatus(allLocationStatus);
|
|
|
+ if(admissionType.equals("1")){
|
|
|
+ baseProcess.setAllLocation(departureName);
|
|
|
+ baseProcess.setAllLocationId(departureId);
|
|
|
+ baseProcess.setAllLocationStatus("0");
|
|
|
+ }else {
|
|
|
+ baseProcess.setAllLocation(allLocation);
|
|
|
+ baseProcess.setAllLocationId(allLocationId);
|
|
|
+ baseProcess.setAllLocationStatus(allLocationStatus);
|
|
|
+ }
|
|
|
+
|
|
|
baseProcess.setAllFlowId(allFlowId+",0");
|
|
|
baseProcess.setCurrentFlowId("0");
|
|
|
baseProcess.setCurrentLocation("场外");
|