|
@@ -328,8 +328,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
}else if (Objects.equals(nb.getType(), OrderChangeType.KJXY.getCode())){
|
|
}else if (Objects.equals(nb.getType(), OrderChangeType.KJXY.getCode())){
|
|
|
//新增运营保障审核
|
|
//新增运营保障审核
|
|
|
nb.setProcessState(OrderChangeProcess.YYBZ.getCode());
|
|
nb.setProcessState(OrderChangeProcess.YYBZ.getCode());
|
|
|
-// completeChange(remarks, nb);
|
|
|
|
|
-// return 1;
|
|
|
|
|
|
|
+
|
|
|
}else {
|
|
}else {
|
|
|
nb.setProcessState(OrderChangeProcess.CWZJ.getCode());
|
|
nb.setProcessState(OrderChangeProcess.CWZJ.getCode());
|
|
|
}
|
|
}
|
|
@@ -341,13 +340,15 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
// return 1;
|
|
// return 1;
|
|
|
// }
|
|
// }
|
|
|
}else if (Objects.equals(nb.getProcessState(), OrderChangeProcess.YYBZ.getCode())){
|
|
}else if (Objects.equals(nb.getProcessState(), OrderChangeProcess.YYBZ.getCode())){
|
|
|
- if (Objects.equals(nb.getType(), OrderChangeType.ZS.getCode())){
|
|
|
|
|
|
|
+ if (Objects.equals(nb.getType(), OrderChangeType.KJXY.getCode())){
|
|
|
|
|
+ completeChange(remarks, nb);
|
|
|
|
|
+ return 1;
|
|
|
|
|
+ }else {
|
|
|
boolean flag=pushApproval(nb, dep,remarks);
|
|
boolean flag=pushApproval(nb, dep,remarks);
|
|
|
if (flag){
|
|
if (flag){
|
|
|
return 1;
|
|
return 1;
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
}else if(Objects.equals(nb.getProcessState(), OrderChangeProcess.TPSH.getCode())) {
|
|
}else if(Objects.equals(nb.getProcessState(), OrderChangeProcess.TPSH.getCode())) {
|
|
|
if (Objects.equals(nb.getType(), OrderChangeType.TDTK.getCode()) || Objects.equals(nb.getType(), OrderChangeType.TDBTK.getCode())) {
|
|
if (Objects.equals(nb.getType(), OrderChangeType.TDTK.getCode()) || Objects.equals(nb.getType(), OrderChangeType.TDBTK.getCode())) {
|
|
|
nb.setStatus(2);
|
|
nb.setStatus(2);
|