Browse Source

驳回修改

anderx 6 years ago
parent
commit
e191a656d7

+ 2 - 2
src/main/java/com/goafanti/common/mapper/NewOrderChangeMapper.xml

@@ -675,7 +675,7 @@ from new_order_change a  where 1=1 and a.id= #{id}
 	 and (a.process_state > 5 and a.process_state < 9) or (a.process_state =9 and a.status=4) 
 	</if>
 	<if test="complete ==2 and processState == 7">
-	 and ((a.process_state = 7  and  a.status = 4)or a.process_state = 8)
+	 and ((a.process_state = 7  and  a.status = 4)or a.process_state &gt; 7)
 	</if>
 	<if test="complete ==2 and processState == 8">
 	 and a.process_state = 8  and  a.status = 4
@@ -749,7 +749,7 @@ from new_order_change a  where 1=1 and a.id= #{id}
 	 and ((a.process_state &gt; 5 and  a.status != 4)or  (a.process_state in (5,9) and  a.status = 4))    
 	</if>
 	<if test="complete ==2 and processState == 7">
-	 and ((a.process_state = 7  and  a.status = 4)or a.process_state = 8)
+	 and ((a.process_state = 7  and  a.status = 4)or a.process_state &gt; 7)
 	</if>
 	<if test="complete ==2 and processState == 8">
 	 and a.process_state = 8  and  a.status = 4

+ 3 - 0
src/main/java/com/goafanti/order/service/impl/OrderChangeServiceImpl.java

@@ -122,6 +122,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 			}
 		}else {
 			nb.setProcessState(0);
+			nb.setStatus(3);//订单变更设置为驳回
 		}
 		OrderChangeLog ocl=new OrderChangeLog();
 		ocl.setAuditor(TokenManager.getAdminId());
@@ -223,6 +224,8 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 			noc.setSettlementAmount(t.getSettlementAmount());
 			noc.setChangeAmount(t.getChangeAmount());
 			noc.setApplicant(t.getApplicant());
+			noc.setStatus(1);//订单置为正常
+			noc.setProcessState(1);//流程置为营销管理员
 			noc.setDepName(t.getDepName());
 		}else if(changeType==1) {
 			noc.setProjectState(t.getProjectState());