|
@@ -263,8 +263,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
if (nb.getStatus()==4) {
|
|
if (nb.getStatus()==4) {
|
|
|
throw new BusinessException(new Error( "变更流程已通过审核","变更流程已通过审核"));
|
|
throw new BusinessException(new Error( "变更流程已通过审核","变更流程已通过审核"));
|
|
|
}
|
|
}
|
|
|
- boolean zxsFlag=false;
|
|
|
|
|
- boolean zxsjlFlag=false;
|
|
|
|
|
|
|
+ Date date =new Date();
|
|
|
//2通过 3驳回
|
|
//2通过 3驳回
|
|
|
if (status==2) {
|
|
if (status==2) {
|
|
|
//变更类型 0退单退款 1项目及金额变更 2仅项目变更 3仅金额变更 4重报 5赠送 6退单不退款 7仅变更合同
|
|
//变更类型 0退单退款 1项目及金额变更 2仅项目变更 3仅金额变更 4重报 5赠送 6退单不退款 7仅变更合同
|
|
@@ -294,28 +293,20 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
nb.getType()==OrderChangeType.XMJJEBG.getCode()||
|
|
nb.getType()==OrderChangeType.XMJJEBG.getCode()||
|
|
|
nb.getType()==OrderChangeType.TDTK.getCode()||
|
|
nb.getType()==OrderChangeType.TDTK.getCode()||
|
|
|
nb.getType()==OrderChangeType.TDBTK.getCode()){
|
|
nb.getType()==OrderChangeType.TDBTK.getCode()){
|
|
|
- int zxs=orderExamineMapper.checkCountStatus(orderNo,0,null);
|
|
|
|
|
- if (zxs>0){
|
|
|
|
|
- nb.setProcessState(OrderChangeProcess.JSY.getCode());
|
|
|
|
|
- }else {
|
|
|
|
|
- zxsFlag=true;
|
|
|
|
|
- zxsjlFlag=pushZXSJLprocess(nb);
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ pushZXS(nb, date,1);
|
|
|
}else if (nb.getType()==OrderChangeType.JJEBG.getCode()){
|
|
}else if (nb.getType()==OrderChangeType.JJEBG.getCode()){
|
|
|
nb.setProcessState(OrderChangeProcess.JSZJ.getCode());
|
|
nb.setProcessState(OrderChangeProcess.JSZJ.getCode());
|
|
|
}else if (nb.getType()==OrderChangeType.ZS.getCode()){
|
|
}else if (nb.getType()==OrderChangeType.ZS.getCode()){
|
|
|
nb.setProcessState(OrderChangeProcess.CWZY.getCode());
|
|
nb.setProcessState(OrderChangeProcess.CWZY.getCode());
|
|
|
}
|
|
}
|
|
|
}else if (nb.getProcessState()==OrderChangeProcess.JSY.getCode()){
|
|
}else if (nb.getProcessState()==OrderChangeProcess.JSY.getCode()){
|
|
|
- zxsFlag=pushZXSprocess(nb);
|
|
|
|
|
|
|
+ orderExamineMapper.updateByOrderNoAndAid(orderNo,TokenManager.getAdminId(),0);
|
|
|
|
|
+ pushZXS(nb,date,0);
|
|
|
//咨询师审核,将自己审核的全部标记已审核
|
|
//咨询师审核,将自己审核的全部标记已审核
|
|
|
}else if (nb.getProcessState()==OrderChangeProcess.JSJL.getCode()){
|
|
}else if (nb.getProcessState()==OrderChangeProcess.JSJL.getCode()){
|
|
|
//咨询师经理审核,将自己审核的全部标记已审核
|
|
//咨询师经理审核,将自己审核的全部标记已审核
|
|
|
orderExamineMapper.updateByOrderNoAndAid(orderNo,TokenManager.getAdminId(),1);
|
|
orderExamineMapper.updateByOrderNoAndAid(orderNo,TokenManager.getAdminId(),1);
|
|
|
- int wsh=orderExamineMapper.checkCountStatus(orderNo,1,0);
|
|
|
|
|
- if (wsh==0){
|
|
|
|
|
- pushZXSJLprocess(nb);
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ pushZXSJL(nb,date,0);
|
|
|
}else if (nb.getProcessState()==OrderChangeProcess.JSZJ.getCode()){
|
|
}else if (nb.getProcessState()==OrderChangeProcess.JSZJ.getCode()){
|
|
|
nb.setProcessState(OrderChangeProcess.CWZY.getCode());
|
|
nb.setProcessState(OrderChangeProcess.CWZY.getCode());
|
|
|
}else if (nb.getProcessState()==OrderChangeProcess.CWZY.getCode()){
|
|
}else if (nb.getProcessState()==OrderChangeProcess.CWZY.getCode()){
|
|
@@ -378,24 +369,14 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
orderExamineMapper.updateByOrderNoAndAid(nb.getOrderNo(),TokenManager.getAdminId(),0);
|
|
orderExamineMapper.updateByOrderNoAndAid(nb.getOrderNo(),TokenManager.getAdminId(),0);
|
|
|
int wsh=orderExamineMapper.checkCountStatus(nb.getOrderNo(),0,0);
|
|
int wsh=orderExamineMapper.checkCountStatus(nb.getOrderNo(),0,0);
|
|
|
if (wsh==0){
|
|
if (wsh==0){
|
|
|
- zxsFlag=true;
|
|
|
|
|
- zxsjlFlag= pushZXSJLprocess( nb);
|
|
|
|
|
|
|
+ pushZXSJL( nb,date,1);
|
|
|
}
|
|
}
|
|
|
}else if(rejectState==4){
|
|
}else if(rejectState==4){
|
|
|
- zxsjlFlag=pushZXSJLprocess(nb);
|
|
|
|
|
|
|
+ pushZXSJL(nb,date,1);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
addOrderChangeLog(remarks, status, orderNo, nb.getId());
|
|
addOrderChangeLog(remarks, status, orderNo, nb.getId());
|
|
|
- if (zxsFlag||zxsjlFlag){
|
|
|
|
|
- Date date =new Date();
|
|
|
|
|
- date.setTime(date.getTime()+1000);
|
|
|
|
|
- if (zxsFlag){
|
|
|
|
|
- addOrderChangeLog("无咨询师自动通过", 2, orderNo, nb.getId(),date);
|
|
|
|
|
- }
|
|
|
|
|
- if (zxsjlFlag){
|
|
|
|
|
- addOrderChangeLog("无咨询师经理自动通过", 2, nb.getOrderNo(), nb.getId(),date);
|
|
|
|
|
- }
|
|
|
|
|
- }
|
|
|
|
|
|
|
+
|
|
|
|
|
|
|
|
sendNotice(status,nb);
|
|
sendNotice(status,nb);
|
|
|
pushOrderCangeProcess(nb);
|
|
pushOrderCangeProcess(nb);
|
|
@@ -404,27 +385,32 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
|
- * 判断zxs是否全审核,全审核就去判断咨询师经理,跳过就返回x=1,在后续添加日志放到先审核,后添加日志
|
|
|
|
|
|
|
+ *
|
|
|
* @param nb
|
|
* @param nb
|
|
|
- * @return
|
|
|
|
|
|
|
+ * @param date
|
|
|
|
|
+ * @param type 0正常审核 1跨流程需要通知
|
|
|
*/
|
|
*/
|
|
|
- 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);
|
|
|
|
|
|
|
+ public void pushZXS(NewOrderChangeBo nb, Date date,Integer type) {
|
|
|
|
|
+ int zxs=orderExamineMapper.checkCountStatus(nb.getOrderNo(),0,null);
|
|
|
|
|
+ if (zxs>0){
|
|
|
|
|
+ nb.setProcessState(OrderChangeProcess.JSY.getCode());
|
|
|
|
|
+ }else {
|
|
|
|
|
+ if(type==1){
|
|
|
|
|
+ date.setTime(date.getTime()+100);
|
|
|
|
|
+ addOrderChangeLog("无咨询师自动通过", 2, nb.getOrderNo(), nb.getId(), date);
|
|
|
|
|
+ }
|
|
|
|
|
+ pushZXSJL(nb,date,1);
|
|
|
}
|
|
}
|
|
|
- return false;
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
|
* 咨询师经理,跳过就返回x=1,在后续添加日志放到先审核,后添加日志
|
|
* 咨询师经理,跳过就返回x=1,在后续添加日志放到先审核,后添加日志
|
|
|
* @param nb
|
|
* @param nb
|
|
|
|
|
+ * @param type 0正常审核 1跨流程需要通知
|
|
|
* @return
|
|
* @return
|
|
|
*/
|
|
*/
|
|
|
- private boolean pushZXSJLprocess(NewOrderChangeBo nb) {
|
|
|
|
|
|
|
+ public void pushZXSJL(NewOrderChangeBo nb,Date date,Integer type) {
|
|
|
int zxsjl=orderExamineMapper.checkCountStatus(nb.getOrderNo(),1,0);
|
|
int zxsjl=orderExamineMapper.checkCountStatus(nb.getOrderNo(),1,0);
|
|
|
- boolean zxsjlFlag=false;
|
|
|
|
|
if (nb.getType()==OrderChangeType.XMJJEBG.getCode()||
|
|
if (nb.getType()==OrderChangeType.XMJJEBG.getCode()||
|
|
|
nb.getType()==OrderChangeType.TDTK.getCode()||
|
|
nb.getType()==OrderChangeType.TDTK.getCode()||
|
|
|
nb.getType()==OrderChangeType.TDBTK.getCode()||
|
|
nb.getType()==OrderChangeType.TDBTK.getCode()||
|
|
@@ -433,7 +419,10 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
if (zxsjl>0){
|
|
if (zxsjl>0){
|
|
|
nb.setProcessState(OrderChangeProcess.JSJL.getCode());
|
|
nb.setProcessState(OrderChangeProcess.JSJL.getCode());
|
|
|
}else {
|
|
}else {
|
|
|
- zxsjlFlag=true;
|
|
|
|
|
|
|
+ if (type==1){
|
|
|
|
|
+ date.setTime(date.getTime()+100);
|
|
|
|
|
+ addOrderChangeLog("无咨询师经理自动通过", 2, nb.getOrderNo(), nb.getId(),date);
|
|
|
|
|
+ }
|
|
|
//重报 没有技术员跳入财务
|
|
//重报 没有技术员跳入财务
|
|
|
if (nb.getType()==OrderChangeType.CB.getCode()){
|
|
if (nb.getType()==OrderChangeType.CB.getCode()){
|
|
|
nb.setProcessState(OrderChangeProcess.CWZY.getCode());
|
|
nb.setProcessState(OrderChangeProcess.CWZY.getCode());
|
|
@@ -443,7 +432,6 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
- return zxsjlFlag;
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
private void addOrderChangeLog(String remarks, Integer status, String orderNo, Integer id) {
|
|
private void addOrderChangeLog(String remarks, Integer status, String orderNo, Integer id) {
|
|
@@ -716,8 +704,6 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
}
|
|
}
|
|
|
//如果自己是审核人员则跳过
|
|
//如果自己是审核人员则跳过
|
|
|
if (flag){
|
|
if (flag){
|
|
|
- boolean zxsFlag=false;
|
|
|
|
|
- boolean zxsjlFlag=false;
|
|
|
|
|
if (t.getType()==OrderChangeType.CB.getCode()||
|
|
if (t.getType()==OrderChangeType.CB.getCode()||
|
|
|
t.getType()==OrderChangeType.JXMBG.getCode()||
|
|
t.getType()==OrderChangeType.JXMBG.getCode()||
|
|
|
t.getType()==OrderChangeType.XMJJEBG.getCode()||
|
|
t.getType()==OrderChangeType.XMJJEBG.getCode()||
|
|
@@ -725,26 +711,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
t.getType()==OrderChangeType.TDBTK.getCode()){
|
|
t.getType()==OrderChangeType.TDBTK.getCode()){
|
|
|
//将所有审核重置
|
|
//将所有审核重置
|
|
|
orderExamineMapper.updateByOrderNo(t.getOrderNo(),null,null);
|
|
orderExamineMapper.updateByOrderNo(t.getOrderNo(),null,null);
|
|
|
- int wsh=orderExamineMapper.checkCountStatus(t.getOrderNo(),0,0);
|
|
|
|
|
- if (wsh==0){
|
|
|
|
|
- zxsFlag=true;
|
|
|
|
|
- zxsjlFlag= pushZXSJLprocess( t);
|
|
|
|
|
- }
|
|
|
|
|
- if (zxsFlag||zxsjlFlag){
|
|
|
|
|
- date.setTime(date.getTime()+1000);
|
|
|
|
|
- if (zxsFlag){
|
|
|
|
|
- addOrderChangeLog("无咨询师自动通过", 2, t.getOrderNo(), t.getId(),date);
|
|
|
|
|
- noc.setProcessState(OrderChangeProcess.JSJL.getCode());
|
|
|
|
|
- }
|
|
|
|
|
- if (zxsjlFlag){
|
|
|
|
|
- addOrderChangeLog("无咨询师经理自动通过", 2, t.getOrderNo(), t.getId(),date);
|
|
|
|
|
- if (t.getType()==OrderChangeType.CB.getCode()){
|
|
|
|
|
- noc.setProcessState(OrderChangeProcess.CWZY.getCode());
|
|
|
|
|
- }else {
|
|
|
|
|
- noc.setProcessState(OrderChangeProcess.JSZJ.getCode());
|
|
|
|
|
- }
|
|
|
|
|
- }
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ pushZXS(t,date,1);
|
|
|
}else if(t.getType()==OrderChangeType.ZS.getCode()){
|
|
}else if(t.getType()==OrderChangeType.ZS.getCode()){
|
|
|
noc.setProcessState(OrderChangeProcess.CWZY.getCode());
|
|
noc.setProcessState(OrderChangeProcess.CWZY.getCode());
|
|
|
}else if(t.getType()==OrderChangeType.JJEBG.getCode()){
|
|
}else if(t.getType()==OrderChangeType.JJEBG.getCode()){
|
|
@@ -1589,7 +1556,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
@Override
|
|
@Override
|
|
|
public Object gerProcessName(Integer id) {
|
|
public Object gerProcessName(Integer id) {
|
|
|
NewOrderChange newOrderChange=newOrderChangeMapper.selectByPrimaryKey(id);
|
|
NewOrderChange newOrderChange=newOrderChangeMapper.selectByPrimaryKey(id);
|
|
|
- return newOrderChangeMapper.gerProcessName(id,newOrderChange.getOrderNo());
|
|
|
|
|
|
|
+ return newOrderChangeMapper.getProcessName(id,newOrderChange.getOrderNo());
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
@Override
|
|
@Override
|