qt
/
weaver-hrm-salary
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix 编辑工资单模板，补发显示部分

This commit is contained in:
Harryxzy 2022-12-07 10:34:41 +08:00
parent 5078fa9b87
commit 19022fc505
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/engine/salary/mapper/salarybill/SalaryTemplateMapper.xml
View File

@ -70,6 +70,9 @@
salary_item_null_status,
salary_item_zero_status,
salary_item_setting,
replenish_name,
replenish_rule,
replenish_salary_item_setting,
create_time,
update_time,
creator,

6
src/com/engine/salary/wrapper/SalaryTemplateWrapper.java
View File

@ -150,10 +150,10 @@ public class SalaryTemplateWrapper extends Service {
salaryTemplateBaseSetDTO.setMsgStatus(po.getMsgStatus().equals(SalaryTemplateWhetherEnum.TRUE.getValue()));
salaryTemplateBaseSetDTO.setSalarySob(po.getSalarySobId());
salaryTemplateBaseSetDTO.setSendEmail(po.getSendEmailId());
// 规则赋值
salaryTemplateBaseSetDTO.setReplenishRule(SalaryTemplateReplenishRuleEnum.ALL.getValue().equals(po.getReplenishRule()) ? po.getReplenishRule() : SalaryTemplateReplenishRuleEnum.BYRULE.getValue());
// 规则赋值 如果为ALL传“” 如果为byRule传薪资项目ID
salaryTemplateBaseSetDTO.setReplenishRule(SalaryTemplateReplenishRuleEnum.ALL.getValue().equals(po.getReplenishRule()) ? "" : po.getReplenishRule());
// 规则设置赋值
salaryTemplateBaseSetDTO.setReplenishRuleSet(po.getReplenishRule());
// salaryTemplateBaseSetDTO.setReplenishRuleSet(po.getReplenishRule());
// 修改时获取补规则设置下拉列表
replenishRuleSetOptionList = getReplenishRuleSetOptions(po.getSalarySobId());
}