|
@@ -405,6 +405,8 @@ public class CostIncomeGroupServiceImpl extends ServiceImpl<CostIncomeGroupMappe
|
|
|
afterIncomegroup.setOpenDepartmentCode(openDepartmentCode);
|
|
|
afterIncomegroup.setOpenDepartmentName(openDepartmentName);
|
|
|
afterIncomegroup.setOpenDepartmentStatus(responsibility.getResponsibilityType());
|
|
|
+ afterIncomegroup.setOpenResponsibilityCode(responsibility.getResponsibilityName());
|
|
|
+ afterIncomegroup.setOpenResponsibilityName(responsibility.getResponsibilityName());
|
|
|
}
|
|
|
}
|
|
|
} else {
|
|
@@ -438,6 +440,8 @@ public class CostIncomeGroupServiceImpl extends ServiceImpl<CostIncomeGroupMappe
|
|
|
afterIncomegroup.setStartDepartmentCode(startDepartmentCode);
|
|
|
afterIncomegroup.setStartDepartmentName(startDepartmentName);
|
|
|
afterIncomegroup.setStartDepartmentStatus(responsibility.getResponsibilityType());
|
|
|
+ afterIncomegroup.setStartResponsibilityCode(responsibility.getResponsibilityName());
|
|
|
+ afterIncomegroup.setStartResponsibilityName(responsibility.getResponsibilityName());
|
|
|
}
|
|
|
}
|
|
|
} else {
|
|
@@ -495,12 +499,6 @@ public class CostIncomeGroupServiceImpl extends ServiceImpl<CostIncomeGroupMappe
|
|
|
afterIncomegroup.setResponsibilityCode(responsibility.getResponsibilityCode());
|
|
|
afterIncomegroup.setResponsibilityName(responsibility.getResponsibilityName());
|
|
|
}
|
|
|
- }else if (NumberConstant.ONE.equals(openDepartmentStatus) && NumberConstant.TWO.equals(startDepartmentStatus)){
|
|
|
- afterIncomegroup.setResponsibilityCode(costIncomeGroup.getOpenResponsibilityCode());
|
|
|
- afterIncomegroup.setResponsibilityName(costIncomeGroup.getOpenResponsibilityName());
|
|
|
- }if (NumberConstant.TWO.equals(openDepartmentStatus) && NumberConstant.ONE.equals(startDepartmentStatus)){
|
|
|
- afterIncomegroup.setResponsibilityCode(costIncomeGroup.getStartResponsibilityCode());
|
|
|
- afterIncomegroup.setResponsibilityName(costIncomeGroup.getStartResponsibilityName());
|
|
|
}
|
|
|
costIncomeGroup.setAfterIncomeGroup(JSON.toJSONString(afterIncomegroup));
|
|
|
}
|