diff --git a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java index 1048fe4ed..969f0ceb5 100644 --- a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java +++ b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java @@ -1310,12 +1310,18 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { // 获取上期人数 List lastEmpList = lastEmpMap.getOrDefault(dto.getInsuranceId().toString(), Collections.emptyList()); lastEmpList = lastEmpList.stream().distinct().collect(Collectors.toList()); + // 本月新增人数 + List finalLastEmpList = lastEmpList; + Long increaseNum = empList.stream().filter(empId -> !finalLastEmpList.contains(empId)).count(); + // 本月减少人员 + List finalEmpList = empList; + Long decreaseNum = lastEmpList.stream().filter(empId -> !finalEmpList.contains(empId)).count(); HtSbqsListDTO build = HtSbqsListDTO.builder() .insuranceId(dto.getInsuranceId()) .bxlx(dto.getInsuranceName()) .sqjnrs(lastEmpList.size()) - .zjrs(lastEmpList.size() < empList.size() ? empList.size() - lastEmpList.size() : 0) - .jsrs(lastEmpList.size() > empList.size() ? lastEmpList.size() - empList.size() : 0) + .zjrs(increaseNum.intValue()) + .jsrs(decreaseNum.intValue()) .bqrs(empList.size()) .grjnje(perPayment.doubleValue()) .dwjnje(comPayment.doubleValue())