|
|
@@ -202,6 +202,7 @@ public class OrganizationServiceImpl extends BaseMybatisDao<DepartmentMapper> im
|
|
|
public int updateOrganization(InputDep in) {
|
|
|
//获取上级编号
|
|
|
Department superDep=departmentMapper.selectByPrimaryKey(in.getSuperId());
|
|
|
+ Department department = departmentMapper.selectByPrimaryKey(in.getId());
|
|
|
Date now=new Date();
|
|
|
Department dep=new Department();
|
|
|
dep.setLvl(superDep.getLvl()+1);
|
|
|
@@ -215,13 +216,25 @@ public class OrganizationServiceImpl extends BaseMybatisDao<DepartmentMapper> im
|
|
|
dep.setSuperId(in.getSuperId());
|
|
|
dep.setDepNo(in.getDepNo());
|
|
|
dep.setAbbreviation(in.getAbbreviation());
|
|
|
- dep.setFinanceId(in.getFinanceId());
|
|
|
dep.setProvince(in.getProvince());
|
|
|
dep.setHideSign(in.getHideSign());
|
|
|
dep.setWorkingHoursType(in.getWorkingHoursType());
|
|
|
dep.setApproval(in.getApproval());
|
|
|
dep.setApprovalAid(in.getApprovalAid());
|
|
|
- dep.setExpenseFinanceId(in.getExpenseFinanceId());
|
|
|
+ //财务与复审切换的时候要切换所有未审核的财务
|
|
|
+ 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());
|
|
|
+
|
|
|
+ }
|
|
|
+ if (StringUtils.isNotBlank(in.getExpenseFinanceId())&&
|
|
|
+ department.getExpenseFinanceId().equals(in.getExpenseFinanceId())){
|
|
|
+ dep.setExpenseFinanceId(in.getExpenseFinanceId());
|
|
|
+ departmentMapper.updateOrderDepFinance(in.getFinanceId(),department.getFinanceId());
|
|
|
+ }
|
|
|
+
|
|
|
checkFinaceUpdate(in.getId(),in.getFinanceId());
|
|
|
if (in.getExpenseRetrialFinanceExamine()==1){
|
|
|
dep.setExpenseRetrialFinanceExamine(in.getExpenseRetrialFinanceExamine());
|