|
|
@@ -269,7 +269,8 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
if (nb.getStatus()==4) {
|
|
|
throw new BusinessException(new Error( "变更流程已通过审核","变更流程已通过审核"));
|
|
|
}
|
|
|
- int x=0;
|
|
|
+ boolean zxsFlag=false;
|
|
|
+ boolean zxsjlFlag=false;
|
|
|
//2通过 3驳回
|
|
|
if (status==2) {
|
|
|
//变更类型 0退单退款 1项目及金额变更 2仅项目变更 3仅金额变更 4重报 5赠送 6退单不退款 7仅变更合同
|
|
|
@@ -303,7 +304,8 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
if (zxs>0){
|
|
|
nb.setProcessState(OrderChangeProcess.JSY.getCode());
|
|
|
}else {
|
|
|
- addOrderChangeLog("无咨询师自动通过", status, orderNo, nb.getId());
|
|
|
+ zxsFlag=true;
|
|
|
+
|
|
|
pushZXSJLprocess(nb);
|
|
|
}
|
|
|
}else if (nb.getType()==OrderChangeType.JJEBG.getCode()){
|
|
|
@@ -312,7 +314,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
nb.setProcessState(OrderChangeProcess.CWZY.getCode());
|
|
|
}
|
|
|
}else if (nb.getProcessState()==OrderChangeProcess.JSY.getCode()){
|
|
|
- x=pushZXSprocess(nb);
|
|
|
+ zxsFlag=pushZXSprocess(nb);
|
|
|
//咨询师审核,将自己审核的全部标记已审核
|
|
|
}else if (nb.getProcessState()==OrderChangeProcess.JSJL.getCode()){
|
|
|
//咨询师经理审核,将自己审核的全部标记已审核
|
|
|
@@ -378,13 +380,16 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
orderExamineMapper.updateByOrderNo(orderNo,1);
|
|
|
}
|
|
|
if (rejectState==3) {
|
|
|
- x=pushZXSprocess(nb);
|
|
|
+ zxsFlag=pushZXSprocess(nb);
|
|
|
}else if(rejectState==4){
|
|
|
- x=pushZXSJLprocess(nb);
|
|
|
+ zxsjlFlag=pushZXSJLprocess(nb);
|
|
|
}
|
|
|
}
|
|
|
addOrderChangeLog(remarks, status, orderNo, nb.getId());
|
|
|
- if (x>0){
|
|
|
+ if (zxsFlag){
|
|
|
+ addOrderChangeLog("无咨询师自动通过", status, orderNo, nb.getId());
|
|
|
+ }
|
|
|
+ if (zxsjlFlag){
|
|
|
addOrderChangeLog("无咨询师经理自动通过", 2, nb.getOrderNo(), nb.getId());
|
|
|
}
|
|
|
sendNotice(status,nb);
|
|
|
@@ -398,13 +403,13 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
* @param nb
|
|
|
* @return
|
|
|
*/
|
|
|
- private int pushZXSprocess(NewOrderChangeBo nb) {
|
|
|
+ private boolean pushZXSprocess(NewOrderChangeBo nb) {
|
|
|
orderExamineMapper.updateByOrderNoAndAid(nb.getOrderNo(),TokenManager.getAdminId(),0);
|
|
|
int wsh=orderExamineMapper.checkCountStatus(nb.getOrderNo(),0,0);
|
|
|
if (wsh==0){
|
|
|
return pushZXSJLprocess( nb);
|
|
|
}
|
|
|
- return 0;
|
|
|
+ return false;
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -412,9 +417,9 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
* @param nb
|
|
|
* @return
|
|
|
*/
|
|
|
- private Integer pushZXSJLprocess(NewOrderChangeBo nb) {
|
|
|
+ private boolean pushZXSJLprocess(NewOrderChangeBo nb) {
|
|
|
int zxsjl=orderExamineMapper.checkCountStatus(nb.getOrderNo(),1,null);
|
|
|
- int x=0;
|
|
|
+ boolean zxsjlFlag=false;
|
|
|
if (nb.getType()==OrderChangeType.XMJJEBG.getCode()||
|
|
|
nb.getType()==OrderChangeType.TDTK.getCode()||
|
|
|
nb.getType()==OrderChangeType.TDBTK.getCode()||
|
|
|
@@ -423,7 +428,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
if (zxsjl>0){
|
|
|
nb.setProcessState(OrderChangeProcess.JSJL.getCode());
|
|
|
}else {
|
|
|
- x=1;
|
|
|
+ zxsjlFlag=true;
|
|
|
//重报 没有技术员跳入财务
|
|
|
if (nb.getType()==OrderChangeType.CB.getCode()){
|
|
|
nb.setProcessState(OrderChangeProcess.CWZY.getCode());
|
|
|
@@ -433,7 +438,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- return x;
|
|
|
+ return zxsjlFlag;
|
|
|
}
|
|
|
|
|
|
private void addOrderChangeLog(String remarks, Integer status, String orderNo, Integer id) {
|