|
@@ -219,25 +219,26 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
|
|
if (locationIds.contains(billPersonnelAdmission.getDestId())){
|
|
if (locationIds.contains(billPersonnelAdmission.getDestId())){
|
|
baseProcess.setCurrentStatus("1");
|
|
baseProcess.setCurrentStatus("1");
|
|
baseProcess.setProcessType(1);
|
|
baseProcess.setProcessType(1);
|
|
|
|
+ }else {
|
|
|
|
+ baseProcess.setCurrentStatus("1,0");
|
|
|
|
+ baseProcess.setCurrentLocation(baseProcess.getCurrentLocation()+","+baseLocation.getLocationName());
|
|
|
|
+ baseProcess.setCurrentLocationId(baseProcess.getCurrentLocationId() +","+baseLocation.getId());
|
|
|
|
+ BillPcr billPcr = new BillPcr();
|
|
|
|
+ billPcr.setVistitType(billPersonnelAdmission.getVistitType());
|
|
|
|
+ billPcr.setDestName(billPersonnelAdmission.getDestName());
|
|
|
|
+ billPcr.setDestId(billPersonnelAdmission.getDestId());
|
|
|
|
+ billPcr.setPhone(billPersonnelAdmission.getPhone());
|
|
|
|
+ billPcr.setAdmissionUserId(billPersonnelAdmission.getAdmissionUserId());
|
|
|
|
+ billPcr.setAdmissionUserName(billPersonnelAdmission.getAdmissionUserName());
|
|
|
|
+ billPcr.setSubDate(LocalDateTime.now());
|
|
|
|
+ billPcr.setVistitDate(billPersonnelAdmission.getVistitDate());
|
|
|
|
+ billPcr.setFarmId(billPersonnelAdmission.getFarmId());
|
|
|
|
+ billPcr.setProcessId(billPersonnelAdmission.getProcessId());
|
|
|
|
+ billPcr.setAdmissionId(Integer.parseInt(id));
|
|
|
|
+ billPcr.setTestLocation(baseLocation.getLocationName());
|
|
|
|
+ billPcr.setTestLocationId(baseLocation.getId());
|
|
|
|
+ billPcrMapper.insert(billPcr);
|
|
}
|
|
}
|
|
- baseProcess.setCurrentStatus("1,0");
|
|
|
|
- baseProcess.setCurrentLocation(baseProcess.getCurrentLocation()+","+baseLocation.getLocationName());
|
|
|
|
- baseProcess.setCurrentLocationId(baseProcess.getCurrentLocationId() +","+baseLocation.getId());
|
|
|
|
- BillPcr billPcr = new BillPcr();
|
|
|
|
- billPcr.setVistitType(billPersonnelAdmission.getVistitType());
|
|
|
|
- billPcr.setDestName(billPersonnelAdmission.getDestName());
|
|
|
|
- billPcr.setDestId(billPersonnelAdmission.getDestId());
|
|
|
|
- billPcr.setPhone(billPersonnelAdmission.getPhone());
|
|
|
|
- billPcr.setAdmissionUserId(billPersonnelAdmission.getAdmissionUserId());
|
|
|
|
- billPcr.setAdmissionUserName(billPersonnelAdmission.getAdmissionUserName());
|
|
|
|
- billPcr.setSubDate(LocalDateTime.now());
|
|
|
|
- billPcr.setVistitDate(billPersonnelAdmission.getVistitDate());
|
|
|
|
- billPcr.setFarmId(billPersonnelAdmission.getFarmId());
|
|
|
|
- billPcr.setProcessId(billPersonnelAdmission.getProcessId());
|
|
|
|
- billPcr.setAdmissionId(Integer.parseInt(id));
|
|
|
|
- billPcr.setTestLocation(baseLocation.getLocationName());
|
|
|
|
- billPcr.setTestLocationId(baseLocation.getId());
|
|
|
|
- billPcrMapper.insert(billPcr);
|
|
|
|
}else {
|
|
}else {
|
|
baseProcess.setCurrentStatus("1");
|
|
baseProcess.setCurrentStatus("1");
|
|
// baseProcess.setCurrentLocation(baseProcess.getCurrentLocation()+","+baseLocation.getLocationName());
|
|
// baseProcess.setCurrentLocation(baseProcess.getCurrentLocation()+","+baseLocation.getLocationName());
|