|
|
@@ -689,11 +689,52 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
tOrderNewMapper.updateByPrimaryKeySelective(ton);
|
|
|
TOrderNewBo tOrderNew = tOrderNewMapper.getSaleIdByOno(t.getOrderNo());
|
|
|
if (t.getType()!=OrderChangeType.JBGGT.getCode()){
|
|
|
+ Date date =new Date();
|
|
|
if (tOrderNew.getManagerName()!=null){
|
|
|
noc.setProcessState(OrderChangeProcess.YXJL.getCode());
|
|
|
}else {
|
|
|
- addOrderChangeLog("未设置营销经理自动通过", 2, t.getOrderNo(), noc.getId());
|
|
|
- noc.setProcessState(OrderChangeProcess.YXGLY.getCode());
|
|
|
+ date.setTime(date.getTime()+500);
|
|
|
+ addOrderChangeLog("未设置营销经理自动通过", 2, t.getOrderNo(), noc.getId(),date);
|
|
|
+ List<Admin> admins = adminMapper.listAdminBydepIdAndRoleType(ton.getOrderDep(), AFTConstants.SALESMAN_ADMIN);
|
|
|
+ boolean flag=false;
|
|
|
+ for (Admin admin : admins) {
|
|
|
+ if (tOrderNew.getSalesmanId().equals(admin.getId())){
|
|
|
+ flag=true;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ //如果自己是审核人员则跳过
|
|
|
+ if (flag){
|
|
|
+ boolean zxsFlag=false;
|
|
|
+ boolean zxsjlFlag=false;
|
|
|
+ if (t.getType()==OrderChangeType.CB.getCode()||
|
|
|
+ t.getType()==OrderChangeType.JXMBG.getCode()||
|
|
|
+ t.getType()==OrderChangeType.XMJJEBG.getCode()||
|
|
|
+ t.getType()==OrderChangeType.TDTK.getCode()||
|
|
|
+ t.getType()==OrderChangeType.TDBTK.getCode()){
|
|
|
+ orderExamineMapper.updateByOrderNoAndAid(t.getOrderNo(),TokenManager.getAdminId(),0);
|
|
|
+ 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);
|
|
|
+ }
|
|
|
+ if (zxsjlFlag){
|
|
|
+ addOrderChangeLog("无咨询师经理自动通过", 2, t.getOrderNo(), t.getId(),date);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }else if(t.getType()==OrderChangeType.ZS.getCode()){
|
|
|
+ noc.setProcessState(OrderChangeProcess.CWZY.getCode());
|
|
|
+ }else if(t.getType()==OrderChangeType.JJEBG.getCode()){
|
|
|
+ noc.setProcessState(OrderChangeProcess.JSZJ.getCode());
|
|
|
+ }
|
|
|
+ }else {
|
|
|
+ noc.setProcessState(OrderChangeProcess.YXGLY.getCode());
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
}else {
|
|
|
noc.setProcessState(OrderChangeProcess.YXGLY.getCode());
|