|
|
@@ -256,7 +256,7 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
|
|
|
split1[1] = "2";
|
|
|
split1[2] = "2";
|
|
|
split1[3] = "1";
|
|
|
- baseProcess.setAllLocationStatus(split1[0] +","+ split1[1] +","+split1[2]+","+split1[3]+ status.substring(7));
|
|
|
+ baseProcess.setAllLocationStatus(split1[0] + "," + split1[1] + "," + split1[2] + "," + split1[3] + status.substring(7));
|
|
|
}
|
|
|
if (baseLocation.getId() == 3) {
|
|
|
//生成隔离申请
|
|
|
@@ -283,7 +283,7 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
|
|
|
split1[1] = "2";
|
|
|
split1[2] = "2";
|
|
|
split1[3] = "1";
|
|
|
- baseProcess.setAllLocationStatus(split1[0] +","+ split1[1] +","+ split1[2]+","+split1[3] + status.substring(7));
|
|
|
+ baseProcess.setAllLocationStatus(split1[0] + "," + split1[1] + "," + split1[2] + "," + split1[3] + status.substring(7));
|
|
|
}
|
|
|
|
|
|
if (baseLocation.getId() == 4) {
|
|
|
@@ -316,7 +316,7 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
|
|
|
split1[2] = "2";
|
|
|
split1[3] = "2";
|
|
|
split1[4] = "1";
|
|
|
- baseProcess.setAllLocationStatus(split1[0] +","+ split1[1] +","+ split1[2] +","+ split1[3]+","+split1[4]+ status.substring(9));
|
|
|
+ baseProcess.setAllLocationStatus(split1[0] + "," + split1[1] + "," + split1[2] + "," + split1[3] + "," + split1[4] + status.substring(9));
|
|
|
} else {
|
|
|
//生成隔离申请
|
|
|
BillIsolate isolate = new BillIsolate();
|
|
|
@@ -370,9 +370,9 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
|
|
|
split1[1] = "2";
|
|
|
split1[2] = "2";
|
|
|
split1[3] = "3";
|
|
|
- baseProcess.setAllLocationStatus(split1[0] +","+ split1[1] +","+split1[2]+","+split1[3]+ status.substring(7));
|
|
|
+ baseProcess.setAllLocationStatus(split1[0] + "," + split1[1] + "," + split1[2] + "," + split1[3] + status.substring(7));
|
|
|
}
|
|
|
- if (baseLocation.getId() == 3||baseLocation.getId() == 4) {
|
|
|
+ if (baseLocation.getId() == 3 || baseLocation.getId() == 4) {
|
|
|
String status = baseProcess.getAllLocationStatus();
|
|
|
String[] split1 = status.split(",");
|
|
|
split1[0] = "2";
|
|
|
@@ -380,7 +380,7 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
|
|
|
split1[2] = "2";
|
|
|
split1[3] = "3";
|
|
|
split1[4] = "0";
|
|
|
- baseProcess.setAllLocationStatus(split1[0]+"," + split1[1] +","+ split1[2] +","+ split1[3] +","+ split1[4]+status.substring(9));
|
|
|
+ baseProcess.setAllLocationStatus(split1[0] + "," + split1[1] + "," + split1[2] + "," + split1[3] + "," + split1[4] + status.substring(9));
|
|
|
}
|
|
|
|
|
|
baseProcess.setProcessType(2);
|
|
|
@@ -687,183 +687,190 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
|
|
|
QueryWrapper<BaseLocation> locationQueryWrapper = new QueryWrapper<>();
|
|
|
locationQueryWrapper.eq("farm_id", farmId).eq("id", billClean.getTestLocationId());
|
|
|
BaseLocation baseLocation = locationMapper.selectOne(locationQueryWrapper);//当前所在的位置
|
|
|
- if (baseProcess.getProcessType() == 2 || baseProcess.getProcessType() == 1) {
|
|
|
- return new Result(10001, "修改失败！该申请已提前结束或者被拒绝", false);
|
|
|
- } else {
|
|
|
- if (billClean.getDestId() >= billClean.getTestLocationId() || billClean.getDestId() == 7) { //不是目的地
|
|
|
-
|
|
|
- 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.setCheckDate(sdf.parse(date));
|
|
|
- billClean.setPassDate(sdf.parse(sdf.format(new Date())));
|
|
|
- billClean.setImgUrl(s);
|
|
|
- billClean.setImgStatus(1);
|
|
|
- cleanMapper.updateById(billClean);
|
|
|
-
|
|
|
- if (billClean.getTestLocationId() == 9 || billClean.getTestLocationId() == 10) {
|
|
|
- if (billClean.getDestId() > 9 || billClean.getDestId() > 10) {
|
|
|
- Integer processId = billClean.getProcessId();
|
|
|
- QueryWrapper<BillPersonnelAdmission> queryWrapper1 = new QueryWrapper<>();
|
|
|
- queryWrapper1.eq("farm_id", farmId).eq("process_id", processId);
|
|
|
- BillPersonnelAdmission admission = admissionMapper.selectOne(queryWrapper1);
|
|
|
- admission.setBillStatus(1);
|
|
|
- admission.setPassDate(LocalDateTime.now());
|
|
|
- admission.setPassUserId(TokenSign.getMemberIdByJwtToken(httpServletRequest));
|
|
|
- admission.setPassUserName(TokenSign.getUserNameByJwtToken(httpServletRequest));
|
|
|
- admissionMapper.updateById(admission);
|
|
|
- if (billClean.getTestLocationId() == 10) {
|
|
|
- baseProcess.setAllLocationStatus("2,2,2,0");
|
|
|
- } else {
|
|
|
- baseProcess.setAllLocationStatus("2,2,0,0");
|
|
|
- }
|
|
|
- }
|
|
|
|
|
|
- }
|
|
|
+ if (billClean.getDestId() >= billClean.getTestLocationId() || billClean.getDestId() == 7) { //不是目的地
|
|
|
+
|
|
|
+ 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.setCheckDate(sdf.parse(date));
|
|
|
+ billClean.setPassDate(sdf.parse(sdf.format(new Date())));
|
|
|
+ billClean.setImgUrl(s);
|
|
|
+ billClean.setImgStatus(1);
|
|
|
+ cleanMapper.updateById(billClean);
|
|
|
|
|
|
- //第一次通过生成洗消
|
|
|
- if (billClean.getTestLocationId() == 6) {
|
|
|
- BillClean clean = new BillClean();
|
|
|
- clean.setVistitType(billClean.getVistitType());
|
|
|
- clean.setVistitDate(billClean.getVistitDate());
|
|
|
- clean.setDestName(billClean.getDestName());
|
|
|
- clean.setDestId(billClean.getDestId());
|
|
|
- clean.setAdmissionUserId(billClean.getAdmissionUserId());
|
|
|
- clean.setAdmissionUserName(billClean.getAdmissionUserName());
|
|
|
- clean.setSubDate(LocalDateTime.now());
|
|
|
- clean.setBillStatus(0);
|
|
|
- clean.setImgStatus(0);
|
|
|
- clean.setFarmId(billClean.getFarmId());
|
|
|
- clean.setCarNum(billClean.getCarNum());
|
|
|
- clean.setPhone(billClean.getPhone());
|
|
|
- clean.setProcessId(billClean.getProcessId());
|
|
|
- clean.setTestLocationId(baseLocation.getNextId());
|
|
|
- clean.setTestLocation(baseLocation.getNextLocation());
|
|
|
- cleanMapper.insert(clean);
|
|
|
- if (billClean.getDestId() == 7) {
|
|
|
- baseProcess.setAllLocationStatus("2,2,1");
|
|
|
+ if (billClean.getDestId() == 11) {
|
|
|
+ baseProcess.setAllLocationStatus("2,2,2,2");
|
|
|
+ }
|
|
|
+ if (billClean.getTestLocationId() == 9 || billClean.getTestLocationId() == 10) {
|
|
|
+ if (billClean.getDestId() > 9 || billClean.getDestId() > 10) {
|
|
|
+ Integer processId = billClean.getProcessId();
|
|
|
+ QueryWrapper<BillPersonnelAdmission> queryWrapper1 = new QueryWrapper<>();
|
|
|
+ queryWrapper1.eq("farm_id", farmId).eq("process_id", processId);
|
|
|
+ BillPersonnelAdmission admission = admissionMapper.selectOne(queryWrapper1);
|
|
|
+ admission.setBillStatus(1);
|
|
|
+ admission.setPassDate(LocalDateTime.now());
|
|
|
+ admission.setPassUserId(TokenSign.getMemberIdByJwtToken(httpServletRequest));
|
|
|
+ admission.setPassUserName(TokenSign.getUserNameByJwtToken(httpServletRequest));
|
|
|
+ admissionMapper.updateById(admission);
|
|
|
+ if (billClean.getTestLocationId() == 10) {
|
|
|
+ baseProcess.setAllLocationStatus("2,2,2,1");
|
|
|
} else {
|
|
|
baseProcess.setAllLocationStatus("2,2,1,0");
|
|
|
}
|
|
|
}
|
|
|
+ if (billClean.getDestId() == 9) {
|
|
|
+ baseProcess.setAllLocationStatus("2,2");
|
|
|
+ }
|
|
|
+ if (billClean.getDestId() == 10) {
|
|
|
+ baseProcess.setAllLocationStatus("2,2,2");
|
|
|
+ }
|
|
|
|
|
|
- if (billClean.getTestLocationId() == 7) {
|
|
|
- //生成烘干申请
|
|
|
- BillDry billPcr = new BillDry();
|
|
|
- billPcr.setPhone(billClean.getPhone());
|
|
|
- billPcr.setVistitType(billClean.getVistitType());
|
|
|
- billPcr.setDestName(billClean.getDestName());
|
|
|
- billPcr.setDestId(billClean.getDestId());
|
|
|
- billPcr.setAdmissionUserName(billClean.getAdmissionUserName());
|
|
|
- billPcr.setAdmissionUserId(billClean.getAdmissionUserId());
|
|
|
- billPcr.setVistitDate(billClean.getVistitDate());
|
|
|
- billPcr.setSubDate(LocalDateTime.now());
|
|
|
- billPcr.setBillStatus(0);
|
|
|
- billPcr.setImgStatus(0);
|
|
|
- billPcr.setCarNum(billClean.getCarNum());
|
|
|
- billPcr.setProcessId(billClean.getProcessId());
|
|
|
- billPcr.setFarmId(billClean.getFarmId());
|
|
|
- billPcr.setTestLocation(baseLocation.getLocationName());
|
|
|
- billPcr.setTestLocationId(baseLocation.getId());
|
|
|
- dryMapper.insert(billPcr);
|
|
|
- baseProcess.setAllLocationStatus("2,2,2,1");
|
|
|
+ }
|
|
|
+
|
|
|
+ //第一次通过生成洗消
|
|
|
+ if (billClean.getTestLocationId() == 6) {
|
|
|
+ BillClean clean = new BillClean();
|
|
|
+ clean.setVistitType(billClean.getVistitType());
|
|
|
+ clean.setVistitDate(billClean.getVistitDate());
|
|
|
+ clean.setDestName(billClean.getDestName());
|
|
|
+ clean.setDestId(billClean.getDestId());
|
|
|
+ clean.setAdmissionUserId(billClean.getAdmissionUserId());
|
|
|
+ clean.setAdmissionUserName(billClean.getAdmissionUserName());
|
|
|
+ clean.setSubDate(LocalDateTime.now());
|
|
|
+ clean.setBillStatus(0);
|
|
|
+ clean.setImgStatus(0);
|
|
|
+ clean.setFarmId(billClean.getFarmId());
|
|
|
+ clean.setCarNum(billClean.getCarNum());
|
|
|
+ clean.setPhone(billClean.getPhone());
|
|
|
+ clean.setProcessId(billClean.getProcessId());
|
|
|
+ clean.setTestLocationId(baseLocation.getNextId());
|
|
|
+ clean.setTestLocation(baseLocation.getNextLocation());
|
|
|
+ cleanMapper.insert(clean);
|
|
|
+ if (billClean.getDestId() == 7) {
|
|
|
+ baseProcess.setAllLocationStatus("2,2,1");
|
|
|
+ } else {
|
|
|
+ baseProcess.setAllLocationStatus("2,2,1,0");
|
|
|
}
|
|
|
- baseProcess.setUpdateDate(baseProcess.getUpdateDate() + "," + sdf.format(new Date()));
|
|
|
- baseProcess.setCurrentLocation(baseProcess.getCurrentLocation() + "," + baseLocation.getLocationName());
|
|
|
- baseProcess.setCurrentLocationId(baseProcess.getCurrentLocationId() + "," + baseLocation.getId());
|
|
|
- String status = baseProcess.getCurrentStatus();
|
|
|
- String substring = status.substring(0, status.length() - 1);
|
|
|
- baseProcess.setCurrentStatus(substring + "1," + 0);
|
|
|
- processMapper.updateById(baseProcess);
|
|
|
- } else {
|
|
|
- billClean.setImgStatus(1);
|
|
|
- billClean.setImgUrl(s);
|
|
|
- billClean.setBillStatus(2);
|
|
|
- billClean.setPassUserName(TokenSign.getUserNameByJwtToken(httpServletRequest));
|
|
|
- billClean.setPassUserId(TokenSign.getMemberIdByJwtToken(httpServletRequest));
|
|
|
- billClean.setTestLocation(baseLocation.getLocationName());
|
|
|
- billClean.setTestLocationId(baseLocation.getId());
|
|
|
- billClean.setCheckDate(sdf.parse(date));
|
|
|
- billClean.setPassDate(sdf.parse(sdf.format(new Date())));
|
|
|
- cleanMapper.updateById(billClean);
|
|
|
-
|
|
|
- baseProcess.setProcessType(2);
|
|
|
- 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");
|
|
|
-
|
|
|
- processMapper.updateById(baseProcess);
|
|
|
}
|
|
|
- return new Result(10000, "修改成功！", true);
|
|
|
- } else if (billClean.getDestId() == 53) {
|
|
|
- if ("1".equals(result)) {
|
|
|
- billClean.setBillStatus(1);
|
|
|
- baseProcess.setProcessType(1);
|
|
|
- } else {
|
|
|
- billClean.setBillStatus(2);
|
|
|
- baseProcess.setProcessType(2);
|
|
|
+
|
|
|
+ if (billClean.getTestLocationId() == 7) {
|
|
|
+ //生成烘干申请
|
|
|
+ BillDry billPcr = new BillDry();
|
|
|
+ billPcr.setPhone(billClean.getPhone());
|
|
|
+ billPcr.setVistitType(billClean.getVistitType());
|
|
|
+ billPcr.setDestName(billClean.getDestName());
|
|
|
+ billPcr.setDestId(billClean.getDestId());
|
|
|
+ billPcr.setAdmissionUserName(billClean.getAdmissionUserName());
|
|
|
+ billPcr.setAdmissionUserId(billClean.getAdmissionUserId());
|
|
|
+ billPcr.setVistitDate(billClean.getVistitDate());
|
|
|
+ billPcr.setSubDate(LocalDateTime.now());
|
|
|
+ billPcr.setBillStatus(0);
|
|
|
+ billPcr.setImgStatus(0);
|
|
|
+ billPcr.setCarNum(billClean.getCarNum());
|
|
|
+ billPcr.setProcessId(billClean.getProcessId());
|
|
|
+ billPcr.setFarmId(billClean.getFarmId());
|
|
|
+ billPcr.setTestLocation(baseLocation.getLocationName());
|
|
|
+ billPcr.setTestLocationId(baseLocation.getId());
|
|
|
+ dryMapper.insert(billPcr);
|
|
|
+ baseProcess.setAllLocationStatus("2,2,2,1");
|
|
|
}
|
|
|
- Integer processId = billClean.getProcessId();
|
|
|
- QueryWrapper<BillPersonnelAdmission> queryWrapper1 = new QueryWrapper<>();
|
|
|
- queryWrapper1.eq("farm_id", farmId).eq("process_id", processId);
|
|
|
- BillPersonnelAdmission admission = admissionMapper.selectOne(queryWrapper1);
|
|
|
- admission.setBillStatus(1);
|
|
|
- admission.setPassDate(LocalDateTime.now());
|
|
|
- admission.setPassUserId(TokenSign.getMemberIdByJwtToken(httpServletRequest));
|
|
|
- admission.setPassUserName(TokenSign.getUserNameByJwtToken(httpServletRequest));
|
|
|
- admissionMapper.updateById(admission);
|
|
|
- billClean.setImgStatus(1);
|
|
|
- billClean.setImgUrl(s);
|
|
|
- billClean.setPassUserName(TokenSign.getUserNameByJwtToken(httpServletRequest));
|
|
|
- billClean.setPassUserId(TokenSign.getMemberIdByJwtToken(httpServletRequest));
|
|
|
- billClean.setTestLocation(baseLocation.getLocationName());
|
|
|
- billClean.setTestLocationId(baseLocation.getId());
|
|
|
- billClean.setCheckDate(sdf.parse(date));
|
|
|
- billClean.setPassDate(sdf.parse(sdf.format(new Date())));
|
|
|
baseProcess.setUpdateDate(baseProcess.getUpdateDate() + "," + sdf.format(new Date()));
|
|
|
- baseProcess.setCurrentLocation(baseProcess.getCurrentLocation());
|
|
|
- baseProcess.setCurrentLocationId(baseProcess.getCurrentLocationId());
|
|
|
+ baseProcess.setCurrentLocation(baseProcess.getCurrentLocation() + "," + baseLocation.getLocationName());
|
|
|
+ baseProcess.setCurrentLocationId(baseProcess.getCurrentLocationId() + "," + baseLocation.getId());
|
|
|
String status = baseProcess.getCurrentStatus();
|
|
|
String substring = status.substring(0, status.length() - 1);
|
|
|
- baseProcess.setCurrentStatus(substring + "1");
|
|
|
+ baseProcess.setCurrentStatus(substring + "1," + 0);
|
|
|
processMapper.updateById(baseProcess);
|
|
|
- cleanMapper.updateById(billClean);
|
|
|
- return new Result(10000, "修改成功！", true);
|
|
|
} else {
|
|
|
- //当前是目的地
|
|
|
- if ("1".equals(result)) {
|
|
|
- billClean.setBillStatus(1);
|
|
|
- baseProcess.setProcessType(1);
|
|
|
- } else {
|
|
|
- billClean.setBillStatus(2);
|
|
|
- baseProcess.setProcessType(2);
|
|
|
- }
|
|
|
billClean.setImgStatus(1);
|
|
|
billClean.setImgUrl(s);
|
|
|
+ billClean.setBillStatus(2);
|
|
|
billClean.setPassUserName(TokenSign.getUserNameByJwtToken(httpServletRequest));
|
|
|
billClean.setPassUserId(TokenSign.getMemberIdByJwtToken(httpServletRequest));
|
|
|
billClean.setTestLocation(baseLocation.getLocationName());
|
|
|
billClean.setTestLocationId(baseLocation.getId());
|
|
|
billClean.setCheckDate(sdf.parse(date));
|
|
|
billClean.setPassDate(sdf.parse(sdf.format(new Date())));
|
|
|
+ cleanMapper.updateById(billClean);
|
|
|
|
|
|
+ baseProcess.setProcessType(2);
|
|
|
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.setCurrentStatus(substring + "2");
|
|
|
+
|
|
|
processMapper.updateById(baseProcess);
|
|
|
- cleanMapper.updateById(billClean);
|
|
|
- return new Result(10000, "修改成功！", true);
|
|
|
}
|
|
|
+ return new Result(10000, "修改成功！", true);
|
|
|
+ } else if (billClean.getDestId() == 53) {
|
|
|
+ if ("1".equals(result)) {
|
|
|
+ billClean.setBillStatus(1);
|
|
|
+ baseProcess.setProcessType(1);
|
|
|
+ } else {
|
|
|
+ billClean.setBillStatus(2);
|
|
|
+ baseProcess.setProcessType(2);
|
|
|
+ }
|
|
|
+ Integer processId = billClean.getProcessId();
|
|
|
+ QueryWrapper<BillPersonnelAdmission> queryWrapper1 = new QueryWrapper<>();
|
|
|
+ queryWrapper1.eq("farm_id", farmId).eq("process_id", processId);
|
|
|
+ BillPersonnelAdmission admission = admissionMapper.selectOne(queryWrapper1);
|
|
|
+ admission.setBillStatus(1);
|
|
|
+ admission.setPassDate(LocalDateTime.now());
|
|
|
+ admission.setPassUserId(TokenSign.getMemberIdByJwtToken(httpServletRequest));
|
|
|
+ admission.setPassUserName(TokenSign.getUserNameByJwtToken(httpServletRequest));
|
|
|
+ admissionMapper.updateById(admission);
|
|
|
+ billClean.setImgStatus(1);
|
|
|
+ billClean.setImgUrl(s);
|
|
|
+ billClean.setPassUserName(TokenSign.getUserNameByJwtToken(httpServletRequest));
|
|
|
+ billClean.setPassUserId(TokenSign.getMemberIdByJwtToken(httpServletRequest));
|
|
|
+ billClean.setTestLocation(baseLocation.getLocationName());
|
|
|
+ billClean.setTestLocationId(baseLocation.getId());
|
|
|
+ billClean.setCheckDate(sdf.parse(date));
|
|
|
+ billClean.setPassDate(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");
|
|
|
+ processMapper.updateById(baseProcess);
|
|
|
+ cleanMapper.updateById(billClean);
|
|
|
+ return new Result(10000, "修改成功！", true);
|
|
|
+ } else {
|
|
|
+ //当前是目的地
|
|
|
+ if ("1".equals(result)) {
|
|
|
+ billClean.setBillStatus(1);
|
|
|
+ baseProcess.setProcessType(1);
|
|
|
+ } else {
|
|
|
+ billClean.setBillStatus(2);
|
|
|
+ baseProcess.setProcessType(2);
|
|
|
+ }
|
|
|
+ billClean.setImgStatus(1);
|
|
|
+ billClean.setImgUrl(s);
|
|
|
+ billClean.setPassUserName(TokenSign.getUserNameByJwtToken(httpServletRequest));
|
|
|
+ billClean.setPassUserId(TokenSign.getMemberIdByJwtToken(httpServletRequest));
|
|
|
+ billClean.setTestLocation(baseLocation.getLocationName());
|
|
|
+ billClean.setTestLocationId(baseLocation.getId());
|
|
|
+ billClean.setCheckDate(sdf.parse(date));
|
|
|
+ billClean.setPassDate(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");
|
|
|
+ processMapper.updateById(baseProcess);
|
|
|
+ cleanMapper.updateById(billClean);
|
|
|
+ return new Result(10000, "修改成功！", true);
|
|
|
}
|
|
|
+
|
|
|
} else {
|
|
|
BillDry billClean = dryMapper.selectById(id);//某条烘干记录
|
|
|
QueryWrapper<BaseProcess> queryWrapper = new QueryWrapper<>();
|
