|
|
@@ -133,7 +133,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
|
|
|
String allLocationId = "";
|
|
|
String allLocationStatus = "";
|
|
|
for (BaseLocation baseLocation : baseLocations) {
|
|
|
- if (baseLocation.getId() < Integer.parseInt(destId)||baseLocation.getId()>=20) {
|
|
|
+ if (baseLocation.getId() < Integer.parseInt(destId) || baseLocation.getId() >= 20) {
|
|
|
allLocation = allLocation + baseLocation.getLocationName() + ",";
|
|
|
allLocationId = allLocationId + baseLocation.getId() + ",";
|
|
|
allLocationStatus = allLocationStatus + "0" + ",";
|
|
|
@@ -808,7 +808,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
|
|
|
String[] split1 = status.split(",");
|
|
|
split1[0] = "2";
|
|
|
split1[1] = "3";
|
|
|
- baseProcess.setAllLocationStatus(split1[0] +","+split1[1]+ status1.substring(3));
|
|
|
+ baseProcess.setAllLocationStatus(split1[0] + "," + split1[1] + status1.substring(3));
|
|
|
|
|
|
processMapper.updateById(baseProcess);
|
|
|
pcrMapper.updateById(billPcr);
|
|
|
@@ -999,7 +999,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
|
|
|
split[2] = "2";
|
|
|
split[3] = "2";
|
|
|
split[4] = "1";
|
|
|
- baseProcess.setAllLocationStatus(split[0] + "," + split[1] + "," + split[2] + "," + split[3]+"," +split[4]+ status.substring(9));
|
|
|
+ baseProcess.setAllLocationStatus(split[0] + "," + split[1] + "," + split[2] + "," + split[3] + "," + split[4] + status.substring(9));
|
|
|
}
|
|
|
|
|
|
billIsolate.setIsolateRealEndDate(new Date());
|
|
|
@@ -1069,7 +1069,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
|
|
|
split[2] = "2";
|
|
|
split[3] = "2";
|
|
|
split[4] = "1";
|
|
|
- baseProcess.setAllLocationStatus(split[0] + "," + split[1] + "," + split[2] + "," + split[3]+"," +split[4]+ status.substring(9));
|
|
|
+ baseProcess.setAllLocationStatus(split[0] + "," + split[1] + "," + split[2] + "," + split[3] + "," + split[4] + status.substring(9));
|
|
|
}
|
|
|
billIsolate.setIsolateRealEndDate(new Date());
|
|
|
SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd");
|
|
|
@@ -1170,89 +1170,64 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
|
|
|
locationQueryWrapper.eq("farm_id", farmId).eq("id", billClean.getTestLocationId());
|
|
|
BaseLocation baseLocation = locationMapper.selectOne(locationQueryWrapper);//当前洗消检测所在的位置
|
|
|
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
|
|
|
- if (baseProcess.getProcessType() == 2 || baseProcess.getProcessType() == 1) {
|
|
|
- return new Result(10001, "修改失败！该申请已提前结束或者被拒绝", false);
|
|
|
- } else {
|
|
|
- if (billClean.getDestId() >= billClean.getTestLocationId()) { //说明当前不是目的地
|
|
|
- if ("1".equals(result)) {
|
|
|
- billClean.setBillStatus(1);
|
|
|
- billClean.setPassUserName(TokenSign.getUserNameByJwtToken(httpServletRequest));
|
|
|
- billClean.setPassUserId(TokenSign.getMemberIdByJwtToken(httpServletRequest));
|
|
|
- billClean.setTestLocation(baseLocation.getLocationName());
|
|
|
- billClean.setTestLocationId(baseLocation.getId());
|
|
|
- billClean.setPassDate(sdf.parse(sdf.format(new Date())));
|
|
|
- billClean.setCheckDate(sdf.parse(sdf.format(new Date())));
|
|
|
-
|
|
|
- //拉猪车结束
|
|
|
- if (billClean.getTestLocationId() == 16) {
|
|
|
- baseProcess.setUpdateDate(baseProcess.getUpdateDate() + "," + sdf.format(new Date()));
|
|
|
- baseProcess.setCurrentLocation(baseProcess.getCurrentLocation());
|
|
|
- baseProcess.setCurrentLocationId(baseProcess.getCurrentLocationId());
|
|
|
- String status = baseProcess.getCurrentStatus();
|
|
|
- String substring = status.substring(0, status.length() - 1);
|
|
|
- baseProcess.setCurrentStatus(substring + "1");
|
|
|
- baseProcess.setProcessType(1);
|
|
|
+ if (billClean.getDestId() >= billClean.getTestLocationId()) { //说明当前不是目的地
|
|
|
+ if ("1".equals(result)) {
|
|
|
+ billClean.setBillStatus(1);
|
|
|
+ billClean.setPassUserName(TokenSign.getUserNameByJwtToken(httpServletRequest));
|
|
|
+ billClean.setPassUserId(TokenSign.getMemberIdByJwtToken(httpServletRequest));
|
|
|
+ billClean.setTestLocation(baseLocation.getLocationName());
|
|
|
+ billClean.setTestLocationId(baseLocation.getId());
|
|
|
+ billClean.setPassDate(sdf.parse(sdf.format(new Date())));
|
|
|
+ billClean.setCheckDate(sdf.parse(sdf.format(new Date())));
|
|
|
+
|
|
|
+ //拉猪车结束
|
|
|
+ if (billClean.getTestLocationId() == 16) {
|
|
|
+ baseProcess.setUpdateDate(baseProcess.getUpdateDate() + "," + sdf.format(new Date()));
|
|
|
+ baseProcess.setCurrentLocation(baseProcess.getCurrentLocation());
|
|
|
+ baseProcess.setCurrentLocationId(baseProcess.getCurrentLocationId());
|
|
|
+ String status = baseProcess.getCurrentStatus();
|
|
|
+ String substring = status.substring(0, status.length() - 1);
|
|
|
+ baseProcess.setCurrentStatus(substring + "1");
|
|
|
+ baseProcess.setProcessType(1);
|
|
|
|
|
|
- baseProcess.setAllLocationStatus("2,2");
|
|
|
- } else {
|
|
|
- baseProcess.setUpdateDate(baseProcess.getUpdateDate() + "," + sdf.format(new Date()));
|
|
|
- baseProcess.setCurrentLocation(baseProcess.getCurrentLocation() + "," + baseLocation.getNextLocation());
|
|
|
- baseProcess.setCurrentLocationId(baseProcess.getCurrentLocationId() + "," + baseLocation.getNextId());
|
|
|
- String status = baseProcess.getCurrentStatus();
|
|
|
- String substring = status.substring(0, status.length() - 1);
|
|
|
- baseProcess.setCurrentStatus(substring + "1," + 0);
|
|
|
- }
|
|
|
+ baseProcess.setAllLocationStatus("2,2");
|
|
|
+ } else {
|
|
|
+ baseProcess.setUpdateDate(baseProcess.getUpdateDate() + "," + sdf.format(new Date()));
|
|
|
+ baseProcess.setCurrentLocation(baseProcess.getCurrentLocation() + "," + baseLocation.getNextLocation());
|
|
|
+ baseProcess.setCurrentLocationId(baseProcess.getCurrentLocationId() + "," + baseLocation.getNextId());
|
|
|
+ String status = baseProcess.getCurrentStatus();
|
|
|
+ String substring = status.substring(0, status.length() - 1);
|
|
|
+ baseProcess.setCurrentStatus(substring + "1," + 0);
|
|
|
+ }
|
|
|
|
|
|
|
|
|
- //环保车洗消合格生成烘干申请
|
|
|
- if (billClean.getTestLocationId() == 12 || billClean.getTestLocationId() == 13) {
|
|
|
- BillDry billDry = new BillDry();
|
|
|
- billDry.setVistitType(billClean.getVistitType());
|
|
|
- billDry.setDestName(billClean.getDestName());
|
|
|
- billDry.setDestId(billClean.getDestId());
|
|
|
- billDry.setAdmissionUserName(billClean.getAdmissionUserName());
|
|
|
- billDry.setAdmissionUserId(billClean.getAdmissionUserId());
|
|
|
- billDry.setVistitDate(billClean.getVistitDate());
|
|
|
- billDry.setSubDate(LocalDateTime.now());
|
|
|
- billDry.setFarmId(billClean.getFarmId());
|
|
|
- billDry.setBillStatus(0);
|
|
|
- billDry.setProcessId(billClean.getProcessId());
|
|
|
- billDry.setTestLocation(baseLocation.getLocationName());
|
|
|
- billDry.setTestLocationId(baseLocation.getId());
|
|
|
- billDry.setPhone(billClean.getPhone());
|
|
|
- billDry.setCarNum(billClean.getCarNum());
|
|
|
- billDry.setImgStatus(0);
|
|
|
- dryMapper.insert(billDry);
|
|
|
- }
|
|
|
- //拉猪车洗消合格生成烘干申请
|
|
|
-
|
|
|
- if (billClean.getTestLocationId() == 15) {
|
|
|
- QueryWrapper<BillClean> queryWrapper = new QueryWrapper<>();
|
|
|
- queryWrapper.eq("farm_id", farmId).eq("process_id", baseProcess.getId());
|
|
|
- List<BillClean> billCleans = cleanMapper.selectList(queryWrapper);
|
|
|
- if (billCleans.size() == 1) {
|
|
|
- BillDry billDry = new BillDry();
|
|
|
- billDry.setVistitType(billClean.getVistitType());
|
|
|
- billDry.setDestName(billClean.getDestName());
|
|
|
- billDry.setDestId(billClean.getDestId());
|
|
|
- billDry.setAdmissionUserName(billClean.getAdmissionUserName());
|
|
|
- billDry.setAdmissionUserId(billClean.getAdmissionUserId());
|
|
|
- billDry.setVistitDate(billClean.getVistitDate());
|
|
|
- billDry.setSubDate(LocalDateTime.now());
|
|
|
- billDry.setFarmId(billClean.getFarmId());
|
|
|
- billDry.setBillStatus(0);
|
|
|
- billDry.setProcessId(billClean.getProcessId());
|
|
|
- billDry.setTestLocation(baseLocation.getLocationName());
|
|
|
- billDry.setTestLocationId(baseLocation.getId());
|
|
|
- billDry.setPhone(billClean.getPhone());
|
|
|
- billDry.setCarNum(billClean.getCarNum());
|
|
|
- billDry.setImgStatus(0);
|
|
|
- dryMapper.insert(billDry);
|
|
|
- }
|
|
|
- }
|
|
|
+ //环保车洗消合格生成烘干申请
|
|
|
+ if (billClean.getTestLocationId() == 12 || billClean.getTestLocationId() == 13) {
|
|
|
+ BillDry billDry = new BillDry();
|
|
|
+ billDry.setVistitType(billClean.getVistitType());
|
|
|
+ billDry.setDestName(billClean.getDestName());
|
|
|
+ billDry.setDestId(billClean.getDestId());
|
|
|
+ billDry.setAdmissionUserName(billClean.getAdmissionUserName());
|
|
|
+ billDry.setAdmissionUserId(billClean.getAdmissionUserId());
|
|
|
+ billDry.setVistitDate(billClean.getVistitDate());
|
|
|
+ billDry.setSubDate(LocalDateTime.now());
|
|
|
+ billDry.setFarmId(billClean.getFarmId());
|
|
|
+ billDry.setBillStatus(0);
|
|
|
+ billDry.setProcessId(billClean.getProcessId());
|
|
|
+ billDry.setTestLocation(baseLocation.getLocationName());
|
|
|
+ billDry.setTestLocationId(baseLocation.getId());
|
|
|
+ billDry.setPhone(billClean.getPhone());
|
|
|
+ billDry.setCarNum(billClean.getCarNum());
|
|
|
+ billDry.setImgStatus(0);
|
|
|
+ dryMapper.insert(billDry);
|
|
|
+ }
|
|
|
+ //拉猪车洗消合格生成烘干申请
|
|
|
|
|
|
- //送猪车洗消合格生成烘干申请
|
|
|
- if (billClean.getTestLocationId() == 17) {
|
|
|
+ if (billClean.getTestLocationId() == 15) {
|
|
|
+ QueryWrapper<BillClean> queryWrapper = new QueryWrapper<>();
|
|
|
+ queryWrapper.eq("farm_id", farmId).eq("process_id", baseProcess.getId());
|
|
|
+ List<BillClean> billCleans = cleanMapper.selectList(queryWrapper);
|
|
|
+ if (billCleans.size() == 1) {
|
|
|
BillDry billDry = new BillDry();
|
|
|
billDry.setVistitType(billClean.getVistitType());
|
|
|
billDry.setDestName(billClean.getDestName());
|
|
|
@@ -1271,76 +1246,98 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
|
|
|
billDry.setImgStatus(0);
|
|
|
dryMapper.insert(billDry);
|
|
|
}
|
|
|
- processMapper.updateById(baseProcess);
|
|
|
- cleanMapper.updateById(billClean);
|
|
|
- return new Result(10000, "修改成功！", true);
|
|
|
- } else {
|
|
|
- billClean.setBillStatus(2);
|
|
|
- billClean.setPassUserName(TokenSign.getUserNameByJwtToken(httpServletRequest));
|
|
|
- billClean.setPassUserId(TokenSign.getMemberIdByJwtToken(httpServletRequest));
|
|
|
- billClean.setTestLocation(baseLocation.getLocationName());
|
|
|
- billClean.setTestLocationId(baseLocation.getId());
|
|
|
- billClean.setPassDate(sdf.parse(sdf.format(new Date())));
|
|
|
- billClean.setCheckDate(sdf.parse(sdf.format(new Date())));
|
|
|
- billClean.setImgStatus(0);
|
|
|
-
|
|
|
- baseProcess.setUpdateDate(baseProcess.getUpdateDate() + "," + sdf.format(new Date()));
|
|
|
- baseProcess.setCurrentLocation(baseProcess.getCurrentLocation());
|
|
|
- baseProcess.setCurrentLocationId(baseProcess.getCurrentLocationId());
|
|
|
- String status = baseProcess.getCurrentStatus();
|
|
|
- String substring = status.substring(0, status.length() - 1);
|
|
|
-
|
|
|
- baseProcess.setCurrentStatus(substring + "2");
|
|
|
- baseProcess.setProcessType(2);
|
|
|
- baseProcess.setAllLocationStatus("2,3,0,0,0");
|
|
|
- processMapper.updateById(baseProcess);
|
|
|
- cleanMapper.updateById(billClean);
|
|
|
- return new Result(10000, "修改成功！", true);
|
|
|
}
|
|
|
- } else {
|
|
|
- if ("1".equals(result)) {
|
|
|
- billClean.setBillStatus(1);
|
|
|
- billClean.setPassUserName(TokenSign.getUserNameByJwtToken(httpServletRequest));
|
|
|
- billClean.setPassUserId(TokenSign.getMemberIdByJwtToken(httpServletRequest));
|
|
|
- billClean.setTestLocation(baseLocation.getLocationName());
|
|
|
- billClean.setTestLocationId(baseLocation.getId());
|
|
|
- billClean.setPassDate(sdf.parse(sdf.format(new Date())));
|
|
|
- billClean.setCheckDate(sdf.parse(sdf.format(new Date())));
|
|
|
|
|
|
- baseProcess.setUpdateDate(baseProcess.getUpdateDate() + "," + sdf.format(new Date()));
|
|
|
- baseProcess.setCurrentLocation(baseProcess.getCurrentLocation());
|
|
|
- baseProcess.setCurrentLocationId(baseProcess.getCurrentLocationId());
|
|
|
- String status = baseProcess.getCurrentStatus();
|
|
|
- String substring = status.substring(0, status.length() - 1);
|
|
|
- baseProcess.setCurrentStatus(substring + "1");
|
|
|
- baseProcess.setProcessType(1);
|
|
|
- processMapper.updateById(baseProcess);
|
|
|
- cleanMapper.updateById(billClean);
|
|
|
- return new Result(10000, "修改成功！", true);
|
|
|
- } else {
|
|
|
- baseProcess.setUpdateDate(baseProcess.getUpdateDate() + "," + sdf.format(new Date()));
|
|
|
- baseProcess.setCurrentLocation(baseProcess.getCurrentLocation());
|
|
|
- baseProcess.setCurrentLocationId(baseProcess.getCurrentLocationId());
|
|
|
- String status = baseProcess.getCurrentStatus();
|
|
|
- String substring = status.substring(0, status.length() - 1);
|
|
|
- baseProcess.setCurrentStatus(substring + "2");
|
|
|
- baseProcess.setProcessType(2);
|
|
|
- billClean.setBillStatus(2);
|
|
|
- billClean.setPassUserName(TokenSign.getUserNameByJwtToken(httpServletRequest));
|
|
|
- billClean.setPassUserId(TokenSign.getMemberIdByJwtToken(httpServletRequest));
|
|
|
- billClean.setTestLocation(baseLocation.getLocationName());
|
|
|
- billClean.setTestLocationId(baseLocation.getId());
|
|
|
- billClean.setPassDate(sdf.parse(sdf.format(new Date())));
|
|
|
- billClean.setCheckDate(sdf.parse(sdf.format(new Date())));
|
|
|
- billClean.setImgStatus(0);
|
|
|
-
|
|
|
- processMapper.updateById(baseProcess);
|
|
|
- cleanMapper.updateById(billClean);
|
|
|
- return new Result(10000, "修改成功！", true);
|
|
|
+ //送猪车洗消合格生成烘干申请
|
|
|
+ if (billClean.getTestLocationId() == 17) {
|
|
|
+ BillDry billDry = new BillDry();
|
|
|
+ billDry.setVistitType(billClean.getVistitType());
|
|
|
+ billDry.setDestName(billClean.getDestName());
|
|
|
+ billDry.setDestId(billClean.getDestId());
|
|
|
+ billDry.setAdmissionUserName(billClean.getAdmissionUserName());
|
|
|
+ billDry.setAdmissionUserId(billClean.getAdmissionUserId());
|
|
|
+ billDry.setVistitDate(billClean.getVistitDate());
|
|
|
+ billDry.setSubDate(LocalDateTime.now());
|
|
|
+ billDry.setFarmId(billClean.getFarmId());
|
|
|
+ billDry.setBillStatus(0);
|
|
|
+ billDry.setProcessId(billClean.getProcessId());
|
|
|
+ billDry.setTestLocation(baseLocation.getLocationName());
|
|
|
+ billDry.setTestLocationId(baseLocation.getId());
|
|
|
+ billDry.setPhone(billClean.getPhone());
|
|
|
+ billDry.setCarNum(billClean.getCarNum());
|
|
|
+ billDry.setImgStatus(0);
|
|
|
+ dryMapper.insert(billDry);
|
|
|
}
|
|
|
-
|
|
|
+ processMapper.updateById(baseProcess);
|
|
|
+ cleanMapper.updateById(billClean);
|
|
|
+ return new Result(10000, "修改成功！", true);
|
|
|
+ } else {
|
|
|
+ billClean.setBillStatus(2);
|
|
|
+ billClean.setPassUserName(TokenSign.getUserNameByJwtToken(httpServletRequest));
|
|
|
+ billClean.setPassUserId(TokenSign.getMemberIdByJwtToken(httpServletRequest));
|
|
|
+ billClean.setTestLocation(baseLocation.getLocationName());
|
|
|
+ billClean.setTestLocationId(baseLocation.getId());
|
|
|
+ billClean.setPassDate(sdf.parse(sdf.format(new Date())));
|
|
|
+ billClean.setCheckDate(sdf.parse(sdf.format(new Date())));
|
|
|
+ billClean.setImgStatus(0);
|
|
|
+
|
|
|
+ baseProcess.setUpdateDate(baseProcess.getUpdateDate() + "," + sdf.format(new Date()));
|
|
|
+ baseProcess.setCurrentLocation(baseProcess.getCurrentLocation());
|
|
|
+ baseProcess.setCurrentLocationId(baseProcess.getCurrentLocationId());
|
|
|
+ String status = baseProcess.getCurrentStatus();
|
|
|
+ String substring = status.substring(0, status.length() - 1);
|
|
|
+
|
|
|
+ baseProcess.setCurrentStatus(substring + "2");
|
|
|
+ baseProcess.setProcessType(2);
|
|
|
+ baseProcess.setAllLocationStatus("2,3,0,0,0");
|
|
|
+ processMapper.updateById(baseProcess);
|
|
|
+ cleanMapper.updateById(billClean);
|
|
|
+ return new Result(10000, "修改成功！", true);
|
|
|
}
|
|
|
+ } else {
|
|
|
+ if ("1".equals(result)) {
|
|
|
+ billClean.setBillStatus(1);
|
|
|
+ billClean.setPassUserName(TokenSign.getUserNameByJwtToken(httpServletRequest));
|
|
|
+ billClean.setPassUserId(TokenSign.getMemberIdByJwtToken(httpServletRequest));
|
|
|
+ billClean.setTestLocation(baseLocation.getLocationName());
|
|
|
+ billClean.setTestLocationId(baseLocation.getId());
|
|
|
+ billClean.setPassDate(sdf.parse(sdf.format(new Date())));
|
|
|
+ billClean.setCheckDate(sdf.parse(sdf.format(new Date())));
|
|
|
+
|
|
|
+ baseProcess.setUpdateDate(baseProcess.getUpdateDate() + "," + sdf.format(new Date()));
|
|
|
+ baseProcess.setCurrentLocation(baseProcess.getCurrentLocation());
|
|
|
+ baseProcess.setCurrentLocationId(baseProcess.getCurrentLocationId());
|
|
|
+ String status = baseProcess.getCurrentStatus();
|
|
|
+ String substring = status.substring(0, status.length() - 1);
|
|
|
+ baseProcess.setCurrentStatus(substring + "1");
|
|
|
+ baseProcess.setProcessType(1);
|
|
|
+ processMapper.updateById(baseProcess);
|
|
|
+ cleanMapper.updateById(billClean);
|
|
|
+ return new Result(10000, "修改成功！", true);
|
|
|
+ } else {
|
|
|
+ baseProcess.setUpdateDate(baseProcess.getUpdateDate() + "," + sdf.format(new Date()));
|
|
|
+ baseProcess.setCurrentLocation(baseProcess.getCurrentLocation());
|
|
|
+ baseProcess.setCurrentLocationId(baseProcess.getCurrentLocationId());
|
|
|
+ String status = baseProcess.getCurrentStatus();
|
|
|
+ String substring = status.substring(0, status.length() - 1);
|
|
|
+ baseProcess.setCurrentStatus(substring + "2");
|
|
|
+ baseProcess.setProcessType(2);
|
|
|
+ billClean.setBillStatus(2);
|
|
|
+ billClean.setPassUserName(TokenSign.getUserNameByJwtToken(httpServletRequest));
|
|
|
+ billClean.setPassUserId(TokenSign.getMemberIdByJwtToken(httpServletRequest));
|
|
|
+ billClean.setTestLocation(baseLocation.getLocationName());
|
|
|
+ billClean.setTestLocationId(baseLocation.getId());
|
|
|
+ billClean.setPassDate(sdf.parse(sdf.format(new Date())));
|
|
|
+ billClean.setCheckDate(sdf.parse(sdf.format(new Date())));
|
|
|
+ billClean.setImgStatus(0);
|
|
|
+
|
|
|
+ processMapper.updateById(baseProcess);
|
|
|
+ cleanMapper.updateById(billClean);
|
|
|
+ return new Result(10000, "修改成功！", true);
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
+
|
|
|
}
|
|
|
|
|
|
//烘干检测
|
|
|
@@ -1358,125 +1355,19 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
|
|
|
locationQueryWrapper.eq("farm_id", farmId).eq("id", billClean.getTestLocationId());
|
|
|
BaseLocation baseLocation = locationMapper.selectOne(locationQueryWrapper);//当前洗消检测所在的位置
|
|
|
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
|
|
|
- if (baseProcess.getProcessType() == 2 || baseProcess.getProcessType() == 1) {
|
|
|
- return new Result(10001, "修改失败！该申请已提前结束或者被拒绝", false);
|
|
|
- } else {
|
|
|
- if (billClean.getDestId() >= billClean.getTestLocationId()) { //说明当前不是目的地
|
|
|
- if ("1".equals(result)) {
|
|
|
- billClean.setBillStatus(1);
|
|
|
- billClean.setPassUserName(TokenSign.getUserNameByJwtToken(httpServletRequest));
|
|
|
- billClean.setPassUserId(TokenSign.getMemberIdByJwtToken(httpServletRequest));
|
|
|
- billClean.setTestLocation(baseLocation.getLocationName());
|
|
|
- billClean.setTestLocationId(baseLocation.getId());
|
|
|
- billClean.setPassDate(sdf.parse(sdf.format(new Date())));
|
|
|
- billClean.setCheckDate(sdf.parse(sdf.format(new Date())));
|
|
|
-
|
|
|
- //最终结束
|
|
|
- if (billClean.getTestLocationId() == 13 || billClean.getTestLocationId() == 17 || billClean.getTestLocationId() == 43) {
|
|
|
- baseProcess.setUpdateDate(baseProcess.getUpdateDate() + "," + sdf.format(new Date()));
|
|
|
- baseProcess.setCurrentLocation(baseProcess.getCurrentLocation());
|
|
|
- baseProcess.setCurrentLocationId(baseProcess.getCurrentLocationId());
|
|
|
- String status = baseProcess.getCurrentStatus();
|
|
|
- String substring = status.substring(0, status.length() - 1);
|
|
|
- baseProcess.setCurrentStatus(substring + "1");
|
|
|
- baseProcess.setProcessType(1);
|
|
|
- if (billClean.getTestLocationId() == 17) {
|
|
|
- baseProcess.setAllLocationStatus("2,2,2");
|
|
|
- }
|
|
|
- } else {
|
|
|
- baseProcess.setUpdateDate(baseProcess.getUpdateDate() + "," + sdf.format(new Date()));
|
|
|
- baseProcess.setCurrentLocation(baseProcess.getCurrentLocation() + "," + baseLocation.getNextLocation());
|
|
|
- baseProcess.setCurrentLocationId(baseProcess.getCurrentLocationId() + "," + baseLocation.getNextId());
|
|
|
- String status = baseProcess.getCurrentStatus();
|
|
|
- String substring = status.substring(0, status.length() - 1);
|
|
|
- baseProcess.setCurrentStatus(substring + "1," + 0);
|
|
|
- }
|
|
|
-
|
|
|
- //环保车烘干合格生成洗消申请
|
|
|
- if (billClean.getTestLocationId() == 12 && baseProcess.getDestId() > 12) {
|
|
|
-
|
|
|
- BillClean clean = new BillClean();
|
|
|
- clean.setVistitType(billClean.getVistitType());
|
|
|
- clean.setDestName(billClean.getDestName());
|
|
|
- clean.setDestId(billClean.getDestId());
|
|
|
- clean.setAdmissionUserName(billClean.getAdmissionUserName());
|
|
|
- clean.setAdmissionUserId(billClean.getAdmissionUserId());
|
|
|
- clean.setVistitDate(billClean.getVistitDate());
|
|
|
- clean.setSubDate(LocalDateTime.now());
|
|
|
- clean.setFarmId(billClean.getFarmId());
|
|
|
- clean.setBillStatus(0);
|
|
|
- clean.setProcessId(billClean.getProcessId());
|
|
|
- clean.setTestLocationId(baseLocation.getNextId());
|
|
|
- clean.setTestLocation(baseLocation.getNextLocation());
|
|
|
- clean.setPhone(billClean.getPhone());
|
|
|
- clean.setCarNum(billClean.getCarNum());
|
|
|
- clean.setImgStatus(0);
|
|
|
- cleanMapper.insert(clean);
|
|
|
- if (billClean.getDestId() == 13) {
|
|
|
- baseProcess.setAllLocationStatus("2,2,1");
|
|
|
- } else {
|
|
|
- baseProcess.setAllLocationStatus("2,2,1,0");
|
|
|
- }
|
|
|
-
|
|
|
- }
|
|
|
-
|
|
|
-
|
|
|
- //拉猪车烘干合格生成洗消申请
|
|
|
- if (billClean.getTestLocationId() == 15) {
|
|
|
- BillClean clean = new BillClean();
|
|
|
- clean.setVistitType(billClean.getVistitType());
|
|
|
- clean.setDestName(billClean.getDestName());
|
|
|
- clean.setDestId(billClean.getDestId());
|
|
|
- clean.setAdmissionUserName(billClean.getAdmissionUserName());
|
|
|
- clean.setAdmissionUserId(billClean.getAdmissionUserId());
|
|
|
- clean.setVistitDate(billClean.getVistitDate());
|
|
|
- clean.setSubDate(LocalDateTime.now());
|
|
|
- clean.setFarmId(billClean.getFarmId());
|
|
|
- clean.setBillStatus(0);
|
|
|
- clean.setProcessId(billClean.getProcessId());
|
|
|
- clean.setTestLocationId(baseLocation.getId());
|
|
|
- clean.setTestLocation(baseLocation.getLocationName());
|
|
|
- clean.setPhone(billClean.getPhone());
|
|
|
- clean.setCarNum(billClean.getCarNum());
|
|
|
- clean.setImgStatus(0);
|
|
|
- cleanMapper.insert(clean);
|
|
|
- }
|
|
|
-
|
|
|
- processMapper.updateById(baseProcess);
|
|
|
- dryMapper.updateById(billClean);
|
|
|
- return new Result(10000, "修改成功！", true);
|
|
|
- } else {
|
|
|
- billClean.setBillStatus(2);
|
|
|
- billClean.setPassUserName(TokenSign.getUserNameByJwtToken(httpServletRequest));
|
|
|
- billClean.setPassUserId(TokenSign.getMemberIdByJwtToken(httpServletRequest));
|
|
|
- billClean.setTestLocation(baseLocation.getLocationName());
|
|
|
- billClean.setTestLocationId(baseLocation.getId());
|
|
|
- billClean.setPassDate(sdf.parse(sdf.format(new Date())));
|
|
|
- billClean.setCheckDate(sdf.parse(sdf.format(new Date())));
|
|
|
- billClean.setImgStatus(0);
|
|
|
-
|
|
|
- baseProcess.setUpdateDate(baseProcess.getUpdateDate() + "," + sdf.format(new Date()));
|
|
|
- baseProcess.setCurrentLocation(baseProcess.getCurrentLocation());
|
|
|
- baseProcess.setCurrentLocationId(baseProcess.getCurrentLocationId());
|
|
|
- String status = baseProcess.getCurrentStatus();
|
|
|
- String substring = status.substring(0, status.length() - 1);
|
|
|
-
|
|
|
- baseProcess.setCurrentStatus(substring + "2");
|
|
|
- baseProcess.setProcessType(2);
|
|
|
- processMapper.updateById(baseProcess);
|
|
|
- dryMapper.updateById(billClean);
|
|
|
- return new Result(10000, "修改成功！", true);
|
|
|
- }
|
|
|
- } else {
|
|
|
- if ("1".equals(result)) {
|
|
|
- billClean.setBillStatus(1);
|
|
|
- billClean.setPassUserName(TokenSign.getUserNameByJwtToken(httpServletRequest));
|
|
|
- billClean.setPassUserId(TokenSign.getMemberIdByJwtToken(httpServletRequest));
|
|
|
- billClean.setTestLocation(baseLocation.getLocationName());
|
|
|
- billClean.setTestLocationId(baseLocation.getId());
|
|
|
- billClean.setPassDate(sdf.parse(sdf.format(new Date())));
|
|
|
- billClean.setCheckDate(sdf.parse(sdf.format(new Date())));
|
|
|
|
|
|
+ if (billClean.getDestId() >= billClean.getTestLocationId()) { //说明当前不是目的地
|
|
|
+ if ("1".equals(result)) {
|
|
|
+ billClean.setBillStatus(1);
|
|
|
+ billClean.setPassUserName(TokenSign.getUserNameByJwtToken(httpServletRequest));
|
|
|
+ billClean.setPassUserId(TokenSign.getMemberIdByJwtToken(httpServletRequest));
|
|
|
+ billClean.setTestLocation(baseLocation.getLocationName());
|
|
|
+ billClean.setTestLocationId(baseLocation.getId());
|
|
|
+ billClean.setPassDate(sdf.parse(sdf.format(new Date())));
|
|
|
+ billClean.setCheckDate(sdf.parse(sdf.format(new Date())));
|
|
|
+
|
|
|
+ //最终结束
|
|
|
+ if (billClean.getTestLocationId() == 13 || billClean.getTestLocationId() == 17 || billClean.getTestLocationId() == 43) {
|
|
|
baseProcess.setUpdateDate(baseProcess.getUpdateDate() + "," + sdf.format(new Date()));
|
|
|
baseProcess.setCurrentLocation(baseProcess.getCurrentLocation());
|
|
|
baseProcess.setCurrentLocationId(baseProcess.getCurrentLocationId());
|
|
|
@@ -1484,32 +1375,139 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
|
|
|
String substring = status.substring(0, status.length() - 1);
|
|
|
baseProcess.setCurrentStatus(substring + "1");
|
|
|
baseProcess.setProcessType(1);
|
|
|
- processMapper.updateById(baseProcess);
|
|
|
- dryMapper.updateById(billClean);
|
|
|
- return new Result(10000, "修改成功！", true);
|
|
|
+ if (billClean.getTestLocationId() == 17) {
|
|
|
+ baseProcess.setAllLocationStatus("2,2,2");
|
|
|
+ }
|
|
|
+ if (billClean.getTestLocationId() == 13) {
|
|
|
+ baseProcess.setAllLocationStatus("2,2,2,2");
|
|
|
+ }
|
|
|
} else {
|
|
|
baseProcess.setUpdateDate(baseProcess.getUpdateDate() + "," + sdf.format(new Date()));
|
|
|
- baseProcess.setCurrentLocation(baseProcess.getCurrentLocation());
|
|
|
- baseProcess.setCurrentLocationId(baseProcess.getCurrentLocationId());
|
|
|
+ baseProcess.setCurrentLocation(baseProcess.getCurrentLocation() + "," + baseLocation.getNextLocation());
|
|
|
+ baseProcess.setCurrentLocationId(baseProcess.getCurrentLocationId() + "," + baseLocation.getNextId());
|
|
|
String status = baseProcess.getCurrentStatus();
|
|
|
String substring = status.substring(0, status.length() - 1);
|
|
|
- baseProcess.setCurrentStatus(substring + "2");
|
|
|
- baseProcess.setProcessType(2);
|
|
|
- billClean.setBillStatus(2);
|
|
|
- billClean.setPassUserName(TokenSign.getUserNameByJwtToken(httpServletRequest));
|
|
|
- billClean.setPassUserId(TokenSign.getMemberIdByJwtToken(httpServletRequest));
|
|
|
- billClean.setTestLocation(baseLocation.getLocationName());
|
|
|
- billClean.setTestLocationId(baseLocation.getId());
|
|
|
- billClean.setPassDate(sdf.parse(sdf.format(new Date())));
|
|
|
- billClean.setCheckDate(sdf.parse(sdf.format(new Date())));
|
|
|
- billClean.setImgStatus(0);
|
|
|
+ baseProcess.setCurrentStatus(substring + "1," + 0);
|
|
|
+ }
|
|
|
|
|
|
- processMapper.updateById(baseProcess);
|
|
|
- dryMapper.updateById(billClean);
|
|
|
- return new Result(10000, "修改成功！", true);
|
|
|
+ //环保车烘干合格生成洗消申请
|
|
|
+ if (billClean.getTestLocationId() == 12 && baseProcess.getDestId() > 12) {
|
|
|
+
|
|
|
+ BillClean clean = new BillClean();
|
|
|
+ clean.setVistitType(billClean.getVistitType());
|
|
|
+ clean.setDestName(billClean.getDestName());
|
|
|
+ clean.setDestId(billClean.getDestId());
|
|
|
+ clean.setAdmissionUserName(billClean.getAdmissionUserName());
|
|
|
+ clean.setAdmissionUserId(billClean.getAdmissionUserId());
|
|
|
+ clean.setVistitDate(billClean.getVistitDate());
|
|
|
+ clean.setSubDate(LocalDateTime.now());
|
|
|
+ clean.setFarmId(billClean.getFarmId());
|
|
|
+ clean.setBillStatus(0);
|
|
|
+ clean.setProcessId(billClean.getProcessId());
|
|
|
+ clean.setTestLocationId(baseLocation.getNextId());
|
|
|
+ clean.setTestLocation(baseLocation.getNextLocation());
|
|
|
+ clean.setPhone(billClean.getPhone());
|
|
|
+ clean.setCarNum(billClean.getCarNum());
|
|
|
+ clean.setImgStatus(0);
|
|
|
+ cleanMapper.insert(clean);
|
|
|
+ if (billClean.getDestId() == 13) {
|
|
|
+ baseProcess.setAllLocationStatus("2,2,1");
|
|
|
+ } else {
|
|
|
+ baseProcess.setAllLocationStatus("2,2,1,0");
|
|
|
+ }
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+ //拉猪车烘干合格生成洗消申请
|
|
|
+ if (billClean.getTestLocationId() == 15) {
|
|
|
+ BillClean clean = new BillClean();
|
|
|
+ clean.setVistitType(billClean.getVistitType());
|
|
|
+ clean.setDestName(billClean.getDestName());
|
|
|
+ clean.setDestId(billClean.getDestId());
|
|
|
+ clean.setAdmissionUserName(billClean.getAdmissionUserName());
|
|
|
+ clean.setAdmissionUserId(billClean.getAdmissionUserId());
|
|
|
+ clean.setVistitDate(billClean.getVistitDate());
|
|
|
+ clean.setSubDate(LocalDateTime.now());
|
|
|
+ clean.setFarmId(billClean.getFarmId());
|
|
|
+ clean.setBillStatus(0);
|
|
|
+ clean.setProcessId(billClean.getProcessId());
|
|
|
+ clean.setTestLocationId(baseLocation.getId());
|
|
|
+ clean.setTestLocation(baseLocation.getLocationName());
|
|
|
+ clean.setPhone(billClean.getPhone());
|
|
|
+ clean.setCarNum(billClean.getCarNum());
|
|
|
+ clean.setImgStatus(0);
|
|
|
+ cleanMapper.insert(clean);
|
|
|
}
|
|
|
|
|
|
+ processMapper.updateById(baseProcess);
|
|
|
+ dryMapper.updateById(billClean);
|
|
|
+ return new Result(10000, "修改成功！", true);
|
|
|
+ } else {
|
|
|
+ billClean.setBillStatus(2);
|
|
|
+ billClean.setPassUserName(TokenSign.getUserNameByJwtToken(httpServletRequest));
|
|
|
+ billClean.setPassUserId(TokenSign.getMemberIdByJwtToken(httpServletRequest));
|
|
|
+ billClean.setTestLocation(baseLocation.getLocationName());
|
|
|
+ billClean.setTestLocationId(baseLocation.getId());
|
|
|
+ billClean.setPassDate(sdf.parse(sdf.format(new Date())));
|
|
|
+ billClean.setCheckDate(sdf.parse(sdf.format(new Date())));
|
|
|
+ billClean.setImgStatus(0);
|
|
|
+
|
|
|
+ baseProcess.setUpdateDate(baseProcess.getUpdateDate() + "," + sdf.format(new Date()));
|
|
|
+ baseProcess.setCurrentLocation(baseProcess.getCurrentLocation());
|
|
|
+ baseProcess.setCurrentLocationId(baseProcess.getCurrentLocationId());
|
|
|
+ String status = baseProcess.getCurrentStatus();
|
|
|
+ String substring = status.substring(0, status.length() - 1);
|
|
|
+
|
|
|
+ baseProcess.setCurrentStatus(substring + "2");
|
|
|
+ baseProcess.setProcessType(2);
|
|
|
+ processMapper.updateById(baseProcess);
|
|
|
+ dryMapper.updateById(billClean);
|
|
|
+ return new Result(10000, "修改成功！", true);
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ if ("1".equals(result)) {
|
|
|
+ billClean.setBillStatus(1);
|
|
|
+ billClean.setPassUserName(TokenSign.getUserNameByJwtToken(httpServletRequest));
|
|
|
+ billClean.setPassUserId(TokenSign.getMemberIdByJwtToken(httpServletRequest));
|
|
|
+ billClean.setTestLocation(baseLocation.getLocationName());
|
|
|
+ billClean.setTestLocationId(baseLocation.getId());
|
|
|
+ billClean.setPassDate(sdf.parse(sdf.format(new Date())));
|
|
|
+ billClean.setCheckDate(sdf.parse(sdf.format(new Date())));
|
|
|
+
|
|
|
+ baseProcess.setUpdateDate(baseProcess.getUpdateDate() + "," + sdf.format(new Date()));
|
|
|
+ baseProcess.setCurrentLocation(baseProcess.getCurrentLocation());
|
|
|
+ baseProcess.setCurrentLocationId(baseProcess.getCurrentLocationId());
|
|
|
+ String status = baseProcess.getCurrentStatus();
|
|
|
+ String substring = status.substring(0, status.length() - 1);
|
|
|
+ baseProcess.setCurrentStatus(substring + "1");
|
|
|
+ baseProcess.setProcessType(1);
|
|
|
+ processMapper.updateById(baseProcess);
|
|
|
+ dryMapper.updateById(billClean);
|
|
|
+ return new Result(10000, "修改成功！", true);
|
|
|
+ } else {
|
|
|
+ baseProcess.setUpdateDate(baseProcess.getUpdateDate() + "," + sdf.format(new Date()));
|
|
|
+ baseProcess.setCurrentLocation(baseProcess.getCurrentLocation());
|
|
|
+ baseProcess.setCurrentLocationId(baseProcess.getCurrentLocationId());
|
|
|
+ String status = baseProcess.getCurrentStatus();
|
|
|
+ String substring = status.substring(0, status.length() - 1);
|
|
|
+ baseProcess.setCurrentStatus(substring + "2");
|
|
|
+ baseProcess.setProcessType(2);
|
|
|
+ billClean.setBillStatus(2);
|
|
|
+ billClean.setPassUserName(TokenSign.getUserNameByJwtToken(httpServletRequest));
|
|
|
+ billClean.setPassUserId(TokenSign.getMemberIdByJwtToken(httpServletRequest));
|
|
|
+ billClean.setTestLocation(baseLocation.getLocationName());
|
|
|
+ billClean.setTestLocationId(baseLocation.getId());
|
|
|
+ billClean.setPassDate(sdf.parse(sdf.format(new Date())));
|
|
|
+ billClean.setCheckDate(sdf.parse(sdf.format(new Date())));
|
|
|
+ billClean.setImgStatus(0);
|
|
|
+
|
|
|
+ processMapper.updateById(baseProcess);
|
|
|
+ dryMapper.updateById(billClean);
|
|
|
+ return new Result(10000, "修改成功！", true);
|
|
|
}
|
|
|
+
|
|
|
+
|
|
|
}
|
|
|
}
|
|
|
|
