|
|
@@ -3,6 +3,7 @@ package com.goafanti.organization.service.impl;
|
|
|
import com.goafanti.admin.bo.AdminListBo;
|
|
|
import com.goafanti.common.dao.DepartmentMapper;
|
|
|
import com.goafanti.common.dao.ExpenseConfigDetailsMapper;
|
|
|
+import com.goafanti.common.dao.TOrderNewMapper;
|
|
|
import com.goafanti.common.model.Department;
|
|
|
import com.goafanti.common.model.ExpenseConfigDetails;
|
|
|
import com.goafanti.common.utils.AsyncUtils;
|
|
|
@@ -29,6 +30,8 @@ public class OrganizationServiceImpl extends BaseMybatisDao<DepartmentMapper> im
|
|
|
private DepartmentMapper departmentMapper;
|
|
|
@Autowired
|
|
|
private ExpenseConfigDetailsMapper expenseConfigDetailsMapper;
|
|
|
+ @Autowired
|
|
|
+ private TOrderNewMapper torderNewMapper;
|
|
|
|
|
|
@Autowired
|
|
|
private AsyncUtils asyncUtils;
|
|
|
@@ -222,19 +225,23 @@ public class OrganizationServiceImpl extends BaseMybatisDao<DepartmentMapper> im
|
|
|
dep.setApproval(in.getApproval());
|
|
|
dep.setApprovalAid(in.getApprovalAid());
|
|
|
//财务与复审切换的时候要切换所有未审核的财务
|
|
|
- if(StringUtils.isNotBlank(in.getFinanceId())&&department.getFinanceId().equals(in.getFinanceId())){
|
|
|
+ if(StringUtils.isNotBlank(in.getFinanceId())&&!department.getFinanceId().equals(in.getFinanceId())){
|
|
|
dep.setFinanceId(in.getFinanceId());
|
|
|
//处理订单
|
|
|
- departmentMapper.updateOrderDepFinance(in.getFinanceId(),department.getFinanceId());
|
|
|
departmentMapper.updateOrderDepFinanceNotExamine(in.getFinanceId(),department.getFinanceId());
|
|
|
+ List<String> list = torderNewMapper.selectByFinanceNotExamine(in.getFinanceId());
|
|
|
+ torderNewMapper.updateOrderDepFinanceExamineName(list);
|
|
|
|
|
|
}
|
|
|
- if (StringUtils.isNotBlank(in.getExpenseFinanceId())&&
|
|
|
- department.getExpenseFinanceId().equals(in.getExpenseFinanceId())){
|
|
|
- dep.setExpenseFinanceId(in.getExpenseFinanceId());
|
|
|
- departmentMapper.updateOrderDepFinance(in.getFinanceId(),department.getFinanceId());
|
|
|
+ if (StringUtils.isNotBlank(in.getRetrialFinanceId())&&
|
|
|
+ !department.getRetrialFinanceId().equals(in.getRetrialFinanceId())){
|
|
|
+ dep.setRetrialFinanceId(in.getRetrialFinanceId());
|
|
|
+ departmentMapper.updateOrderDepFinanceNotExamine(in.getRetrialFinanceId(),department.getRetrialFinanceId());
|
|
|
+ List<String> list = torderNewMapper.selectByFinanceNotExamine(in.getRetrialFinanceId());
|
|
|
+ torderNewMapper.updateOrderDepFinanceExamineName(list);
|
|
|
}
|
|
|
|
|
|
+ dep.setExpenseFinanceId(in.getExpenseFinanceId());
|
|
|
checkFinaceUpdate(in.getId(),in.getFinanceId());
|
|
|
if (in.getExpenseRetrialFinanceExamine()==1){
|
|
|
dep.setExpenseRetrialFinanceExamine(in.getExpenseRetrialFinanceExamine());
|