Pārlūkot izejas kodu

新增董事长特批审核

anderx 3 gadi atpakaļ
vecāks
revīzija
afbd44dcfd

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

@@ -277,10 +277,11 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 					}else {
 						if(nb.getProcessState()==7) {
 							nb.setProcessState(nb.getProcessState()+1);
-						}else if(nb.getProcessState()==8) {//董事长项目变更通过
-							nb.setStatus(2);
 						}
 					}
+					if(nb.getProcessState()==8) {//董事长项目变更通过
+						nb.setStatus(2);
+					}
 					//营销管理通过则设置技术管理员通过表
 					if(nb.getProcessState()==1){
 						if (orderExamineMapper.checkCountStatus(orderNo,null,null)<1) {
@@ -291,8 +292,15 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 						nb.setProcessState(nb.getProcessState()+1);
 					}
 					//必须放置在咨询师与咨询师经理前,否则会直接通过不走咨询师管理员
-					if(nb.getProcessState()==4||nb.getProcessState()==5||nb.getProcessState()==6) {
+					if(nb.getProcessState()==4||nb.getProcessState()==5) {
 						nb.setProcessState(nb.getProcessState()+1);
+					}else if (nb.getProcessState()==6){
+						TOrderNew tOrderNew = tOrderNewMapper.selectByPrimaryKey(nb.getOrderNo());
+						if (tOrderNew.getSalesmanId().equals("734092ad-6564-4021-b7ab-aab5af3a1537")){
+							nb.setProcessState(8);
+						} else{
+							nb.setProcessState(7);
+						}
 					}
 					if(nb.getProcessState()==2){//咨询师
 						//找出当时人的审核改为通过