From 4516f74d2ea55d23b1809e39c95597f81bcfe052 Mon Sep 17 00:00:00 2001 From: Harryxzy Date: Fri, 8 Mar 2024 10:38:20 +0800 Subject: [PATCH] =?UTF-8?q?=E8=89=BE=E5=BF=97-=E5=90=88=E5=B9=B60301?= =?UTF-8?q?=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/engine/salary/biz/SIArchivesBiz.java | 2 +- .../siarchives/bo/InsuranceArchivesBO.java | 2 +- .../service/impl/SIArchivesServiceImpl.java | 46 +++++++++---------- .../salary/wrapper/SalaryFormulaWrapper.java | 2 +- 4 files changed, 25 insertions(+), 27 deletions(-) diff --git a/src/com/engine/salary/biz/SIArchivesBiz.java b/src/com/engine/salary/biz/SIArchivesBiz.java index be133f80c..e7f7e0d06 100644 --- a/src/com/engine/salary/biz/SIArchivesBiz.java +++ b/src/com/engine/salary/biz/SIArchivesBiz.java @@ -618,7 +618,7 @@ public class SIArchivesBiz { InsuranceSchemePO insuranceSchemePO = siSchemeBiz.getById(insuranceArchivesFundSchemePO.getFundSchemeId()); schemeName = insuranceSchemePO != null ? insuranceSchemePO.getSchemeName() : ""; } - InsuranceArchivesFundSchemeDTO data = InsuranceArchivesBO.convertFundPOtoDTO(insuranceArchivesFundSchemePO, employeeId, schemeName); + InsuranceArchivesFundSchemeDTO data = InsuranceArchivesBO.convertFundPOtoDTO(insuranceArchivesFundSchemePO, schemeName); if (insuranceArchivesFundSchemePO == null) { data.setEmployeeId(employeeId); data.setUnderTake(UndertakerEnum.SCOPE_PERSON.getValue().toString()); diff --git a/src/com/engine/salary/entity/siarchives/bo/InsuranceArchivesBO.java b/src/com/engine/salary/entity/siarchives/bo/InsuranceArchivesBO.java index 7fccae98b..4395240eb 100644 --- a/src/com/engine/salary/entity/siarchives/bo/InsuranceArchivesBO.java +++ b/src/com/engine/salary/entity/siarchives/bo/InsuranceArchivesBO.java @@ -41,7 +41,7 @@ public class InsuranceArchivesBO { } - public static InsuranceArchivesFundSchemeDTO convertFundPOtoDTO(InsuranceArchivesFundSchemePO po, Long employeeId, String schemeName) { + public static InsuranceArchivesFundSchemeDTO convertFundPOtoDTO(InsuranceArchivesFundSchemePO po, String schemeName) { if (Objects.isNull(po)) { return InsuranceArchivesFundSchemeDTO.builder().build(); } diff --git a/src/com/engine/salary/service/impl/SIArchivesServiceImpl.java b/src/com/engine/salary/service/impl/SIArchivesServiceImpl.java index 1a7856c55..2c069251d 100644 --- a/src/com/engine/salary/service/impl/SIArchivesServiceImpl.java +++ b/src/com/engine/salary/service/impl/SIArchivesServiceImpl.java @@ -1,8 +1,5 @@ package com.engine.salary.service.impl; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; -import com.alibaba.fastjson.TypeReference; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; @@ -19,6 +16,7 @@ import com.cloudstore.eccom.pc.table.WeaTableColumn; import com.cloudstore.eccom.result.WeaResultMsg; import com.engine.common.util.ServiceUtil; import com.engine.core.impl.Service; +import com.engine.salary.biz.SISchemeBiz; import com.engine.salary.cmd.siarchives.SIArchivesTipsCmd; import com.engine.salary.common.SalaryContext; import com.engine.salary.config.SalaryElogConfig; @@ -28,11 +26,6 @@ import com.engine.salary.encrypt.EncryptUtil; import com.engine.salary.entity.datacollection.DataCollectionEmployee; import com.engine.salary.entity.siarchives.bo.InsuranceArchivesBO; import com.engine.salary.entity.siarchives.bo.InsuranceArchivesBaseInfoBO; -import com.engine.salary.entity.siarchives.dto.InsuranceArchivesBaseDTO; -import com.engine.salary.entity.siarchives.dto.InsuranceArchivesFundSchemeDTO; -import com.engine.salary.entity.siarchives.dto.InsuranceArchivesOtherSchemeDTO; -import com.engine.salary.entity.siarchives.dto.InsuranceArchivesSocialSchemeDTO; -import com.engine.salary.entity.siarchives.param.InsuranceArchivesDetailListParam; import com.engine.salary.entity.siarchives.dto.*; import com.engine.salary.entity.siarchives.param.*; import com.engine.salary.entity.siarchives.po.*; @@ -58,24 +51,12 @@ import com.engine.salary.mapper.sischeme.InsuranceSchemeDetailMapper; import com.engine.salary.mapper.sischeme.InsuranceSchemeMapper; import com.engine.salary.mapper.taxagent.TaxAgentMapper; import com.engine.salary.service.*; -import com.engine.salary.mapper.siarchives.FundSchemeMapper; -import com.engine.salary.mapper.siarchives.InsuranceBaseInfoMapper; -import com.engine.salary.mapper.siarchives.OtherSchemeMapper; -import com.engine.salary.mapper.siarchives.SocialSchemeMapper; -import com.engine.salary.mapper.taxagent.TaxAgentMapper; -import com.engine.salary.service.SIArchivesService; -import com.engine.salary.service.TaxAgentEmpChangeService; -import com.engine.salary.service.TaxAgentService; -import com.engine.salary.service.*; import com.engine.salary.sys.constant.SalarySysConstant; import com.engine.salary.sys.entity.po.SalarySysConfPO; import com.engine.salary.sys.entity.vo.OrderRuleVO; import com.engine.salary.sys.enums.OpenEnum; import com.engine.salary.sys.service.SalarySysConfService; import com.engine.salary.sys.service.impl.SalarySysConfServiceImpl; -import com.engine.salary.util.SalaryAssert; -import com.engine.salary.util.SalaryEntityUtil; -import com.engine.salary.util.SalaryI18nUtil; import com.engine.salary.util.*; import com.engine.salary.util.db.IdGenerator; import com.engine.salary.util.db.MapperProxyFactory; @@ -102,7 +83,6 @@ import java.math.BigDecimal; import java.text.SimpleDateFormat; import java.util.*; import java.util.function.Function; -import java.util.function.Function; import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.stream.Collectors; @@ -2693,7 +2673,13 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService .build()); encryptUtil.decryptList(otherList, InsuranceArchivesOtherSchemePO.class); InsuranceArchivesOtherSchemePO insuranceArchivesOtherSchemePO = otherList.size() != 0 ? otherList.get(0) : null; - InsuranceArchivesOtherSchemeDTO data = InsuranceArchivesBO.convertOtherPOtoDTO(insuranceArchivesOtherSchemePO, employeeId); + String schemeName = ""; + if (insuranceArchivesOtherSchemePO.getOtherSchemeId() != null) { + SISchemeBiz siSchemeBiz = new SISchemeBiz(); + InsuranceSchemePO insuranceSchemePO = siSchemeBiz.getById(insuranceArchivesOtherSchemePO.getOtherSchemeId()); + schemeName = insuranceSchemePO != null ? insuranceSchemePO.getSchemeName() : ""; + } + InsuranceArchivesOtherSchemeDTO data = InsuranceArchivesBO.convertOtherPOtoDTO(insuranceArchivesOtherSchemePO, employeeId, schemeName); if (insuranceArchivesOtherSchemePO == null) { data.setEmployeeId(employeeId); data.setUnderTake(UndertakerEnum.SCOPE_PERSON.getValue().toString()); @@ -2715,7 +2701,13 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService .build()); encryptUtil.decryptList(fundList, InsuranceArchivesFundSchemePO.class); InsuranceArchivesFundSchemePO insuranceArchivesFundSchemePO = fundList.size() != 0 ? fundList.get(0) : null; - InsuranceArchivesFundSchemeDTO data = InsuranceArchivesBO.convertFundPOtoDTO(insuranceArchivesFundSchemePO, employeeId); + String schemeName = ""; + if (insuranceArchivesFundSchemePO.getFundSchemeId() != null) { + SISchemeBiz siSchemeBiz = new SISchemeBiz(); + InsuranceSchemePO insuranceSchemePO = siSchemeBiz.getById(insuranceArchivesFundSchemePO.getFundSchemeId()); + schemeName = insuranceSchemePO != null ? insuranceSchemePO.getSchemeName() : ""; + } + InsuranceArchivesFundSchemeDTO data = InsuranceArchivesBO.convertFundPOtoDTO(insuranceArchivesFundSchemePO, schemeName); if (insuranceArchivesFundSchemePO == null) { data.setEmployeeId(employeeId); data.setUnderTake(UndertakerEnum.SCOPE_PERSON.getValue().toString()); @@ -2731,7 +2723,13 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService */ public InsuranceArchivesSocialSchemeDTO buildSocialForm(Long employeeId, Long paymentOrganization) { InsuranceArchivesSocialSchemePO insuranceArchivesSocialSchemePO = getSocialByEmployeeId(employeeId, paymentOrganization); - InsuranceArchivesSocialSchemeDTO data = InsuranceArchivesBO.convertSocialPOtoDTO(insuranceArchivesSocialSchemePO, employeeId); + String schemeName = ""; + if (insuranceArchivesSocialSchemePO.getSocialSchemeId() != null) { + SISchemeBiz siSchemeBiz = new SISchemeBiz(); + InsuranceSchemePO insuranceSchemePO = siSchemeBiz.getById(insuranceArchivesSocialSchemePO.getSocialSchemeId()); + schemeName = insuranceSchemePO != null ? insuranceSchemePO.getSchemeName() : ""; + } + InsuranceArchivesSocialSchemeDTO data = InsuranceArchivesBO.convertSocialPOtoDTO(insuranceArchivesSocialSchemePO, employeeId, schemeName); if (insuranceArchivesSocialSchemePO == null) { data.setEmployeeId(employeeId); data.setUnderTake(UndertakerEnum.SCOPE_PERSON.getValue().toString()); diff --git a/src/com/engine/salary/wrapper/SalaryFormulaWrapper.java b/src/com/engine/salary/wrapper/SalaryFormulaWrapper.java index 8035bb142..25b179606 100644 --- a/src/com/engine/salary/wrapper/SalaryFormulaWrapper.java +++ b/src/com/engine/salary/wrapper/SalaryFormulaWrapper.java @@ -128,7 +128,7 @@ public class SalaryFormulaWrapper extends Service { welfareList.add(new InsuranceAcctDetailImportFieldDTO("fundSum","公积金合计",false)); //艾志二开"企业年金及其他福利"改为"劳务固定费" // welfareList.add(new InsuranceAcctDetailImportFieldDTO("otherSum","其他福利合计", false)); - welfareList.add(new InsuranceAcctDetailImportFieldDTO("otherSum","劳务固定费合计")); + welfareList.add(new InsuranceAcctDetailImportFieldDTO("otherSum","劳务固定费合计", false)); welfareList.add(new InsuranceAcctDetailImportFieldDTO("total","合计", false)); // 缓存勾选