|
@@ -349,6 +349,15 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+
|
|
|
+ if (baseProcess.getDestId() == 1) {
|
|
|
+ baseProcess.setAllLocationStatus("2,2");
|
|
|
+ }
|
|
|
+
|
|
|
+ if (baseProcess.getDestId() == 4) {
|
|
|
+ baseProcess.setAllLocationStatus("2,2,2,2");
|
|
|
+ }
|
|
|
+
|
|
|
baseProcess.setUpdateDate(baseProcess.getUpdateDate() + "," + sdf.format(new Date()));
|
|
|
baseProcess.setCurrentLocation(baseProcess.getCurrentLocation() + "," + baseLocation.getLocationName());
|
|
|
baseProcess.setCurrentLocationId(baseProcess.getCurrentLocationId() + "," + baseLocation.getId());
|
|
@@ -364,6 +373,18 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
|
|
|
billClean.setCheckDate(sdf.parse(date));
|
|
|
billClean.setPassDate(sdf.parse(sdf.format(new Date())));
|
|
|
|
|
|
+
|
|
|
+ if (baseProcess.getDestId() == 1) {
|
|
|
+ baseProcess.setAllLocationStatus("2,3");
|
|
|
+ }
|
|
|
+
|
|
|
+ if (baseProcess.getDestId() == 3) {
|
|
|
+ baseProcess.setAllLocationStatus("2,2,3");
|
|
|
+ }
|
|
|
+ if (baseProcess.getDestId() == 4) {
|
|
|
+ baseProcess.setAllLocationStatus("2,2,2,3");
|
|
|
+ }
|
|
|
+
|
|
|
if (baseLocation.getId() == 1 && baseProcess.getDestId() > 2) {
|
|
|
String status = baseProcess.getAllLocationStatus();
|
|
|
String[] split1 = status.split(",");
|
|
@@ -431,6 +452,17 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
|
|
|
split1.replace(s2, s2 + 1, "3");
|
|
|
baseProcess.setAllLocationStatus(split1.toString());
|
|
|
|
|
|
+ if (baseProcess.getDestId() == 1) {
|
|
|
+ baseProcess.setAllLocationStatus("2,3");
|
|
|
+ }
|
|
|
+
|
|
|
+ if (baseProcess.getDestId() == 3) {
|
|
|
+ baseProcess.setAllLocationStatus("2,2,3");
|
|
|
+ }
|
|
|
+ if (baseProcess.getDestId() == 4) {
|
|
|
+ baseProcess.setAllLocationStatus("2,2,2,3");
|
|
|
+ }
|
|
|
+
|
|
|
processMapper.updateById(baseProcess);
|
|
|
cleanMapper.updateById(billClean);
|
|
|
return new Result(10000, "修改成功!", true);
|