Browse Source

版本切换

anderx 1 year ago
parent
commit
11fb2ef637

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

@@ -186,7 +186,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 
 	private void addOrderExamineByTask(String orderNo, Integer type, TOrderTaskBo t) {
 		//重报和仅项目变更只需要当事人审核
-		if (type ==OrderChangeType.CB.getCode()|| type ==OrderChangeType.JXMBG.getCode()){
+		if (Objects.equals(type, OrderChangeType.CB.getCode()) || Objects.equals(type, OrderChangeType.JXMBG.getCode())){
 			Integer receiverType=null;
 			if (t.getTaskReceiver()!=null){
 				//等于咨询师 做咨询新增
@@ -207,8 +207,8 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 				orderExamineMapper.insertSelective(o);
 			}
 			//项目及金额、退单不退款、退单退款需要当事人和经理审核,其他不需要咨询师审核
-		}else if (type ==OrderChangeType.XMJJEBG.getCode()|| type ==OrderChangeType.TDBTK.getCode() ||
-					type ==OrderChangeType.TDTK.getCode()){
+		}else if (Objects.equals(type, OrderChangeType.XMJJEBG.getCode()) || Objects.equals(type, OrderChangeType.TDBTK.getCode()) ||
+                Objects.equals(type, OrderChangeType.TDTK.getCode())){
 			if (t.getConsultantId()!=null) {
 				OrderExamine o=new OrderExamine();
 				o.setAid(t.getConsultantId());
@@ -264,7 +264,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 		NewOrderChangeBo nb=newOrderChangeMapper.selectByChangeId(changeId);
 		String orderNo=nb.getOrderNo();
 		Department dep = tOrderNewMapper.selectDepByOrderNo(orderNo);
-		if (processState==null||(nb.getProcessState()!=9&&processState !=nb.getProcessState()) ) {
+		if (processState==null||(nb.getProcessState()!=9&& !processState.equals(nb.getProcessState())) ) {
 			throw new BusinessException(new Error( "变更流程与您所操作流程不匹配","变更流程与您所操作流程不匹配"));
 		}
 		if (nb.getStatus()==4) {
@@ -275,9 +275,9 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 		if (status==2) {
 			//变更类型 0退单退款 1项目及金额变更 2仅项目变更 3仅金额变更 4重报 5赠送 6退单不退款 7仅变更合同
 			if(nb.getType() !=null){
-				if(nb.getType()==OrderChangeType.JBGGT.getCode()){
+				if(Objects.equals(nb.getType(), OrderChangeType.JBGGT.getCode())){
 					//仅合同图片修改:营销-营销总经理
-					if(nb.getProcessState()==OrderChangeProcess.YXGLY.getCode()){
+					if(Objects.equals(nb.getProcessState(), OrderChangeProcess.YXGLY.getCode())){
 						completeChange(remarks, nb);
 						return 1;
 					}
@@ -290,69 +290,69 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 				 退单不退款:营销-经理-总经理审核-技术员-技术经理-技术总监-财务-财务总监-总裁(副总裁)-财务退票
 					仅金额:营销-经理-总经理审核-技术总监-财务-财务总监-总裁(副总裁)
 				框架协议审核流程: 营销员发起-营销经理审核-营销管理员审核-财务审核 */
-					if (nb.getProcessState()==OrderChangeProcess.YXJL.getCode()){
+					if (Objects.equals(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()||
-								nb.getType()==OrderChangeType.TDBTK.getCode()){
+					}else if (Objects.equals(nb.getProcessState(), OrderChangeProcess.YXGLY.getCode())){
+						if (Objects.equals(nb.getType(), OrderChangeType.CB.getCode()) ||
+                                Objects.equals(nb.getType(), OrderChangeType.JXMBG.getCode()) ||
+                                Objects.equals(nb.getType(), OrderChangeType.XMJJEBG.getCode()) ||
+                                Objects.equals(nb.getType(), OrderChangeType.TDTK.getCode()) ||
+                                Objects.equals(nb.getType(), OrderChangeType.TDBTK.getCode())){
 							pushZXS(nb, date,1);
-						}else if (nb.getType()==OrderChangeType.JJEBG.getCode()){
+						}else if (Objects.equals(nb.getType(), OrderChangeType.JJEBG.getCode())){
 							nb.setProcessState(OrderChangeProcess.JSZJ.getCode());
-						}else if (nb.getType()==OrderChangeType.ZS.getCode()||nb.getType()==OrderChangeType.KJXY.getCode()){
+						}else if (Objects.equals(nb.getType(), OrderChangeType.ZS.getCode()) || Objects.equals(nb.getType(), OrderChangeType.KJXY.getCode())){
 							nb.setProcessState(OrderChangeProcess.CWZY.getCode());
 						}
-					}else if (nb.getProcessState()==OrderChangeProcess.JSY.getCode()){
+					}else if (Objects.equals(nb.getProcessState(), OrderChangeProcess.JSY.getCode())){
 						orderExamineMapper.updateByOrderNoAndAid(orderNo,TokenManager.getAdminId(),0);
 						pushZXS(nb,date,0);
 						//咨询师审核,将自己审核的全部标记已审核
-					}else if (nb.getProcessState()==OrderChangeProcess.JSJL.getCode()){
+					}else if (Objects.equals(nb.getProcessState(), OrderChangeProcess.JSJL.getCode())){
 						//咨询师经理审核,将自己审核的全部标记已审核
 						orderExamineMapper.updateByOrderNoAndAid(orderNo,TokenManager.getAdminId(),1);
 						pushZXSJL(nb,date,0);
-					}else if (nb.getProcessState()==OrderChangeProcess.JSZJ.getCode()){
+					}else if (Objects.equals(nb.getProcessState(), OrderChangeProcess.JSZJ.getCode())){
 						nb.setProcessState(OrderChangeProcess.CWZY.getCode());
-					}else if (nb.getProcessState()==OrderChangeProcess.CWZY.getCode()){
-						if (nb.getType()==OrderChangeType.ZS.getCode()){
+					}else if (Objects.equals(nb.getProcessState(), OrderChangeProcess.CWZY.getCode())){
+						if (Objects.equals(nb.getType(), OrderChangeType.ZS.getCode())){
 							boolean flag=pushApproval(nb, dep,remarks);
 							if (flag) return 1;
-						}else if (nb.getType()==OrderChangeType.KJXY.getCode()){
+						}else if (Objects.equals(nb.getType(), OrderChangeType.KJXY.getCode())){
 							completeChange(remarks, nb);
 							return 1;
 						}else {
 							nb.setProcessState(OrderChangeProcess.CWZJ.getCode());
 						}
-					}else if (nb.getProcessState()==OrderChangeProcess.CWZJ.getCode()){
+					}else if (Objects.equals(nb.getProcessState(), OrderChangeProcess.CWZJ.getCode())){
 						boolean flag=pushApproval(nb, dep,remarks);
 						if (flag){
 							return 1;
 						}
-					}else if(nb.getProcessState()==OrderChangeProcess.TPSH.getCode()) {
-						if (nb.getType()==OrderChangeType.TDTK.getCode()||nb.getType()==OrderChangeType.TDBTK.getCode()) {
+					}else if(Objects.equals(nb.getProcessState(), OrderChangeProcess.TPSH.getCode())) {
+						if (Objects.equals(nb.getType(), OrderChangeType.TDTK.getCode()) || Objects.equals(nb.getType(), OrderChangeType.TDBTK.getCode())) {
 							nb.setStatus(2);
 						}else {
 							completeChange(remarks, nb);
 							return 1;
 						}
-					}else if (nb.getProcessState()==OrderChangeProcess.FZC.getCode()){
-							if (nb.getType()==OrderChangeType.TDTK.getCode()) {
+					}else if (Objects.equals(nb.getProcessState(), OrderChangeProcess.FZC.getCode())){
+							if (Objects.equals(nb.getType(), OrderChangeType.TDTK.getCode())) {
 								if (nb.getChangeAmount().compareTo(new BigDecimal("0.2")) < 0) {
 									//小于则总裁通过,大于则董事长
 									nb.setStatus(2);
 								}else {
 									nb.setProcessState(OrderChangeProcess.DSZ.getCode());
 								}
-							}else if (nb.getType()==OrderChangeType.TDBTK.getCode()){
+							}else if (Objects.equals(nb.getType(), OrderChangeType.TDBTK.getCode())){
 								nb.setStatus(2);
 							}else {
 								completeChange(remarks, nb);
 								return 1;
 							}
 
-						}else if (nb.getProcessState()==OrderChangeProcess.DSZ.getCode()){
-							if (nb.getType()==OrderChangeType.TDTK.getCode()||nb.getType()==OrderChangeType.TDBTK.getCode()) {
+						}else if (Objects.equals(nb.getProcessState(), OrderChangeProcess.DSZ.getCode())){
+							if (Objects.equals(nb.getType(), OrderChangeType.TDTK.getCode()) || Objects.equals(nb.getType(), OrderChangeType.TDBTK.getCode())) {
 								nb.setStatus(2);
 							}else {
 								completeChange(remarks, nb);
@@ -365,7 +365,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 				nb.setStatus(1);//如果驳回数据则改为正常数据
 			}
 			//通过订单取消记录的驳回位置
-			if (processState==nb.getBackStatus()) {
+			if (processState.equals(nb.getBackStatus())) {
 				nb.setBackStatus(0);
 			}
 		}else {