|
|
@@ -318,7 +318,9 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
}
|
|
|
}else if (nb.getProcessState()==OrderChangeProcess.CWZJ.getCode()){
|
|
|
boolean flag=pushApproval(nb, dep,remarks);
|
|
|
- if (flag) return 1;
|
|
|
+ if (flag){
|
|
|
+ return 1;
|
|
|
+ }
|
|
|
}else if(nb.getProcessState()==OrderChangeProcess.TPSH.getCode()) {
|
|
|
if (nb.getType()==OrderChangeType.TDTK.getCode()||nb.getType()==OrderChangeType.TDBTK.getCode()) {
|
|
|
nb.setStatus(2);
|
|
|
@@ -401,7 +403,11 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
nb.setProcessState(OrderChangeProcess.TPSH.getCode());
|
|
|
}else {
|
|
|
addOrderChangeLog("公司/部门管理审核人员未设置,系统自动通过", 2, nb.getOrderNo(), nb.getId(),date,AFTConstants.SUPERADMIN_ID);
|
|
|
- completeChange(remarks,nb);
|
|
|
+ if (nb.getType()==OrderChangeType.TDTK.getCode()||nb.getType()==OrderChangeType.TDBTK.getCode()){
|
|
|
+ nb.setStatus(2);
|
|
|
+ }else {
|
|
|
+ completeChange(remarks,nb);
|
|
|
+ }
|
|
|
return true;
|
|
|
}
|
|
|
|