|
|
@@ -322,11 +322,24 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
}else if (Objects.equals(nb.getProcessState(), OrderChangeProcess.CWZY.getCode())){
|
|
|
if (Objects.equals(nb.getType(), OrderChangeType.ZS.getCode())){
|
|
|
//新增运营保障审核
|
|
|
- nb.setProcessState(OrderChangeProcess.YYBZ.getCode());
|
|
|
-// boolean flag=pushApproval(nb, dep,remarks);
|
|
|
-// if (flag) return 1;
|
|
|
+ if (dep.getOperationGuaranteeId()==null){
|
|
|
+ date.setTime(date.getTime()+100);
|
|
|
+ addOrderChangeLog("无运营保障自动通过", 2, nb.getOrderNo(), nb.getId(),date);
|
|
|
+ boolean flag=pushApproval(nb, dep,remarks);
|
|
|
+ if (flag) return 1;
|
|
|
+ }else {
|
|
|
+ nb.setProcessState(OrderChangeProcess.YYBZ.getCode());
|
|
|
+ }
|
|
|
}else if (Objects.equals(nb.getType(), OrderChangeType.KJXY.getCode())){
|
|
|
//新增运营保障审核
|
|
|
+ if (dep.getOperationGuaranteeId()==null){
|
|
|
+ date.setTime(date.getTime()+100);
|
|
|
+ addOrderChangeLog("无运营保障自动通过", 2, nb.getOrderNo(), nb.getId(),date);
|
|
|
+ completeChange(remarks, nb);
|
|
|
+ return 1;
|
|
|
+ }else {
|
|
|
+ nb.setProcessState(OrderChangeProcess.YYBZ.getCode());
|
|
|
+ }
|
|
|
nb.setProcessState(OrderChangeProcess.YYBZ.getCode());
|
|
|
|
|
|
}else {
|
|
|
@@ -334,11 +347,14 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
}
|
|
|
}else if (Objects.equals(nb.getProcessState(), OrderChangeProcess.CWZJ.getCode())){
|
|
|
//新增运营保障审核
|
|
|
- nb.setProcessState(OrderChangeProcess.YYBZ.getCode());
|
|
|
-// boolean flag=pushApproval(nb, dep,remarks);
|
|
|
-// if (flag){
|
|
|
-// return 1;
|
|
|
-// }
|
|
|
+ if (dep.getOperationGuaranteeId()==null){
|
|
|
+ date.setTime(date.getTime()+100);
|
|
|
+ addOrderChangeLog("无运营保障自动通过", 2, nb.getOrderNo(), nb.getId(),date);
|
|
|
+ boolean flag=pushApproval(nb, dep,remarks);
|
|
|
+ if (flag) return 1;
|
|
|
+ }else {
|
|
|
+ nb.setProcessState(OrderChangeProcess.YYBZ.getCode());
|
|
|
+ }
|
|
|
}else if (Objects.equals(nb.getProcessState(), OrderChangeProcess.YYBZ.getCode())){
|
|
|
if (Objects.equals(nb.getType(), OrderChangeType.KJXY.getCode())){
|
|
|
completeChange(remarks, nb);
|
|
|
@@ -537,46 +553,36 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
//获取接收者
|
|
|
//流程状态 0=营销员,1=营销经理,2=营销管理员,3=技术员,4=技术经理,5=技术总监,6=财务专员,7=财务总监,8=总裁,9=董事长
|
|
|
List<String> alist = new ArrayList<>();
|
|
|
- //获取部门负责财务人员
|
|
|
- switch (nb.getProcessState()) {
|
|
|
- case 0:
|
|
|
+ if (nb.getProcessState().equals(OrderChangeProcess.YXY.getCode())){
|
|
|
alist.add(o.getSalesmanId());
|
|
|
- break;
|
|
|
- case 1:
|
|
|
+ } else if (nb.getProcessState().equals(OrderChangeProcess.YXJL.getCode())) {
|
|
|
Admin saleaman = adminMapper.selectByPrimaryKey(o.getSalesmanId());
|
|
|
alist.add(saleaman.getManagerId());
|
|
|
- break;
|
|
|
- case 2:
|
|
|
+ }else if (nb.getProcessState().equals(OrderChangeProcess.YXGLY.getCode())) {
|
|
|
alist.addAll(adminMapper.listNameByDepAndName(o.getOrderDep(), AFTConstants.SALESMAN_ADMIN));
|
|
|
- break;
|
|
|
- case 3:
|
|
|
-
|
|
|
+ }else if (nb.getProcessState().equals(OrderChangeProcess.JSY.getCode())) {
|
|
|
alist.addAll(addOrderExamine(o.getOrderNo(),0));
|
|
|
- break;
|
|
|
- case 4:
|
|
|
+ }else if (nb.getProcessState().equals(OrderChangeProcess.JSJL.getCode())) {
|
|
|
alist.addAll(addOrderExamine(o.getOrderNo(),1));
|
|
|
- break;
|
|
|
- case 5:
|
|
|
+ }else if (nb.getProcessState().equals(OrderChangeProcess.JSZJ.getCode())) {
|
|
|
for (Admin admin : adminMapper.getAdminRoleTypeList(AFTConstants.TECH_ADMIN)) {
|
|
|
alist.add(admin.getId());
|
|
|
}
|
|
|
- break;
|
|
|
- case 6:
|
|
|
+ }else if (nb.getProcessState().equals(OrderChangeProcess.CWZY.getCode())) {
|
|
|
alist.add(o.getFinanceId());
|
|
|
- break;
|
|
|
- case 7:
|
|
|
+ }else if (nb.getProcessState().equals(OrderChangeProcess.CWZJ.getCode())) {
|
|
|
for (Admin admin : adminMapper.getAdminRoleTypeList(AFTConstants.FINANCE_ADMIN)) {
|
|
|
alist.add(admin.getId());
|
|
|
}
|
|
|
- break;
|
|
|
- case 8:
|
|
|
+ }else if (nb.getProcessState().equals(OrderChangeProcess.YYBZ.getCode())) {
|
|
|
+ alist.add(o.getOperationGuaranteeId());
|
|
|
+ }else if (nb.getProcessState().equals(OrderChangeProcess.TPSH.getCode())) {
|
|
|
if(nb.getStatus()==2) {
|
|
|
alist.add(o.getFinanceId());
|
|
|
}else {
|
|
|
alist.add(o.getApprovalAid());
|
|
|
}
|
|
|
- break;
|
|
|
- case 9:
|
|
|
+ }else if (nb.getProcessState().equals(OrderChangeProcess.DSZ.getCode())) {
|
|
|
if(nb.getStatus()==2) {
|
|
|
alist.add(o.getFinanceId());
|
|
|
}else {
|
|
|
@@ -584,8 +590,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
alist.add(admin.getId());
|
|
|
}
|
|
|
}
|
|
|
- break;
|
|
|
- case 10:
|
|
|
+ }else if (nb.getProcessState().equals(OrderChangeProcess.FZC.getCode())) {
|
|
|
if(nb.getStatus()==2) {
|
|
|
alist.add(o.getFinanceId());
|
|
|
}else {
|
|
|
@@ -593,7 +598,6 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
alist.add(admin.getId());
|
|
|
}
|
|
|
}
|
|
|
- break;
|
|
|
}
|
|
|
//发送站内信息与邮件
|
|
|
pushGeneralSendNoticeAndEmail(alist, type, o, TokenManager.getAdminId(),0);
|
|
|
@@ -898,7 +902,10 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
}
|
|
|
if (str.length()>0)noc.setExamineName(str.substring(0,str.length()-1));
|
|
|
|
|
|
- }else if (Objects.equals(noc.getProcessState(), OrderChangeProcess.TPSH.getCode())
|
|
|
+ }else if (Objects.equals(noc.getProcessState(), OrderChangeProcess.YYBZ.getCode())){
|
|
|
+ TOrderNewBo ton = tOrderNewMapper.getSaleIdByOno(noc.getOrderNo());
|
|
|
+ noc.setExamineName(ton.getExamineName());
|
|
|
+ } else if (Objects.equals(noc.getProcessState(), OrderChangeProcess.TPSH.getCode())
|
|
|
|| Objects.equals(noc.getProcessState(), OrderChangeProcess.DSZ.getCode())
|
|
|
|| Objects.equals(noc.getProcessState(), OrderChangeProcess.FZC.getCode())){
|
|
|
if(noc.getStatus()==1){
|
|
|
@@ -1690,7 +1697,9 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
if (processName.getApprovalStatus()==0){
|
|
|
processName.setApprovalName("未设置特批审核人员");
|
|
|
}
|
|
|
+
|
|
|
}
|
|
|
+ processName.setYybz(processName.getYybz()==null?"未设置营运保障审核":processName.getYybz());
|
|
|
return processName;
|
|
|
}
|
|
|
|