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

薪酬系统-福利台账，福利核算、核算明细列表逻辑优化（取消对档案状态的过滤）

This commit is contained in:
sy 2023-04-17 10:27:31 +08:00
parent b5d3acf418
commit f68981baac
2 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/com/engine/salary/biz/SIAccountBiz.java
View File

@ -148,14 +148,14 @@ public class SIAccountBiz extends Service {
public PageInfo<InsuranceAccountDetailPO> listCommonPage(InsuranceAccountDetailParam queryParam) {
queryParam.setPaymentStatus(PaymentStatusEnum.COMMON.getValue());
//过滤出需要核算的人员，即福利档案基础信息表中runStatus为正在缴纳和待减员的人员
List<InsuranceArchivesBaseInfoPO> baseInfoPOList = getInsuranceBaseInfoMapper().listAll();
List<Long> canAccountIds = baseInfoPOList.stream()
.filter(f->f.getPaymentOrganization().toString().equals(queryParam.getPaymentOrganization())
&& (f.getRunStatus().equals(EmployeeStatusEnum.PAYING.getValue()) || f.getRunStatus().equals(EmployeeStatusEnum.STAY_DEL.getValue())))
.map(InsuranceArchivesBaseInfoPO::getEmployeeId)
.collect(Collectors.toList());
queryParam.setEmployeeIds(canAccountIds);
// //过滤出需要核算的人员，即福利档案基础信息表中runStatus为正在缴纳和待减员的人员
// List<InsuranceArchivesBaseInfoPO> baseInfoPOList = getInsuranceBaseInfoMapper().listAll();
// List<Long> canAccountIds = baseInfoPOList.stream()
// .filter(f->f.getPaymentOrganization().toString().equals(queryParam.getPaymentOrganization())
// && (f.getRunStatus().equals(EmployeeStatusEnum.PAYING.getValue()) || f.getRunStatus().equals(EmployeeStatusEnum.STAY_DEL.getValue())))
// .map(InsuranceArchivesBaseInfoPO::getEmployeeId)
// .collect(Collectors.toList());
// queryParam.setEmployeeIds(canAccountIds);
//排序配置
OrderRuleVO orderRule = getSalarySysConfService(user).orderRule();
queryParam.setOrderRule(orderRule);
@ -226,8 +226,8 @@ public class SIAccountBiz extends Service {
List<Long> employeeIds = getInsuranceAccountDetailMapper().selectEmpByPaymentOrg(paymentOrganization);
// employeeIds = employeeIds.stream().filter(employeeIdsInTaxAgent::contains).collect(Collectors.toList());
if (CollectionUtils.isEmpty(employeeIds)) {
List<InsuranceAccountBatchPO> list = Lists.newArrayList(getInsuranceAccountBatchMapper().getByBillMonth(param.getBillMonth(), paymentOrganization));
encryptUtil.decryptList(list, InsuranceAccountBatchPO.class);
List<InsuranceAccountDetailPO> list = Lists.newArrayList(getInsuranceAccountDetailMapper().queryNormalListByBillMonth(param.getBillMonth(), paymentOrganization));
encryptUtil.decryptList(list, InsuranceAccountDetailPO.class);
if (CollectionUtils.isNotEmpty(list)) {
list.stream().forEach(f -> {
getInsuranceAccountDetailMapper().deleteById(f.getId());

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

@ -316,14 +316,14 @@ public class SIAccountServiceImpl extends Service implements SIAccountService {
Long employeeId = (long) user.getUID();
Map<String, Object> datas = new HashMap<>();
//过滤出福利档案基础信息表中runStatus为正在缴纳和待减员的人员
List<InsuranceArchivesBaseInfoPO> baseInfoPOList = getInsuranceBaseInfoMapper().listAll();
List<Long> canAccountIds = baseInfoPOList.stream()
.filter(f->f.getPaymentOrganization().toString().equals(queryParam.getPaymentOrganization())
&& (f.getRunStatus().equals(EmployeeStatusEnum.PAYING.getValue()) || f.getRunStatus().equals(EmployeeStatusEnum.STAY_DEL.getValue())))
.map(InsuranceArchivesBaseInfoPO::getEmployeeId)
.collect(Collectors.toList());
queryParam.setEmployeeIds(canAccountIds);
// //过滤出福利档案基础信息表中runStatus为正在缴纳和待减员的人员
// List<InsuranceArchivesBaseInfoPO> baseInfoPOList = getInsuranceBaseInfoMapper().listAll();
// List<Long> canAccountIds = baseInfoPOList.stream()
// .filter(f->f.getPaymentOrganization().toString().equals(queryParam.getPaymentOrganization())
// && (f.getRunStatus().equals(EmployeeStatusEnum.PAYING.getValue()) || f.getRunStatus().equals(EmployeeStatusEnum.STAY_DEL.getValue())))
// .map(InsuranceArchivesBaseInfoPO::getEmployeeId)
// .collect(Collectors.toList());
// queryParam.setEmployeeIds(canAccountIds);
//补缴缴纳列表
queryParam.setPaymentStatus(PaymentStatusEnum.REPAIR.getValue());
@ -2859,14 +2859,14 @@ public class SIAccountServiceImpl extends Service implements SIAccountService {
Map<String, Object> datas = new HashMap<>();
queryParam.setPageSize(10000000);
//过滤出福利档案基础信息表中runStatus为正在缴纳和待减员的人员
List<InsuranceArchivesBaseInfoPO> baseInfoPOList = getInsuranceBaseInfoMapper().listAll();
List<Long> canAccountIds = baseInfoPOList.stream()
.filter(f->f.getPaymentOrganization().toString().equals(queryParam.getPaymentOrganization())
&& (f.getRunStatus().equals(EmployeeStatusEnum.PAYING.getValue()) || f.getRunStatus().equals(EmployeeStatusEnum.STAY_DEL.getValue())))
.map(InsuranceArchivesBaseInfoPO::getEmployeeId)
.collect(Collectors.toList());
queryParam.setEmployeeIds(canAccountIds);
// //过滤出福利档案基础信息表中runStatus为正在缴纳和待减员的人员
// List<InsuranceArchivesBaseInfoPO> baseInfoPOList = getInsuranceBaseInfoMapper().listAll();
// List<Long> canAccountIds = baseInfoPOList.stream()
// .filter(f->f.getPaymentOrganization().toString().equals(queryParam.getPaymentOrganization())
// && (f.getRunStatus().equals(EmployeeStatusEnum.PAYING.getValue()) || f.getRunStatus().equals(EmployeeStatusEnum.STAY_DEL.getValue())))
// .map(InsuranceArchivesBaseInfoPO::getEmployeeId)
// .collect(Collectors.toList());
// queryParam.setEmployeeIds(canAccountIds);
//补缴缴纳列表
queryParam.setPaymentStatus(PaymentStatusEnum.REPAIR.getValue());