diff --git a/src/com/engine/salary/entity/siaccount/po/InsuranceAccountDetailPO.java b/src/com/engine/salary/entity/siaccount/po/InsuranceAccountDetailPO.java index 310009f9c..e2b7c85f2 100644 --- a/src/com/engine/salary/entity/siaccount/po/InsuranceAccountDetailPO.java +++ b/src/com/engine/salary/entity/siaccount/po/InsuranceAccountDetailPO.java @@ -338,4 +338,7 @@ public class InsuranceAccountDetailPO { private String jobcall; private Long jobcallId; private String status; + + + private String changeReason; } diff --git a/src/com/engine/salary/service/impl/RecordsBuildServiceImpl.java b/src/com/engine/salary/service/impl/RecordsBuildServiceImpl.java index 29ee07ccc..d5187d9f6 100644 --- a/src/com/engine/salary/service/impl/RecordsBuildServiceImpl.java +++ b/src/com/engine/salary/service/impl/RecordsBuildServiceImpl.java @@ -95,6 +95,7 @@ public class RecordsBuildServiceImpl extends Service implements RecordsBuildServ Map 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)); diff --git a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java index 42f5bce5f..ef2605ec4 100644 --- a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java +++ b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java @@ -7933,12 +7933,14 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { List 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 = getColumnBuildService(user).buildCommonColumnsWithStyle(changeDetailList, Long.valueOf(user.getUID()), SalaryDefaultTenantConstant.DEFAULT_TENANT_KEY, PaymentStatusEnum.COMMON.getValue()); List 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; }