|
@@ -857,7 +857,9 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
|
|
|
if (nextId == 0) {
|
|
|
if (StringUtils.isBlank(splits[1])) {
|
|
|
baseProcess.setProcessType(1);
|
|
|
- if (allLocationId.length() > 5) {
|
|
|
+ if (allLocationId.length() > 9) {
|
|
|
+ baseProcess.setAllLocationStatus("2,2,2,2,2,2,2");
|
|
|
+ } else if (allLocationId.length() > 5 && allLocationId.length() < 10) {
|
|
|
baseProcess.setAllLocationStatus("2,2,2,2,2");
|
|
|
} else {
|
|
|
baseProcess.setAllLocationStatus("2,2,2");
|
|
@@ -916,6 +918,15 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
|
|
|
beforeMapper.insert(before);
|
|
|
}
|
|
|
baseProcess.setCurrentFlowId(baseProcess.getCurrentFlowId() + "," + nextId + "," + splits[1]);
|
|
|
+ if (allLocationId.length() > 9) {
|
|
|
+ if (index == 1) {
|
|
|
+ baseProcess.setAllLocationStatus("2,2,2,1,0,0,0");
|
|
|
+ } else {
|
|
|
+ baseProcess.setAllLocationStatus("2,2,2,2,2,1,0");
|
|
|
+ }
|
|
|
+ } else if (allLocationId.length() > 5 && allLocationId.length() < 10) {
|
|
|
+ baseProcess.setAllLocationStatus("2,2,2,1,0");
|
|
|
+ }
|
|
|
}
|
|
|
}else if (nextId == 1) {
|
|
|
//新增采样
|
|
@@ -1038,7 +1049,9 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
|
|
|
if (nextId == 0) {
|
|
|
if (StringUtils.isBlank(splits[1])) {
|
|
|
baseProcess.setProcessType(1);
|
|
|
- if (allLocationId.length() > 5) {
|
|
|
+ if (allLocationId.length() > 9) {
|
|
|
+ baseProcess.setAllLocationStatus("2,2,2,2,2,2,2");
|
|
|
+ } else if (allLocationId.length() > 5 && allLocationId.length() < 10) {
|
|
|
baseProcess.setAllLocationStatus("2,2,2,2,2");
|
|
|
} else {
|
|
|
baseProcess.setAllLocationStatus("2,2,2");
|
|
@@ -1097,6 +1110,15 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
|
|
|
beforeMapper.insert(before);
|
|
|
}
|
|
|
baseProcess.setCurrentFlowId(baseProcess.getCurrentFlowId() + "," + nextId + "," + splits[1]);
|
|
|
+ if (allLocationId.length() > 9) {
|
|
|
+ if (index == 1) {
|
|
|
+ baseProcess.setAllLocationStatus("2,2,2,1,0,0,0");
|
|
|
+ } else {
|
|
|
+ baseProcess.setAllLocationStatus("2,2,2,2,2,1,0");
|
|
|
+ }
|
|
|
+ } else if (allLocationId.length() > 5 && allLocationId.length() < 10) {
|
|
|
+ baseProcess.setAllLocationStatus("2,2,2,1,0");
|
|
|
+ }
|
|
|
}
|
|
|
} else if (nextId == 1) {
|
|
|
//新增采样
|