From 2a6d5569290a7b0417dc1d9ebee66eae3cada517 Mon Sep 17 00:00:00 2001 From: sy Date: Thu, 20 Oct 2022 11:27:27 +0800 Subject: [PATCH] =?UTF-8?q?=E8=96=AA=E9=85=AC=E7=B3=BB=E7=BB=9F-=E7=A6=8F?= =?UTF-8?q?=E5=88=A9=E5=8F=B0=E8=B4=A6=E6=A0=B8=E7=AE=97=E5=92=8C=E6=AD=A3?= =?UTF-8?q?=E5=B8=B8=E7=BC=B4=E7=BA=B3=E4=BA=BA=E5=91=98=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E6=B7=BB=E5=8A=A0=E5=9F=BA=E7=A1=80=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E8=A1=A8runStatus=E5=AD=97=E6=AE=B5=E7=9A=84=E7=AD=9B?= =?UTF-8?q?=E9=80=89=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/engine/salary/biz/SIAccountBiz.java | 18 ++++++++++++++++++ .../siaccount/InsuranceAccountDetailMapper.xml | 18 ++++++++++++++++++ .../service/impl/SIAccountServiceImpl.java | 5 +---- 3 files changed, 37 insertions(+), 4 deletions(-) diff --git a/src/com/engine/salary/biz/SIAccountBiz.java b/src/com/engine/salary/biz/SIAccountBiz.java index 46d469563..9e74b499e 100644 --- a/src/com/engine/salary/biz/SIAccountBiz.java +++ b/src/com/engine/salary/biz/SIAccountBiz.java @@ -120,12 +120,21 @@ public class SIAccountBiz extends Service { public PageInfo listCommonPage(InsuranceAccountDetailParam queryParam) { queryParam.setPaymentStatus(PaymentStatusEnum.COMMON.getValue()); + //过滤出需要核算的人员，即福利档案基础信息表中runStatus为正在缴纳和待减员的人员 + List baseInfoPOList = getInsuranceBaseInfoMapper().listAll(); + List 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); SalaryPageUtil.start(queryParam.getCurrent(), queryParam.getPageSize()); List list = getInsuranceAccountDetailMapper().list(queryParam); + InsuranceAccountDetailPOEncrypt.decryptInsuranceAccountDetailPOList(list); PageInfo pageInfo = new PageInfo<>(list, InsuranceAccountDetailPO.class); return pageInfo; @@ -228,6 +237,15 @@ public class SIAccountBiz extends Service { // 需要分权的情况 // if(getTaxAgentService().isOpenDevolution()) { List empIds = getInsuranceAccountDetailMapper().selectEmpByPaymentOrg(param.getPaymentOrganization()); + //过滤出需要核算的人员，即福利档案基础信息表中runStatus为正在缴纳和待减员的人员 + List baseInfoPOList = getInsuranceBaseInfoMapper().listAll(); + List canAccountIds = baseInfoPOList.stream() + .filter(f->f.getPaymentOrganization().equals(param.getPaymentOrganization()) + && (f.getRunStatus().equals(EmployeeStatusEnum.PAYING.getValue()) || f.getRunStatus().equals(EmployeeStatusEnum.STAY_DEL.getValue()))) + .map(InsuranceArchivesBaseInfoPO::getEmployeeId) + .collect(Collectors.toList()); + + empIds = empIds.stream().filter(f->canAccountIds.contains(f)).collect(Collectors.toList()); //过滤不在扣缴义务人下的数据 // Collection employeeIdsInTaxAgent = getTaxAgentService().listEmployeeIdsInTaxAgent(param.getPaymentOrganization()); diff --git a/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.xml b/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.xml index 5b045fed8..7f92c2a41 100644 --- a/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.xml +++ b/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.xml @@ -169,6 +169,12 @@ e.lastname like CONCAT('%',#{param.userName},'%') ) + + AND t.employee_id IN + + #{employeeId} + + @@ -177,6 +183,12 @@ e.lastname like '%'||#{param.userName}||'%' ) + + AND t.employee_id IN + + #{employeeId} + + @@ -185,6 +197,12 @@ e.lastname like '%'+#{param.userName}+'%' ) + + AND t.employee_id IN + + #{employeeId} + + diff --git a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java index 1e29e2fd7..89283ead7 100644 --- a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java +++ b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java @@ -30,10 +30,7 @@ import com.engine.salary.entity.sicategory.po.ICategoryPO; import com.engine.salary.entity.sischeme.po.InsuranceSchemePO; import com.engine.salary.entity.taxagent.po.TaxAgentPO; import com.engine.salary.enums.UserStatusEnum; -import com.engine.salary.enums.siaccount.BillStatusEnum; -import com.engine.salary.enums.siaccount.InspectStatusEnum; -import com.engine.salary.enums.siaccount.PaymentStatusEnum; -import com.engine.salary.enums.siaccount.ProjectTypeEnum; +import com.engine.salary.enums.siaccount.*; import com.engine.salary.enums.sicategory.WelfareTypeEnum; import com.engine.salary.exception.SalaryRunTimeException; import com.engine.salary.mapper.siaccount.ExcelInsuranceDetailMapper;