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

汇通调整

This commit is contained in:
Harryxzy 2025-09-24 16:33:13 +08:00
parent c746ab8a40
commit 422681e448
3 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/engine/salary/entity/siaccount/po/InsuranceAccountDetailPO.java
View File

@ -338,4 +338,7 @@ public class InsuranceAccountDetailPO {
private String jobcall;
private Long jobcallId;
private String status;
private String changeReason;
}

1
src/com/engine/salary/service/impl/RecordsBuildServiceImpl.java
View File

@ -95,6 +95,7 @@ public class RecordsBuildServiceImpl extends Service implements RecordsBuildServ
Map<String, Object> record = new HashMap<>();
DataCollectionEmployee simpleEmployee = collect.get(item.getEmployeeId());
record.put("id", item.getId());
record.put("changeReason", item.getChangeReason());
record.put("employeeId", item.getEmployeeId());
record.put("billMonth", item.getBillMonth());
record.put("billStatus", SalaryEnumUtil.enumMatchByValue(item.getBillStatus(), BillStatusEnum.values(), BillStatusEnum.class));

3
src/com/engine/salary/service/impl/SIAccountServiceImpl.java
View File

@ -7933,12 +7933,14 @@ public class SIAccountServiceImpl extends Service implements SIAccountService {
List<String> lessKey = lastMonthDetailMap.keySet().stream().filter(key -> !thisMonthKey.contains(key)).collect(Collectors.toList());
for (String key : lessKey) {
InsuranceAccountDetailPO lastMonthPO = lastMonthDetailMap.get(key);
lastMonthPO.setChangeReason("减少");
changeDetail.add(lastMonthPO);
}
for (InsuranceAccountDetailPO thisMonthPO : insuranceAccountDetailPOS) {
InsuranceAccountDetailPO lastMonthPO = lastMonthDetailMap.get(thisMonthPO.getPaymentOrganization() + "_split" + thisMonthPO.getEmployeeId());
if (lastMonthPO == null) {
thisMonthPO.setChangeReason("新增");
changeDetail.add(thisMonthPO);
} else {
boolean socialEqual,fundEqual,otherEqual;
@ -7984,6 +7986,7 @@ public class SIAccountServiceImpl extends Service implements SIAccountService {
//动态列组装
List<WeaTableColumn> weaTableColumn = getColumnBuildService(user).buildCommonColumnsWithStyle(changeDetailList, Long.valueOf(user.getUID()), SalaryDefaultTenantConstant.DEFAULT_TENANT_KEY, PaymentStatusEnum.COMMON.getValue());
List<Column> columns = weaTableColumn.stream().map(v -> new Column(v.getText(), v.getColumn(), v.getColumn())).collect(Collectors.toList());
columns.add(0, new Column("类型", "changeReason", "changeReason"));
pageInfos.setColumns(columns);
return pageInfos;
}