|
|
@@ -289,9 +289,18 @@ public class OrganizationServiceImpl extends BaseMybatisDao<DepartmentMapper> im
|
|
|
//如果技术总监、运营保障审核、财务复审为空则修改为null
|
|
|
if (StringUtils.isBlank(in.getTechAdminId())||StringUtils.isBlank(in.getOperationGuaranteeId())
|
|
|
||StringUtils.isBlank(in.getRetrialFinanceId())){
|
|
|
- if(StringUtils.isBlank(in.getTechAdminId())) in.setTechAdminId(null);
|
|
|
- if(StringUtils.isBlank(in.getOperationGuaranteeId())) in.setOperationGuaranteeId(null);
|
|
|
- if(StringUtils.isBlank(in.getRetrialFinanceId())) in.setRetrialFinanceId(null);
|
|
|
+ if(StringUtils.isBlank(in.getTechAdminId())){
|
|
|
+ in.setTechAdminId(null);
|
|
|
+ dep.setTechAdminId(null);
|
|
|
+ }
|
|
|
+ if(StringUtils.isBlank(in.getOperationGuaranteeId())){
|
|
|
+ in.setOperationGuaranteeId(null);
|
|
|
+ dep.setOperationGuaranteeId(null);
|
|
|
+ }
|
|
|
+ if(StringUtils.isBlank(in.getRetrialFinanceId())){
|
|
|
+ in.setRetrialFinanceId(null);
|
|
|
+ dep.setRetrialFinanceId(null);
|
|
|
+ }
|
|
|
departmentMapper.updateNull(in);
|
|
|
}
|
|
|
//处理去掉技术总监
|
|
|
@@ -341,7 +350,7 @@ public class OrganizationServiceImpl extends BaseMybatisDao<DepartmentMapper> im
|
|
|
}
|
|
|
updateRetrialFinance=true;
|
|
|
}
|
|
|
- if (in.getOperationGuaranteeId()==null&&StringUtils.isBlank(useDep.getOperationGuaranteeId())){
|
|
|
+ if (in.getOperationGuaranteeId()==null&&StringUtils.isNotBlank(useDep.getOperationGuaranteeId())){
|
|
|
List<String> strings = torderNewMapper.selectByDepAndProcess(useDep.getId(), ProcessStatus.YYBZSH.getCode());
|
|
|
for (String s : strings) {
|
|
|
addOrderLog(s,OrderLogProcess.YYBZSHTG.getCode(),"运营保障审核人未设置,系统自动通过");
|
|
|
@@ -349,6 +358,7 @@ public class OrganizationServiceImpl extends BaseMybatisDao<DepartmentMapper> im
|
|
|
TOrderNewBo order = torderNewMapper.getSaleIdByOno(s);
|
|
|
StringBuilder str = new StringBuilder();
|
|
|
TOrderNew newOrder = new TOrderNew();
|
|
|
+ newOrder.setOrderNo(s);
|
|
|
if (order.getApprovalStatus() == 0) {
|
|
|
addOrderLog(s,OrderLogProcess.TP.getCode(),"部门特批审核未设置,系统自动通过");
|
|
|
newOrder.setProcessStatus(ProcessStatus.YPZXSGLY.getCode());
|
|
|
@@ -373,7 +383,7 @@ public class OrganizationServiceImpl extends BaseMybatisDao<DepartmentMapper> im
|
|
|
newOrder.setExamineName(str.substring(0,str.length()-1));
|
|
|
torderNewMapper.updateByPrimaryKeySelective(newOrder);
|
|
|
}
|
|
|
- } else if (!useDep.getOperationGuaranteeId().equals(in.getOperationGuaranteeId())) {
|
|
|
+ } else if (Objects.equals(useDep.getOperationGuaranteeId(),in.getOperationGuaranteeId())) {
|
|
|
List<String> strings = torderNewMapper.selectByDepAndProcess(useDep.getId(), ProcessStatus.YYBZSH.getCode());
|
|
|
Admin admin = adminMapper.selectByPrimaryKey(in.getOperationGuaranteeId());
|
|
|
for (String s : strings) {
|
|
|
@@ -390,10 +400,17 @@ public class OrganizationServiceImpl extends BaseMybatisDao<DepartmentMapper> im
|
|
|
TOrderNew tOrderNew = torderNewMapper.selectByPrimaryKey(s);
|
|
|
if (Objects.equals(tOrderNew.getApproval(), ApprovalNewState.TPDSH.getCode())){
|
|
|
TOrderNew newOrder=new TOrderNew();
|
|
|
+ List<Admin> admins = adminMapper.selectAdminByRoleType(AFTConstants.TECH_ADMIN);
|
|
|
+ StringBuilder str = new StringBuilder();
|
|
|
+ for (Admin admin : admins) {
|
|
|
+ str.append(admin.getName()).append(",");
|
|
|
+ }
|
|
|
+ newOrder.setExamineName(str.substring(0,str.length()-1));
|
|
|
newOrder.setOrderNo(s);
|
|
|
newOrder.setApproval(ApprovalNewState.TPTG.getCode());
|
|
|
+ newOrder.setProcessStatus(ProcessStatus.YPZXSGLY.getCode());
|
|
|
torderNewMapper.updateByPrimaryKeySelective(newOrder);
|
|
|
- addOrderLog(s,OrderLogProcess.TP.getCode(),"特批审核人未设置,系统自动通过");
|
|
|
+ addOrderLog(s,OrderLogProcess.TP.getCode(),"特批审核关闭,系统自动通过");
|
|
|
}
|
|
|
}
|
|
|
} else if (in.getApprovalAid().equals(useDep.getApprovalAid())) {
|