|
|
@@ -256,16 +256,19 @@ public class OrganizationServiceImpl extends BaseMybatisDao<DepartmentMapper> im
|
|
|
if(StringUtils.isBlank(useDep.getFinanceId())&&StringUtils.isNotBlank(in.getFinanceId())){
|
|
|
addExamine(useDep, in.getFinanceId(),orderS);
|
|
|
}
|
|
|
+ //财务复审
|
|
|
if(StringUtils.isBlank(useDep.getRetrialFinanceId())&&StringUtils.isNotBlank(in.getRetrialFinanceId())){
|
|
|
addExamine(useDep, in.getExpenseFinanceId(),orderS);
|
|
|
}
|
|
|
+ //技术总监审核人
|
|
|
if(StringUtils.isBlank(useDep.getTechAdminId())&&StringUtils.isNotBlank(in.getTechAdminId())){
|
|
|
addExamine(useDep, in.getTechAdminId(),orderS);
|
|
|
}
|
|
|
+ //已派财务与总监审核
|
|
|
if(!orderS.isEmpty()){
|
|
|
torderNewMapper.updateOrderDepFinanceExamineName(orderS,ProcessStatus.YPCW_JSZJ.getCode());
|
|
|
}
|
|
|
-
|
|
|
+ //运营保障审核人
|
|
|
if(StringUtils.isBlank(useDep.getOperationGuaranteeId())&&StringUtils.isNotBlank(in.getOperationGuaranteeId())){
|
|
|
List<String> strings = torderNewMapper.selectByDepAndProcess(useDep.getId(), ProcessStatus.YYBZSH.getCode());
|
|
|
if(!strings.isEmpty()){
|
|
|
@@ -429,6 +432,11 @@ public class OrganizationServiceImpl extends BaseMybatisDao<DepartmentMapper> im
|
|
|
}
|
|
|
|
|
|
}
|
|
|
+ //切换财务审核与财务复审
|
|
|
+ if (in.getExpenseFinanceId()!=null&&!in.getExpenseFinanceId().equals(useDep.getExpenseFinanceId())){
|
|
|
+ //如果新的财务审核人与旧财务审核人不一致,切换审核人
|
|
|
+ adminMapper.updateDepExpenseFinance(in.getId(),in.getExpenseFinanceId());
|
|
|
+ }
|
|
|
|
|
|
if (in.getExpenseFinanceId()!=null&&!in.getExpenseFinanceId().equals(useDep.getExpenseFinanceId())){
|
|
|
dep.setExpenseFinanceId(in.getExpenseFinanceId());
|