|
|
@@ -240,16 +240,27 @@ public class OrganizationServiceImpl extends BaseMybatisDao<DepartmentMapper> im
|
|
|
dep.setApprovalAid(in.getApprovalAid());
|
|
|
dep.setTechAdminId(in.getTechAdminId());
|
|
|
dep.setOperationGuaranteeId(in.getOperationGuaranteeId());
|
|
|
+ pushUpdateDep(in, useDep, dep);
|
|
|
+ return departmentMapper.updateByPrimaryKeySelective(dep);
|
|
|
+ }
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 根据传入参数处理各种情况,并且处理传入数据
|
|
|
+ * @param in 输入部门参数
|
|
|
+ * @param useDep 原部门参数
|
|
|
+ * @param dep 修改部门擦拭
|
|
|
+ */
|
|
|
+ private void pushUpdateDep(InputDep in, Department useDep, Department dep) {
|
|
|
List<String> orderS = new ArrayList();
|
|
|
//如果本来部分没有,新增财务
|
|
|
if(StringUtils.isBlank(useDep.getFinanceId())&&StringUtils.isNotBlank(in.getFinanceId())){
|
|
|
- addExamine(useDep,in.getFinanceId(),orderS);
|
|
|
+ addExamine(useDep, in.getFinanceId(),orderS);
|
|
|
}
|
|
|
if(StringUtils.isBlank(useDep.getRetrialFinanceId())&&StringUtils.isNotBlank(in.getRetrialFinanceId())){
|
|
|
- addExamine(useDep,in.getExpenseFinanceId(),orderS);
|
|
|
+ addExamine(useDep, in.getExpenseFinanceId(),orderS);
|
|
|
}
|
|
|
if(StringUtils.isBlank(useDep.getTechAdminId())&&StringUtils.isNotBlank(in.getTechAdminId())){
|
|
|
- addExamine(useDep,in.getTechAdminId(),orderS);
|
|
|
+ addExamine(useDep, in.getTechAdminId(),orderS);
|
|
|
}
|
|
|
if(!orderS.isEmpty()){
|
|
|
torderNewMapper.updateOrderDepFinanceExamineName(orderS,ProcessStatus.YPCW_JSZJ.getCode());
|
|
|
@@ -267,7 +278,7 @@ public class OrganizationServiceImpl extends BaseMybatisDao<DepartmentMapper> im
|
|
|
if(!in.getFinanceId().equals(useDep.getFinanceId())){
|
|
|
dep.setFinanceId(in.getFinanceId());
|
|
|
//审核人切换
|
|
|
- departmentMapper.updateOrderDepFinanceNotExamine(in.getFinanceId(),useDep.getFinanceId(),useDep.getId());
|
|
|
+ departmentMapper.updateOrderDepFinanceNotExamine(in.getFinanceId(), useDep.getFinanceId(), useDep.getId());
|
|
|
//查询切换后的订单刷新审核人
|
|
|
List<String> list = torderNewMapper.selectByFinanceNotExamine(in.getFinanceId());
|
|
|
if (!list.isEmpty()){
|
|
|
@@ -278,9 +289,9 @@ 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);
|
|
|
+ if(StringUtils.isBlank(in.getOperationGuaranteeId())) in.setOperationGuaranteeId(null);
|
|
|
+ if(StringUtils.isBlank(in.getRetrialFinanceId())) in.setRetrialFinanceId(null);
|
|
|
departmentMapper.updateNull(in);
|
|
|
}
|
|
|
//处理去掉技术总监
|
|
|
@@ -289,7 +300,7 @@ public class OrganizationServiceImpl extends BaseMybatisDao<DepartmentMapper> im
|
|
|
//先将旧的查出来
|
|
|
List<String> list = torderNewMapper.selectByFinanceNotExamine(useDep.getTechAdminId());
|
|
|
//再删除旧单需要审核的
|
|
|
- torderExamineMapper.deleteExamineFinance(useDep.getId(),useDep.getTechAdminId());
|
|
|
+ torderExamineMapper.deleteExamineFinance(useDep.getId(), useDep.getTechAdminId());
|
|
|
if (!list.isEmpty()){
|
|
|
//先把药推送到下个流程的查出来
|
|
|
for (String s : list) {
|
|
|
@@ -299,7 +310,7 @@ public class OrganizationServiceImpl extends BaseMybatisDao<DepartmentMapper> im
|
|
|
}
|
|
|
}else{
|
|
|
//审核人切换
|
|
|
- departmentMapper.updateOrderDepFinanceNotExamine(in.getTechAdminId(),useDep.getTechAdminId(),useDep.getId());
|
|
|
+ departmentMapper.updateOrderDepFinanceNotExamine(in.getTechAdminId(), useDep.getTechAdminId(), useDep.getId());
|
|
|
//查询切换后的订单刷新审核人
|
|
|
List<String> list = torderNewMapper.selectByFinanceNotExamine(in.getTechAdminId());
|
|
|
if (!list.isEmpty()){
|
|
|
@@ -312,7 +323,7 @@ public class OrganizationServiceImpl extends BaseMybatisDao<DepartmentMapper> im
|
|
|
//先将旧的查出来
|
|
|
List<String> list = torderNewMapper.selectByFinanceNotExamine(useDep.getRetrialFinanceId());
|
|
|
//再删除旧单需要审核的
|
|
|
- torderExamineMapper.deleteExamineFinance(useDep.getId(),useDep.getRetrialFinanceId());
|
|
|
+ torderExamineMapper.deleteExamineFinance(useDep.getId(), useDep.getRetrialFinanceId());
|
|
|
if (!list.isEmpty()) {
|
|
|
//先把药推送到下个流程的查出来
|
|
|
for (String s : list) {
|
|
|
@@ -322,7 +333,7 @@ public class OrganizationServiceImpl extends BaseMybatisDao<DepartmentMapper> im
|
|
|
}
|
|
|
}else {
|
|
|
dep.setRetrialFinanceId(in.getRetrialFinanceId());
|
|
|
- departmentMapper.updateOrderDepFinanceNotExamine(in.getRetrialFinanceId(),useDep.getRetrialFinanceId(),useDep.getId());
|
|
|
+ departmentMapper.updateOrderDepFinanceNotExamine(in.getRetrialFinanceId(), useDep.getRetrialFinanceId(), useDep.getId());
|
|
|
List<String> list = torderNewMapper.selectByFinanceNotExamine(in.getRetrialFinanceId());
|
|
|
if (!list.isEmpty()){
|
|
|
torderNewMapper.updateOrderDepFinanceExamineName(list,ProcessStatus.YPCW_JSZJ.getCode());
|
|
|
@@ -332,14 +343,14 @@ public class OrganizationServiceImpl extends BaseMybatisDao<DepartmentMapper> im
|
|
|
}
|
|
|
if (in.getExpenseFinanceId()!=null&&!in.getExpenseFinanceId().equals(useDep.getExpenseFinanceId())){
|
|
|
dep.setExpenseFinanceId(in.getExpenseFinanceId());
|
|
|
- departmentMapper.updateExpenseFinanceNotExamine(in.getExpenseFinanceId(),useDep.getExpenseFinanceId());
|
|
|
+ departmentMapper.updateExpenseFinanceNotExamine(in.getExpenseFinanceId(), useDep.getExpenseFinanceId());
|
|
|
}
|
|
|
if (updateFinance){
|
|
|
aids.add(in.getFinanceId());
|
|
|
if(!aids.contains(useDep.getFinanceId())){
|
|
|
aids.add(useDep.getFinanceId());
|
|
|
}
|
|
|
- torderMidMapper.updateFinanceId(in.getId(),in.getFinanceId());
|
|
|
+ torderMidMapper.updateFinanceId(in.getId(), in.getFinanceId());
|
|
|
newOrderChangeMapper.updateExamineById(in.getFinanceId(), OrderChangeProcess.CWZY.getCode());
|
|
|
}
|
|
|
if(updateRetrialFinance){
|
|
|
@@ -367,8 +378,6 @@ public class OrganizationServiceImpl extends BaseMybatisDao<DepartmentMapper> im
|
|
|
if (in.getCashierExamine()==1){
|
|
|
dep.setCashierExamine(in.getCashierExamine());
|
|
|
}
|
|
|
-
|
|
|
- return departmentMapper.updateByPrimaryKeySelective(dep);
|
|
|
}
|
|
|
|
|
|
/**
|