From bfcb9a78f830bda10a6e4f93704ddc2dbcf5f540 Mon Sep 17 00:00:00 2001 From: MustangDeng <670124965@qq.com> Date: Mon, 6 Jun 2022 21:21:10 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WEB-INF/prop/hrmSalary.properties | 2 -- .../TaxDeclarationDetailPOEncrypt.java | 19 +++++++++++++++++++ .../taxdeclaration/bo/TaxDeclarationBO.java | 1 + .../impl/TaxDeclarationDetailServiceImpl.java | 2 +- .../salary/wrapper/TaxDeclarationWrapper.java | 7 +++++-- 5 files changed, 26 insertions(+), 5 deletions(-) diff --git a/resource/ecology9/WEB-INF/prop/hrmSalary.properties b/resource/ecology9/WEB-INF/prop/hrmSalary.properties index f56549819..0848d12af 100644 --- a/resource/ecology9/WEB-INF/prop/hrmSalary.properties +++ b/resource/ecology9/WEB-INF/prop/hrmSalary.properties @@ -6,6 +6,4 @@ isPermission=false salaryAdminRoleId=28 #是否开启默认关闭非标-开启后，默认不启用非标，在应用中心非标中进行开启 defaultCloseNonStandard149=true - -#AES密钥 AESEncryptScrect=990EB004A1C862721C1513AE90038C9E \ No newline at end of file diff --git a/src/com/engine/salary/encrypt/taxdeclaration/TaxDeclarationDetailPOEncrypt.java b/src/com/engine/salary/encrypt/taxdeclaration/TaxDeclarationDetailPOEncrypt.java index 274b08346..5899dc13c 100644 --- a/src/com/engine/salary/encrypt/taxdeclaration/TaxDeclarationDetailPOEncrypt.java +++ b/src/com/engine/salary/encrypt/taxdeclaration/TaxDeclarationDetailPOEncrypt.java @@ -2,6 +2,7 @@ package com.engine.salary.encrypt.taxdeclaration; import com.engine.salary.encrypt.AESEncryptUtil; import com.engine.salary.entity.taxdeclaration.po.TaxDeclarationDetailPO; +import org.docx4j.wml.P; import java.util.Collection; import java.util.List; @@ -22,6 +23,16 @@ public class TaxDeclarationDetailPOEncrypt { return list; } + public static Collection encryptTaxDeclarationDetailPOList(Collection list) { + if(list == null || list.size() == 0) { + return list; + } + list.forEach(item -> { + item.setFieldValue(AESEncryptUtil.encrypt(item.getFieldValue())); + }); + return list; + } + public static List decryptTaxDeclarationDetailPOList(List list) { if(list == null || list.size() == 0) { return list; @@ -38,4 +49,12 @@ public class TaxDeclarationDetailPOEncrypt { }); return list; } + + public static TaxDeclarationDetailPO encryptTaxDeclarationDetailPOItem(TaxDeclarationDetailPO item) { + if(item == null) { + return item; + } + item.setFieldValue(AESEncryptUtil.decrypt(item.getFieldValue())); + return item; + } } diff --git a/src/com/engine/salary/entity/taxdeclaration/bo/TaxDeclarationBO.java b/src/com/engine/salary/entity/taxdeclaration/bo/TaxDeclarationBO.java index 6afae5f96..4bef32061 100644 --- a/src/com/engine/salary/entity/taxdeclaration/bo/TaxDeclarationBO.java +++ b/src/com/engine/salary/entity/taxdeclaration/bo/TaxDeclarationBO.java @@ -1,5 +1,6 @@ package com.engine.salary.entity.taxdeclaration.bo; +import com.engine.salary.encrypt.taxdeclaration.TaxDeclarationDetailPOEncrypt; import com.engine.salary.entity.datacollection.AddUpSituation; import com.engine.salary.entity.datacollection.DataCollectionEmployee; import com.engine.salary.entity.salaryacct.po.SalaryAcctResultPO; diff --git a/src/com/engine/salary/service/impl/TaxDeclarationDetailServiceImpl.java b/src/com/engine/salary/service/impl/TaxDeclarationDetailServiceImpl.java index bd6e36e5f..22d090594 100644 --- a/src/com/engine/salary/service/impl/TaxDeclarationDetailServiceImpl.java +++ b/src/com/engine/salary/service/impl/TaxDeclarationDetailServiceImpl.java @@ -96,7 +96,7 @@ public class TaxDeclarationDetailServiceImpl extends Service implements TaxDecla @Override public void batchSave(Collection taxDeclarationDetailPOS) { if (CollectionUtils.isNotEmpty(taxDeclarationDetailPOS)) { - TaxDeclarationDetailPOEncrypt.decryptTaxDeclarationDetailPOList(taxDeclarationDetailPOS); + TaxDeclarationDetailPOEncrypt.encryptTaxDeclarationDetailPOList(taxDeclarationDetailPOS); List> partition = Lists.partition((List) taxDeclarationDetailPOS, 100); partition.forEach(getTaxDeclarationDetailMapper()::batchInsert); } diff --git a/src/com/engine/salary/wrapper/TaxDeclarationWrapper.java b/src/com/engine/salary/wrapper/TaxDeclarationWrapper.java index b6f47cc57..189e1dcba 100644 --- a/src/com/engine/salary/wrapper/TaxDeclarationWrapper.java +++ b/src/com/engine/salary/wrapper/TaxDeclarationWrapper.java @@ -8,6 +8,7 @@ import com.engine.salary.biz.TaxAgentBiz; import com.engine.salary.common.LocalDateRange; import com.engine.salary.component.WeaFormOption; import com.engine.salary.encrypt.datacollection.AddUpSituationEncrypt; +import com.engine.salary.encrypt.taxdeclaration.TaxDeclarationDetailPOEncrypt; import com.engine.salary.entity.datacollection.AddUpSituation; import com.engine.salary.entity.datacollection.DataCollectionEmployee; import com.engine.salary.entity.salaryacct.po.SalaryAcctRecordPO; @@ -21,6 +22,7 @@ import com.engine.salary.entity.taxdeclaration.dto.TaxDeclarationInfoDTO; import com.engine.salary.entity.taxdeclaration.dto.TaxDeclarationListDTO; import com.engine.salary.entity.taxdeclaration.param.TaxDeclarationListQueryParam; import com.engine.salary.entity.taxdeclaration.param.TaxDeclarationSaveParam; +import com.engine.salary.entity.taxdeclaration.po.TaxDeclarationDetailPO; import com.engine.salary.entity.taxdeclaration.po.TaxDeclarationPO; import com.engine.salary.entity.taxrate.TaxAgent; import com.engine.salary.enums.salaryaccounting.SalaryAcctRecordStatusEnum; @@ -267,14 +269,15 @@ public class TaxDeclarationWrapper extends Service { } // 保存个税申报表明细 if (CollectionUtils.isNotEmpty(result.getNeedInsertTaxDeclarationDetails())) { - getTaxDeclarationDetailService(user).batchSave(result.getNeedInsertTaxDeclarationDetails()); + Collection needInsertTaxDeclarationDetails = result.getNeedInsertTaxDeclarationDetails(); + getTaxDeclarationDetailService(user).batchSave(needInsertTaxDeclarationDetails); } // 保存累计情况 if (CollectionUtils.isNotEmpty(result.getNeedInsertAccumulatedSituations())) { Set taxAgentIds = SalaryEntityUtil.properties(result.getNeedInsertTaxDeclarations(), TaxDeclarationPO::getTaxAgentId); getAddUpSituationService(user).deleteByTaxYearMonthAndTaxAgentIds(SalaryDateUtil.localDate2YearMonth(taxCycle),taxAgentIds); ArrayList addUpSituations = Lists.newArrayList(result.getNeedInsertAccumulatedSituations()); -// AddUpSituationEncrypt.decryptAddUpSituationList(addUpSituations); + AddUpSituationEncrypt.encryptAddUpSituationList(addUpSituations); List> partition = Lists.partition(addUpSituations, 100); partition.forEach(getAddUpSituationMapper()::insertData); }