From d3de862d1176d42ed4f8e92da8338653722b579c Mon Sep 17 00:00:00 2001 From: fcli Date: Tue, 13 Dec 2022 13:34:22 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=8A=A0=E5=AF=86=E7=BB=9F=E4=B8=80,?= =?UTF-8?q?=E8=96=AA=E8=B5=84=E9=A1=B9=E7=9B=AE&=E7=A4=BE=E4=BF=9D?= =?UTF-8?q?=E6=A1=A3=E6=A1=88=E8=AF=A6=E6=83=85...?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../engine/salary/biz/AddUpSituationBiz.java | 10 ++--- .../engine/salary/biz/OtherDeductionBiz.java | 15 ++++--- src/com/engine/salary/biz/SIAccountBiz.java | 20 ++++----- src/com/engine/salary/biz/SIArchivesBiz.java | 41 +++++++++---------- src/com/engine/salary/biz/SISchemeBiz.java | 16 ++++---- .../salary/biz/SalaryArchiveItemBiz.java | 13 +++--- .../salary/biz/SpecialAddDeductionBiz.java | 19 +++++---- .../archive/SalaryArchiveItemPOEncrypt.java | 1 + .../SalaryItemAdjustRecordListDTOEncrypt.java | 1 + .../datacollection/AddUpDeductionEncrypt.java | 1 + .../AddUpDeductionRecordStrDTOEncrypt.java | 1 + .../AddUpDeductionStrDTOEncrypt.java | 1 + .../AddUpSituationDTOEncrypt.java | 6 +-- .../datacollection/AddUpSituationEncrypt.java | 1 + .../AddUpSituationRecordDTOEncrypt.java | 1 + .../OtherDeductionListDTOEncrypt.java | 1 + .../OtherDeductionPOEncrypt.java | 10 +---- .../OtherDeductionRecordDTOEncrypt.java | 1 + .../SpecialAddDeductionEncrypt.java | 5 +-- .../SalaryAcctResultReportPOEncrypt.java | 1 + .../salaryacct/ExcelAcctResultPOEncrypt.java | 1 + .../salaryacct/SalaryAcctResultPOEncrypt.java | 1 + .../ExcelInsuranceDetailPOEncrypt.java | 1 + .../InsuranceAccountDetailTempPOEncrypt.java | 1 + .../encrypt/siaccount/SiAccountEncrypt.java | 1 + .../InsuranceArchivesFundSchemePOEncrypt.java | 1 + ...InsuranceArchivesOtherSchemePOEncrypt.java | 2 +- ...nsuranceArchivesSocialSchemePOEncrypt.java | 1 + .../siexport/AccountExportPOEncrypt.java | 1 + .../siexport/ExcelAccountExportPOEncrypt.java | 1 + .../InsuranceSchemeDetailPOEncrypt.java | 1 + .../TaxDeclarationDetailEncrypt.java | 2 + .../TaxDeclarationDetailPOEncrypt.java | 1 + .../entity/datacollection/AddUpSituation.java | 18 ++++++++ .../dto/AddUpSituationRecordDTO.java | 18 ++++++++ .../dto/OtherDeductionListDTO.java | 9 ++-- .../dto/OtherDeductionRecordDTO.java | 5 +++ .../dto/SpecialAddDeductionListDTO.java | 12 ++++-- .../dto/SpecialAddDeductionRecordDTO.java | 11 +++-- .../datacollection/po/OtherDeductionPO.java | 5 +++ .../po/SpecialAddDeductionPO.java | 11 ++++- .../report/po/SalaryAcctResultReportPO.java | 3 ++ .../salaryacct/po/ExcelAcctResultPO.java | 2 + .../siaccount/po/ExcelInsuranceDetailPO.java | 18 ++++++++ .../po/InsuranceAccountDetailTempPO.java | 18 ++++++++ .../po/InsuranceArchivesFundSchemePO.java | 2 + .../po/InsuranceArchivesOtherSchemePO.java | 2 + .../po/InsuranceArchivesSocialSchemePO.java | 2 + .../sischeme/po/InsuranceSchemeDetailPO.java | 4 ++ .../taxdeclaration/bo/TaxDeclarationBO.java | 5 ++- .../po/TaxDeclarationDetailPO.java | 2 + .../impl/AddUpDeductionServiceImpl.java | 3 +- .../impl/AddUpSituationServiceImpl.java | 3 +- .../impl/OtherDeductionServiceImpl.java | 17 ++++---- .../impl/SIAComparisonResultServiceImpl.java | 8 ++-- .../service/impl/SIAccountServiceImpl.java | 3 +- .../service/impl/SIExportServiceImpl.java | 3 +- .../service/impl/SIImportServiceImpl.java | 11 +++-- .../service/impl/SISchemeServiceImpl.java | 33 ++++++++------- .../impl/SalaryAcctReportServiceImpl.java | 7 ++-- .../SalaryComparisonResultServiceImpl.java | 10 ++--- .../impl/SpecialAddDeductionServiceImpl.java | 14 ++++--- .../impl/TaxDeclarationDetailServiceImpl.java | 10 +++-- .../impl/SalarySysConfServiceImpl.java | 12 +++--- 64 files changed, 296 insertions(+), 165 deletions(-) diff --git a/src/com/engine/salary/biz/AddUpSituationBiz.java b/src/com/engine/salary/biz/AddUpSituationBiz.java index fee6dfcb7..ba27c39d9 100644 --- a/src/com/engine/salary/biz/AddUpSituationBiz.java +++ b/src/com/engine/salary/biz/AddUpSituationBiz.java @@ -1,8 +1,6 @@ package com.engine.salary.biz; import com.engine.salary.encrypt.EncryptUtil; -import com.engine.salary.encrypt.datacollection.AddUpSituationEncrypt; -import com.engine.salary.encrypt.datacollection.AddUpSituationRecordDTOEncrypt; import com.engine.salary.entity.datacollection.AddUpSituation; import com.engine.salary.entity.datacollection.dto.AddUpSituationDTO; import com.engine.salary.entity.datacollection.dto.AddUpSituationRecordDTO; @@ -67,7 +65,7 @@ public class AddUpSituationBiz extends BaseBean { try { AddUpSituationMapper mapper = sqlSession.getMapper(AddUpSituationMapper.class); AddUpSituation byId = mapper.getById(id); - return AddUpSituationEncrypt.decryptAddUpSituation(byId); + return encryptUtil.decrypt(byId, AddUpSituation.class); } finally { sqlSession.close(); } @@ -84,7 +82,7 @@ public class AddUpSituationBiz extends BaseBean { try { AddUpSituationMapper mapper = sqlSession.getMapper(AddUpSituationMapper.class); List addUpSituationRecordDTOS = mapper.recordList(param); - return AddUpSituationRecordDTOEncrypt.decryptAddUpSituationRecordDTOList(addUpSituationRecordDTOS); + return encryptUtil.decryptList(addUpSituationRecordDTOS, AddUpSituationRecordDTO.class); } finally { sqlSession.close(); } @@ -103,7 +101,7 @@ public class AddUpSituationBiz extends BaseBean { SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); try { AddUpSituationMapper mapper = sqlSession.getMapper(AddUpSituationMapper.class); - AddUpSituationEncrypt.encryptAddUpSituationList(param); + encryptUtil.encryptList(param, AddUpSituation.class); List> partition = Lists.partition(param, 50); partition.forEach(mapper::insertData); sqlSession.commit(); @@ -125,7 +123,7 @@ public class AddUpSituationBiz extends BaseBean { SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); try { AddUpSituationMapper mapper = sqlSession.getMapper(AddUpSituationMapper.class); - AddUpSituationEncrypt.encryptAddUpSituationList(param); + encryptUtil.encryptList(param, AddUpSituation.class); List> partition = Lists.partition(param, 50); partition.forEach(mapper::updateData); sqlSession.commit(); diff --git a/src/com/engine/salary/biz/OtherDeductionBiz.java b/src/com/engine/salary/biz/OtherDeductionBiz.java index b71668f86..5b6002825 100644 --- a/src/com/engine/salary/biz/OtherDeductionBiz.java +++ b/src/com/engine/salary/biz/OtherDeductionBiz.java @@ -1,7 +1,6 @@ package com.engine.salary.biz; -import com.engine.salary.encrypt.datacollection.OtherDeductionPOEncrypt; -import com.engine.salary.encrypt.datacollection.OtherDeductionRecordDTOEncrypt; +import com.engine.salary.encrypt.EncryptUtil; import com.engine.salary.entity.datacollection.dto.OtherDeductionRecordDTO; import com.engine.salary.entity.datacollection.param.OtherDeductionQueryParam; import com.engine.salary.entity.datacollection.po.OtherDeductionPO; @@ -17,7 +16,7 @@ import java.util.stream.Collectors; public class OtherDeductionBiz extends BaseBean { - + private EncryptUtil encryptUtil = new EncryptUtil(); /** * 条件查询 @@ -30,7 +29,7 @@ public class OtherDeductionBiz extends BaseBean { try { OtherDeductionMapper mapper = sqlSession.getMapper(OtherDeductionMapper.class); List otherDeductionPOS = mapper.listSome(param); - return OtherDeductionPOEncrypt.decryptOtherDeductionPOList(otherDeductionPOS); + return encryptUtil.decryptList(otherDeductionPOS, OtherDeductionPO.class); } finally { sqlSession.close(); } @@ -48,7 +47,7 @@ public class OtherDeductionBiz extends BaseBean { try { OtherDeductionMapper mapper = sqlSession.getMapper(OtherDeductionMapper.class); OtherDeductionPO byId = mapper.getById(id); - return OtherDeductionPOEncrypt.decryptOtherDeductionPO(byId); + return encryptUtil.decrypt(byId, OtherDeductionPO.class); } finally { sqlSession.close(); } @@ -65,7 +64,7 @@ public class OtherDeductionBiz extends BaseBean { try { OtherDeductionMapper mapper = sqlSession.getMapper(OtherDeductionMapper.class); List otherDeductionRecordDTOS = mapper.recordList(param); - return OtherDeductionRecordDTOEncrypt.decryptOtherDeductionRecordDTOList(otherDeductionRecordDTOS); + return encryptUtil.decryptList(otherDeductionRecordDTOS, OtherDeductionRecordDTO.class); } finally { sqlSession.close(); } @@ -84,7 +83,7 @@ public class OtherDeductionBiz extends BaseBean { SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); try { OtherDeductionMapper mapper = sqlSession.getMapper(OtherDeductionMapper.class); - OtherDeductionPOEncrypt.encryptOtherDeductionPOList(param); + encryptUtil.encryptList(param, OtherDeductionPO.class); List> partition = Lists.partition(param, 100); partition.forEach(mapper::insertData); sqlSession.commit(); @@ -106,7 +105,7 @@ public class OtherDeductionBiz extends BaseBean { SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); try { OtherDeductionMapper mapper = sqlSession.getMapper(OtherDeductionMapper.class); - OtherDeductionPOEncrypt.encryptOtherDeductionPOList(param); + encryptUtil.encryptList(param, OtherDeductionPO.class); List> partition = Lists.partition(param, 100); partition.forEach(mapper::updateData); sqlSession.commit(); diff --git a/src/com/engine/salary/biz/SIAccountBiz.java b/src/com/engine/salary/biz/SIAccountBiz.java index 100097823..cdbcbd315 100644 --- a/src/com/engine/salary/biz/SIAccountBiz.java +++ b/src/com/engine/salary/biz/SIAccountBiz.java @@ -9,8 +9,6 @@ import com.engine.salary.cache.SalaryCacheKey; import com.engine.salary.constant.SalaryDefaultTenantConstant; import com.engine.salary.encrypt.AESEncryptUtil; import com.engine.salary.encrypt.EncryptUtil; -import com.engine.salary.encrypt.siaccount.InsuranceAccountDetailTempPOEncrypt; -import com.engine.salary.encrypt.sischeme.InsuranceSchemeDetailPOEncrypt; import com.engine.salary.entity.datacollection.DataCollectionEmployee; import com.engine.salary.entity.salaryacct.dto.SalaryAcctProgressDTO; import com.engine.salary.entity.siaccount.dto.InsuranceAccountViewListDTO; @@ -411,7 +409,7 @@ public class SIAccountBiz extends Service { }); //临时表数据入库 if (CollectionUtils.isNotEmpty(list)) { - InsuranceAccountDetailTempPOEncrypt.encryptInsuranceAccountDetailTempPOList(list); + encryptUtil.encryptList(list, InsuranceAccountDetailTempPO.class); List> lists = splitList(list, 40); lists.forEach(subList -> { MapperProxyFactory.getProxy(SIAccountDetailTempMapper.class).batchSaveAccountTempDetails(subList); @@ -448,7 +446,7 @@ public class SIAccountBiz extends Service { String billMonth = param.getBillMonth(); try { List list = MapperProxyFactory.getProxy(SIAccountDetailTempMapper.class).getListByEmployeeIdsAndBillMonth(ids, billMonth, param.getPaymentOrganization()); - InsuranceAccountDetailTempPOEncrypt.decryptInsuranceAccountDetailTempPOList(list); + encryptUtil.decryptList(list, InsuranceAccountDetailTempPO.class); Integer paymentStatus = 0; log.info("核算明细临时表 hrsa_bill_detail_temp待处理数量：{}", list.size()); List> partitionIds = Lists.partition((List) ids, 100); @@ -527,7 +525,7 @@ public class SIAccountBiz extends Service { Boolean inDataRange = SalaryDateUtil.monthInRange(insuranceAccountDetailPO.getBillMonth(), otherPO.getOtherStartTime(), otherPO.getOtherEndTime()); if ((Objects.equals(NonPaymentEnum.YES.getValue(), otherPO.getNonPayment()) || otherPO.getNonPayment() == null) && otherPO.getOtherSchemeId() != null && inDataRange) { List detailPOS = MapperProxyFactory.getProxy(InsuranceSchemeDetailMapper.class).queryListBySchemeId(otherPO.getOtherSchemeId()); - InsuranceSchemeDetailPOEncrypt.decryptList(detailPOS); + encryptUtil.decryptList(detailPOS, InsuranceSchemeDetailPO.class); //方案中包含的需要缴纳其他的个人福利 Map otherPerson = detailPOS.stream() .filter(item -> Objects.equals(IsPaymentEnum.YES.getValue(), item.getIsPayment()) && item.getPaymentScope() == PaymentScopeEnum.SCOPE_PERSON.getValue()) @@ -618,7 +616,7 @@ public class SIAccountBiz extends Service { Boolean inDataRange = SalaryDateUtil.monthInRange(insuranceAccountDetailPO.getBillMonth(), fundPO.getFundStartTime(), fundPO.getFundEndTime()); if ((NonPaymentEnum.YES.getValue() == fundPO.getNonPayment() || fundPO.getNonPayment() == null) && fundPO.getFundSchemeId() != null && inDataRange) { List detailPOS = MapperProxyFactory.getProxy(InsuranceSchemeDetailMapper.class).queryListBySchemeId(fundPO.getFundSchemeId()); - InsuranceSchemeDetailPOEncrypt.decryptList(detailPOS); + encryptUtil.decryptList(detailPOS, InsuranceSchemeDetailPO.class); //方案中包含的需要缴纳社保的个人福利 Map fundperson = detailPOS.stream() .filter(item -> IsPaymentEnum.YES.getValue() == item.getIsPayment() && item.getPaymentScope() == PaymentScopeEnum.SCOPE_PERSON.getValue()) @@ -709,7 +707,7 @@ public class SIAccountBiz extends Service { Boolean inDataRange = SalaryDateUtil.monthInRange(insuranceAccountDetailPO.getBillMonth(), socialPO.getSocialStartTime(), socialPO.getSocialEndTime()); if ((NonPaymentEnum.YES.getValue().equals(socialPO.getNonPayment()) || socialPO.getNonPayment() == null) && socialPO.getSocialSchemeId() != null && inDataRange) { List detailPOS = MapperProxyFactory.getProxy(InsuranceSchemeDetailMapper.class).queryListBySchemeId(socialPO.getSocialSchemeId()); - InsuranceSchemeDetailPOEncrypt.decryptList(detailPOS); + encryptUtil.decryptList(detailPOS, InsuranceSchemeDetailPO.class); //方案中包含的需要缴纳社保的个人福利 Map schemeperson = detailPOS.stream() .filter(item -> Objects.equals(IsPaymentEnum.YES.getValue(), item.getIsPayment()) && Objects.equals(item.getPaymentScope(), PaymentScopeEnum.SCOPE_PERSON.getValue())) @@ -1106,7 +1104,7 @@ public class SIAccountBiz extends Service { insuranceAccountDetailPO.setOtherPaymentBaseString(otherPO.getOtherPaymentBaseString()); if ((Objects.equals(NonPaymentEnum.YES.getValue(), otherPO.getNonPayment()) || otherPO.getNonPayment() == null) && otherPO.getOtherSchemeId() != null) { List detailPOS = MapperProxyFactory.getProxy(InsuranceSchemeDetailMapper.class).queryListBySchemeId(otherPO.getOtherSchemeId()); - InsuranceSchemeDetailPOEncrypt.decryptList(detailPOS); + encryptUtil.decryptList(detailPOS, InsuranceSchemeDetailPO.class); //方案中包含的需要缴纳其他的个人福利 Map otherPerson = detailPOS.stream() .filter(item -> Objects.equals(IsPaymentEnum.YES.getValue(), item.getIsPayment()) && item.getPaymentScope() == PaymentScopeEnum.SCOPE_PERSON.getValue()) @@ -1196,7 +1194,7 @@ public class SIAccountBiz extends Service { insuranceAccountDetailPO.setFundPaymentBaseString(fundPO.getFundPaymentBaseString()); if ((NonPaymentEnum.YES.getValue() == fundPO.getNonPayment() || fundPO.getNonPayment() == null) && fundPO.getFundSchemeId() != null) { List detailPOS = MapperProxyFactory.getProxy(InsuranceSchemeDetailMapper.class).queryListBySchemeId(fundPO.getFundSchemeId()); - InsuranceSchemeDetailPOEncrypt.decryptList(detailPOS); + encryptUtil.decryptList(detailPOS, InsuranceSchemeDetailPO.class); //方案中包含的需要缴纳社保的个人福利 Map fundperson = detailPOS.stream() .filter(item -> IsPaymentEnum.YES.getValue() == item.getIsPayment() && item.getPaymentScope() == PaymentScopeEnum.SCOPE_PERSON.getValue()) @@ -1284,7 +1282,7 @@ public class SIAccountBiz extends Service { insuranceAccountDetailPO.setSocialPaymentBaseString(socialPO.getSocialPaymentBaseString()); if ((NonPaymentEnum.YES.getValue() == socialPO.getNonPayment() || socialPO.getNonPayment() == null) && socialPO.getSocialSchemeId() != null) { List detailPOS = MapperProxyFactory.getProxy(InsuranceSchemeDetailMapper.class).queryListBySchemeId(socialPO.getSocialSchemeId()); - InsuranceSchemeDetailPOEncrypt.decryptList(detailPOS); + encryptUtil.decryptList(detailPOS, InsuranceSchemeDetailPO.class); //方案中包含的需要缴纳社保的个人福利 Map schemeperson = detailPOS.stream() .filter(item -> IsPaymentEnum.YES.getValue() == item.getIsPayment() && item.getPaymentScope() == PaymentScopeEnum.SCOPE_PERSON.getValue()) @@ -1372,7 +1370,7 @@ public class SIAccountBiz extends Service { insuranceAccountDetailPO.setSocialPaymentBaseString(socialPO.getSocialPaymentBaseString()); if ((NonPaymentEnum.YES.getValue() == socialPO.getNonPayment() || socialPO.getNonPayment() == null) && socialPO.getSocialSchemeId() != null) { List detailPOS = MapperProxyFactory.getProxy(InsuranceSchemeDetailMapper.class).queryListBySchemeId(socialPO.getSocialSchemeId()); - InsuranceSchemeDetailPOEncrypt.decryptList(detailPOS); + encryptUtil.decryptList(detailPOS, InsuranceSchemeDetailPO.class); //方案中包含的需要缴纳社保的个人福利 Map schemeperson = detailPOS.stream() .filter(item -> IsPaymentEnum.YES.getValue() == item.getIsPayment() && item.getPaymentScope() == PaymentScopeEnum.SCOPE_PERSON.getValue()) diff --git a/src/com/engine/salary/biz/SIArchivesBiz.java b/src/com/engine/salary/biz/SIArchivesBiz.java index 62fa5fc76..ba4f3df93 100644 --- a/src/com/engine/salary/biz/SIArchivesBiz.java +++ b/src/com/engine/salary/biz/SIArchivesBiz.java @@ -14,10 +14,7 @@ import com.cloudstore.eccom.pc.table.WeaTableColumn; import com.cloudstore.eccom.result.WeaResultMsg; import com.engine.salary.constant.SalaryDefaultTenantConstant; import com.engine.salary.encrypt.AESEncryptUtil; -import com.engine.salary.encrypt.siarchives.InsuranceArchivesFundSchemePOEncrypt; -import com.engine.salary.encrypt.siarchives.InsuranceArchivesOtherSchemePOEncrypt; -import com.engine.salary.encrypt.siarchives.InsuranceArchivesSocialSchemePOEncrypt; -import com.engine.salary.encrypt.sischeme.InsuranceSchemeDetailPOEncrypt; +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.dto.InsuranceArchivesBaseDTO; @@ -81,6 +78,8 @@ public class SIArchivesBiz { Boolean needAuth; Collection taxAgentPOS; + private EncryptUtil encryptUtil = new EncryptUtil(); + private TaxAgentMapper getTaxAgentMapper() { return MapperProxyFactory.getProxy(TaxAgentMapper.class); } @@ -378,7 +377,7 @@ public class SIArchivesBiz { try { InsuranceSchemeDetailMapper insuranceSchemeDetailMapper = sqlSession.getMapper(InsuranceSchemeDetailMapper.class); List insuranceSchemeDetailPOS = insuranceSchemeDetailMapper.queryListByPrimaryIdIsPayment(schemeId, IsPaymentEnum.YES.getValue(), welfareType); - InsuranceSchemeDetailPOEncrypt.decryptList(insuranceSchemeDetailPOS); + encryptUtil.decryptList(insuranceSchemeDetailPOS, InsuranceSchemeDetailPO.class); return insuranceSchemeDetailPOS; } finally { sqlSession.close(); @@ -417,7 +416,7 @@ public class SIArchivesBiz { .employeeId(employeeId) .paymentOrganization(paymentOrganization) .build()); - InsuranceArchivesOtherSchemePOEncrypt.decryptList(otherList); + encryptUtil.decryptList(otherList, InsuranceArchivesOtherSchemePO.class); InsuranceArchivesOtherSchemePO insuranceArchivesOtherSchemePO = otherList.size() != 0 ? otherList.get(0) : null; InsuranceArchivesOtherSchemeDTO data = InsuranceArchivesBO.convertOtherPOtoDTO(insuranceArchivesOtherSchemePO, employeeId); if (insuranceArchivesOtherSchemePO == null) { @@ -448,7 +447,7 @@ public class SIArchivesBiz { .employeeId(employeeId) .paymentOrganization(paymentOrganization) .build()); - InsuranceArchivesFundSchemePOEncrypt.decryptList(fundList); + encryptUtil.decryptList(fundList, InsuranceArchivesFundSchemePO.class); InsuranceArchivesFundSchemePO insuranceArchivesFundSchemePO = fundList.size() != 0 ? fundList.get(0) : null; InsuranceArchivesFundSchemeDTO data = InsuranceArchivesBO.convertFundPOtoDTO(insuranceArchivesFundSchemePO, employeeId); if (insuranceArchivesFundSchemePO == null) { @@ -494,7 +493,7 @@ public class SIArchivesBiz { .employeeId(employeeId) .paymentOrganization(paymentOrganization) .build()); - InsuranceArchivesSocialSchemePOEncrypt.decryptList(socialList); + encryptUtil.decryptList(socialList, InsuranceArchivesSocialSchemePO.class); return socialList.size() != 0 ? socialList.get(0) : null; } finally { sqlSession.close(); @@ -670,7 +669,7 @@ public class SIArchivesBiz { if (!checkWelBaseLimit(updateOtherInfo.getOtherSchemeId(),updateOtherInfo.getOtherPaymentBaseString())) { throw new SalaryRunTimeException("其他福利明细中的基数更新内容不符合相关基数上下限要求，请检查后重试！"); } - InsuranceArchivesOtherSchemePOEncrypt.encryptItem(updateOtherInfo); + encryptUtil.encrypt(updateOtherInfo, InsuranceArchivesOtherSchemePO.class); otherSchemeMapper.updateById(updateOtherInfo); sqlSession.commit(); } else { @@ -722,7 +721,7 @@ public class SIArchivesBiz { if (!checkWelBaseLimit(updateFundInfo.getFundSchemeId(),updateFundInfo.getFundPaymentBaseString())) { throw new SalaryRunTimeException("公积金福利明细中的基数更新内容不符合相关基数上下限要求，请检查后重试！"); } - InsuranceArchivesFundSchemePOEncrypt.encryptItem(updateFundInfo); + encryptUtil.encrypt(updateFundInfo, InsuranceArchivesFundSchemePO.class); fundSchemeMapper.updateById(updateFundInfo); sqlSession.commit(); @@ -783,7 +782,7 @@ public class SIArchivesBiz { if (!checkWelBaseLimit(updateSocialInfo.getSocialSchemeId(),updateSocialInfo.getSocialPaymentBaseString())) { throw new SalaryRunTimeException("社保福利明细中的基数更新内容不符合相关基数上下限要求，请检查后重试！"); } - InsuranceArchivesSocialSchemePOEncrypt.encryptItem(updateSocialInfo); + encryptUtil.encrypt(updateSocialInfo, InsuranceArchivesSocialSchemePO.class); socialSchemeMapper.updateById(updateSocialInfo); sqlSession.commit(); @@ -837,7 +836,7 @@ public class SIArchivesBiz { if (isPaymentList.size() > 0) { InsuranceSchemeDetailPO insuranceSchemeDetailPO = isPaymentList.get(0); - InsuranceSchemeDetailPOEncrypt.decryptItem(insuranceSchemeDetailPO); + encryptUtil.decrypt(insuranceSchemeDetailPO, InsuranceSchemeDetailPO.class); String lowerLimit = "0.000".equals(insuranceSchemeDetailPO.getLowerLimit()) ? null : insuranceSchemeDetailPO.getLowerLimit(); String upperLimit = "0.000".equals(insuranceSchemeDetailPO.getUpperLimit()) ? null : insuranceSchemeDetailPO.getUpperLimit(); if (lowerLimit != null && lowerLimit.length() > 0 && Double.parseDouble(entry.getValue()) < Double.parseDouble(lowerLimit)) { @@ -1077,13 +1076,13 @@ public class SIArchivesBiz { insuranceArchivesEmployeePOS.forEach(item -> { List socialList = socialSchemeMapper.getSocialByEmployeeId(Collections.singletonList(item.getEmployeeId())); - InsuranceArchivesSocialSchemePOEncrypt.decryptList(socialList); + encryptUtil.decryptList(socialList, InsuranceArchivesSocialSchemePO.class); // InsuranceArchivesSocialSchemePO socialItem = socialList.size() != 0 ? socialList.get(0) : null; List fundList = fundSchemeMapper.getFundByEmployeeId(Collections.singletonList(item.getEmployeeId())); - InsuranceArchivesFundSchemePOEncrypt.decryptList(fundList); + encryptUtil.decryptList(fundList, InsuranceArchivesFundSchemePO.class); // InsuranceArchivesFundSchemePO fundItem = fundList.size() != 0 ? fundList.get(0) : null; List otherList = otherSchemeMapper.getOtherByEmployeeId(Collections.singletonList(item.getEmployeeId())); - InsuranceArchivesOtherSchemePOEncrypt.decryptList(otherList); + encryptUtil.decryptList(otherList, InsuranceArchivesOtherSchemePO.class); // InsuranceArchivesOtherSchemePO otherItem = otherList.size() != 0 ? otherList.get(0) : null; if (socialList.size() > 0) { for (InsuranceArchivesSocialSchemePO socialSchemePO : socialList) { @@ -1189,13 +1188,13 @@ public class SIArchivesBiz { InsuranceSchemeMapper insuranceSchemeMapper = sqlSession.getMapper(InsuranceSchemeMapper.class); // List employeeIds = insuranceArchivesEmployeePOS.stream().map(InsuranceArchivesEmployeePO::getEmployeeId).collect(Collectors.toList()); - Map socialSchemePOMap = InsuranceArchivesSocialSchemePOEncrypt.decryptList(this.getSocialByEmployeeIdAndPayOrg(insuranceArchivesEmployeePOS)) + Map socialSchemePOMap = encryptUtil.decryptList(this.getSocialByEmployeeIdAndPayOrg(insuranceArchivesEmployeePOS), InsuranceArchivesSocialSchemePO.class) .stream().collect(Collectors.toMap(InsuranceArchivesSocialSchemePO::getId, Function.identity())); - Map fundSchemePOMap = InsuranceArchivesFundSchemePOEncrypt.decryptList(this.getFundByEmployeeIdAndPayOrg(insuranceArchivesEmployeePOS)) + Map fundSchemePOMap = encryptUtil.decryptList(this.getFundByEmployeeIdAndPayOrg(insuranceArchivesEmployeePOS), InsuranceArchivesFundSchemePO.class) .stream().collect(Collectors.toMap(InsuranceArchivesFundSchemePO::getId, Function.identity())); List otherByEmployeeList = this.getOtherByEmployeeIdAndPayOrg(insuranceArchivesEmployeePOS); - InsuranceArchivesOtherSchemePOEncrypt.decryptList(otherByEmployeeList); + encryptUtil.decryptList(otherByEmployeeList, InsuranceArchivesOtherSchemePO.class); Map otherSchemePOMap = otherByEmployeeList .stream().collect(Collectors.toMap(InsuranceArchivesOtherSchemePO::getId, Function.identity())); insuranceArchivesEmployeePOS.forEach(item -> { @@ -1442,16 +1441,16 @@ public class SIArchivesBiz { Map socialMap = new HashMap<>(); Map funMap = new HashMap<>(); Map otherMap = new HashMap<>(); - List socialPOS = InsuranceArchivesSocialSchemePOEncrypt.decryptList(this.getSocialByEmployeeIdAndPayOrg(insuranceArchivesEmployeePOS)); + List socialPOS = encryptUtil.decryptList(this.getSocialByEmployeeIdAndPayOrg(insuranceArchivesEmployeePOS), InsuranceArchivesSocialSchemePO.class); if (CollectionUtils.isNotEmpty(socialPOS)) { socialMap = socialPOS.stream().collect(Collectors.toMap(InsuranceArchivesSocialSchemePO::getEmployeeId, Function.identity())); } - List fundPOS = InsuranceArchivesFundSchemePOEncrypt.decryptList(this.getFundByEmployeeIdAndPayOrg(insuranceArchivesEmployeePOS)); + List fundPOS = encryptUtil.decryptList(this.getFundByEmployeeIdAndPayOrg(insuranceArchivesEmployeePOS), InsuranceArchivesFundSchemePO.class); if (CollectionUtils.isNotEmpty(fundPOS)) { funMap = fundPOS.stream().collect(Collectors.toMap(InsuranceArchivesFundSchemePO::getEmployeeId, Function.identity())); } List otherPOS = this.getOtherByEmployeeIdAndPayOrg(insuranceArchivesEmployeePOS); - InsuranceArchivesOtherSchemePOEncrypt.decryptList(otherPOS); + encryptUtil.decryptList(otherPOS, InsuranceArchivesOtherSchemePO.class); if (CollectionUtils.isNotEmpty(otherPOS)) { otherMap = otherPOS.stream().collect(Collectors.toMap(InsuranceArchivesOtherSchemePO::getEmployeeId, Function.identity())); } diff --git a/src/com/engine/salary/biz/SISchemeBiz.java b/src/com/engine/salary/biz/SISchemeBiz.java index 1ca41d542..b1596254f 100644 --- a/src/com/engine/salary/biz/SISchemeBiz.java +++ b/src/com/engine/salary/biz/SISchemeBiz.java @@ -3,7 +3,7 @@ package com.engine.salary.biz; import com.api.formmode.mybatis.util.SqlProxyHandle; import com.engine.salary.constant.SalaryDefaultTenantConstant; import com.engine.salary.encrypt.AESEncryptUtil; -import com.engine.salary.encrypt.sischeme.InsuranceSchemeDetailPOEncrypt; +import com.engine.salary.encrypt.EncryptUtil; import com.engine.salary.entity.sicategory.po.ICategoryPO; import com.engine.salary.entity.sischeme.bo.InsuranceSchemeBO; import com.engine.salary.entity.sischeme.dto.InsuranceSchemeDTO; @@ -42,6 +42,8 @@ public class SISchemeBiz { return SqlProxyHandle.getProxy(SIAccountUtilMapper.class); } + private EncryptUtil encryptUtil = new EncryptUtil(); + /** * 获取社保方案 * @@ -150,7 +152,7 @@ public class SISchemeBiz { try { InsuranceSchemeDetailMapper insuranceSchemeDetailMapper = sqlSession.getMapper(InsuranceSchemeDetailMapper.class); InsuranceSchemeDetailPO insuranceSchemeDetailPO = insuranceSchemeDetailMapper.getByPPI(primaryId, paymentScope, insuranceId); - InsuranceSchemeDetailPOEncrypt.decryptItem(insuranceSchemeDetailPO); + encryptUtil.decrypt(insuranceSchemeDetailPO, InsuranceSchemeDetailPO.class); return insuranceSchemeDetailPO; } finally { sqlSession.close(); @@ -231,7 +233,7 @@ public class SISchemeBiz { try { InsuranceSchemeDetailMapper insuranceSchemeDetailMapper = sqlSession.getMapper(InsuranceSchemeDetailMapper.class); List insuranceSchemeDetailPOS = insuranceSchemeDetailMapper.queryListBySchemeId(primaryId); - InsuranceSchemeDetailPOEncrypt.decryptList(insuranceSchemeDetailPOS); + encryptUtil.decryptList(insuranceSchemeDetailPOS, InsuranceSchemeDetailPO.class); return decryptSchemeDetailList(insuranceSchemeDetailPOS); } finally { sqlSession.close(); @@ -271,7 +273,7 @@ public class SISchemeBiz { //保存福利项目明细表 InsuranceSchemeDetailMapper insuranceSchemeDetailMapper = sqlSession.getMapper(InsuranceSchemeDetailMapper.class); List insuranceSchemeDetailPOS = InsuranceSchemeBO.convertToInsuranceSchemeDetailPoList(saveParam.getInsuranceSchemeDetailList(), employeeId, insuranceSchemePO.getId()); - InsuranceSchemeDetailPOEncrypt.encryptList(insuranceSchemeDetailPOS); + encryptUtil.encryptList(insuranceSchemeDetailPOS, InsuranceSchemeDetailPO.class); insuranceSchemeDetailPOS.forEach(insuranceSchemeDetailMapper::insert); sqlSession.commit(); @@ -325,7 +327,7 @@ public class SISchemeBiz { insuranceSchemeDetailMapper.batchDeleteByPrimaryIds(Collections.singleton(updateParam.getInsuranceScheme().getId())); //更新明细表 List insuranceSchemeDetailPOS = InsuranceSchemeBO.convertToInsuranceSchemeDetailPoList(updateParam.getInsuranceSchemeDetailList(), employeeId, insuranceSchemePO.getId()); - InsuranceSchemeDetailPOEncrypt.encryptList(insuranceSchemeDetailPOS); + encryptUtil.encryptList(insuranceSchemeDetailPOS, InsuranceSchemeDetailPO.class); insuranceSchemeDetailPOS.forEach(insuranceSchemeDetailMapper::insert); //记录操作日志 @@ -410,7 +412,7 @@ public class SISchemeBiz { .validNum(item.getValidNum()) .build() ).collect(Collectors.toList()); - InsuranceSchemeDetailPOEncrypt.encryptList(detailPOS); + encryptUtil.encryptList(detailPOS, InsuranceSchemeDetailPO.class); detailPOS.forEach(insuranceSchemeDetailMapper::insert); } @@ -432,7 +434,7 @@ public class SISchemeBiz { try { InsuranceSchemeDetailMapper insuranceSchemeDetailMapper = sqlSession.getMapper(InsuranceSchemeDetailMapper.class); List insuranceSchemeDetailPOList = insuranceSchemeDetailMapper.queryListByInsuranceIdIsPayment(insuranceId, isPayment); - InsuranceSchemeDetailPOEncrypt.decryptList(insuranceSchemeDetailPOList); + encryptUtil.decryptList(insuranceSchemeDetailPOList, InsuranceSchemeDetailPO.class); return insuranceSchemeDetailPOList; } finally { sqlSession.close(); diff --git a/src/com/engine/salary/biz/SalaryArchiveItemBiz.java b/src/com/engine/salary/biz/SalaryArchiveItemBiz.java index d2a79b233..8917d6de9 100644 --- a/src/com/engine/salary/biz/SalaryArchiveItemBiz.java +++ b/src/com/engine/salary/biz/SalaryArchiveItemBiz.java @@ -1,7 +1,6 @@ package com.engine.salary.biz; import com.engine.salary.encrypt.EncryptUtil; -import com.engine.salary.encrypt.archive.SalaryArchiveItemPOEncrypt; import com.engine.salary.entity.salaryarchive.dto.SalaryItemAdjustRecordListDTO; import com.engine.salary.entity.salaryarchive.param.SalaryArchiveItemQueryParam; import com.engine.salary.entity.salaryarchive.param.SalaryItemAdjustRecordQueryParam; @@ -36,7 +35,7 @@ public class SalaryArchiveItemBiz { try { SalaryArchiveItemMapper mapper = sqlSession.getMapper(SalaryArchiveItemMapper.class); List salaryArchiveItemPOS = mapper.listByParam(build); - return SalaryArchiveItemPOEncrypt.decryptSalaryArchiveItemPOList(salaryArchiveItemPOS); + return encryptUtil.decryptList(salaryArchiveItemPOS, SalaryArchiveItemPO.class); } finally { sqlSession.close(); } @@ -46,7 +45,7 @@ public class SalaryArchiveItemBiz { SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); try { SalaryArchiveItemMapper mapper = sqlSession.getMapper(SalaryArchiveItemMapper.class); - return SalaryArchiveItemPOEncrypt.decryptSalaryArchiveItemPO(mapper.getById(salaryArchiveItemId)); + return encryptUtil.decrypt(mapper.getById(salaryArchiveItemId), SalaryArchiveItemPO.class); } finally { sqlSession.close(); } @@ -65,7 +64,7 @@ public class SalaryArchiveItemBiz { ineffectiveSalaryItems.addAll(mapper.getIneffectiveSalaryItems(build)); }); } - return SalaryArchiveItemPOEncrypt.decryptSalaryArchiveItemPOList(ineffectiveSalaryItems); + return encryptUtil.decryptList(ineffectiveSalaryItems, SalaryArchiveItemPO.class); } finally { sqlSession.close(); } @@ -76,7 +75,7 @@ public class SalaryArchiveItemBiz { try { SalaryArchiveItemMapper mapper = sqlSession.getMapper(SalaryArchiveItemMapper.class); List effectiveSalaryItems = mapper.getEffectiveSalaryItems(build); - return SalaryArchiveItemPOEncrypt.decryptSalaryArchiveItemPOList(effectiveSalaryItems); + return encryptUtil.decryptList(effectiveSalaryItems, SalaryArchiveItemPO.class); } finally { sqlSession.close(); } @@ -115,7 +114,7 @@ public class SalaryArchiveItemBiz { SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); try { SalaryArchiveItemMapper mapper = sqlSession.getMapper(SalaryArchiveItemMapper.class); - SalaryArchiveItemPOEncrypt.encryptSalaryArchiveItemPO(salaryArchiveItem); + encryptUtil.encrypt(salaryArchiveItem, SalaryArchiveItemPO.class); mapper.update(salaryArchiveItem); sqlSession.commit(); } finally { @@ -128,7 +127,7 @@ public class SalaryArchiveItemBiz { SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); try { SalaryArchiveItemMapper mapper = sqlSession.getMapper(SalaryArchiveItemMapper.class); - SalaryArchiveItemPOEncrypt.encryptSalaryArchiveItemPO(salaryArchiveItem); + encryptUtil.encrypt(salaryArchiveItem, SalaryArchiveItemPO.class); mapper.updateIgnoreNull(salaryArchiveItem); sqlSession.commit(); } finally { diff --git a/src/com/engine/salary/biz/SpecialAddDeductionBiz.java b/src/com/engine/salary/biz/SpecialAddDeductionBiz.java index cece96e18..7fc30292e 100644 --- a/src/com/engine/salary/biz/SpecialAddDeductionBiz.java +++ b/src/com/engine/salary/biz/SpecialAddDeductionBiz.java @@ -1,13 +1,12 @@ package com.engine.salary.biz; -import com.engine.salary.encrypt.datacollection.SpecialAddDeductionEncrypt; +import com.engine.salary.encrypt.EncryptUtil; import com.engine.salary.entity.datacollection.dto.SpecialAddDeductionListDTO; import com.engine.salary.entity.datacollection.dto.SpecialAddDeductionRecordDTO; import com.engine.salary.entity.datacollection.param.SpecialAddDeductionQueryParam; import com.engine.salary.entity.datacollection.po.SpecialAddDeductionPO; import com.engine.salary.mapper.datacollection.SpecialAddDeductionMapper; import com.engine.salary.util.db.MapperProxyFactory; -import com.engine.salary.util.page.SalaryPageUtil; import com.google.common.collect.Lists; import org.apache.commons.collections4.CollectionUtils; import org.apache.ibatis.session.SqlSession; @@ -18,6 +17,8 @@ import java.util.*; import java.util.stream.Collectors; public class SpecialAddDeductionBiz extends BaseBean { + private EncryptUtil encryptUtil = new EncryptUtil(); + private SpecialAddDeductionMapper mapper() { return MapperProxyFactory.getProxy(SpecialAddDeductionMapper.class); } @@ -32,26 +33,26 @@ public class SpecialAddDeductionBiz extends BaseBean { try (SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession()) { SpecialAddDeductionMapper mapper = sqlSession.getMapper(SpecialAddDeductionMapper.class); SpecialAddDeductionPO byId = mapper.getById(id); - return SpecialAddDeductionEncrypt.decrypt(byId); + return encryptUtil.decrypt(byId, SpecialAddDeductionPO.class); } } public List listDTOByParam(SpecialAddDeductionQueryParam param) { List specialAddDeductionRecordDTOS = mapper().listDtoByParam(param); - return SpecialAddDeductionEncrypt.decrypt(specialAddDeductionRecordDTOS); + return encryptUtil.decryptList(specialAddDeductionRecordDTOS, SpecialAddDeductionRecordDTO.class); } public List listByParam(SpecialAddDeductionQueryParam param) { List specialAddDeductionListDTOS = mapper().listByParam(param); - return SpecialAddDeductionEncrypt.decrypt(specialAddDeductionListDTOS); + return encryptUtil.decryptList(specialAddDeductionListDTOS, SpecialAddDeductionListDTO.class); } public List listByTaxAgentIds(List taxAgentIds) { try (SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession()) { SpecialAddDeductionMapper mapper = sqlSession.getMapper(SpecialAddDeductionMapper.class); List pos = mapper.listByTaxAgentIds(taxAgentIds); - return SpecialAddDeductionEncrypt.decrypt(pos); + return encryptUtil.decryptList(pos, SpecialAddDeductionPO.class); } } @@ -68,7 +69,7 @@ public class SpecialAddDeductionBiz extends BaseBean { } try (SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession()) { SpecialAddDeductionMapper mapper = sqlSession.getMapper(SpecialAddDeductionMapper.class); - SpecialAddDeductionEncrypt.encrypt(param); + encryptUtil.encryptList(param, SpecialAddDeductionPO.class); List> partition = Lists.partition(param, 100); partition.forEach(mapper::batchInsert); sqlSession.commit(); @@ -88,7 +89,7 @@ public class SpecialAddDeductionBiz extends BaseBean { SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); try { SpecialAddDeductionMapper mapper = sqlSession.getMapper(SpecialAddDeductionMapper.class); - SpecialAddDeductionEncrypt.encrypt(param); + encryptUtil.encryptList(param, SpecialAddDeductionPO.class); List> partition = Lists.partition(param, 100); partition.forEach(mapper::updateBatchSelective); sqlSession.commit(); @@ -166,7 +167,7 @@ public class SpecialAddDeductionBiz extends BaseBean { .stream() .filter(Objects::nonNull) .filter(s -> s.getEmployeeId() != null) - .map(SpecialAddDeductionEncrypt::decrypt) + .map(item -> encryptUtil.decrypt(item, SpecialAddDeductionPO.class)) .collect(Collectors.toList()); } } diff --git a/src/com/engine/salary/encrypt/archive/SalaryArchiveItemPOEncrypt.java b/src/com/engine/salary/encrypt/archive/SalaryArchiveItemPOEncrypt.java index 98acfd230..b307616a8 100644 --- a/src/com/engine/salary/encrypt/archive/SalaryArchiveItemPOEncrypt.java +++ b/src/com/engine/salary/encrypt/archive/SalaryArchiveItemPOEncrypt.java @@ -10,6 +10,7 @@ import java.util.List; * 字段： * item_value */ +@Deprecated public class SalaryArchiveItemPOEncrypt { public static List encryptSalaryArchiveItemPOList(List list) { if(list == null || list.size() == 0) { diff --git a/src/com/engine/salary/encrypt/archive/SalaryItemAdjustRecordListDTOEncrypt.java b/src/com/engine/salary/encrypt/archive/SalaryItemAdjustRecordListDTOEncrypt.java index 3c3bb602a..404b0b3f4 100644 --- a/src/com/engine/salary/encrypt/archive/SalaryItemAdjustRecordListDTOEncrypt.java +++ b/src/com/engine/salary/encrypt/archive/SalaryItemAdjustRecordListDTOEncrypt.java @@ -5,6 +5,7 @@ import com.engine.salary.entity.salaryarchive.dto.SalaryItemAdjustRecordListDTO; import java.util.List; +@Deprecated public class SalaryItemAdjustRecordListDTOEncrypt { public static List decryptSalaryItemAdjustRecordListDTOList(List list) { if(list == null || list.size() == 0) { diff --git a/src/com/engine/salary/encrypt/datacollection/AddUpDeductionEncrypt.java b/src/com/engine/salary/encrypt/datacollection/AddUpDeductionEncrypt.java index c79112501..848c56ab2 100644 --- a/src/com/engine/salary/encrypt/datacollection/AddUpDeductionEncrypt.java +++ b/src/com/engine/salary/encrypt/datacollection/AddUpDeductionEncrypt.java @@ -16,6 +16,7 @@ import java.util.List; * add_up_illness_medical * add_up_infant_care */ +@Deprecated public class AddUpDeductionEncrypt { @Deprecated public static List encryptAddUpDeductionList(List list) { diff --git a/src/com/engine/salary/encrypt/datacollection/AddUpDeductionRecordStrDTOEncrypt.java b/src/com/engine/salary/encrypt/datacollection/AddUpDeductionRecordStrDTOEncrypt.java index 4dc13a349..0750a6422 100644 --- a/src/com/engine/salary/encrypt/datacollection/AddUpDeductionRecordStrDTOEncrypt.java +++ b/src/com/engine/salary/encrypt/datacollection/AddUpDeductionRecordStrDTOEncrypt.java @@ -16,6 +16,7 @@ import java.util.stream.Collectors; * add_up_housing_rent * add_up_support_elderly */ +@Deprecated public class AddUpDeductionRecordStrDTOEncrypt { public static List decryptAddUpDeductionRecordDTO(List list) { if(list == null || list.size() == 0) { diff --git a/src/com/engine/salary/encrypt/datacollection/AddUpDeductionStrDTOEncrypt.java b/src/com/engine/salary/encrypt/datacollection/AddUpDeductionStrDTOEncrypt.java index 163ec4b03..4877fe406 100644 --- a/src/com/engine/salary/encrypt/datacollection/AddUpDeductionStrDTOEncrypt.java +++ b/src/com/engine/salary/encrypt/datacollection/AddUpDeductionStrDTOEncrypt.java @@ -14,6 +14,7 @@ import java.util.List; * add_up_housing_rent * add_up_support_elderly */ +@Deprecated public class AddUpDeductionStrDTOEncrypt { public static void decryptAddUpDeductionList(List list) { if (list == null || list.size() == 0) { diff --git a/src/com/engine/salary/encrypt/datacollection/AddUpSituationDTOEncrypt.java b/src/com/engine/salary/encrypt/datacollection/AddUpSituationDTOEncrypt.java index fb39e33e1..a8b369c80 100644 --- a/src/com/engine/salary/encrypt/datacollection/AddUpSituationDTOEncrypt.java +++ b/src/com/engine/salary/encrypt/datacollection/AddUpSituationDTOEncrypt.java @@ -3,7 +3,6 @@ package com.engine.salary.encrypt.datacollection; import com.engine.salary.encrypt.AESEncryptUtil; import com.engine.salary.entity.datacollection.dto.AddUpSituationDTO; -import java.util.ArrayList; import java.util.List; /** @@ -24,9 +23,10 @@ import java.util.List; * add_up_allowed_donation * add_up_advance_tax */ +@Deprecated public class AddUpSituationDTOEncrypt { public static List encryptAddUpSituationDTOList(List list) { - if(list == null || list.size() == 0) { + if (list == null || list.size() == 0) { return list; } list.forEach(item -> { @@ -53,7 +53,7 @@ public class AddUpSituationDTOEncrypt { } public static List decryptAddUpSituationDTOList(List list) { - if(list == null || list.size() == 0) { + if (list == null || list.size() == 0) { return list; } list.forEach(item -> { diff --git a/src/com/engine/salary/encrypt/datacollection/AddUpSituationEncrypt.java b/src/com/engine/salary/encrypt/datacollection/AddUpSituationEncrypt.java index fa2a72f07..b6debb195 100644 --- a/src/com/engine/salary/encrypt/datacollection/AddUpSituationEncrypt.java +++ b/src/com/engine/salary/encrypt/datacollection/AddUpSituationEncrypt.java @@ -23,6 +23,7 @@ import java.util.List; * add_up_allowed_donation * add_up_advance_tax */ +@Deprecated public class AddUpSituationEncrypt { public static List encryptAddUpSituationList(List list) { if(list == null || list.size() == 0) { diff --git a/src/com/engine/salary/encrypt/datacollection/AddUpSituationRecordDTOEncrypt.java b/src/com/engine/salary/encrypt/datacollection/AddUpSituationRecordDTOEncrypt.java index dc5e0c086..dd39664f9 100644 --- a/src/com/engine/salary/encrypt/datacollection/AddUpSituationRecordDTOEncrypt.java +++ b/src/com/engine/salary/encrypt/datacollection/AddUpSituationRecordDTOEncrypt.java @@ -5,6 +5,7 @@ import com.engine.salary.entity.datacollection.dto.AddUpSituationRecordDTO; import java.util.List; +@Deprecated public class AddUpSituationRecordDTOEncrypt { public static List encryptAddUpSituationRecordDTOList(List list) { if(list == null || list.size() == 0) { diff --git a/src/com/engine/salary/encrypt/datacollection/OtherDeductionListDTOEncrypt.java b/src/com/engine/salary/encrypt/datacollection/OtherDeductionListDTOEncrypt.java index c7a1f9385..6d099a631 100644 --- a/src/com/engine/salary/encrypt/datacollection/OtherDeductionListDTOEncrypt.java +++ b/src/com/engine/salary/encrypt/datacollection/OtherDeductionListDTOEncrypt.java @@ -14,6 +14,7 @@ import java.util.List; * other_deduction * deduction_allowed_donation */ +@Deprecated public class OtherDeductionListDTOEncrypt { public static List encryptOtherDeductionListDTOList(List list) { if(list == null || list.size() == 0) { diff --git a/src/com/engine/salary/encrypt/datacollection/OtherDeductionPOEncrypt.java b/src/com/engine/salary/encrypt/datacollection/OtherDeductionPOEncrypt.java index ddfed66f5..bed9cd935 100644 --- a/src/com/engine/salary/encrypt/datacollection/OtherDeductionPOEncrypt.java +++ b/src/com/engine/salary/encrypt/datacollection/OtherDeductionPOEncrypt.java @@ -4,15 +4,7 @@ import com.engine.salary.encrypt.AESEncryptUtil; import com.engine.salary.entity.datacollection.po.OtherDeductionPO; import java.util.List; - -/** - * hrsa_other_deduction: 加解密 - * 字段： - * business_healthy_insurance - * tax_delay_endowment_insurance - * other_deduction - * deduction_allowed_donation - */ +@Deprecated public class OtherDeductionPOEncrypt { public static List encryptOtherDeductionPOList(List list) { if(list == null || list.size() == 0) { diff --git a/src/com/engine/salary/encrypt/datacollection/OtherDeductionRecordDTOEncrypt.java b/src/com/engine/salary/encrypt/datacollection/OtherDeductionRecordDTOEncrypt.java index 015a3741e..44fffcc1b 100644 --- a/src/com/engine/salary/encrypt/datacollection/OtherDeductionRecordDTOEncrypt.java +++ b/src/com/engine/salary/encrypt/datacollection/OtherDeductionRecordDTOEncrypt.java @@ -13,6 +13,7 @@ import java.util.List; * other_deduction * deduction_allowed_donation */ +@Deprecated public class OtherDeductionRecordDTOEncrypt { public static List encryptOtherDeductionRecordDTOList(List list) { if(list == null || list.size() == 0) { diff --git a/src/com/engine/salary/encrypt/datacollection/SpecialAddDeductionEncrypt.java b/src/com/engine/salary/encrypt/datacollection/SpecialAddDeductionEncrypt.java index c6169219c..448fb2010 100644 --- a/src/com/engine/salary/encrypt/datacollection/SpecialAddDeductionEncrypt.java +++ b/src/com/engine/salary/encrypt/datacollection/SpecialAddDeductionEncrypt.java @@ -1,13 +1,9 @@ package com.engine.salary.encrypt.datacollection; import com.engine.salary.encrypt.AESEncryptUtil; -import com.engine.salary.entity.datacollection.dto.SpecialAddDeductionRecordDTO; -import com.engine.salary.entity.datacollection.po.SpecialAddDeductionPO; import java.lang.reflect.Field; import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; import java.util.List; import java.util.stream.Collectors; @@ -22,6 +18,7 @@ import java.util.stream.Collectors; * serious_illness_treatment * infant_care */ +@Deprecated public class SpecialAddDeductionEncrypt { private static final List FIELDS = Arrays.asList( "childrenEducation", "continuingEducation", "supportingElder", "housingLoanInterest", diff --git a/src/com/engine/salary/encrypt/report/SalaryAcctResultReportPOEncrypt.java b/src/com/engine/salary/encrypt/report/SalaryAcctResultReportPOEncrypt.java index 37232d0e2..7c34d4dc9 100644 --- a/src/com/engine/salary/encrypt/report/SalaryAcctResultReportPOEncrypt.java +++ b/src/com/engine/salary/encrypt/report/SalaryAcctResultReportPOEncrypt.java @@ -8,6 +8,7 @@ import java.util.Collection; /** * 薪资核算报表 */ +@Deprecated public class SalaryAcctResultReportPOEncrypt { public static Collection encryptList(Collection list) { diff --git a/src/com/engine/salary/encrypt/salaryacct/ExcelAcctResultPOEncrypt.java b/src/com/engine/salary/encrypt/salaryacct/ExcelAcctResultPOEncrypt.java index 57b6cae02..c19d16689 100644 --- a/src/com/engine/salary/encrypt/salaryacct/ExcelAcctResultPOEncrypt.java +++ b/src/com/engine/salary/encrypt/salaryacct/ExcelAcctResultPOEncrypt.java @@ -6,6 +6,7 @@ import com.engine.salary.entity.salaryacct.po.ExcelAcctResultPO; import java.util.Collection; import java.util.List; +@Deprecated public class ExcelAcctResultPOEncrypt { public static Collection encryptList(Collection list) { diff --git a/src/com/engine/salary/encrypt/salaryacct/SalaryAcctResultPOEncrypt.java b/src/com/engine/salary/encrypt/salaryacct/SalaryAcctResultPOEncrypt.java index 4150e15bf..e7da51250 100644 --- a/src/com/engine/salary/encrypt/salaryacct/SalaryAcctResultPOEncrypt.java +++ b/src/com/engine/salary/encrypt/salaryacct/SalaryAcctResultPOEncrypt.java @@ -5,6 +5,7 @@ import com.engine.salary.entity.salaryacct.po.SalaryAcctResultPO; import java.util.List; +@Deprecated public class SalaryAcctResultPOEncrypt { @Deprecated diff --git a/src/com/engine/salary/encrypt/siaccount/ExcelInsuranceDetailPOEncrypt.java b/src/com/engine/salary/encrypt/siaccount/ExcelInsuranceDetailPOEncrypt.java index 6d6a30776..592ba011a 100644 --- a/src/com/engine/salary/encrypt/siaccount/ExcelInsuranceDetailPOEncrypt.java +++ b/src/com/engine/salary/encrypt/siaccount/ExcelInsuranceDetailPOEncrypt.java @@ -30,6 +30,7 @@ import java.util.List; * other_sum * total */ +@Deprecated public class ExcelInsuranceDetailPOEncrypt { public static List encryptInsuranceAccountDetailPOList(List list) { if(list == null || list.size() == 0) { diff --git a/src/com/engine/salary/encrypt/siaccount/InsuranceAccountDetailTempPOEncrypt.java b/src/com/engine/salary/encrypt/siaccount/InsuranceAccountDetailTempPOEncrypt.java index af3a86e42..5e5f32724 100644 --- a/src/com/engine/salary/encrypt/siaccount/InsuranceAccountDetailTempPOEncrypt.java +++ b/src/com/engine/salary/encrypt/siaccount/InsuranceAccountDetailTempPOEncrypt.java @@ -30,6 +30,7 @@ import java.util.List; * other_sum * total */ +@Deprecated public class InsuranceAccountDetailTempPOEncrypt { public static List encryptInsuranceAccountDetailTempPOList(List list) { if(list == null || list.size() == 0) { diff --git a/src/com/engine/salary/encrypt/siaccount/SiAccountEncrypt.java b/src/com/engine/salary/encrypt/siaccount/SiAccountEncrypt.java index 14fdbee4e..73a627e5f 100644 --- a/src/com/engine/salary/encrypt/siaccount/SiAccountEncrypt.java +++ b/src/com/engine/salary/encrypt/siaccount/SiAccountEncrypt.java @@ -12,6 +12,7 @@ import java.util.List; * social_pay * fund_pay */ +@Deprecated public class SiAccountEncrypt { @Deprecated public static List encryptInsuranceAccountBatchList(List list) { diff --git a/src/com/engine/salary/encrypt/siarchives/InsuranceArchivesFundSchemePOEncrypt.java b/src/com/engine/salary/encrypt/siarchives/InsuranceArchivesFundSchemePOEncrypt.java index 5bc6a7d3e..18233ed58 100644 --- a/src/com/engine/salary/encrypt/siarchives/InsuranceArchivesFundSchemePOEncrypt.java +++ b/src/com/engine/salary/encrypt/siarchives/InsuranceArchivesFundSchemePOEncrypt.java @@ -5,6 +5,7 @@ import com.engine.salary.entity.siarchives.po.InsuranceArchivesFundSchemePO; import java.util.List; +@Deprecated public class InsuranceArchivesFundSchemePOEncrypt { public static List encryptList(List list) { if(list == null || list.size() == 0) { diff --git a/src/com/engine/salary/encrypt/siarchives/InsuranceArchivesOtherSchemePOEncrypt.java b/src/com/engine/salary/encrypt/siarchives/InsuranceArchivesOtherSchemePOEncrypt.java index 071868571..d24b22e89 100644 --- a/src/com/engine/salary/encrypt/siarchives/InsuranceArchivesOtherSchemePOEncrypt.java +++ b/src/com/engine/salary/encrypt/siarchives/InsuranceArchivesOtherSchemePOEncrypt.java @@ -1,11 +1,11 @@ package com.engine.salary.encrypt.siarchives; import com.engine.salary.encrypt.AESEncryptUtil; -import com.engine.salary.entity.siaccount.po.InsuranceAccountBatchPO; import com.engine.salary.entity.siarchives.po.InsuranceArchivesOtherSchemePO; import java.util.List; +@Deprecated public class InsuranceArchivesOtherSchemePOEncrypt { public static List encryptList(List list) { if(list == null || list.size() == 0) { diff --git a/src/com/engine/salary/encrypt/siarchives/InsuranceArchivesSocialSchemePOEncrypt.java b/src/com/engine/salary/encrypt/siarchives/InsuranceArchivesSocialSchemePOEncrypt.java index 19cc358a5..7490ad352 100644 --- a/src/com/engine/salary/encrypt/siarchives/InsuranceArchivesSocialSchemePOEncrypt.java +++ b/src/com/engine/salary/encrypt/siarchives/InsuranceArchivesSocialSchemePOEncrypt.java @@ -5,6 +5,7 @@ import com.engine.salary.entity.siarchives.po.InsuranceArchivesSocialSchemePO; import java.util.List; +@Deprecated public class InsuranceArchivesSocialSchemePOEncrypt { public static List encryptList(List list) { if(list == null || list.size() == 0) { diff --git a/src/com/engine/salary/encrypt/siexport/AccountExportPOEncrypt.java b/src/com/engine/salary/encrypt/siexport/AccountExportPOEncrypt.java index 5684afec1..564993785 100644 --- a/src/com/engine/salary/encrypt/siexport/AccountExportPOEncrypt.java +++ b/src/com/engine/salary/encrypt/siexport/AccountExportPOEncrypt.java @@ -30,6 +30,7 @@ import java.util.List; * other_sum * total */ +@Deprecated public class AccountExportPOEncrypt { public static List encryptAccountExportPOList(List list) { if(list == null || list.size() == 0) { diff --git a/src/com/engine/salary/encrypt/siexport/ExcelAccountExportPOEncrypt.java b/src/com/engine/salary/encrypt/siexport/ExcelAccountExportPOEncrypt.java index 3121cc46d..d562ac937 100644 --- a/src/com/engine/salary/encrypt/siexport/ExcelAccountExportPOEncrypt.java +++ b/src/com/engine/salary/encrypt/siexport/ExcelAccountExportPOEncrypt.java @@ -30,6 +30,7 @@ import java.util.List; * other_sum * total */ +@Deprecated public class ExcelAccountExportPOEncrypt { public static List encryptExcelAccountExportPOList(List list) { if(list == null || list.size() == 0) { diff --git a/src/com/engine/salary/encrypt/sischeme/InsuranceSchemeDetailPOEncrypt.java b/src/com/engine/salary/encrypt/sischeme/InsuranceSchemeDetailPOEncrypt.java index 613c0a362..2f75436c8 100644 --- a/src/com/engine/salary/encrypt/sischeme/InsuranceSchemeDetailPOEncrypt.java +++ b/src/com/engine/salary/encrypt/sischeme/InsuranceSchemeDetailPOEncrypt.java @@ -5,6 +5,7 @@ import com.engine.salary.entity.sischeme.po.InsuranceSchemeDetailPO; import java.util.List; +@Deprecated public class InsuranceSchemeDetailPOEncrypt { public static List encryptList(List list) { if(list == null || list.size() == 0) { diff --git a/src/com/engine/salary/encrypt/taxdeclaration/TaxDeclarationDetailEncrypt.java b/src/com/engine/salary/encrypt/taxdeclaration/TaxDeclarationDetailEncrypt.java index 0e912c4ba..b1bde8463 100644 --- a/src/com/engine/salary/encrypt/taxdeclaration/TaxDeclarationDetailEncrypt.java +++ b/src/com/engine/salary/encrypt/taxdeclaration/TaxDeclarationDetailEncrypt.java @@ -10,6 +10,8 @@ import java.util.List; * 字段： * field_value */ + +@Deprecated public class TaxDeclarationDetailEncrypt { public static List encryptTaxDeclarationDetailList(List list) { if(list == null || list.size() == 0) { diff --git a/src/com/engine/salary/encrypt/taxdeclaration/TaxDeclarationDetailPOEncrypt.java b/src/com/engine/salary/encrypt/taxdeclaration/TaxDeclarationDetailPOEncrypt.java index 8f0d57b3a..0cbc88a29 100644 --- a/src/com/engine/salary/encrypt/taxdeclaration/TaxDeclarationDetailPOEncrypt.java +++ b/src/com/engine/salary/encrypt/taxdeclaration/TaxDeclarationDetailPOEncrypt.java @@ -11,6 +11,7 @@ import java.util.List; * 字段： * field_value */ +@Deprecated public class TaxDeclarationDetailPOEncrypt { public static List encryptTaxDeclarationDetailPOList(List list) { if(list == null || list.size() == 0) { diff --git a/src/com/engine/salary/entity/datacollection/AddUpSituation.java b/src/com/engine/salary/entity/datacollection/AddUpSituation.java index ddecd5eee..6335aee90 100644 --- a/src/com/engine/salary/entity/datacollection/AddUpSituation.java +++ b/src/com/engine/salary/entity/datacollection/AddUpSituation.java @@ -1,5 +1,6 @@ package com.engine.salary.entity.datacollection; +import com.engine.salary.annotation.Encrypt; import com.engine.salary.annotation.SalaryFormulaVar; import com.engine.salary.annotation.SalaryTable; import com.engine.salary.annotation.SalaryTableOperate; @@ -52,102 +53,119 @@ public class AddUpSituation { * 累计收入额 */ @SalaryFormulaVar(defaultLabel = "累计收入额", labelId = 86712, dataType = "number") + @Encrypt private String addUpIncome; /** * 累计减除费用 */ @SalaryFormulaVar(defaultLabel = "累计减除费用", labelId = 86711, dataType = "number") + @Encrypt private String addUpSubtraction; /** * 累计社保个人合计 */ @SalaryFormulaVar(defaultLabel = "累计社保个人合计", labelId = 86710, dataType = "number") + @Encrypt private String addUpSocialSecurityTotal; /** * 累计公积金个人合计 */ @SalaryFormulaVar(defaultLabel = "累计公积金个人合计", labelId = 86709, dataType = "number") + @Encrypt private String addUpAccumulationFundTotal; /** * 累计子女教育 */ @SalaryFormulaVar(defaultLabel = "累计子女教育", labelId = 86321, dataType = "number") + @Encrypt private String addUpChildEducation; /** * 累计继续教育 */ @SalaryFormulaVar(defaultLabel = "累计继续教育", labelId = 86323, dataType = "number") + @Encrypt private String addUpContinuingEducation; /** * 累计住房贷款利息 */ @SalaryFormulaVar(defaultLabel = "累计住房贷款利息", labelId = 86324, dataType = "number") + @Encrypt private String addUpHousingLoanInterest; /** * 累计住房租金 */ @SalaryFormulaVar(defaultLabel = "累计住房租金", labelId = 86325, dataType = "number") + @Encrypt private String addUpHousingRent; /** * 累计赡养老人 */ @SalaryFormulaVar(defaultLabel = "累计赡养老人", labelId = 86326, dataType = "number") + @Encrypt private String addUpSupportElderly; /** * 累计大病医疗 */ @SalaryFormulaVar(defaultLabel = "累计大病医疗", labelId = 105142, dataType = "number") + @Encrypt private String addUpIllnessMedical; /** * 累计婴幼儿照护 */ @SalaryFormulaVar(defaultLabel = "累计婴幼儿照护", labelId = 117732, dataType = "number") + @Encrypt private String addUpInfantCare; /** * 累计企业（职业）年金及其他福利 */ @SalaryFormulaVar(defaultLabel = "累计企业（职业）年金及其他福利", labelId = 90567, dataType = "number") + @Encrypt private String addUpEnterpriseAndOther; /** * 累计其他免税扣除 */ @SalaryFormulaVar(defaultLabel = "累计其他免税扣除", labelId = 93902, dataType = "number") + @Encrypt private String addUpOtherDeduction; /** * 累计免税收入 */ @SalaryFormulaVar(defaultLabel = "累计免税收入", labelId = 86704, dataType = "number") + @Encrypt private String addUpTaxExemptIncome; /** * 累计准予扣除的捐赠额 */ @SalaryFormulaVar(defaultLabel = "累计准予扣除的捐赠额", labelId = 86703, dataType = "number") + @Encrypt private String addUpAllowedDonation; /** * 累计减免税额 */ @SalaryFormulaVar(defaultLabel = "累计减免税额", labelId = 105478, dataType = "number") + @Encrypt private String addUpTaxSavings; /** * 累计已预扣预缴税额 */ @SalaryFormulaVar(defaultLabel = "累计已预扣预缴税额", labelId = 86702, dataType = "number") + @Encrypt private String addUpAdvanceTax; /** diff --git a/src/com/engine/salary/entity/datacollection/dto/AddUpSituationRecordDTO.java b/src/com/engine/salary/entity/datacollection/dto/AddUpSituationRecordDTO.java index 50a79012b..b32b60cae 100644 --- a/src/com/engine/salary/entity/datacollection/dto/AddUpSituationRecordDTO.java +++ b/src/com/engine/salary/entity/datacollection/dto/AddUpSituationRecordDTO.java @@ -1,6 +1,7 @@ package com.engine.salary.entity.datacollection.dto; import com.cloudstore.eccom.pc.table.WeaTableType; +import com.engine.salary.annotation.Encrypt; import com.engine.salary.annotation.SalaryTable; import com.engine.salary.annotation.SalaryTableColumn; import com.engine.salary.annotation.TableTitle; @@ -71,85 +72,102 @@ public class AddUpSituationRecordDTO { @SalaryTableColumn(text = "累计收入额", width = "10%", column = "addUpIncome") @TableTitle(title = "累计收入额", dataIndex = "addUpIncome", key = "addUpIncome") @ExcelProperty(index = 6) + @Encrypt private String addUpIncome; @SalaryTableColumn(text = "累计减除费用", width = "10%", column = "addUpSubtraction") @TableTitle(title = "累计减除费用", dataIndex = "addUpSubtraction", key = "addUpSubtraction") @ExcelProperty(index = 7) + @Encrypt private String addUpSubtraction; @SalaryTableColumn(text = "累计社保个人合计", width = "10%", column = "addUpSocialSecurityTotal") @TableTitle(title = "累计社保个人合计", dataIndex = "addUpSocialSecurityTotal", key = "addUpSocialSecurityTotal") @ExcelProperty(index = 8) + @Encrypt private String addUpSocialSecurityTotal; @SalaryTableColumn(text = "累计公积金个人合计", width = "10%", column = "addUpAccumulationFundTotal") @TableTitle(title = "累计公积金个人合计", dataIndex = "addUpAccumulationFundTotal", key = "addUpAccumulationFundTotal") @ExcelProperty(index = 9) + @Encrypt private String addUpAccumulationFundTotal; @ExcelProperty(index = 10) @SalaryTableColumn(text = "累计子女教育", width = "10%", column = "addUpChildEducation") @TableTitle(title = "累计子女教育", dataIndex = "addUpChildEducation", key = "addUpChildEducation") + @Encrypt private String addUpChildEducation; @ExcelProperty(index = 11) @SalaryTableColumn(text = "累计继续教育", width = "10%", column = "addUpContinuingEducation") @TableTitle(title = "累计继续教育", dataIndex = "addUpContinuingEducation", key = "addUpContinuingEducation") + @Encrypt private String addUpContinuingEducation; @ExcelProperty(index = 12) @SalaryTableColumn(text = "累计住房贷款利息", width = "10%", column = "addUpHousingLoanInterest") @TableTitle(title = "累计住房贷款利息", dataIndex = "addUpHousingLoanInterest", key = "addUpHousingLoanInterest") + @Encrypt private String addUpHousingLoanInterest; @ExcelProperty(index = 13) @SalaryTableColumn(text = "累计住房租金", width = "10%", column = "addUpHousingRent") @TableTitle(title = "累计住房租金", dataIndex = "addUpHousingRent", key = "addUpHousingRent") + @Encrypt private String addUpHousingRent; @ExcelProperty(index = 14) @SalaryTableColumn(text = "累计赡养老人", width = "10%", column = "addUpSupportElderly") @TableTitle(title = "累计赡养老人", dataIndex = "addUpSupportElderly", key = "addUpSupportElderly") + @Encrypt private String addUpSupportElderly; @ExcelProperty(index = 15) @SalaryTableColumn(text = "累计大病医疗", width = "10%", column = "addUpIllnessMedical") @TableTitle(title = "累计大病医疗", dataIndex = "addUpIllnessMedical", key = "addUpIllnessMedical") + @Encrypt private String addUpIllnessMedical; @ExcelProperty(index = 16) @SalaryTableColumn(text = "累计企业（职业）年金及其他福利", width = "10%", column = "addUpEnterpriseAndOther") @TableTitle(title = "累计企业（职业）年金及其他福利", dataIndex = "addUpEnterpriseAndOther", key = "addUpEnterpriseAndOther") + @Encrypt private String addUpEnterpriseAndOther; @ExcelProperty(index = 17) @SalaryTableColumn(text = "累计其他扣除", width = "10%", column = "addUpOtherDeduction") @TableTitle(title = "累计其他扣除", dataIndex = "addUpOtherDeduction", key = "addUpOtherDeduction") + @Encrypt private String addUpOtherDeduction; @ExcelProperty(index = 18) @SalaryTableColumn(text = "累计免税收入", width = "10%", column = "addUpTaxExemptIncome") @TableTitle(title = "累计免税收入", dataIndex = "addUpTaxExemptIncome", key = "addUpTaxExemptIncome") + @Encrypt private String addUpTaxExemptIncome; @ExcelProperty(index = 19) @SalaryTableColumn(text = "累计准予扣除的捐赠额", width = "10%", column = "addUpAllowedDonation") @TableTitle(title = "累计准予扣除的捐赠额", dataIndex = "addUpAllowedDonation", key = "addUpAllowedDonation") + @Encrypt private String addUpAllowedDonation; @ExcelProperty(index = 20) @SalaryTableColumn(text = "累计减免税额", width = "10%", column = "addUpTaxSavings") @TableTitle(title = "累计减免税额", dataIndex = "addUpTaxSavings", key = "addUpTaxSavings") + @Encrypt private String addUpTaxSavings; @ExcelProperty(index = 21) @SalaryTableColumn(text = "累计已预扣预缴税额", width = "10%", column = "addUpAdvanceTax") @TableTitle(title = "累计已预扣预缴税额", dataIndex = "addUpAdvanceTax", key = "addUpAdvanceTax") + @Encrypt private String addUpAdvanceTax; @ExcelProperty(index = 22) @SalaryTableColumn(text = "累计婴幼儿照护", width = "10%", column = "addUpInfantCare") @TableTitle(title = "累计婴幼儿照护", dataIndex = "addUpInfantCare", key = "addUpInfantCare") + @Encrypt private String addUpInfantCare; } diff --git a/src/com/engine/salary/entity/datacollection/dto/OtherDeductionListDTO.java b/src/com/engine/salary/entity/datacollection/dto/OtherDeductionListDTO.java index c5702b9c9..fef35da8e 100644 --- a/src/com/engine/salary/entity/datacollection/dto/OtherDeductionListDTO.java +++ b/src/com/engine/salary/entity/datacollection/dto/OtherDeductionListDTO.java @@ -1,10 +1,7 @@ package com.engine.salary.entity.datacollection.dto; import com.cloudstore.eccom.pc.table.WeaTableType; -import com.engine.salary.annotation.SalaryTable; -import com.engine.salary.annotation.SalaryTableColumn; -import com.engine.salary.annotation.SalaryTableOperate; -import com.engine.salary.annotation.TableTitle; +import com.engine.salary.annotation.*; import com.engine.salary.util.excel.ExcelProperty; import lombok.AllArgsConstructor; import lombok.Builder; @@ -87,24 +84,28 @@ public class OtherDeductionListDTO { @ExcelProperty(index = 7) @SalaryTableColumn(text = "商业健康保险", width = "10%", column = "businessHealthyInsurance") @TableTitle(title = "商业健康保险", dataIndex = "businessHealthyInsurance", key = "businessHealthyInsurance") + @Encrypt private String businessHealthyInsurance; //税延养老保险 @ExcelProperty(index = 8) @SalaryTableColumn(text = "税延养老保险", width = "10%", column = "taxDelayEndowmentInsurance") @TableTitle(title = "税延养老保险", dataIndex = "taxDelayEndowmentInsurance", key = "taxDelayEndowmentInsurance") + @Encrypt private String taxDelayEndowmentInsurance; //其他 @ExcelProperty(index = 9) @SalaryTableColumn(text = "其他", width = "10%", column = "otherDeduction") @TableTitle(title = "其他", dataIndex = "otherDeduction", key = "otherDeduction") + @Encrypt private String otherDeduction; //准予扣除的捐赠额 @ExcelProperty(index = 10) @SalaryTableColumn(text = "准予扣除的捐赠额", width = "10%", column = "deductionAllowedDonation") @TableTitle(title = "准予扣除的捐赠额", dataIndex = "deductionAllowedDonation", key = "deductionAllowedDonation") + @Encrypt private String deductionAllowedDonation; @SalaryTableColumn(text = "操作", width = "20%", column = "operate") diff --git a/src/com/engine/salary/entity/datacollection/dto/OtherDeductionRecordDTO.java b/src/com/engine/salary/entity/datacollection/dto/OtherDeductionRecordDTO.java index ef1c09271..caafb0010 100644 --- a/src/com/engine/salary/entity/datacollection/dto/OtherDeductionRecordDTO.java +++ b/src/com/engine/salary/entity/datacollection/dto/OtherDeductionRecordDTO.java @@ -1,6 +1,7 @@ package com.engine.salary.entity.datacollection.dto; import com.cloudstore.eccom.pc.table.WeaTableType; +import com.engine.salary.annotation.Encrypt; import com.engine.salary.annotation.SalaryTable; import com.engine.salary.annotation.SalaryTableColumn; import com.engine.salary.annotation.TableTitle; @@ -72,20 +73,24 @@ public class OtherDeductionRecordDTO { //商业健康保险 @SalaryTableColumn(text = "商业健康保险", width = "10%", column = "businessHealthyInsurance") @TableTitle(title = "商业健康保险", dataIndex = "businessHealthyInsurance", key = "businessHealthyInsurance") + @Encrypt private String businessHealthyInsurance; //税延养老保险 @SalaryTableColumn(text = "税延养老保险", width = "10%", column = "taxDelayEndowmentInsurance") @TableTitle(title = "税延养老保险", dataIndex = "taxDelayEndowmentInsurance", key = "taxDelayEndowmentInsurance") + @Encrypt private String taxDelayEndowmentInsurance; //其他 @SalaryTableColumn(text = "其他", width = "10%", column = "otherDeduction") @TableTitle(title = "其他", dataIndex = "otherDeduction", key = "otherDeduction") + @Encrypt private String otherDeduction; //准予扣除的捐赠额 @SalaryTableColumn(text = "准予扣除的捐赠额", width = "10%", column = "deductionAllowedDonation") @TableTitle(title = "准予扣除的捐赠额", dataIndex = "deductionAllowedDonation", key = "deductionAllowedDonation") + @Encrypt private String deductionAllowedDonation; } diff --git a/src/com/engine/salary/entity/datacollection/dto/SpecialAddDeductionListDTO.java b/src/com/engine/salary/entity/datacollection/dto/SpecialAddDeductionListDTO.java index 8b86b6281..8597f505b 100644 --- a/src/com/engine/salary/entity/datacollection/dto/SpecialAddDeductionListDTO.java +++ b/src/com/engine/salary/entity/datacollection/dto/SpecialAddDeductionListDTO.java @@ -1,10 +1,7 @@ package com.engine.salary.entity.datacollection.dto; import com.cloudstore.eccom.pc.table.WeaTableType; -import com.engine.salary.annotation.SalaryTable; -import com.engine.salary.annotation.SalaryTableColumn; -import com.engine.salary.annotation.SalaryTableOperate; -import com.engine.salary.annotation.TableTitle; +import com.engine.salary.annotation.*; import com.engine.salary.util.excel.ExcelProperty; import lombok.AllArgsConstructor; import lombok.Builder; @@ -87,42 +84,49 @@ public class SpecialAddDeductionListDTO { @ExcelProperty(index = 7) @SalaryTableColumn(text = "子女教育", width = "10%", column = "childrenEducation") @TableTitle(title = "子女教育", dataIndex = "childrenEducation", key = "childrenEducation") + @Encrypt private String childrenEducation; //继续教育 @ExcelProperty(index = 8) @SalaryTableColumn(text = "继续教育", width = "10%", column = "continuingEducation") @TableTitle(title = "继续教育", dataIndex = "continuingEducation", key = "continuingEducation") + @Encrypt private String continuingEducation; //住房贷款利息 @ExcelProperty(index = 9) @SalaryTableColumn(text = "住房贷款利息", width = "10%", column = "housingLoanInterest") @TableTitle(title = "住房贷款利息", dataIndex = "housingLoanInterest", key = "housingLoanInterest") + @Encrypt private String housingLoanInterest; //住房租金 @ExcelProperty(index = 10) @SalaryTableColumn(text = "住房租金", width = "10%", column = "housingRent") @TableTitle(title = "住房租金", dataIndex = "housingRent", key = "housingRent") + @Encrypt private String housingRent; //赡养老人 @ExcelProperty(index = 11) @SalaryTableColumn(text = "赡养老人", width = "10%", column = "supportingElder") @TableTitle(title = "赡养老人", dataIndex = "supportingElder", key = "supportingElder") + @Encrypt private String supportingElder; //大病医疗 @ExcelProperty(index = 12) @SalaryTableColumn(text = "大病医疗", width = "10%", column = "seriousIllnessTreatment") @TableTitle(title = "大病医疗", dataIndex = "seriousIllnessTreatment", key = "seriousIllnessTreatment") + @Encrypt private String seriousIllnessTreatment; //婴幼儿照护 @ExcelProperty(index = 13) @SalaryTableColumn(text = "婴幼儿照护", width = "10%", column = "infantCare") @TableTitle(title = "婴幼儿照护", dataIndex = "infantCare", key = "infantCare") + @Encrypt private String infantCare; @SalaryTableColumn(text = "操作", width = "20%", column = "operate") diff --git a/src/com/engine/salary/entity/datacollection/dto/SpecialAddDeductionRecordDTO.java b/src/com/engine/salary/entity/datacollection/dto/SpecialAddDeductionRecordDTO.java index a7cb63bac..f872279e1 100644 --- a/src/com/engine/salary/entity/datacollection/dto/SpecialAddDeductionRecordDTO.java +++ b/src/com/engine/salary/entity/datacollection/dto/SpecialAddDeductionRecordDTO.java @@ -1,17 +1,15 @@ package com.engine.salary.entity.datacollection.dto; import com.cloudstore.eccom.pc.table.WeaTableType; +import com.engine.salary.annotation.Encrypt; import com.engine.salary.annotation.SalaryTable; import com.engine.salary.annotation.SalaryTableColumn; import com.engine.salary.annotation.TableTitle; -import com.fasterxml.jackson.annotation.JsonFormat; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import java.util.Date; - /** * 其他免税扣除记录列表 *

Copyright: Copyright (c) 2022

@@ -66,35 +64,42 @@ public class SpecialAddDeductionRecordDTO { //子女教育 @SalaryTableColumn(text = "子女教育", width = "10%", column = "childrenEducation") @TableTitle(title = "子女教育", dataIndex = "childrenEducation", key = "childrenEducation") + @Encrypt private String childrenEducation; //继续教育 @SalaryTableColumn(text = "继续教育", width = "10%", column = "continuingEducation") @TableTitle(title = "继续教育", dataIndex = "continuingEducation", key = "continuingEducation") + @Encrypt private String continuingEducation; //住房贷款利息 @SalaryTableColumn(text = "住房贷款利息", width = "10%", column = "housingLoanInterest") @TableTitle(title = "住房贷款利息", dataIndex = "housingLoanInterest", key = "housingLoanInterest") + @Encrypt private String housingLoanInterest; //住房租金 @SalaryTableColumn(text = "住房租金", width = "10%", column = "housingRent") @TableTitle(title = "住房租金", dataIndex = "housingRent", key = "housingRent") + @Encrypt private String housingRent; //赡养老人 @SalaryTableColumn(text = "赡养老人", width = "10%", column = "supportingElder") @TableTitle(title = "赡养老人", dataIndex = "supportingElder", key = "supportingElder") + @Encrypt private String supportingElder; //大病医疗 @SalaryTableColumn(text = "大病医疗", width = "10%", column = "seriousIllnessTreatment") @TableTitle(title = "大病医疗", dataIndex = "seriousIllnessTreatment", key = "seriousIllnessTreatment") + @Encrypt private String seriousIllnessTreatment; //大病医疗 @SalaryTableColumn(text = "婴幼儿照护", width = "10%", column = "infantCare") @TableTitle(title = "婴幼儿照护", dataIndex = "infantCare", key = "infantCare") + @Encrypt private String infantCare; } diff --git a/src/com/engine/salary/entity/datacollection/po/OtherDeductionPO.java b/src/com/engine/salary/entity/datacollection/po/OtherDeductionPO.java index 7b0ca4113..addccafa3 100644 --- a/src/com/engine/salary/entity/datacollection/po/OtherDeductionPO.java +++ b/src/com/engine/salary/entity/datacollection/po/OtherDeductionPO.java @@ -1,5 +1,6 @@ package com.engine.salary.entity.datacollection.po; +import com.engine.salary.annotation.Encrypt; import com.engine.salary.annotation.SalaryFormulaVar; import lombok.AllArgsConstructor; import lombok.Builder; @@ -43,24 +44,28 @@ public class OtherDeductionPO { * 商业健康保险 */ @SalaryFormulaVar(defaultLabel = "商业健康保险", labelId = 91238, dataType = "number") + @Encrypt private String businessHealthyInsurance; /** * 税延养老保险 */ @SalaryFormulaVar(defaultLabel = "税延养老保险", labelId = 91239, dataType = "number") + @Encrypt private String taxDelayEndowmentInsurance; /** * 其他 */ @SalaryFormulaVar(defaultLabel = "其他", labelId = 84500, dataType = "number") + @Encrypt private String otherDeduction; /** * 准予扣除的捐赠额 */ @SalaryFormulaVar(defaultLabel = "准予扣除的捐赠额", labelId = 91240, dataType = "number") + @Encrypt private String deductionAllowedDonation; /** diff --git a/src/com/engine/salary/entity/datacollection/po/SpecialAddDeductionPO.java b/src/com/engine/salary/entity/datacollection/po/SpecialAddDeductionPO.java index 32cfe786b..9aaaa7363 100644 --- a/src/com/engine/salary/entity/datacollection/po/SpecialAddDeductionPO.java +++ b/src/com/engine/salary/entity/datacollection/po/SpecialAddDeductionPO.java @@ -1,12 +1,14 @@ package com.engine.salary.entity.datacollection.po; -import java.util.Date; +import com.engine.salary.annotation.Encrypt; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; import lombok.experimental.Accessors; +import java.util.Date; + /** * 数据采集-专项附加扣除表 */ @@ -31,36 +33,43 @@ public class SpecialAddDeductionPO { /** * 子女教育 */ + @Encrypt private String childrenEducation; /** * 继续教育 */ + @Encrypt private String continuingEducation; /** * 住房贷款利息 */ + @Encrypt private String housingLoanInterest; /** * 住房租金 */ + @Encrypt private String housingRent; /** * 赡养老人 */ + @Encrypt private String supportingElder; /** * 大病医疗 */ + @Encrypt private String seriousIllnessTreatment; /** * 婴幼儿照护 */ + @Encrypt private String infantCare; /** diff --git a/src/com/engine/salary/entity/report/po/SalaryAcctResultReportPO.java b/src/com/engine/salary/entity/report/po/SalaryAcctResultReportPO.java index 400a8ab2d..0af632fd8 100644 --- a/src/com/engine/salary/entity/report/po/SalaryAcctResultReportPO.java +++ b/src/com/engine/salary/entity/report/po/SalaryAcctResultReportPO.java @@ -1,5 +1,6 @@ package com.engine.salary.entity.report.po; +import com.engine.salary.annotation.Encrypt; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -24,6 +25,7 @@ public class SalaryAcctResultReportPO { /** * 薪资核算人员id */ + @Encrypt private String salaryAcctEmpId; /** * 薪资核算的id @@ -32,6 +34,7 @@ public class SalaryAcctResultReportPO { /** * 人员id */ + @Encrypt private String employeeId; /** * 个税扣缴义务人id diff --git a/src/com/engine/salary/entity/salaryacct/po/ExcelAcctResultPO.java b/src/com/engine/salary/entity/salaryacct/po/ExcelAcctResultPO.java index a7fc850c5..4e7bc31d4 100644 --- a/src/com/engine/salary/entity/salaryacct/po/ExcelAcctResultPO.java +++ b/src/com/engine/salary/entity/salaryacct/po/ExcelAcctResultPO.java @@ -1,5 +1,6 @@ package com.engine.salary.entity.salaryacct.po; +import com.engine.salary.annotation.Encrypt; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -61,6 +62,7 @@ public class ExcelAcctResultPO { /** * 计算后的值 */ + @Encrypt private String resultValue; /** diff --git a/src/com/engine/salary/entity/siaccount/po/ExcelInsuranceDetailPO.java b/src/com/engine/salary/entity/siaccount/po/ExcelInsuranceDetailPO.java index 7f7544456..4e7889544 100644 --- a/src/com/engine/salary/entity/siaccount/po/ExcelInsuranceDetailPO.java +++ b/src/com/engine/salary/entity/siaccount/po/ExcelInsuranceDetailPO.java @@ -1,5 +1,6 @@ package com.engine.salary.entity.siaccount.po; +import com.engine.salary.annotation.Encrypt; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -97,6 +98,7 @@ public class ExcelInsuranceDetailPO { /** * 社保缴纳基数 */ + @Encrypt private String socialPaymentBaseString; /** @@ -107,6 +109,7 @@ public class ExcelInsuranceDetailPO { /** * 公积金缴纳基数 */ + @Encrypt private String fundPaymentBaseString; /** @@ -117,51 +120,61 @@ public class ExcelInsuranceDetailPO { /** * 其他福利缴纳基数 */ + @Encrypt private String otherPaymentBaseString; /** * 社保个人缴费明细 */ + @Encrypt private String socialPerJson; /** * 社保个人合计 */ + @Encrypt private String socialPerSum; /** * 公积金个人缴费明细 */ + @Encrypt private String fundPerJson; /** * 公积金个人合计 */ + @Encrypt private String fundPerSum; /** * 其他福利个人缴费明细 */ + @Encrypt private String otherPerJson; /** * 其他福利个人合计 */ + @Encrypt private String otherPerSum; /** * 个人合计 */ + @Encrypt private String perSum; /** * 社保单位缴费明细 */ + @Encrypt private String socialComJson; /** * 社保单位合计 */ + @Encrypt private String socialComSum; /** @@ -187,26 +200,31 @@ public class ExcelInsuranceDetailPO { /** * 单位合计 */ + @Encrypt private String comSum; /** * 社保合计 */ + @Encrypt private String socialSum; /** * 公积金合计 */ + @Encrypt private String fundSum; /** * 其他福利合计 */ + @Encrypt private String otherSum; /** * 合计 */ + @Encrypt private String total; /** diff --git a/src/com/engine/salary/entity/siaccount/po/InsuranceAccountDetailTempPO.java b/src/com/engine/salary/entity/siaccount/po/InsuranceAccountDetailTempPO.java index cda03ca2e..50897c6b2 100644 --- a/src/com/engine/salary/entity/siaccount/po/InsuranceAccountDetailTempPO.java +++ b/src/com/engine/salary/entity/siaccount/po/InsuranceAccountDetailTempPO.java @@ -1,5 +1,6 @@ package com.engine.salary.entity.siaccount.po; +import com.engine.salary.annotation.Encrypt; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -98,6 +99,7 @@ public class InsuranceAccountDetailTempPO { /** * 社保缴纳基数 */ + @Encrypt private String socialPaymentBaseString; /** @@ -108,6 +110,7 @@ public class InsuranceAccountDetailTempPO { /** * 公积金缴纳基数 */ + @Encrypt private String fundPaymentBaseString; /** @@ -118,51 +121,61 @@ public class InsuranceAccountDetailTempPO { /** * 其他福利缴纳基数 */ + @Encrypt private String otherPaymentBaseString; /** * 社保个人缴费明细 */ + @Encrypt private String socialPerJson; /** * 社保个人合计 */ + @Encrypt private String socialPerSum; /** * 公积金个人缴费明细 */ + @Encrypt private String fundPerJson; /** * 公积金个人合计 */ + @Encrypt private String fundPerSum; /** * 其他福利个人缴费明细 */ + @Encrypt private String otherPerJson; /** * 其他福利个人合计 */ + @Encrypt private String otherPerSum; /** * 个人合计 */ + @Encrypt private String perSum; /** * 社保单位缴费明细 */ + @Encrypt private String socialComJson; /** * 社保单位合计 */ + @Encrypt private String socialComSum; /** @@ -188,26 +201,31 @@ public class InsuranceAccountDetailTempPO { /** * 单位合计 */ + @Encrypt private String comSum; /** * 社保合计 */ + @Encrypt private String socialSum; /** * 公积金合计 */ + @Encrypt private String fundSum; /** * 其他福利合计 */ + @Encrypt private String otherSum; /** * 合计 */ + @Encrypt private String total; /** diff --git a/src/com/engine/salary/entity/siarchives/po/InsuranceArchivesFundSchemePO.java b/src/com/engine/salary/entity/siarchives/po/InsuranceArchivesFundSchemePO.java index 352e948fa..5e511ae39 100644 --- a/src/com/engine/salary/entity/siarchives/po/InsuranceArchivesFundSchemePO.java +++ b/src/com/engine/salary/entity/siarchives/po/InsuranceArchivesFundSchemePO.java @@ -1,5 +1,6 @@ package com.engine.salary.entity.siarchives.po; +import com.engine.salary.annotation.Encrypt; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -83,6 +84,7 @@ public class InsuranceArchivesFundSchemePO { /** * 公积金缴纳基数 */ + @Encrypt private String fundPaymentBaseString; /** diff --git a/src/com/engine/salary/entity/siarchives/po/InsuranceArchivesOtherSchemePO.java b/src/com/engine/salary/entity/siarchives/po/InsuranceArchivesOtherSchemePO.java index a97420925..5a7453937 100644 --- a/src/com/engine/salary/entity/siarchives/po/InsuranceArchivesOtherSchemePO.java +++ b/src/com/engine/salary/entity/siarchives/po/InsuranceArchivesOtherSchemePO.java @@ -1,5 +1,6 @@ package com.engine.salary.entity.siarchives.po; +import com.engine.salary.annotation.Encrypt; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -73,6 +74,7 @@ public class InsuranceArchivesOtherSchemePO { /** * 其他福利缴纳基数 */ + @Encrypt private String otherPaymentBaseString; /** diff --git a/src/com/engine/salary/entity/siarchives/po/InsuranceArchivesSocialSchemePO.java b/src/com/engine/salary/entity/siarchives/po/InsuranceArchivesSocialSchemePO.java index 901977fee..d9c5a6e72 100644 --- a/src/com/engine/salary/entity/siarchives/po/InsuranceArchivesSocialSchemePO.java +++ b/src/com/engine/salary/entity/siarchives/po/InsuranceArchivesSocialSchemePO.java @@ -1,5 +1,6 @@ package com.engine.salary.entity.siarchives.po; +import com.engine.salary.annotation.Encrypt; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -79,6 +80,7 @@ public class InsuranceArchivesSocialSchemePO { /** * 社保缴纳基数 */ + @Encrypt private String socialPaymentBaseString; /** diff --git a/src/com/engine/salary/entity/sischeme/po/InsuranceSchemeDetailPO.java b/src/com/engine/salary/entity/sischeme/po/InsuranceSchemeDetailPO.java index 5d1f79fd8..40f491caf 100644 --- a/src/com/engine/salary/entity/sischeme/po/InsuranceSchemeDetailPO.java +++ b/src/com/engine/salary/entity/sischeme/po/InsuranceSchemeDetailPO.java @@ -1,5 +1,6 @@ package com.engine.salary.entity.sischeme.po; +import com.engine.salary.annotation.Encrypt; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -59,11 +60,13 @@ public class InsuranceSchemeDetailPO { /** * 基数上限 */ + @Encrypt private String upperLimit; /** * 基数下限 */ + @Encrypt private String lowerLimit; /** @@ -74,6 +77,7 @@ public class InsuranceSchemeDetailPO { /** * 固定费用 */ + @Encrypt private String fixedCost; /** diff --git a/src/com/engine/salary/entity/taxdeclaration/bo/TaxDeclarationBO.java b/src/com/engine/salary/entity/taxdeclaration/bo/TaxDeclarationBO.java index 6a4ee80f6..2282119c3 100644 --- a/src/com/engine/salary/entity/taxdeclaration/bo/TaxDeclarationBO.java +++ b/src/com/engine/salary/entity/taxdeclaration/bo/TaxDeclarationBO.java @@ -2,7 +2,7 @@ package com.engine.salary.entity.taxdeclaration.bo; import com.engine.salary.constant.SalaryDefaultTenantConstant; import com.engine.salary.constant.TaxDeclarationDataIndexConstant; -import com.engine.salary.encrypt.datacollection.AddUpSituationEncrypt; +import com.engine.salary.encrypt.EncryptUtil; import com.engine.salary.entity.datacollection.AddUpSituation; import com.engine.salary.entity.datacollection.DataCollectionEmployee; import com.engine.salary.entity.salaryacct.po.SalaryAcctResultPO; @@ -44,6 +44,7 @@ import java.util.stream.Collectors; * @version 1.0 **/ public class TaxDeclarationBO { + private static EncryptUtil encryptUtil = new EncryptUtil(); public static List convert2ListDTO(List taxDeclarations, List simpleEmployees, @@ -413,7 +414,7 @@ public class TaxDeclarationBO { .tenantKey(taxDeclaration.getTenantKey()) .deleteType(NumberUtils.INTEGER_ZERO) .build(); - AddUpSituationEncrypt.encryptAddUpSituation(accumulatedSituation); + encryptUtil.encrypt(accumulatedSituation, AddUpSituation.class); result.getNeedInsertAddUpSituations().add(accumulatedSituation); }); } diff --git a/src/com/engine/salary/entity/taxdeclaration/po/TaxDeclarationDetailPO.java b/src/com/engine/salary/entity/taxdeclaration/po/TaxDeclarationDetailPO.java index 90787406d..e7c4e49b2 100644 --- a/src/com/engine/salary/entity/taxdeclaration/po/TaxDeclarationDetailPO.java +++ b/src/com/engine/salary/entity/taxdeclaration/po/TaxDeclarationDetailPO.java @@ -1,5 +1,6 @@ package com.engine.salary.entity.taxdeclaration.po; +import com.engine.salary.annotation.Encrypt; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -50,6 +51,7 @@ public class TaxDeclarationDetailPO { /** * 申报表字段的值 */ + @Encrypt private String fieldValue; diff --git a/src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java b/src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java index 2e19d1190..506046b23 100644 --- a/src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java +++ b/src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java @@ -13,7 +13,6 @@ import com.engine.salary.biz.AddUpDeductionBiz; import com.engine.salary.biz.EmployBiz; import com.engine.salary.common.LocalDateRange; import com.engine.salary.encrypt.EncryptUtil; -import com.engine.salary.encrypt.datacollection.AddUpDeductionRecordStrDTOEncrypt; import com.engine.salary.entity.datacollection.AddUpDeduction; import com.engine.salary.entity.datacollection.DataCollectionEmployee; import com.engine.salary.entity.datacollection.dto.AddUpDeductionDTO; @@ -876,7 +875,7 @@ public class AddUpDeductionServiceImpl extends Service implements AddUpDeduction SalaryPageUtil.start(queryParam.getCurrent(), queryParam.getPageSize()); List list = getAddUpDeductionMapper().recordList(queryParam); - AddUpDeductionRecordStrDTOEncrypt.decryptAddUpDeductionRecordDTO(list); + encryptUtil.decryptList(list, AddUpDeductionRecordDTO.class); return new PageInfo<>(list, AddUpDeductionRecordDTO.class); } diff --git a/src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java b/src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java index 76b09e534..74d6e344c 100644 --- a/src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java +++ b/src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java @@ -10,7 +10,6 @@ import com.engine.core.impl.Service; import com.engine.salary.biz.AddUpSituationBiz; import com.engine.salary.biz.EmployBiz; import com.engine.salary.encrypt.EncryptUtil; -import com.engine.salary.encrypt.datacollection.AddUpSituationRecordDTOEncrypt; import com.engine.salary.entity.datacollection.AddUpSituation; import com.engine.salary.entity.datacollection.DataCollectionEmployee; import com.engine.salary.entity.datacollection.dto.AddUpSituationDTO; @@ -222,7 +221,7 @@ public class AddUpSituationServiceImpl extends Service implements AddUpSituation SalaryPageUtil.start(queryParam.getCurrent(), queryParam.getPageSize()); List list = getAddUpSituationMapper().recordList(queryParam); - AddUpSituationRecordDTOEncrypt.decryptAddUpSituationRecordDTOList(list); + encryptUtil.decryptList(list, AddUpSituationRecordDTO.class); return new PageInfo<>(list, AddUpSituationRecordDTO.class); } diff --git a/src/com/engine/salary/service/impl/OtherDeductionServiceImpl.java b/src/com/engine/salary/service/impl/OtherDeductionServiceImpl.java index dd4a026ca..ee0c3ecf3 100644 --- a/src/com/engine/salary/service/impl/OtherDeductionServiceImpl.java +++ b/src/com/engine/salary/service/impl/OtherDeductionServiceImpl.java @@ -7,8 +7,7 @@ import com.engine.core.impl.Service; import com.engine.salary.biz.EmployBiz; import com.engine.salary.biz.OtherDeductionBiz; import com.engine.salary.constant.SalaryDefaultTenantConstant; -import com.engine.salary.encrypt.datacollection.OtherDeductionListDTOEncrypt; -import com.engine.salary.encrypt.datacollection.OtherDeductionRecordDTOEncrypt; +import com.engine.salary.encrypt.EncryptUtil; import com.engine.salary.entity.datacollection.DataCollectionEmployee; import com.engine.salary.entity.datacollection.dto.OtherDeductionListDTO; import com.engine.salary.entity.datacollection.dto.OtherDeductionRecordDTO; @@ -59,6 +58,7 @@ import java.util.stream.Collectors; import static com.engine.salary.constant.SalaryDefaultTenantConstant.DEFAULT_TENANT_KEY; public class OtherDeductionServiceImpl extends Service implements OtherDeductionService { + private EncryptUtil encryptUtil = new EncryptUtil(); private OtherDeductionMapper getOtherDeductionMapper() { return MapperProxyFactory.getProxy(OtherDeductionMapper.class); @@ -119,8 +119,9 @@ public class OtherDeductionServiceImpl extends Service implements OtherDeduction } SalaryPageUtil.start(queryParam.getCurrent(), queryParam.getPageSize()); List list = getOtherDeductionMapper().list(queryParam); - OtherDeductionListDTOEncrypt.decryptOtherDeductionListDTOList(list); - return new PageInfo<>(list, OtherDeductionListDTO.class); + PageInfo page = new PageInfo<>(list, OtherDeductionListDTO.class); + encryptUtil.decryptList(page.getList(), OtherDeductionListDTO.class); + return page; } @Override @@ -144,7 +145,7 @@ public class OtherDeductionServiceImpl extends Service implements OtherDeduction } SalaryPageUtil.start(queryParam.getCurrent(), queryParam.getPageSize()); List list = getOtherDeductionMapper().recordList(queryParam); - OtherDeductionRecordDTOEncrypt.decryptOtherDeductionRecordDTOList(list); + encryptUtil.decryptList(list, OtherDeductionRecordDTO.class); return new PageInfo<>(list, OtherDeductionRecordDTO.class); } @@ -432,7 +433,7 @@ public class OtherDeductionServiceImpl extends Service implements OtherDeduction } List list = getOtherDeductionMapper().list(param); - OtherDeductionListDTOEncrypt.decryptOtherDeductionListDTOList(list); + encryptUtil.decryptList(list, OtherDeductionListDTO.class); // 开启分权并且不是薪酬模块总管理员 if (getTaxAgentService(user).isOpenDevolution() && !getTaxAgentService(user).isChief(employeeId)) { List taxAgentIdsAsAdmin = getTaxAgentService(user).listAllTaxAgentsAsAdmin(employeeId).stream().map(TaxAgentPO::getId).collect(Collectors.toList()); @@ -526,7 +527,7 @@ public class OtherDeductionServiceImpl extends Service implements OtherDeduction SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM"); //查询详细信息 List list = getOtherDeductionMapper().recordList(param); - OtherDeductionRecordDTOEncrypt.decryptOtherDeductionRecordDTOList(list); + encryptUtil.decryptList(list, OtherDeductionRecordDTO.class); final List> dataRowList = Optional.ofNullable(list) .map(List::stream) .map(operatorStream -> operatorStream.map(dto -> { @@ -780,7 +781,7 @@ public class OtherDeductionServiceImpl extends Service implements OtherDeduction ids.add(otherDeductionParam.getId()); OtherDeductionQueryParam build = OtherDeductionQueryParam.builder().ids(ids).build(); List list = getOtherDeductionMapper().recordList(build); - OtherDeductionRecordDTOEncrypt.decryptOtherDeductionRecordDTOList(list); + encryptUtil.decryptList(list, OtherDeductionRecordDTO.class); if (list == null || list.size() == 0) { throw new SalaryRunTimeException("该数据不存在！"); diff --git a/src/com/engine/salary/service/impl/SIAComparisonResultServiceImpl.java b/src/com/engine/salary/service/impl/SIAComparisonResultServiceImpl.java index d79a76f2e..f5fc62819 100644 --- a/src/com/engine/salary/service/impl/SIAComparisonResultServiceImpl.java +++ b/src/com/engine/salary/service/impl/SIAComparisonResultServiceImpl.java @@ -2,8 +2,7 @@ package com.engine.salary.service.impl; import com.engine.common.util.ServiceUtil; import com.engine.core.impl.Service; -import com.engine.salary.encrypt.siexport.AccountExportPOEncrypt; -import com.engine.salary.encrypt.siexport.ExcelAccountExportPOEncrypt; +import com.engine.salary.encrypt.EncryptUtil; import com.engine.salary.entity.siaccount.bo.InsuranceComparisonResultBO; import com.engine.salary.entity.siaccount.dto.InsuranceComparisonResultListDTO; import com.engine.salary.entity.siaccount.param.InsuranceComparisonResultQueryParam; @@ -40,6 +39,7 @@ import java.util.stream.Collectors; * @Date: 2022/9/28 **/ public class SIAComparisonResultServiceImpl extends Service implements SIAComparisonResultService { + private EncryptUtil encryptUtil = new EncryptUtil(); private InsuranceExportMapper getInsuranceExportMapper() { return MapperProxyFactory.getProxy(InsuranceExportMapper.class); @@ -147,10 +147,10 @@ public class SIAComparisonResultServiceImpl extends Service implements SIACompar .collect(Collectors.toList()); accountExportPOS = accountExportPOS.stream().filter(v -> canAccountIds.contains(v.getEmployeeId())).collect(Collectors.toList()); - AccountExportPOEncrypt.decryptAccountExportPOList(accountExportPOS); + encryptUtil.decryptList(accountExportPOS, AccountExportPO.class); //2-查询线下对比数据 List excelAccountExportPOS = getInsuranceExportMapper().exportExcelAccount(queryParam); - ExcelAccountExportPOEncrypt.decryptExcelAccountExportPOList(excelAccountExportPOS); + encryptUtil.decryptList(excelAccountExportPOS, ExcelAccountExportPO.class); //3-构建福利核算对比结果列表表头 List weaTableColumns = InsuranceComparisonResultBO.buildTableColumns4ComparisonResult(); //4-通过线上线下两份数据获得对比结果 diff --git a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java index 73a03981b..710e4379f 100644 --- a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java +++ b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java @@ -13,7 +13,6 @@ import com.engine.salary.biz.*; import com.engine.salary.component.SalaryWeaTable; import com.engine.salary.constant.SalaryDefaultTenantConstant; import com.engine.salary.encrypt.EncryptUtil; -import com.engine.salary.encrypt.siaccount.ExcelInsuranceDetailPOEncrypt; import com.engine.salary.entity.datacollection.DataCollectionEmployee; import com.engine.salary.entity.siaccount.bo.InsuranceAccountBO; import com.engine.salary.entity.siaccount.dto.InsuranceAccountBatchListDTO; @@ -1998,7 +1997,7 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { } //将待更新列表加密 - ExcelInsuranceDetailPOEncrypt.encryptInsuranceAccountDetailPOList(addCompareList); + encryptUtil.encryptList(addCompareList, ExcelInsuranceDetailPO.class); //删除 if (idList.size() > 0) { getExcelInsuranceDetailMapper().batchDelByIds(idList); diff --git a/src/com/engine/salary/service/impl/SIExportServiceImpl.java b/src/com/engine/salary/service/impl/SIExportServiceImpl.java index 825f10af9..6e74a92ef 100644 --- a/src/com/engine/salary/service/impl/SIExportServiceImpl.java +++ b/src/com/engine/salary/service/impl/SIExportServiceImpl.java @@ -6,7 +6,6 @@ import com.engine.common.util.ServiceUtil; import com.engine.core.impl.Service; import com.engine.salary.biz.SIAccountBiz; import com.engine.salary.encrypt.EncryptUtil; -import com.engine.salary.encrypt.siexport.AccountExportPOEncrypt; import com.engine.salary.entity.siaccount.dto.InsuranceAccountViewListDTO; import com.engine.salary.entity.siaccount.po.InsuranceAccountDetailPO; import com.engine.salary.entity.siarchives.po.InsuranceArchivesBaseInfoPO; @@ -174,7 +173,7 @@ public class SIExportServiceImpl extends Service implements SIExportService { accountExportPOS = accountExportPOS.stream().filter(f -> canAccountIds.contains(f.getEmployeeId())).collect(Collectors.toList()); } - AccountExportPOEncrypt.decryptAccountExportPOList(accountExportPOS); + encryptUtil.decryptList(accountExportPOS, AccountExportPO.class); List columns = new ArrayList<>(); List> records = new ArrayList<>(); // if (Objects.equals(PaymentStatusEnum.COMMON.getValue(), paymentStatus)) { diff --git a/src/com/engine/salary/service/impl/SIImportServiceImpl.java b/src/com/engine/salary/service/impl/SIImportServiceImpl.java index aecdd2e8d..32e5e69ed 100644 --- a/src/com/engine/salary/service/impl/SIImportServiceImpl.java +++ b/src/com/engine/salary/service/impl/SIImportServiceImpl.java @@ -6,9 +6,7 @@ import com.cloudstore.eccom.pc.table.WeaTableColumn; import com.engine.common.util.ServiceUtil; import com.engine.core.impl.Service; import com.engine.salary.biz.SIArchivesBiz; -import com.engine.salary.encrypt.siarchives.InsuranceArchivesFundSchemePOEncrypt; -import com.engine.salary.encrypt.siarchives.InsuranceArchivesOtherSchemePOEncrypt; -import com.engine.salary.encrypt.siarchives.InsuranceArchivesSocialSchemePOEncrypt; +import com.engine.salary.encrypt.EncryptUtil; import com.engine.salary.entity.siarchives.param.InsuranceArchivesListParam; import com.engine.salary.entity.siarchives.po.InsuranceArchivesEmployeePO; import com.engine.salary.entity.siarchives.po.InsuranceArchivesFundSchemePO; @@ -48,6 +46,7 @@ import java.util.stream.Collectors; * @Version V1.0 **/ public class SIImportServiceImpl extends Service implements SIImportService { + private EncryptUtil encryptUtil = new EncryptUtil(); private SIArchivesBiz siArchivesBiz = new SIArchivesBiz(); @@ -231,19 +230,19 @@ public class SIImportServiceImpl extends Service implements SIImportService { List employeeIds = insuranceArchivesEmployeePOS.stream().map(InsuranceArchivesEmployeePO::getEmployeeId).collect(Collectors.toList()); Map socialSchemePOMap = new HashMap<>(); List socialSchemePOList = siArchivesBiz.getSocialByEmployeeIds(employeeIds); - InsuranceArchivesSocialSchemePOEncrypt.decryptList(socialSchemePOList); + encryptUtil.decryptList(socialSchemePOList, InsuranceArchivesSocialSchemePO.class); if (CollectionUtils.isNotEmpty(socialSchemePOList)) { socialSchemePOMap = socialSchemePOList.stream().collect(Collectors.toMap(InsuranceArchivesSocialSchemePO::getEmployeeId, Function.identity())); } List fundSchemePOList = siArchivesBiz.getFundByEmployeeIds(employeeIds); - InsuranceArchivesFundSchemePOEncrypt.encryptList(fundSchemePOList); + encryptUtil.encryptList(fundSchemePOList, InsuranceArchivesFundSchemePO.class); Map fundSchemePOMap = new HashMap<>(); if (CollectionUtils.isNotEmpty(fundSchemePOList)) { fundSchemePOMap = fundSchemePOList.stream().collect(Collectors.toMap(InsuranceArchivesFundSchemePO::getEmployeeId, Function.identity())); } Map otherSchemePOMap = new HashMap<>(); List otherSchemePOList = siArchivesBiz.getOtherByEmployeeIds(employeeIds); - InsuranceArchivesOtherSchemePOEncrypt.decryptList(otherSchemePOList); + encryptUtil.decryptList(otherSchemePOList, InsuranceArchivesOtherSchemePO.class); if (CollectionUtils.isNotEmpty(otherSchemePOList)) { otherSchemePOMap = otherSchemePOList.stream().collect(Collectors.toMap(InsuranceArchivesOtherSchemePO::getEmployeeId, Function.identity())); } diff --git a/src/com/engine/salary/service/impl/SISchemeServiceImpl.java b/src/com/engine/salary/service/impl/SISchemeServiceImpl.java index 4478d86e9..a19a164cf 100644 --- a/src/com/engine/salary/service/impl/SISchemeServiceImpl.java +++ b/src/com/engine/salary/service/impl/SISchemeServiceImpl.java @@ -12,10 +12,7 @@ import com.engine.salary.biz.SISchemeBiz; import com.engine.salary.cmd.sischeme.*; import com.engine.salary.constant.SalaryDefaultTenantConstant; import com.engine.salary.encrypt.AESEncryptUtil; -import com.engine.salary.encrypt.siarchives.InsuranceArchivesFundSchemePOEncrypt; -import com.engine.salary.encrypt.siarchives.InsuranceArchivesOtherSchemePOEncrypt; -import com.engine.salary.encrypt.siarchives.InsuranceArchivesSocialSchemePOEncrypt; -import com.engine.salary.encrypt.sischeme.InsuranceSchemeDetailPOEncrypt; +import com.engine.salary.encrypt.EncryptUtil; import com.engine.salary.entity.datacollection.DataCollectionEmployee; import com.engine.salary.entity.siarchives.param.InsuranceArchivesListParam; import com.engine.salary.entity.siarchives.param.SIArchiveImportActionParam; @@ -84,6 +81,8 @@ import static com.engine.salary.util.excel.ExcelSupport.EXCEL_TYPE_XLSX; * @Version V1.0 **/ public class SISchemeServiceImpl extends Service implements SISchemeService { + private EncryptUtil encryptUtil = new EncryptUtil(); + private SocialSchemeMapper getSocialSchemeMapper() { return MapperProxyFactory.getProxy(SocialSchemeMapper.class); } @@ -262,9 +261,9 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { end = employeeIds.size(); } List ids = employeeIds.subList(i, end); - socialList.addAll(InsuranceArchivesSocialSchemePOEncrypt.decryptList(siArchivesBiz.getSocialByEmployeeIds(ids))); - fundList.addAll(InsuranceArchivesFundSchemePOEncrypt.decryptList(siArchivesBiz.getFundByEmployeeIds(ids))); - otherList.addAll(InsuranceArchivesOtherSchemePOEncrypt.decryptList(siArchivesBiz.getOtherByEmployeeIds(ids))); + socialList.addAll(encryptUtil.decryptList(siArchivesBiz.getSocialByEmployeeIds(ids), InsuranceArchivesSocialSchemePO.class)); + fundList.addAll(encryptUtil.decryptList(siArchivesBiz.getFundByEmployeeIds(ids), InsuranceArchivesFundSchemePO.class)); + otherList.addAll(encryptUtil.decryptList(siArchivesBiz.getOtherByEmployeeIds(ids), InsuranceArchivesOtherSchemePO.class)); } Map socialSchemePOMap = SalaryEntityUtil.convert2Map(socialList, k -> k.getPaymentOrganization() + "-" + k.getEmployeeId()); Map fundSchemePOMap = SalaryEntityUtil.convert2Map(fundList, k -> k.getPaymentOrganization() + "-" + k.getEmployeeId()); @@ -412,7 +411,7 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { public Collection queryInsuranceSchemeDetailList(Long id) { List insuranceSchemeDetailPOS = MapperProxyFactory.getProxy(InsuranceSchemeDetailMapper.class).queryInsuranceSchemeDetailList(id, IsPaymentEnum.YES.getValue()); - return InsuranceSchemeDetailPOEncrypt.decryptList(insuranceSchemeDetailPOS); + return encryptUtil.decryptList(insuranceSchemeDetailPOS, InsuranceSchemeDetailPO.class); } public String queryInsuranceName(Long id) { @@ -474,7 +473,7 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { List socialByEmployeeId = siArchivesBiz.getSocialByEmployeeIds(new ArrayList() {{ add(item.getEmployeeId()); }}); - InsuranceArchivesSocialSchemePOEncrypt.decryptList(socialByEmployeeId); + encryptUtil.decryptList(socialByEmployeeId, InsuranceArchivesSocialSchemePO.class); InsuranceArchivesSocialSchemePO socialItem = null; if (socialByEmployeeId.size() > 0) { socialItem = socialByEmployeeId.get(0); @@ -484,7 +483,7 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { List fundByEmployeeId = siArchivesBiz.getFundByEmployeeIds(new ArrayList() {{ add(item.getEmployeeId()); }}); - InsuranceArchivesFundSchemePOEncrypt.decryptList(fundByEmployeeId); + encryptUtil.decryptList(fundByEmployeeId, InsuranceArchivesFundSchemePO.class); if (fundByEmployeeId.size() > 0) { fundItem = fundByEmployeeId.get(0); @@ -494,7 +493,7 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { List otherByEmployeeId = siArchivesBiz.getOtherByEmployeeIds(new ArrayList() {{ add(item.getEmployeeId()); }}); - InsuranceArchivesOtherSchemePOEncrypt.decryptList(otherByEmployeeId); + encryptUtil.decryptList(otherByEmployeeId, InsuranceArchivesOtherSchemePO.class); if (otherByEmployeeId.size() > 0) { otherItem = otherByEmployeeId.get(0); } @@ -1082,7 +1081,7 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { insuranceArchivesSocialSchemePO.setEmployeeId(employeeId); insuranceArchivesSocialSchemePO.setUnderTake(UndertakerEnum.SCOPE_PERSON.getValue()); List insuranceSchemeDetailPOS = getInsuranceSchemeDetailMapper().queryListBySchemeId(insuranceArchivesSocialSchemePO.getSocialSchemeId()); - InsuranceSchemeDetailPOEncrypt.decryptList(insuranceSchemeDetailPOS); + encryptUtil.decryptList(insuranceSchemeDetailPOS, InsuranceSchemeDetailPO.class); if (CollectionUtils.isNotEmpty(insuranceSchemeDetailPOS)) { List insuranceIds = insuranceSchemeDetailPOS.stream().map(InsuranceSchemeDetailPO::getInsuranceId).collect(Collectors.toList()); HashMap socialPaymentBase = new HashMap<>(); @@ -1134,7 +1133,7 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { insuranceArchivesFundSchemePO.setEmployeeId(employeeId); List insuranceSchemeDetailPOS = getInsuranceSchemeDetailMapper().queryListBySchemeId(insuranceArchivesFundSchemePO.getFundSchemeId()); - InsuranceSchemeDetailPOEncrypt.decryptList(insuranceSchemeDetailPOS); + encryptUtil.decryptList(insuranceSchemeDetailPOS, InsuranceSchemeDetailPO.class); if (CollectionUtils.isNotEmpty(insuranceSchemeDetailPOS)) { List insuranceIds = insuranceSchemeDetailPOS.stream().map(InsuranceSchemeDetailPO::getInsuranceId).collect(Collectors.toList()); HashMap socialPaymentBase = new HashMap<>(); @@ -1182,7 +1181,7 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { insuranceArchivesOtherSchemePO.setUnderTake(UndertakerEnum.SCOPE_PERSON.getValue()); insuranceArchivesOtherSchemePO.setEmployeeId(employeeId); List insuranceSchemeDetailPOS = getInsuranceSchemeDetailMapper().queryListBySchemeId(insuranceArchivesOtherSchemePO.getOtherSchemeId()); - InsuranceSchemeDetailPOEncrypt.decryptList(insuranceSchemeDetailPOS); + encryptUtil.decryptList(insuranceSchemeDetailPOS, InsuranceSchemeDetailPO.class); if (CollectionUtils.isNotEmpty(insuranceSchemeDetailPOS)) { List insuranceIds = insuranceSchemeDetailPOS.stream().map(InsuranceSchemeDetailPO::getInsuranceId).collect(Collectors.toList()); HashMap socialPaymentBase = new HashMap<>(); @@ -1232,7 +1231,7 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { socialSchemePOS = socialSchemePOS.stream() .collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(f -> f.getPaymentOrganization() + "-" + f.getEmployeeId()))), ArrayList::new)); - List insuranceArchivesSocialSchemePOS = InsuranceArchivesSocialSchemePOEncrypt.encryptList(socialSchemePOS); + List insuranceArchivesSocialSchemePOS = encryptUtil.encryptList(socialSchemePOS, InsuranceArchivesSocialSchemePO.class); List> partition = Lists.partition(insuranceArchivesSocialSchemePOS, 100); partition.forEach(getSocialSchemeMapper()::batchSave); } @@ -1249,7 +1248,7 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { fundSchemePOS = fundSchemePOS.stream() .collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(f -> f.getPaymentOrganization() + "-" + f.getEmployeeId()))), ArrayList::new)); - List insuranceArchivesFundSchemePOS = InsuranceArchivesFundSchemePOEncrypt.encryptList(fundSchemePOS); + List insuranceArchivesFundSchemePOS = encryptUtil.encryptList(fundSchemePOS, InsuranceArchivesFundSchemePO.class); List> partition = Lists.partition(insuranceArchivesFundSchemePOS, 100); partition.forEach(getFundSchemeMapper()::batchSave); } @@ -1266,7 +1265,7 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { otherSchemePOS = otherSchemePOS.stream() .collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(f -> f.getPaymentOrganization() + "-" + f.getEmployeeId()))), ArrayList::new)); - List insuranceArchivesOtherSchemePOS = InsuranceArchivesOtherSchemePOEncrypt.encryptList(otherSchemePOS); + List insuranceArchivesOtherSchemePOS = encryptUtil.encryptList(otherSchemePOS, InsuranceArchivesOtherSchemePO.class); List> partition = Lists.partition(insuranceArchivesOtherSchemePOS, 100); partition.forEach(getOtherSchemeMapper()::batchSave); } diff --git a/src/com/engine/salary/service/impl/SalaryAcctReportServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctReportServiceImpl.java index e02c2aeac..c79f6d79d 100644 --- a/src/com/engine/salary/service/impl/SalaryAcctReportServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryAcctReportServiceImpl.java @@ -3,7 +3,7 @@ package com.engine.salary.service.impl; import com.engine.common.util.ServiceUtil; import com.engine.core.impl.Service; import com.engine.salary.encrypt.AESEncryptUtil; -import com.engine.salary.encrypt.report.SalaryAcctResultReportPOEncrypt; +import com.engine.salary.encrypt.EncryptUtil; import com.engine.salary.entity.report.po.SalaryAcctResultReportPO; import com.engine.salary.mapper.report.SalaryAcctResultReportMapper; import com.engine.salary.service.SalaryAcctReportService; @@ -16,6 +16,7 @@ import com.google.common.collect.Lists; import org.apache.commons.collections4.CollectionUtils; import weaver.hrm.User; +import java.util.ArrayList; import java.util.Collection; import java.util.List; import java.util.stream.Collectors; @@ -31,7 +32,7 @@ import static com.engine.salary.sys.constant.SalarySysConstant.DISPLAY_EMP_INFO_ * @version 1.0 **/ public class SalaryAcctReportServiceImpl extends Service implements SalaryAcctReportService { - + private EncryptUtil encryptUtil = new EncryptUtil(); private SalaryAcctResultReportMapper getSalaryAcctResultReportMapper() { return MapperProxyFactory.getProxy(SalaryAcctResultReportMapper.class); } @@ -77,7 +78,7 @@ public class SalaryAcctReportServiceImpl extends Service implements SalaryAcctRe SalarySysConfPO disPlay = getSalarySysConfService(user).getOneByCode(DISPLAY_EMP_INFO_REPORT); //默认不显示，关闭状态 if (disPlay == null || OpenEnum.OFF.getValue().equals(disPlay.getConfValue())) { - SalaryAcctResultReportPOEncrypt.encryptList(pos); + pos = encryptUtil.encryptList(new ArrayList<>(pos), SalaryAcctResultReportPO.class); } // List> partition = Lists.partition((List) pos, 100); // partition.forEach(getSalaryAcctResultReportMapper()::batchInsert); diff --git a/src/com/engine/salary/service/impl/SalaryComparisonResultServiceImpl.java b/src/com/engine/salary/service/impl/SalaryComparisonResultServiceImpl.java index 09b567960..5abf3f1e5 100644 --- a/src/com/engine/salary/service/impl/SalaryComparisonResultServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryComparisonResultServiceImpl.java @@ -3,7 +3,7 @@ package com.engine.salary.service.impl; import com.engine.common.util.ServiceUtil; import com.engine.core.impl.Service; import com.engine.salary.encrypt.AESEncryptUtil; -import com.engine.salary.encrypt.salaryacct.ExcelAcctResultPOEncrypt; +import com.engine.salary.encrypt.EncryptUtil; import com.engine.salary.entity.datacollection.DataCollectionEmployee; import com.engine.salary.entity.salaryacct.bo.SalaryAcctResultBO; import com.engine.salary.entity.salaryacct.dto.SalaryComparisonResultListDTO; @@ -50,7 +50,7 @@ import java.util.stream.Collectors; * @version 1.0 **/ public class SalaryComparisonResultServiceImpl extends Service implements SalaryComparisonResultService { - + private EncryptUtil encryptUtil = new EncryptUtil(); private ExcelAcctResultMapper getExcelAcctResultMapper() { return MapperProxyFactory.getProxy(ExcelAcctResultMapper.class); @@ -104,7 +104,7 @@ public class SalaryComparisonResultServiceImpl extends Service implements Salary @Override public List listBySalaryAcctRecordId(Long salaryAcctRecordId) { List excelAcctResultPOS = getExcelAcctResultMapper().listSome(ExcelAcctResultPO.builder().salaryAcctRecordId(salaryAcctRecordId).build()); - return ExcelAcctResultPOEncrypt.decryptList(excelAcctResultPOS); + return encryptUtil.decryptList(excelAcctResultPOS, ExcelAcctResultPO.class); } @Override @@ -113,7 +113,7 @@ public class SalaryComparisonResultServiceImpl extends Service implements Salary return Collections.emptyList(); } List excelAcctResultPOS = getExcelAcctResultMapper().listSome(ExcelAcctResultPO.builder().salaryAcctEmpIds(salaryAcctEmployeeIds).build()); - return ExcelAcctResultPOEncrypt.decryptList(excelAcctResultPOS); + return encryptUtil.decryptList(excelAcctResultPOS, ExcelAcctResultPO.class); } @Override @@ -249,10 +249,10 @@ public class SalaryComparisonResultServiceImpl extends Service implements Salary @Override public void batchSave(Collection excelAcctResultPOS) { - ExcelAcctResultPOEncrypt.encryptList(excelAcctResultPOS); if (CollectionUtils.isEmpty(excelAcctResultPOS)) { return; } + excelAcctResultPOS = encryptUtil.encryptList(new ArrayList<>(excelAcctResultPOS), ExcelAcctResultPO.class); List> partition = Lists.partition((List) excelAcctResultPOS, 100); partition.forEach(getExcelAcctResultMapper()::batchInsert); } diff --git a/src/com/engine/salary/service/impl/SpecialAddDeductionServiceImpl.java b/src/com/engine/salary/service/impl/SpecialAddDeductionServiceImpl.java index df9b604be..638d76f86 100644 --- a/src/com/engine/salary/service/impl/SpecialAddDeductionServiceImpl.java +++ b/src/com/engine/salary/service/impl/SpecialAddDeductionServiceImpl.java @@ -5,11 +5,14 @@ import com.engine.common.util.ServiceUtil; import com.engine.core.impl.Service; import com.engine.salary.biz.EmployBiz; import com.engine.salary.biz.SpecialAddDeductionBiz; -import com.engine.salary.encrypt.datacollection.SpecialAddDeductionEncrypt; +import com.engine.salary.encrypt.EncryptUtil; import com.engine.salary.entity.datacollection.DataCollectionEmployee; import com.engine.salary.entity.datacollection.dto.SpecialAddDeductionListDTO; import com.engine.salary.entity.datacollection.dto.SpecialAddDeductionRecordDTO; -import com.engine.salary.entity.datacollection.param.*; +import com.engine.salary.entity.datacollection.param.SpecialAddDeductionImportParam; +import com.engine.salary.entity.datacollection.param.SpecialAddDeductionParam; +import com.engine.salary.entity.datacollection.param.SpecialAddDeductionQueryParam; +import com.engine.salary.entity.datacollection.param.SpecialAddDeductionRecordDeleteParam; import com.engine.salary.entity.datacollection.po.SpecialAddDeductionPO; import com.engine.salary.entity.taxagent.dto.TaxAgentEmployeeTaxAgentDTO; import com.engine.salary.entity.taxagent.dto.TaxAgentManageRangeEmployeeDTO; @@ -52,6 +55,7 @@ import java.util.stream.Collectors; import static com.engine.salary.constant.SalaryDefaultTenantConstant.DEFAULT_TENANT_KEY; public class SpecialAddDeductionServiceImpl extends Service implements SpecialAddDeductionService { + private EncryptUtil encryptUtil = new EncryptUtil(); private SpecialAddDeductionBiz getSpecialAddDeductionBiz() { return new SpecialAddDeductionBiz(); @@ -101,7 +105,7 @@ public class SpecialAddDeductionServiceImpl extends Service implements SpecialAd } SalaryPageUtil.start(queryParam.getCurrent(), queryParam.getPageSize()); List list = getSpecialAddDeductionMapper().listByParam(queryParam); - SpecialAddDeductionEncrypt.decrypt(list); + encryptUtil.decryptList(list, SpecialAddDeductionListDTO.class); return new PageInfo<>(list, SpecialAddDeductionListDTO.class); } @@ -115,7 +119,7 @@ public class SpecialAddDeductionServiceImpl extends Service implements SpecialAd } SalaryPageUtil.start(queryParam.getCurrent(), queryParam.getPageSize()); List list = getSpecialAddDeductionMapper().listDtoByParam(queryParam); - SpecialAddDeductionEncrypt.decrypt(list); + encryptUtil.decryptList(list, SpecialAddDeductionRecordDTO.class); return new PageInfo<>(list, SpecialAddDeductionRecordDTO.class); } @@ -439,7 +443,7 @@ public class SpecialAddDeductionServiceImpl extends Service implements SpecialAd SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM"); //查询详细信息 List list = getSpecialAddDeductionBiz().listDTOByParam(param); - SpecialAddDeductionEncrypt.decrypt(list); + encryptUtil.decryptList(list, SpecialAddDeductionRecordDTO.class); final List> dataRowList = Optional.ofNullable(list) .map(List::stream) .map(operatorStream -> operatorStream.map(dto -> { diff --git a/src/com/engine/salary/service/impl/TaxDeclarationDetailServiceImpl.java b/src/com/engine/salary/service/impl/TaxDeclarationDetailServiceImpl.java index 7524ea9c3..d0773e055 100644 --- a/src/com/engine/salary/service/impl/TaxDeclarationDetailServiceImpl.java +++ b/src/com/engine/salary/service/impl/TaxDeclarationDetailServiceImpl.java @@ -2,7 +2,7 @@ package com.engine.salary.service.impl; import com.engine.common.util.ServiceUtil; import com.engine.core.impl.Service; -import com.engine.salary.encrypt.taxdeclaration.TaxDeclarationDetailPOEncrypt; +import com.engine.salary.encrypt.EncryptUtil; import com.engine.salary.entity.datacollection.DataCollectionEmployee; import com.engine.salary.entity.taxagent.dto.TaxAgentEmployeeDTO; import com.engine.salary.entity.taxdeclaration.bo.TaxDeclarationBO; @@ -46,6 +46,8 @@ import java.util.stream.Collectors; **/ public class TaxDeclarationDetailServiceImpl extends Service implements TaxDeclarationDetailService { + private EncryptUtil encryptUtil = new EncryptUtil(); + private TaxDeclarationDetailMapper getTaxDeclarationDetailMapper() { return MapperProxyFactory.getProxy(TaxDeclarationDetailMapper.class); } @@ -231,7 +233,7 @@ public class TaxDeclarationDetailServiceImpl extends Service implements TaxDecla Set employeeIds = SalaryEntityUtil.properties(list, TaxDeclarationEmployeeDTO::getEmployeeId); List taxDeclarationDetailPOS = listByTaxDeclarationIdAndEmployeeIds(queryParam.getTaxDeclarationId(), employeeIds); - TaxDeclarationDetailPOEncrypt.decryptTaxDeclarationDetailPOList(taxDeclarationDetailPOS); + encryptUtil.decryptList(taxDeclarationDetailPOS, TaxDeclarationDetailPO.class); // 查询人员信息 List simpleEmployeeIds = list.stream() .filter(taxDeclarationEmployeeDTO -> Objects.equals(taxDeclarationEmployeeDTO.getEmployeeType(), EmployeeTypeEnum.ORGANIZATION.getValue())) @@ -258,7 +260,7 @@ public class TaxDeclarationDetailServiceImpl extends Service implements TaxDecla @Override public void batchSave(Collection taxDeclarationDetailPOS) { if (CollectionUtils.isNotEmpty(taxDeclarationDetailPOS)) { - TaxDeclarationDetailPOEncrypt.encryptTaxDeclarationDetailPOList(taxDeclarationDetailPOS); + taxDeclarationDetailPOS = encryptUtil.encryptList(new ArrayList<>(taxDeclarationDetailPOS), TaxDeclarationDetailPO.class); List> partition = Lists.partition((List) taxDeclarationDetailPOS, 100); partition.forEach(getTaxDeclarationDetailMapper()::batchInsert); } @@ -270,7 +272,7 @@ public class TaxDeclarationDetailServiceImpl extends Service implements TaxDecla } List taxDeclarationDetailPOS = getTaxDeclarationDetailMapper().listByTaxDeclarationIdAndEmployeeIds(taxDeclarationId, employeeIds); - return TaxDeclarationDetailPOEncrypt.decryptTaxDeclarationDetailPOList(taxDeclarationDetailPOS); + return encryptUtil.decryptList(taxDeclarationDetailPOS, TaxDeclarationDetailPO.class); } @Override diff --git a/src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java b/src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java index 5f2781b09..e86a03f86 100644 --- a/src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java +++ b/src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java @@ -4,7 +4,7 @@ import com.api.formmode.mybatis.util.SqlProxyHandle; import com.cloudstore.dev.api.util.Util_DataCache; import com.engine.core.impl.Service; import com.engine.salary.encrypt.AESEncryptUtil; -import com.engine.salary.encrypt.datacollection.SpecialAddDeductionEncrypt; +import com.engine.salary.encrypt.EncryptUtil; import com.engine.salary.entity.datacollection.AddUpDeduction; import com.engine.salary.entity.datacollection.AddUpSituation; import com.engine.salary.entity.datacollection.po.OtherDeductionPO; @@ -57,10 +57,11 @@ import weaver.conn.mybatis.MyBatisFactory; import weaver.general.BaseBean; import java.util.*; -import java.util.concurrent.*; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Future; import static com.engine.salary.sys.constant.SalarySysConstant.*; -import static java.util.concurrent.Executors.*; +import static java.util.concurrent.Executors.newFixedThreadPool; /** * 薪酬系统配置类 @@ -71,6 +72,7 @@ import static java.util.concurrent.Executors.*; * @version 1.0 **/ public class SalarySysConfServiceImpl extends Service implements SalarySysConfService { + private EncryptUtil encryptUtil = new EncryptUtil(); private SalarySysConfMapper getSalarySysConfMapper() { return SqlProxyHandle.getProxy(SalarySysConfMapper.class); @@ -929,9 +931,9 @@ public class SalarySysConfServiceImpl extends Service implements SalarySysConfSe if (CollectionUtils.isNotEmpty(addUpSituations)) { addUpSituations.forEach(po -> { if (OpenEnum.OFF.getValue().equals(isOpenEncrypt)) { - SpecialAddDeductionEncrypt.decrypt(po); + encryptUtil.decrypt(po, SpecialAddDeductionPO.class); } else { - SpecialAddDeductionEncrypt.encrypt(po); + encryptUtil.encrypt(po, SpecialAddDeductionPO.class); } }); List> partition = Lists.partition(addUpSituations, 50);