|
|
@@ -165,7 +165,9 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
nb.setStatus(2);
|
|
|
}
|
|
|
}else {
|
|
|
- if(nb.getProcessState()==8) {//董事长项目变更通过
|
|
|
+ if(nb.getProcessState()==7) {
|
|
|
+ nb.setProcessState(nb.getProcessState()+1);
|
|
|
+ }else if(nb.getProcessState()==8) {//董事长项目变更通过
|
|
|
nb.setStatus(2);
|
|
|
}
|
|
|
}
|
|
|
@@ -210,6 +212,13 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
}else {
|
|
|
nb.setProcessState(rejectState);
|
|
|
nb.setStatus(3);//订单变更设置为驳回
|
|
|
+ //如果驳回到技术经理之前则将审核表中状态跳回
|
|
|
+ if(rejectState==3) {
|
|
|
+ orderExamineMapper.updateByOrderNo(orderNo,1);
|
|
|
+ }else if (rejectState<3) {
|
|
|
+ orderExamineMapper.updateByOrderNo(orderNo,null);
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
OrderChangeLog ocl=new OrderChangeLog();
|
|
|
ocl.setAuditor(TokenManager.getAdminId());
|