Browse Source

变更审核流程修改

anderx 3 years ago
parent
commit
f72b125c96

+ 33 - 14
src/main/java/com/goafanti/order/service/impl/OrderChangeServiceImpl.java

@@ -52,6 +52,7 @@ import com.goafanti.order.bo.TOrderLogBo;
 import com.goafanti.order.bo.TOrderNewBo;
 import com.goafanti.order.bo.TOrderTaskBo;
 import com.goafanti.techproject.enums.TaskState;
+import org.springframework.transaction.annotation.Transactional;
 
 @Service
 public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper> implements OrderChangeService {
@@ -243,6 +244,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 		return nb;
 	}
 	@Override
+	@Transactional
 	public int pushOrderChangeAudit(String changeId, String remarks, Integer status,Integer processState,Integer rejectState) {
 		NewOrderChangeBo nb=newOrderChangeMapper.selectByChangeId(changeId);
 		String orderNo=nb.getOrderNo();
@@ -277,8 +279,10 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 					if (nb.getProcessState()==OrderChangeProcess.YXJL.getCode()){
 						nb.setProcessState(OrderChangeProcess.YXGLY.getCode());
 					}else if (nb.getProcessState()==OrderChangeProcess.YXGLY.getCode()){
-						if (nb.getType()==OrderChangeType.CB.getCode()||nb.getType()==OrderChangeType.JXMBG.getCode()||
-								nb.getType()==OrderChangeType.XMJJEBG.getCode()||nb.getType()==OrderChangeType.TDTK.getCode()||
+						if (nb.getType()==OrderChangeType.CB.getCode()||
+								nb.getType()==OrderChangeType.JXMBG.getCode()||
+								nb.getType()==OrderChangeType.XMJJEBG.getCode()||
+								nb.getType()==OrderChangeType.TDTK.getCode()||
 								nb.getType()==OrderChangeType.TDBTK.getCode()){
 							if (orderExamineMapper.checkCountStatus(orderNo, null, null) < 1) {
 								insertOrderExamine(orderNo);
@@ -290,10 +294,13 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 							if (zxs>0){
 								nb.setProcessState(OrderChangeProcess.JSY.getCode());
 							}else {
+								//重报 没有技术员跳入财务
 								if (nb.getType()==OrderChangeType.CB.getCode()){
 									nb.setProcessState(OrderChangeProcess.CWZY.getCode());
+									//项目变更没有跳入技术总监
 								}else if (nb.getType()==OrderChangeType.JXMBG.getCode()){
 									nb.setProcessState(OrderChangeProcess.JSZJ.getCode());
+									//项目变更金额变更、退单退款、退单不退款 没有技术员跳入经理、也没有经理跳入技术总监
 								}else if (nb.getType()==OrderChangeType.XMJJEBG.getCode()||
 										nb.getType()==OrderChangeType.TDTK.getCode()||
 										nb.getType()==OrderChangeType.TDBTK.getCode()){
@@ -304,24 +311,36 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 									}
 								}
 							}
-
-
 						}else if (nb.getType()==OrderChangeType.JJEBG.getCode()){
 							nb.setProcessState(OrderChangeProcess.JSZJ.getCode());
-						}else if (nb.getType()==OrderChangeType.JJEBG.getCode()){
-							nb.setProcessState(OrderChangeProcess.CWZY.getCode());
 						}
 					}else if (nb.getProcessState()==OrderChangeProcess.JSY.getCode()){
-						if (nb.getType()==OrderChangeType.CB.getCode()){
-							nb.setProcessState(OrderChangeProcess.CWZY.getCode());
-						}else if (nb.getType()==OrderChangeType.JXMBG.getCode()){
-							nb.setProcessState(OrderChangeProcess.JSZJ.getCode());
-						}else if (nb.getType()==OrderChangeType.XMJJEBG.getCode()||nb.getType()==OrderChangeType.TDTK.getCode()||
-								nb.getType()==OrderChangeType.TDBTK.getCode()){
-							nb.setProcessState(OrderChangeProcess.JSJL.getCode());
+						//咨询师审核,将自己审核的全部标记已审核
+						orderExamineMapper.updateByOrderNoAndAid(orderNo,TokenManager.getAdminId(),0);
+						int wsh=orderExamineMapper.checkCountStatus(orderNo,0,0);
+						if (wsh==0){
+							if (nb.getType()==OrderChangeType.CB.getCode()){
+								nb.setProcessState(OrderChangeProcess.CWZY.getCode());
+							}else if (nb.getType()==OrderChangeType.JXMBG.getCode()){
+								nb.setProcessState(OrderChangeProcess.JSZJ.getCode());
+							}else if (nb.getType()==OrderChangeType.XMJJEBG.getCode()||nb.getType()==OrderChangeType.TDTK.getCode()||
+									nb.getType()==OrderChangeType.TDBTK.getCode()){
+								int zxsjl=orderExamineMapper.checkCountStatus(orderNo,1,null);
+								if (zxsjl>0){
+									nb.setProcessState(OrderChangeProcess.JSJL.getCode());
+								}else {
+									nb.setProcessState(OrderChangeProcess.JSZJ.getCode());
+								}
+							}
 						}
+
 					}else if (nb.getProcessState()==OrderChangeProcess.JSJL.getCode()){
-						nb.setProcessState(OrderChangeProcess.JSZJ.getCode());
+						//咨询师经理审核,将自己审核的全部标记已审核
+						orderExamineMapper.updateByOrderNoAndAid(orderNo,TokenManager.getAdminId(),1);
+						int wsh=orderExamineMapper.checkCountStatus(orderNo,1,0);
+						if (wsh==0){
+							nb.setProcessState(OrderChangeProcess.JSZJ.getCode());
+						}
 					}else if (nb.getProcessState()==OrderChangeProcess.JSZJ.getCode()){
 						nb.setProcessState(OrderChangeProcess.CWZY.getCode());
 					}else if (nb.getProcessState()==OrderChangeProcess.CWZY.getCode()){