|
|
@@ -286,11 +286,12 @@ public class OrganizationServiceImpl extends BaseMybatisDao<DepartmentMapper> im
|
|
|
}
|
|
|
if (i == tOrderExamines.size()) {
|
|
|
//推送订单流程
|
|
|
- addOrderLog(s,OrderLogProcess.XMZJSH.getCode(),"订单修改技术总监,判定审核通过");
|
|
|
+ addOrderLog(s,OrderLogProcess.XMZJSH.getCode(),"部门修改技术总监,判定审核通过");
|
|
|
StringBuilder str = new StringBuilder();
|
|
|
TOrderNew tOrderNew = torderNewMapper.selectByPrimaryKey(s);
|
|
|
TOrderNewBo order = torderNewMapper.getSaleIdByOno(s);
|
|
|
TOrderNew newOrder = new TOrderNew();
|
|
|
+ newOrder.setOrderNo(s);
|
|
|
//如果订单是特批
|
|
|
if (tOrderNew.getApproval() == ApprovalNewState.TPDSH.getCode() || tOrderNew.getApproval() == ApprovalNewState.TPBH.getCode()) {
|
|
|
if (StringUtils.isNotEmpty(in.getOperationGuaranteeId())) {
|
|
|
@@ -298,14 +299,16 @@ public class OrganizationServiceImpl extends BaseMybatisDao<DepartmentMapper> im
|
|
|
str.append(order.getOperationGuaranteeName()).append(",");
|
|
|
aids.add(order.getOperationGuaranteeId());
|
|
|
} else if (order.getApprovalStatus() == 0) {
|
|
|
+ addOrderLog(s,OrderLogProcess.YYBZSHTG.getCode(),"运营保障审核人未设置,系统自动通过");
|
|
|
+ addOrderLog(s,OrderLogProcess.TP.getCode(),"部门特批审核未设置,系统自动通过");
|
|
|
newOrder.setProcessStatus(ProcessStatus.YPZXSGLY.getCode());
|
|
|
newOrder.setApproval(ApprovalNewState.TPTG.getCode());
|
|
|
- addOrderLog(s,OrderLogProcess.TP.getCode(),"部门特批审核人未设置,系统自动通过");
|
|
|
} else {
|
|
|
+ addOrderLog(s,OrderLogProcess.YYBZSHTG.getCode(),"运营保障审核人未设置,系统自动通过");
|
|
|
newOrder.setProcessStatus(ProcessStatus.YPTPSH.getCode());
|
|
|
aids.add(order.getApprovalAid());
|
|
|
str.append(order.getApprovalName()).append(",");
|
|
|
- addOrderLog(s,OrderLogProcess.YYBZSHTG.getCode(),"运营保障审核人未设置,系统自动通过");
|
|
|
+
|
|
|
}
|
|
|
}
|
|
|
newOrder.setExamineName(str.substring(0,str.length()-1));
|
|
|
@@ -335,11 +338,12 @@ public class OrganizationServiceImpl extends BaseMybatisDao<DepartmentMapper> im
|
|
|
}
|
|
|
if (i == tOrderExamines.size()) {
|
|
|
//推送订单流程
|
|
|
- addOrderLog(s,OrderLogProcess.CWFS.getCode(),"订单修改财务复审,判定审核通过");
|
|
|
+ addOrderLog(s,OrderLogProcess.CWFS.getCode(),"部门修改财务复审,判定审核通过");
|
|
|
StringBuilder str = new StringBuilder();
|
|
|
TOrderNew tOrderNew = torderNewMapper.selectByPrimaryKey(s);
|
|
|
TOrderNewBo order = torderNewMapper.getSaleIdByOno(s);
|
|
|
TOrderNew newOrder = new TOrderNew();
|
|
|
+ newOrder.setOrderNo(s);
|
|
|
//如果订单是特批
|
|
|
if (tOrderNew.getApproval() == ApprovalNewState.TPDSH.getCode() || tOrderNew.getApproval() == ApprovalNewState.TPBH.getCode()) {
|
|
|
if (StringUtils.isNotEmpty(in.getOperationGuaranteeId())) {
|
|
|
@@ -347,14 +351,15 @@ public class OrganizationServiceImpl extends BaseMybatisDao<DepartmentMapper> im
|
|
|
str.append(order.getOperationGuaranteeName()).append(",");
|
|
|
aids.add(order.getOperationGuaranteeId());
|
|
|
} else if (order.getApprovalStatus() == 0) {
|
|
|
+ addOrderLog(s,OrderLogProcess.YYBZSHTG.getCode(),"运营保障审核人未设置,系统自动通过");
|
|
|
+ addOrderLog(s,OrderLogProcess.TP.getCode(),"部门特批审核未设置,系统自动通过");
|
|
|
newOrder.setProcessStatus(ProcessStatus.YPZXSGLY.getCode());
|
|
|
newOrder.setApproval(ApprovalNewState.TPTG.getCode());
|
|
|
- addOrderLog(s,OrderLogProcess.TP.getCode(),"部门特批审核人未设置,系统自动通过");
|
|
|
} else {
|
|
|
+ addOrderLog(s,OrderLogProcess.YYBZSHTG.getCode(),"运营保障审核人未设置,系统自动通过");
|
|
|
newOrder.setProcessStatus(ProcessStatus.YPTPSH.getCode());
|
|
|
aids.add(order.getApprovalAid());
|
|
|
str.append(order.getApprovalName()).append(",");
|
|
|
- addOrderLog(s,OrderLogProcess.YYBZSHTG.getCode(),"运营保障审核人未设置,系统自动通过");
|
|
|
}
|
|
|
}
|
|
|
newOrder.setExamineName(str.substring(0,str.length()-1));
|