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

薪资项目-核算时隐藏fixbug

This commit is contained in:
Harryxzy 2023-07-18 17:00:09 +08:00
parent d551f5ae76
commit db9a0e22eb
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/engine/salary/entity/salaryitem/dto/SalaryItemSobListDTO.java
View File

@ -50,8 +50,8 @@ public class SalaryItemSobListDTO {
private Integer useDefault;
//核算时默认隐藏
@SalaryTableColumn(text = "默认隐藏", width = "10%", column = "useDefault")
@TableTitle(title = "默认隐藏",dataIndex = "useDefault",key = "useDefault")
@SalaryTableColumn(text = "默认隐藏", width = "10%", column = "hideDefault")
@TableTitle(title = "默认隐藏",dataIndex = "hideDefault",key = "hideDefault")
private Integer hideDefault;
//进位规则

4
src/com/engine/salary/entity/salarysob/bo/SalarySobItemBO.java
View File

@ -134,7 +134,7 @@ public class SalarySobItemBO {
.salarySobId(salarySobId)
.salaryItemId(salaryItemPO.getId())
.isGroup(0)
.itemHide(Long.valueOf(salaryItemPO.getHideDefault()))
.itemHide(Long.valueOf(salaryItemPO.getHideDefault()== null ? 0 : salaryItemPO.getHideDefault()))
.creator(employeeId)
.createTime(now)
.updateTime(now)
@ -173,7 +173,7 @@ public class SalarySobItemBO {
.salarySobId(salarySobId)
.salaryItemId(salaryItemPO.getId())
.isGroup(0)
.itemHide(Long.valueOf(salaryItemPO.getHideDefault()))
.itemHide(Long.valueOf(salaryItemPO.getHideDefault() == null ? 0 : salaryItemPO.getHideDefault()))
.creator(employeeId)
.createTime(now)
.updateTime(now)

2
src/com/engine/salary/wrapper/SalarySobItemWrapper.java
View File

@ -96,7 +96,7 @@ public class SalarySobItemWrapper extends Service {
}
})
.collect(Collectors.toList());
SalaryPageUtil.buildPage(searchCurrent, searchPageSize, salaryItemList);
salaryItemList = SalaryPageUtil.buildPage(searchCurrent, searchPageSize, salaryItemList).getList();
//最终返回的分页对象
PageInfo<SalaryItemSobListDTO> dtoPage = new PageInfo<>(SalaryItemSobListDTO.class);