|
@@ -765,9 +765,10 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
if (tOrderNew.getManagerName()!=null){
|
|
if (tOrderNew.getManagerName()!=null){
|
|
|
noc.setProcessState(OrderChangeProcess.YXJL.getCode());
|
|
noc.setProcessState(OrderChangeProcess.YXJL.getCode());
|
|
|
}else {
|
|
}else {
|
|
|
- //营销经理不存在判定营销管理员
|
|
|
|
|
|
|
+ //增加营销经理的日志
|
|
|
date.setTime(date.getTime()+500);
|
|
date.setTime(date.getTime()+500);
|
|
|
addOrderChangeLog("未设置营销经理自动通过", 2, t.getOrderNo(), noc.getId(),date);
|
|
addOrderChangeLog("未设置营销经理自动通过", 2, t.getOrderNo(), noc.getId(),date);
|
|
|
|
|
+ //营销经理不存在判定营销管理员
|
|
|
List<Admin> admins = adminMapper.listAdminBydepIdAndRoleType(tOrderNew.getOrderDep(), AFTConstants.SALESMAN_ADMIN);
|
|
List<Admin> admins = adminMapper.listAdminBydepIdAndRoleType(tOrderNew.getOrderDep(), AFTConstants.SALESMAN_ADMIN);
|
|
|
boolean flag=false;
|
|
boolean flag=false;
|
|
|
for (Admin admin : admins) {
|
|
for (Admin admin : admins) {
|
|
@@ -777,6 +778,9 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
}
|
|
}
|
|
|
//如果自己是审核人员则跳过
|
|
//如果自己是审核人员则跳过
|
|
|
if (flag){
|
|
if (flag){
|
|
|
|
|
+ date.setTime(date.getTime()+500);
|
|
|
|
|
+ addOrderChangeLog("自己是营销管理员自动通过", 2, t.getOrderNo(), noc.getId(),date);
|
|
|
|
|
+ noc.setProcessState(OrderChangeProcess.JSY.getCode());
|
|
|
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()||
|