From a24cb2e6d64055cc302bf5528a409fda3939df43 Mon Sep 17 00:00:00 2001 From: MustangDeng <670124965@qq.com> Date: Thu, 2 Jun 2022 17:01:26 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E8=A7=A3=E5=AF=86=E8=87=AA=E6=B5=8B?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/engine/salary/biz/SIAccountBiz.java | 1 + src/com/engine/salary/biz/SIArchivesBiz.java | 2 +- .../archive/SalaryArchiveItemPOEncrypt.java | 11 ++++++ .../SalaryItemAdjustRecordListDTOEncrypt.java | 4 +++ .../datacollection/AddUpDeductionEncrypt.java | 6 ++++ .../AddUpDeductionRecordStrDTOEncrypt.java | 4 +++ .../AddUpDeductionStrDTOEncrypt.java | 4 +++ .../AddUpSituationDTOEncrypt.java | 7 ++++ .../datacollection/AddUpSituationEncrypt.java | 12 +++++++ .../AddUpSituationRecordDTOEncrypt.java | 6 ++++ .../OtherDeductionListDTOEncrypt.java | 12 +++++++ .../OtherDeductionPOEncrypt.java | 12 +++++++ .../OtherDeductionRecordDTOEncrypt.java | 12 +++++++ .../salaryacct/ExcelAcctResultPOEncrypt.java | 18 ++++++++++ .../salaryacct/SalaryAcctResultPOEncrypt.java | 12 +++++++ .../InsuranceAccountDetailPOEncrypt.java | 8 ++++- .../InsuranceAccountDetailTempPOEncrypt.java | 6 ++++ .../encrypt/siaccount/SiAccountEncrypt.java | 9 +++++ .../InsuranceArchivesFundSchemePOEncrypt.java | 12 +++++++ ...InsuranceArchivesOtherSchemePOEncrypt.java | 12 +++++++ ...nsuranceArchivesSocialSchemePOEncrypt.java | 12 +++++++ .../siexport/AccountExportPOEncrypt.java | 6 ++++ .../InsuranceSchemeDetailPOEncrypt.java | 13 +++++++ .../TaxDeclarationDetailEncrypt.java | 6 ++++ .../TaxDeclarationDetailPOEncrypt.java | 6 ++++ .../datacollection/dto/AddUpDeductionDTO.java | 14 ++++---- .../datacollection/dto/AddUpSituationDTO.java | 34 +++++++++---------- .../impl/SalaryAcctResultServiceImpl.java | 7 ++-- .../service/impl/SalarySendServiceImpl.java | 2 -- .../wrapper/SalaryArchiveItemWrapper.java | 2 ++ 30 files changed, 242 insertions(+), 30 deletions(-) diff --git a/src/com/engine/salary/biz/SIAccountBiz.java b/src/com/engine/salary/biz/SIAccountBiz.java index 0eb984efa..be2adedd5 100644 --- a/src/com/engine/salary/biz/SIAccountBiz.java +++ b/src/com/engine/salary/biz/SIAccountBiz.java @@ -699,6 +699,7 @@ public class SIAccountBiz extends Service{ BigDecimal socialTemp = new BigDecimal("0"); BigDecimal fundTemp = new BigDecimal("0"); BigDecimal otherTemp = new BigDecimal("0"); + InsuranceAccountDetailPOEncrypt.decryptInsuranceAccountDetailPOList(v); for (InsuranceAccountDetailPO item : v) { BigDecimal socialPerson = StringUtils.isBlank(item.getSocialSum()) ? new BigDecimal("0") : new BigDecimal(item.getSocialSum()); BigDecimal fundPerson = StringUtils.isBlank(item.getFundSum()) ? new BigDecimal("0") : new BigDecimal(item.getFundSum()); diff --git a/src/com/engine/salary/biz/SIArchivesBiz.java b/src/com/engine/salary/biz/SIArchivesBiz.java index 4e801bffe..dad8420be 100644 --- a/src/com/engine/salary/biz/SIArchivesBiz.java +++ b/src/com/engine/salary/biz/SIArchivesBiz.java @@ -309,7 +309,7 @@ public class SIArchivesBiz { InsuranceSchemeDetailMapper insuranceSchemeDetailMapper = sqlSession.getMapper(InsuranceSchemeDetailMapper.class); List insuranceSchemeDetailPOS = insuranceSchemeDetailMapper.queryListByPrimaryIdIsPayment(schemeId, IsPaymentEnum.YES.getValue(), welfareType); InsuranceSchemeDetailPOEncrypt.decryptList(insuranceSchemeDetailPOS); - return decryptSchemeDetailList(insuranceSchemeDetailPOS); + return insuranceSchemeDetailPOS; }finally { sqlSession.close(); } diff --git a/src/com/engine/salary/encrypt/archive/SalaryArchiveItemPOEncrypt.java b/src/com/engine/salary/encrypt/archive/SalaryArchiveItemPOEncrypt.java index 4a0aa738e..98acfd230 100644 --- a/src/com/engine/salary/encrypt/archive/SalaryArchiveItemPOEncrypt.java +++ b/src/com/engine/salary/encrypt/archive/SalaryArchiveItemPOEncrypt.java @@ -12,6 +12,9 @@ import java.util.List; */ public class SalaryArchiveItemPOEncrypt { public static List encryptSalaryArchiveItemPOList(List list) { + if(list == null || list.size() == 0) { + return list; + } list.forEach(item -> { item.setItemValue(AESEncryptUtil.encrypt(item.getItemValue())); }); @@ -19,6 +22,9 @@ public class SalaryArchiveItemPOEncrypt { } public static List decryptSalaryArchiveItemPOList(List list) { + if(list == null || list.size() == 0) { + return list; + } list.forEach(item -> { item.setItemValue(AESEncryptUtil.decrypt(item.getItemValue())); }); @@ -26,11 +32,16 @@ public class SalaryArchiveItemPOEncrypt { } public static SalaryArchiveItemPO encryptSalaryArchiveItemPO(SalaryArchiveItemPO item) { + if(item == null) { + return item; } item.setItemValue(AESEncryptUtil.encrypt(item.getItemValue())); return item; } public static SalaryArchiveItemPO decryptSalaryArchiveItemPO(SalaryArchiveItemPO item) { + if(item == null) { + return item; + } item.setItemValue(AESEncryptUtil.decrypt(item.getItemValue())); return item; } diff --git a/src/com/engine/salary/encrypt/archive/SalaryItemAdjustRecordListDTOEncrypt.java b/src/com/engine/salary/encrypt/archive/SalaryItemAdjustRecordListDTOEncrypt.java index 59cbfdab3..3c3bb602a 100644 --- a/src/com/engine/salary/encrypt/archive/SalaryItemAdjustRecordListDTOEncrypt.java +++ b/src/com/engine/salary/encrypt/archive/SalaryItemAdjustRecordListDTOEncrypt.java @@ -7,8 +7,12 @@ import java.util.List; public class SalaryItemAdjustRecordListDTOEncrypt { public static List decryptSalaryItemAdjustRecordListDTOList(List list) { + if(list == null || list.size() == 0) { + return list; + } list.forEach(item -> { item.setAdjustBefore(AESEncryptUtil.decrypt(item.getAdjustBefore())); + item.setAdjustAfter(AESEncryptUtil.decrypt(item.getAdjustAfter())); }); return list; } diff --git a/src/com/engine/salary/encrypt/datacollection/AddUpDeductionEncrypt.java b/src/com/engine/salary/encrypt/datacollection/AddUpDeductionEncrypt.java index d419ebb56..0a1d5665f 100644 --- a/src/com/engine/salary/encrypt/datacollection/AddUpDeductionEncrypt.java +++ b/src/com/engine/salary/encrypt/datacollection/AddUpDeductionEncrypt.java @@ -38,6 +38,9 @@ public class AddUpDeductionEncrypt { } public static AddUpDeduction encryptAddUpDeduction(AddUpDeduction item) { + if(item == null) { + return item; + } item.setAddUpChildEducation(AESEncryptUtil.encrypt(item.getAddUpChildEducation())); item.setAddUpContinuingEducation(AESEncryptUtil.encrypt(item.getAddUpContinuingEducation())); item.setAddUpHousingLoanInterest(AESEncryptUtil.encrypt(item.getAddUpHousingLoanInterest())); @@ -47,6 +50,9 @@ public class AddUpDeductionEncrypt { } public static AddUpDeduction decryptAddUpDeduction(AddUpDeduction item) { + if(item == null) { + return item; + } item.setAddUpChildEducation(AESEncryptUtil.decrypt(item.getAddUpChildEducation())); item.setAddUpContinuingEducation(AESEncryptUtil.decrypt(item.getAddUpContinuingEducation())); item.setAddUpHousingLoanInterest(AESEncryptUtil.decrypt(item.getAddUpHousingLoanInterest())); diff --git a/src/com/engine/salary/encrypt/datacollection/AddUpDeductionRecordStrDTOEncrypt.java b/src/com/engine/salary/encrypt/datacollection/AddUpDeductionRecordStrDTOEncrypt.java index 1022bfc89..7a6e58288 100644 --- a/src/com/engine/salary/encrypt/datacollection/AddUpDeductionRecordStrDTOEncrypt.java +++ b/src/com/engine/salary/encrypt/datacollection/AddUpDeductionRecordStrDTOEncrypt.java @@ -6,6 +6,7 @@ import com.engine.salary.entity.datacollection.dto.AddUpDeductionRecordStrDTO; import org.apache.commons.lang.StringUtils; import java.math.BigDecimal; +import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; @@ -20,6 +21,9 @@ import java.util.stream.Collectors; */ public class AddUpDeductionRecordStrDTOEncrypt { public static List decryptAddUpDeductionRecordDTO(List list) { + if(list == null || list.size() == 0) { + return new ArrayList<>(); + } list.forEach(item -> { item.setAddUpChildEducation(AESEncryptUtil.encrypt(item.getAddUpChildEducation())); item.setAddUpContinuingEducation(AESEncryptUtil.encrypt(item.getAddUpContinuingEducation())); diff --git a/src/com/engine/salary/encrypt/datacollection/AddUpDeductionStrDTOEncrypt.java b/src/com/engine/salary/encrypt/datacollection/AddUpDeductionStrDTOEncrypt.java index 3ef05a092..0998d6189 100644 --- a/src/com/engine/salary/encrypt/datacollection/AddUpDeductionStrDTOEncrypt.java +++ b/src/com/engine/salary/encrypt/datacollection/AddUpDeductionStrDTOEncrypt.java @@ -6,6 +6,7 @@ import com.engine.salary.entity.datacollection.dto.AddUpDeductionStrDTO; import org.apache.commons.lang.StringUtils; import java.math.BigDecimal; +import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; @@ -20,6 +21,9 @@ import java.util.stream.Collectors; */ public class AddUpDeductionStrDTOEncrypt { public static List decryptAddUpDeductionList(List list) { + if(list == null || list.size() == 0) { + return new ArrayList<>(); + } list.forEach(item -> { item.setAddUpChildEducation(AESEncryptUtil.decrypt(item.getAddUpChildEducation())); item.setAddUpContinuingEducation(AESEncryptUtil.decrypt(item.getAddUpContinuingEducation())); diff --git a/src/com/engine/salary/encrypt/datacollection/AddUpSituationDTOEncrypt.java b/src/com/engine/salary/encrypt/datacollection/AddUpSituationDTOEncrypt.java index f8722c658..fb39e33e1 100644 --- a/src/com/engine/salary/encrypt/datacollection/AddUpSituationDTOEncrypt.java +++ b/src/com/engine/salary/encrypt/datacollection/AddUpSituationDTOEncrypt.java @@ -3,6 +3,7 @@ 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; /** @@ -25,6 +26,9 @@ import java.util.List; */ public class AddUpSituationDTOEncrypt { public static List encryptAddUpSituationDTOList(List list) { + if(list == null || list.size() == 0) { + return list; + } list.forEach(item -> { item.setAddUpIncome(AESEncryptUtil.encrypt(item.getAddUpIncome())); item.setAddUpSubtraction(AESEncryptUtil.encrypt(item.getAddUpSubtraction())); @@ -49,6 +53,9 @@ public class AddUpSituationDTOEncrypt { } public static List decryptAddUpSituationDTOList(List list) { + if(list == null || list.size() == 0) { + return list; + } list.forEach(item -> { item.setAddUpIncome(AESEncryptUtil.decrypt(item.getAddUpIncome())); item.setAddUpSubtraction(AESEncryptUtil.decrypt(item.getAddUpSubtraction())); diff --git a/src/com/engine/salary/encrypt/datacollection/AddUpSituationEncrypt.java b/src/com/engine/salary/encrypt/datacollection/AddUpSituationEncrypt.java index 8f39ab7c2..fa2a72f07 100644 --- a/src/com/engine/salary/encrypt/datacollection/AddUpSituationEncrypt.java +++ b/src/com/engine/salary/encrypt/datacollection/AddUpSituationEncrypt.java @@ -25,6 +25,9 @@ import java.util.List; */ public class AddUpSituationEncrypt { public static List encryptAddUpSituationList(List list) { + if(list == null || list.size() == 0) { + return list; + } list.forEach(item -> { item.setAddUpIncome(AESEncryptUtil.encrypt(item.getAddUpIncome())); item.setAddUpSubtraction(AESEncryptUtil.encrypt(item.getAddUpSubtraction())); @@ -50,6 +53,9 @@ public class AddUpSituationEncrypt { } public static List decryptAddUpSituationList(List list) { + if(list == null || list.size() == 0) { + return list; + } list.forEach(item -> { item.setAddUpIncome(AESEncryptUtil.decrypt(item.getAddUpIncome())); item.setAddUpSubtraction(AESEncryptUtil.decrypt(item.getAddUpSubtraction())); @@ -74,6 +80,9 @@ public class AddUpSituationEncrypt { } public static AddUpSituation encryptAddUpSituation(AddUpSituation item) { + if(item == null) { + return item; + } item.setAddUpIncome(AESEncryptUtil.encrypt(item.getAddUpIncome())); item.setAddUpSubtraction(AESEncryptUtil.encrypt(item.getAddUpSubtraction())); item.setAddUpSocialSecurityTotal(AESEncryptUtil.encrypt(item.getAddUpSocialSecurityTotal())); @@ -96,6 +105,9 @@ public class AddUpSituationEncrypt { } public static AddUpSituation decryptAddUpSituation(AddUpSituation item) { + if(item == null) { + return item; + } item.setAddUpIncome(AESEncryptUtil.decrypt(item.getAddUpIncome())); item.setAddUpSubtraction(AESEncryptUtil.decrypt(item.getAddUpSubtraction())); item.setAddUpSocialSecurityTotal(AESEncryptUtil.decrypt(item.getAddUpSocialSecurityTotal())); diff --git a/src/com/engine/salary/encrypt/datacollection/AddUpSituationRecordDTOEncrypt.java b/src/com/engine/salary/encrypt/datacollection/AddUpSituationRecordDTOEncrypt.java index 710cc3ace..dc5e0c086 100644 --- a/src/com/engine/salary/encrypt/datacollection/AddUpSituationRecordDTOEncrypt.java +++ b/src/com/engine/salary/encrypt/datacollection/AddUpSituationRecordDTOEncrypt.java @@ -7,6 +7,9 @@ import java.util.List; public class AddUpSituationRecordDTOEncrypt { public static List encryptAddUpSituationRecordDTOList(List list) { + if(list == null || list.size() == 0) { + return list; + } list.forEach(item -> { item.setAddUpIncome(AESEncryptUtil.encrypt(item.getAddUpIncome())); item.setAddUpSubtraction(AESEncryptUtil.encrypt(item.getAddUpSubtraction())); @@ -32,6 +35,9 @@ public class AddUpSituationRecordDTOEncrypt { } public static List decryptAddUpSituationRecordDTOList(List list) { + if(list == null || list.size() == 0) { + return list; + } list.forEach(item -> { item.setAddUpIncome(AESEncryptUtil.decrypt(item.getAddUpIncome())); item.setAddUpSubtraction(AESEncryptUtil.decrypt(item.getAddUpSubtraction())); diff --git a/src/com/engine/salary/encrypt/datacollection/OtherDeductionListDTOEncrypt.java b/src/com/engine/salary/encrypt/datacollection/OtherDeductionListDTOEncrypt.java index e942c30d0..c7a1f9385 100644 --- a/src/com/engine/salary/encrypt/datacollection/OtherDeductionListDTOEncrypt.java +++ b/src/com/engine/salary/encrypt/datacollection/OtherDeductionListDTOEncrypt.java @@ -16,6 +16,9 @@ import java.util.List; */ public class OtherDeductionListDTOEncrypt { public static List encryptOtherDeductionListDTOList(List list) { + if(list == null || list.size() == 0) { + return list; + } list.forEach(item -> { item.setBusinessHealthyInsurance(AESEncryptUtil.encrypt(item.getBusinessHealthyInsurance())); item.setTaxDelayEndowmentInsurance(AESEncryptUtil.encrypt(item.getTaxDelayEndowmentInsurance())); @@ -26,6 +29,9 @@ public class OtherDeductionListDTOEncrypt { } public static List decryptOtherDeductionListDTOList(List list) { + if(list == null || list.size() == 0) { + return list; + } list.forEach(item -> { item.setBusinessHealthyInsurance(AESEncryptUtil.decrypt(item.getBusinessHealthyInsurance())); item.setTaxDelayEndowmentInsurance(AESEncryptUtil.decrypt(item.getTaxDelayEndowmentInsurance())); @@ -36,6 +42,9 @@ public class OtherDeductionListDTOEncrypt { } public static OtherDeductionListDTO encryptOtherDeductionListDTO(OtherDeductionListDTO item) { + if(item == null) { + return item; + } item.setBusinessHealthyInsurance(AESEncryptUtil.encrypt(item.getBusinessHealthyInsurance())); item.setTaxDelayEndowmentInsurance(AESEncryptUtil.encrypt(item.getTaxDelayEndowmentInsurance())); item.setOtherDeduction(AESEncryptUtil.encrypt(item.getOtherDeduction())); @@ -44,6 +53,9 @@ public class OtherDeductionListDTOEncrypt { } public static OtherDeductionListDTO decryptOtherDeductionListDTO(OtherDeductionListDTO item) { + if(item == null) { + return item; + } item.setBusinessHealthyInsurance(AESEncryptUtil.decrypt(item.getBusinessHealthyInsurance())); item.setTaxDelayEndowmentInsurance(AESEncryptUtil.decrypt(item.getTaxDelayEndowmentInsurance())); item.setOtherDeduction(AESEncryptUtil.decrypt(item.getOtherDeduction())); diff --git a/src/com/engine/salary/encrypt/datacollection/OtherDeductionPOEncrypt.java b/src/com/engine/salary/encrypt/datacollection/OtherDeductionPOEncrypt.java index 46ea2ff1b..ddfed66f5 100644 --- a/src/com/engine/salary/encrypt/datacollection/OtherDeductionPOEncrypt.java +++ b/src/com/engine/salary/encrypt/datacollection/OtherDeductionPOEncrypt.java @@ -15,6 +15,9 @@ import java.util.List; */ public class OtherDeductionPOEncrypt { public static List encryptOtherDeductionPOList(List list) { + if(list == null || list.size() == 0) { + return list; + } list.forEach(item -> { item.setBusinessHealthyInsurance(AESEncryptUtil.encrypt(item.getBusinessHealthyInsurance())); item.setTaxDelayEndowmentInsurance(AESEncryptUtil.encrypt(item.getTaxDelayEndowmentInsurance())); @@ -25,6 +28,9 @@ public class OtherDeductionPOEncrypt { } public static List decryptOtherDeductionPOList(List list) { + if(list == null || list.size() == 0) { + return list; + } list.forEach(item -> { item.setBusinessHealthyInsurance(AESEncryptUtil.decrypt(item.getBusinessHealthyInsurance())); item.setTaxDelayEndowmentInsurance(AESEncryptUtil.decrypt(item.getTaxDelayEndowmentInsurance())); @@ -35,6 +41,9 @@ public class OtherDeductionPOEncrypt { } public static OtherDeductionPO encryptOtherDeductionPO(OtherDeductionPO item) { + if(item == null) { + return item; + } item.setBusinessHealthyInsurance(AESEncryptUtil.encrypt(item.getBusinessHealthyInsurance())); item.setTaxDelayEndowmentInsurance(AESEncryptUtil.encrypt(item.getTaxDelayEndowmentInsurance())); item.setOtherDeduction(AESEncryptUtil.encrypt(item.getOtherDeduction())); @@ -43,6 +52,9 @@ public class OtherDeductionPOEncrypt { } public static OtherDeductionPO decryptOtherDeductionPO(OtherDeductionPO item) { + if(item == null) { + return item; + } item.setBusinessHealthyInsurance(AESEncryptUtil.decrypt(item.getBusinessHealthyInsurance())); item.setTaxDelayEndowmentInsurance(AESEncryptUtil.decrypt(item.getTaxDelayEndowmentInsurance())); item.setOtherDeduction(AESEncryptUtil.decrypt(item.getOtherDeduction())); diff --git a/src/com/engine/salary/encrypt/datacollection/OtherDeductionRecordDTOEncrypt.java b/src/com/engine/salary/encrypt/datacollection/OtherDeductionRecordDTOEncrypt.java index 7405661a0..015a3741e 100644 --- a/src/com/engine/salary/encrypt/datacollection/OtherDeductionRecordDTOEncrypt.java +++ b/src/com/engine/salary/encrypt/datacollection/OtherDeductionRecordDTOEncrypt.java @@ -15,6 +15,9 @@ import java.util.List; */ public class OtherDeductionRecordDTOEncrypt { public static List encryptOtherDeductionRecordDTOList(List list) { + if(list == null || list.size() == 0) { + return list; + } list.forEach(item -> { item.setBusinessHealthyInsurance(AESEncryptUtil.encrypt(item.getBusinessHealthyInsurance())); item.setTaxDelayEndowmentInsurance(AESEncryptUtil.encrypt(item.getTaxDelayEndowmentInsurance())); @@ -25,6 +28,9 @@ public class OtherDeductionRecordDTOEncrypt { } public static List decryptOtherDeductionRecordDTOList(List list) { + if(list == null || list.size() == 0) { + return list; + } list.forEach(item -> { item.setBusinessHealthyInsurance(AESEncryptUtil.decrypt(item.getBusinessHealthyInsurance())); item.setTaxDelayEndowmentInsurance(AESEncryptUtil.decrypt(item.getTaxDelayEndowmentInsurance())); @@ -35,6 +41,9 @@ public class OtherDeductionRecordDTOEncrypt { } public static OtherDeductionRecordDTO encryptOtherDeductionRecordDTO(OtherDeductionRecordDTO item) { + if(item == null) { + return item; + } item.setBusinessHealthyInsurance(AESEncryptUtil.encrypt(item.getBusinessHealthyInsurance())); item.setTaxDelayEndowmentInsurance(AESEncryptUtil.encrypt(item.getTaxDelayEndowmentInsurance())); item.setOtherDeduction(AESEncryptUtil.encrypt(item.getOtherDeduction())); @@ -43,6 +52,9 @@ public class OtherDeductionRecordDTOEncrypt { } public static OtherDeductionRecordDTO decryptOtherDeductionRecordDTO(OtherDeductionRecordDTO item) { + if(item == null) { + return item; + } item.setBusinessHealthyInsurance(AESEncryptUtil.decrypt(item.getBusinessHealthyInsurance())); item.setTaxDelayEndowmentInsurance(AESEncryptUtil.decrypt(item.getTaxDelayEndowmentInsurance())); item.setOtherDeduction(AESEncryptUtil.decrypt(item.getOtherDeduction())); diff --git a/src/com/engine/salary/encrypt/salaryacct/ExcelAcctResultPOEncrypt.java b/src/com/engine/salary/encrypt/salaryacct/ExcelAcctResultPOEncrypt.java index 00dbdcade..57b6cae02 100644 --- a/src/com/engine/salary/encrypt/salaryacct/ExcelAcctResultPOEncrypt.java +++ b/src/com/engine/salary/encrypt/salaryacct/ExcelAcctResultPOEncrypt.java @@ -9,6 +9,9 @@ import java.util.List; public class ExcelAcctResultPOEncrypt { public static Collection encryptList(Collection list) { + if(list == null || list.size() == 0) { + return list; + } list.forEach(item -> { item.setResultValue(AESEncryptUtil.encrypt(item.getResultValue())); }); @@ -16,6 +19,9 @@ public class ExcelAcctResultPOEncrypt { } public static Collection decryptList(Collection list) { + if(list == null || list.size() == 0) { + return list; + } list.forEach(item -> { item.setResultValue(AESEncryptUtil.decrypt(item.getResultValue())); }); @@ -23,6 +29,9 @@ public class ExcelAcctResultPOEncrypt { } public static List encryptList(List list) { + if(list == null || list.size() == 0) { + return list; + } list.forEach(item -> { item.setResultValue(AESEncryptUtil.encrypt(item.getResultValue())); }); @@ -30,6 +39,9 @@ public class ExcelAcctResultPOEncrypt { } public static List decryptList(List list) { + if(list == null || list.size() == 0) { + return list; + } list.forEach(item -> { item.setResultValue(AESEncryptUtil.decrypt(item.getResultValue())); }); @@ -37,11 +49,17 @@ public class ExcelAcctResultPOEncrypt { } public static ExcelAcctResultPO encryptItem(ExcelAcctResultPO item) { + if(item == null) { + return item; + } item.setResultValue(AESEncryptUtil.encrypt(item.getResultValue())); return item; } public static ExcelAcctResultPO decryptItem(ExcelAcctResultPO item) { + if(item == null) { + return item; + } item.setResultValue(AESEncryptUtil.decrypt(item.getResultValue())); return item; } diff --git a/src/com/engine/salary/encrypt/salaryacct/SalaryAcctResultPOEncrypt.java b/src/com/engine/salary/encrypt/salaryacct/SalaryAcctResultPOEncrypt.java index 521674d4d..ecdb969a5 100644 --- a/src/com/engine/salary/encrypt/salaryacct/SalaryAcctResultPOEncrypt.java +++ b/src/com/engine/salary/encrypt/salaryacct/SalaryAcctResultPOEncrypt.java @@ -8,6 +8,9 @@ import java.util.List; public class SalaryAcctResultPOEncrypt { public static List encryptList(List list) { + if(list == null || list.size() == 0) { + return list; + } list.forEach(item -> { item.setResultValue(AESEncryptUtil.encrypt(item.getResultValue())); }); @@ -15,6 +18,9 @@ public class SalaryAcctResultPOEncrypt { } public static List decryptList(List list) { + if(list == null || list.size() == 0) { + return list; + } list.forEach(item -> { item.setResultValue(AESEncryptUtil.decrypt(item.getResultValue())); }); @@ -22,11 +28,17 @@ public class SalaryAcctResultPOEncrypt { } public static SalaryAcctResultPO encryptItem(SalaryAcctResultPO item) { + if(item == null) { + return item; + } item.setResultValue(AESEncryptUtil.encrypt(item.getResultValue())); return item; } public static SalaryAcctResultPO decryptItem(SalaryAcctResultPO item) { + if(item == null) { + return item; + } item.setResultValue(AESEncryptUtil.decrypt(item.getResultValue())); return item; } diff --git a/src/com/engine/salary/encrypt/siaccount/InsuranceAccountDetailPOEncrypt.java b/src/com/engine/salary/encrypt/siaccount/InsuranceAccountDetailPOEncrypt.java index f71e7fcbc..0c7c5aa85 100644 --- a/src/com/engine/salary/encrypt/siaccount/InsuranceAccountDetailPOEncrypt.java +++ b/src/com/engine/salary/encrypt/siaccount/InsuranceAccountDetailPOEncrypt.java @@ -32,7 +32,10 @@ import java.util.List; */ public class InsuranceAccountDetailPOEncrypt { public static List encryptInsuranceAccountDetailPOList(List list) { - list.forEach(item -> { + if(list == null || list.size() == 0) { + return list; + } + list.forEach(item -> { item.setSocialPaymentBaseString(AESEncryptUtil.encrypt(item.getSocialPaymentBaseString())); item.setFundPaymentBaseString(AESEncryptUtil.encrypt(item.getFundPaymentBaseString())); item.setOtherPaymentBaseString(AESEncryptUtil.encrypt(item.getOtherPaymentBaseString())); @@ -55,6 +58,9 @@ public class InsuranceAccountDetailPOEncrypt { } public static List decryptInsuranceAccountDetailPOList(List list) { + if(list == null || list.size() == 0) { + return list; + } list.forEach(item -> { item.setSocialPaymentBaseString(AESEncryptUtil.decrypt(item.getSocialPaymentBaseString())); item.setFundPaymentBaseString(AESEncryptUtil.decrypt(item.getFundPaymentBaseString())); diff --git a/src/com/engine/salary/encrypt/siaccount/InsuranceAccountDetailTempPOEncrypt.java b/src/com/engine/salary/encrypt/siaccount/InsuranceAccountDetailTempPOEncrypt.java index 6b5e2e608..af3a86e42 100644 --- a/src/com/engine/salary/encrypt/siaccount/InsuranceAccountDetailTempPOEncrypt.java +++ b/src/com/engine/salary/encrypt/siaccount/InsuranceAccountDetailTempPOEncrypt.java @@ -32,6 +32,9 @@ import java.util.List; */ public class InsuranceAccountDetailTempPOEncrypt { public static List encryptInsuranceAccountDetailTempPOList(List list) { + if(list == null || list.size() == 0) { + return list; + } list.forEach(item -> { item.setSocialPaymentBaseString(AESEncryptUtil.encrypt(item.getSocialPaymentBaseString())); item.setFundPaymentBaseString(AESEncryptUtil.encrypt(item.getFundPaymentBaseString())); @@ -55,6 +58,9 @@ public class InsuranceAccountDetailTempPOEncrypt { } public static List decryptInsuranceAccountDetailTempPOList(List list) { + if(list == null || list.size() == 0) { + return list; + } list.forEach(item -> { item.setSocialPaymentBaseString(AESEncryptUtil.decrypt(item.getSocialPaymentBaseString())); item.setFundPaymentBaseString(AESEncryptUtil.decrypt(item.getFundPaymentBaseString())); diff --git a/src/com/engine/salary/encrypt/siaccount/SiAccountEncrypt.java b/src/com/engine/salary/encrypt/siaccount/SiAccountEncrypt.java index 00abab5da..96bb1a9d7 100644 --- a/src/com/engine/salary/encrypt/siaccount/SiAccountEncrypt.java +++ b/src/com/engine/salary/encrypt/siaccount/SiAccountEncrypt.java @@ -23,6 +23,9 @@ public class SiAccountEncrypt { } public static List decryptInsuranceAccountBatchList(List list) { + if(list == null || list.size() == 0) { + return list; + } list.forEach(item -> { item.setOtherPay(AESEncryptUtil.decrypt(item.getOtherPay())); item.setSocialPay(AESEncryptUtil.decrypt(item.getSocialPay())); @@ -32,6 +35,9 @@ public class SiAccountEncrypt { } public static InsuranceAccountBatchPO encryptInsuranceAccountBatch(InsuranceAccountBatchPO item) { + if(item == null) { + return item; + } item.setOtherPay(AESEncryptUtil.encrypt(item.getOtherPay())); item.setSocialPay(AESEncryptUtil.encrypt(item.getSocialPay())); item.setFundPay(AESEncryptUtil.encrypt(item.getFundPay())); @@ -39,6 +45,9 @@ public class SiAccountEncrypt { } public static InsuranceAccountBatchPO decryptInsuranceAccountBatch(InsuranceAccountBatchPO item) { + if(item == null) { + return item; + } item.setOtherPay(AESEncryptUtil.decrypt(item.getOtherPay())); item.setSocialPay(AESEncryptUtil.decrypt(item.getSocialPay())); item.setFundPay(AESEncryptUtil.decrypt(item.getFundPay())); diff --git a/src/com/engine/salary/encrypt/siarchives/InsuranceArchivesFundSchemePOEncrypt.java b/src/com/engine/salary/encrypt/siarchives/InsuranceArchivesFundSchemePOEncrypt.java index f732aeed2..5bc6a7d3e 100644 --- a/src/com/engine/salary/encrypt/siarchives/InsuranceArchivesFundSchemePOEncrypt.java +++ b/src/com/engine/salary/encrypt/siarchives/InsuranceArchivesFundSchemePOEncrypt.java @@ -7,6 +7,9 @@ import java.util.List; public class InsuranceArchivesFundSchemePOEncrypt { public static List encryptList(List list) { + if(list == null || list.size() == 0) { + return list; + } list.forEach(item -> { item.setFundPaymentBaseString(AESEncryptUtil.encrypt(item.getFundPaymentBaseString())); }); @@ -14,6 +17,9 @@ public class InsuranceArchivesFundSchemePOEncrypt { } public static List decryptList(List list) { + if(list == null || list.size() == 0) { + return list; + } list.forEach(item -> { item.setFundPaymentBaseString(AESEncryptUtil.decrypt(item.getFundPaymentBaseString())); }); @@ -21,11 +27,17 @@ public class InsuranceArchivesFundSchemePOEncrypt { } public static InsuranceArchivesFundSchemePO encryptItem(InsuranceArchivesFundSchemePO item) { + if(item == null) { + return item; + } item.setFundPaymentBaseString(AESEncryptUtil.encrypt(item.getFundPaymentBaseString())); return item; } public static InsuranceArchivesFundSchemePO decryptItem(InsuranceArchivesFundSchemePO item) { + if(item == null) { + return item; + } item.setFundPaymentBaseString(AESEncryptUtil.decrypt(item.getFundPaymentBaseString())); return item; } diff --git a/src/com/engine/salary/encrypt/siarchives/InsuranceArchivesOtherSchemePOEncrypt.java b/src/com/engine/salary/encrypt/siarchives/InsuranceArchivesOtherSchemePOEncrypt.java index 170f118c6..071868571 100644 --- a/src/com/engine/salary/encrypt/siarchives/InsuranceArchivesOtherSchemePOEncrypt.java +++ b/src/com/engine/salary/encrypt/siarchives/InsuranceArchivesOtherSchemePOEncrypt.java @@ -8,6 +8,9 @@ import java.util.List; public class InsuranceArchivesOtherSchemePOEncrypt { public static List encryptList(List list) { + if(list == null || list.size() == 0) { + return list; + } list.forEach(item -> { item.setOtherPaymentBaseString(AESEncryptUtil.encrypt(item.getOtherPaymentBaseString())); }); @@ -15,6 +18,9 @@ public class InsuranceArchivesOtherSchemePOEncrypt { } public static List decryptList(List list) { + if(list == null || list.size() == 0) { + return list; + } list.forEach(item -> { item.setOtherPaymentBaseString(AESEncryptUtil.decrypt(item.getOtherPaymentBaseString())); }); @@ -22,11 +28,17 @@ public class InsuranceArchivesOtherSchemePOEncrypt { } public static InsuranceArchivesOtherSchemePO encryptItem(InsuranceArchivesOtherSchemePO item) { + if(item == null) { + return item; + } item.setOtherPaymentBaseString(AESEncryptUtil.encrypt(item.getOtherPaymentBaseString())); return item; } public static InsuranceArchivesOtherSchemePO decryptItem(InsuranceArchivesOtherSchemePO item) { + if(item == null) { + return item; + } item.setOtherPaymentBaseString(AESEncryptUtil.decrypt(item.getOtherPaymentBaseString())); return item; } diff --git a/src/com/engine/salary/encrypt/siarchives/InsuranceArchivesSocialSchemePOEncrypt.java b/src/com/engine/salary/encrypt/siarchives/InsuranceArchivesSocialSchemePOEncrypt.java index 666395bb0..19cc358a5 100644 --- a/src/com/engine/salary/encrypt/siarchives/InsuranceArchivesSocialSchemePOEncrypt.java +++ b/src/com/engine/salary/encrypt/siarchives/InsuranceArchivesSocialSchemePOEncrypt.java @@ -7,6 +7,9 @@ import java.util.List; public class InsuranceArchivesSocialSchemePOEncrypt { public static List encryptList(List list) { + if(list == null || list.size() == 0) { + return list; + } list.forEach(item -> { item.setSocialPaymentBaseString(AESEncryptUtil.encrypt(item.getSocialPaymentBaseString())); }); @@ -14,6 +17,9 @@ public class InsuranceArchivesSocialSchemePOEncrypt { } public static List decryptList(List list) { + if(list == null || list.size() == 0) { + return list; + } list.forEach(item -> { item.setSocialPaymentBaseString(AESEncryptUtil.decrypt(item.getSocialPaymentBaseString())); }); @@ -21,11 +27,17 @@ public class InsuranceArchivesSocialSchemePOEncrypt { } public static InsuranceArchivesSocialSchemePO encryptItem(InsuranceArchivesSocialSchemePO item) { + if(item == null) { + return item; + } item.setSocialPaymentBaseString(AESEncryptUtil.encrypt(item.getSocialPaymentBaseString())); return item; } public static InsuranceArchivesSocialSchemePO decryptItem(InsuranceArchivesSocialSchemePO item) { + if(item == null) { + return item; + } item.setSocialPaymentBaseString(AESEncryptUtil.decrypt(item.getSocialPaymentBaseString())); return item; } diff --git a/src/com/engine/salary/encrypt/siexport/AccountExportPOEncrypt.java b/src/com/engine/salary/encrypt/siexport/AccountExportPOEncrypt.java index a8d0240c0..5684afec1 100644 --- a/src/com/engine/salary/encrypt/siexport/AccountExportPOEncrypt.java +++ b/src/com/engine/salary/encrypt/siexport/AccountExportPOEncrypt.java @@ -32,6 +32,9 @@ import java.util.List; */ public class AccountExportPOEncrypt { public static List encryptAccountExportPOList(List list) { + if(list == null || list.size() == 0) { + return list; + } list.forEach(item -> { item.setSocialPaymentBaseString(AESEncryptUtil.encrypt(item.getSocialPaymentBaseString())); item.setFundPaymentBaseString(AESEncryptUtil.encrypt(item.getFundPaymentBaseString())); @@ -55,6 +58,9 @@ public class AccountExportPOEncrypt { } public static List decryptAccountExportPOList(List list) { + if(list == null || list.size() == 0) { + return list; + } list.forEach(item -> { item.setSocialPaymentBaseString(AESEncryptUtil.decrypt(item.getSocialPaymentBaseString())); item.setFundPaymentBaseString(AESEncryptUtil.decrypt(item.getFundPaymentBaseString())); diff --git a/src/com/engine/salary/encrypt/sischeme/InsuranceSchemeDetailPOEncrypt.java b/src/com/engine/salary/encrypt/sischeme/InsuranceSchemeDetailPOEncrypt.java index e461a357b..613c0a362 100644 --- a/src/com/engine/salary/encrypt/sischeme/InsuranceSchemeDetailPOEncrypt.java +++ b/src/com/engine/salary/encrypt/sischeme/InsuranceSchemeDetailPOEncrypt.java @@ -7,6 +7,9 @@ import java.util.List; public class InsuranceSchemeDetailPOEncrypt { public static List encryptList(List list) { + if(list == null || list.size() == 0) { + return list; + } list.forEach(item -> { item.setLowerLimit(AESEncryptUtil.encrypt(item.getLowerLimit())); item.setFixedCost(AESEncryptUtil.encrypt(item.getFixedCost())); @@ -16,6 +19,10 @@ public class InsuranceSchemeDetailPOEncrypt { } public static List decryptList(List list) { + + if(list == null || list.size() == 0) { + return list; + } list.forEach(item -> { item.setLowerLimit(AESEncryptUtil.decrypt(item.getLowerLimit())); item.setFixedCost(AESEncryptUtil.decrypt(item.getFixedCost())); @@ -25,6 +32,9 @@ public class InsuranceSchemeDetailPOEncrypt { } public static InsuranceSchemeDetailPO encryptItem(InsuranceSchemeDetailPO item) { + if(item == null) { + return item; + } item.setLowerLimit(AESEncryptUtil.encrypt(item.getLowerLimit())); item.setFixedCost(AESEncryptUtil.encrypt(item.getFixedCost())); item.setUpperLimit(AESEncryptUtil.encrypt(item.getUpperLimit())); @@ -32,6 +42,9 @@ public class InsuranceSchemeDetailPOEncrypt { } public static InsuranceSchemeDetailPO decryptItem(InsuranceSchemeDetailPO item) { + if(item == null) { + return item; + } item.setLowerLimit(AESEncryptUtil.decrypt(item.getLowerLimit())); item.setFixedCost(AESEncryptUtil.decrypt(item.getFixedCost())); item.setUpperLimit(AESEncryptUtil.decrypt(item.getUpperLimit())); diff --git a/src/com/engine/salary/encrypt/taxdeclaration/TaxDeclarationDetailEncrypt.java b/src/com/engine/salary/encrypt/taxdeclaration/TaxDeclarationDetailEncrypt.java index 618f2540a..f88f07f14 100644 --- a/src/com/engine/salary/encrypt/taxdeclaration/TaxDeclarationDetailEncrypt.java +++ b/src/com/engine/salary/encrypt/taxdeclaration/TaxDeclarationDetailEncrypt.java @@ -13,6 +13,9 @@ import java.util.List; */ public class TaxDeclarationDetailEncrypt { public static List encryptTaxDeclarationDetailList(List list) { + if(list == null || list.size() == 0) { + return list; + } list.forEach(item -> { item.setFieldValue(AESEncryptUtil.encrypt(item.getFieldValue())); }); @@ -20,6 +23,9 @@ public class TaxDeclarationDetailEncrypt { } public static List decryptTaxDeclarationDetailList(List list) { + if(list == null || list.size() == 0) { + return list; + } list.forEach(item -> { item.setFieldValue(AESEncryptUtil.decrypt(item.getFieldValue())); }); diff --git a/src/com/engine/salary/encrypt/taxdeclaration/TaxDeclarationDetailPOEncrypt.java b/src/com/engine/salary/encrypt/taxdeclaration/TaxDeclarationDetailPOEncrypt.java index 92896334e..274b08346 100644 --- a/src/com/engine/salary/encrypt/taxdeclaration/TaxDeclarationDetailPOEncrypt.java +++ b/src/com/engine/salary/encrypt/taxdeclaration/TaxDeclarationDetailPOEncrypt.java @@ -13,6 +13,9 @@ import java.util.List; */ public class TaxDeclarationDetailPOEncrypt { public static List encryptTaxDeclarationDetailPOList(List list) { + if(list == null || list.size() == 0) { + return list; + } list.forEach(item -> { item.setFieldValue(AESEncryptUtil.encrypt(item.getFieldValue())); }); @@ -20,6 +23,9 @@ public class TaxDeclarationDetailPOEncrypt { } public static List decryptTaxDeclarationDetailPOList(List list) { + if(list == null || list.size() == 0) { + return list; + } list.forEach(item -> { item.setFieldValue(AESEncryptUtil.decrypt(item.getFieldValue())); }); diff --git a/src/com/engine/salary/entity/datacollection/dto/AddUpDeductionDTO.java b/src/com/engine/salary/entity/datacollection/dto/AddUpDeductionDTO.java index d2b923a3e..5b3af1063 100644 --- a/src/com/engine/salary/entity/datacollection/dto/AddUpDeductionDTO.java +++ b/src/com/engine/salary/entity/datacollection/dto/AddUpDeductionDTO.java @@ -93,46 +93,46 @@ public class AddUpDeductionDTO { * 累计子女教育 */ @ExcelProperty(index = 7, msg = "第8列，累计子女教育解析错误，请输入数字") - @SalaryTableColumn(text = "累计子女教育", width = "10%", column = "addUpChildEducation") + @SalaryTableColumn(text = "累计子女教育", width = "10%", column = "addUpChildEducation", transmethod = "com.engine.salary.transmethod.EncryptTransMethod.decrypt") private String addUpChildEducation; /** * 累计继续教育 */ @ExcelProperty(index = 8, msg = "第9列，累计继续教育教育解析错误，请输入数字") - @SalaryTableColumn(text = "累计继续教育", width = "10%", column = "addUpContinuingEducation") + @SalaryTableColumn(text = "累计继续教育", width = "10%", column = "addUpContinuingEducation", transmethod = "com.engine.salary.transmethod.EncryptTransMethod.decrypt") private String addUpContinuingEducation; /** * 累计住房贷款利息 */ @ExcelProperty(index = 9, msg = "第10列，累计住房贷款利息解析错误，请输入数字") - @SalaryTableColumn(text = "累计住房贷款利息", width = "10%", column = "addUpHousingLoanInterest") + @SalaryTableColumn(text = "累计住房贷款利息", width = "10%", column = "addUpHousingLoanInterest", transmethod = "com.engine.salary.transmethod.EncryptTransMethod.decrypt") private String addUpHousingLoanInterest; /** * 累计住房租金 */ @ExcelProperty(index = 10, msg = "第11列，累计住房租金解析错误，请输入数字") - @SalaryTableColumn(text = "累计住房租金", width = "10%", column = "addUpHousingRent") + @SalaryTableColumn(text = "累计住房租金", width = "10%", column = "addUpHousingRent", transmethod = "com.engine.salary.transmethod.EncryptTransMethod.decrypt") private String addUpHousingRent; /** * 累计赡养老人 */ @ExcelProperty(index = 11, msg = "第12列，累计赡养老人解析错误，请输入数字") - @SalaryTableColumn(text = "累计赡养老人", width = "10%", column = "addUpSupportElderly") + @SalaryTableColumn(text = "累计赡养老人", width = "10%", column = "addUpSupportElderly", transmethod = "com.engine.salary.transmethod.EncryptTransMethod.decrypt") private String addUpSupportElderly; /** * 累计大病医疗 */ @ExcelProperty(index = 12, msg = "第13列，累计大病医疗解析错误，请输入数字") - @SalaryTableColumn(text = "累计大病医疗", width = "10%", column = "addUpIllnessMedical") + @SalaryTableColumn(text = "累计大病医疗", width = "10%", column = "addUpIllnessMedical", transmethod = "com.engine.salary.transmethod.EncryptTransMethod.decrypt") private String addUpIllnessMedical; @ExcelProperty(index = 13, msg = "第14列，累计婴幼儿照护解析错误，请输入数字") - @SalaryTableColumn(text = "累计婴幼儿照护", width = "10%", column = "addUpInfantCare") + @SalaryTableColumn(text = "累计婴幼儿照护", width = "10%", column = "addUpInfantCare", transmethod = "com.engine.salary.transmethod.EncryptTransMethod.decrypt") private String addUpInfantCare; @SalaryTableColumn(text = "操作", width = "20%", column = "operate") diff --git a/src/com/engine/salary/entity/datacollection/dto/AddUpSituationDTO.java b/src/com/engine/salary/entity/datacollection/dto/AddUpSituationDTO.java index 1a8c71d36..88f58f913 100644 --- a/src/com/engine/salary/entity/datacollection/dto/AddUpSituationDTO.java +++ b/src/com/engine/salary/entity/datacollection/dto/AddUpSituationDTO.java @@ -76,88 +76,88 @@ public class AddUpSituationDTO { private String hiredate; //累计收入额 - @SalaryTableColumn(text = "累计收入额", width = "10%", column = "addUpIncome") + @SalaryTableColumn(text = "累计收入额", width = "10%", column = "addUpIncome", transmethod = "com.engine.salary.transmethod.EncryptTransMethod.decrypt") @ExcelProperty(index = 7) private String addUpIncome; //累计减除费用 - @SalaryTableColumn(text = "累计减除费用", width = "10%", column = "addUpSubtraction") + @SalaryTableColumn(text = "累计减除费用", width = "10%", column = "addUpSubtraction", transmethod = "com.engine.salary.transmethod.EncryptTransMethod.decrypt") @ExcelProperty(index = 8) private String addUpSubtraction; //累计社保个人合计 - @SalaryTableColumn(text = "累计社保个人合计", width = "10%", column = "addUpSocialSecurityTotal") + @SalaryTableColumn(text = "累计社保个人合计", width = "10%", column = "addUpSocialSecurityTotal", transmethod = "com.engine.salary.transmethod.EncryptTransMethod.decrypt") @ExcelProperty(index = 9) private String addUpSocialSecurityTotal; //累计公积金个人合计 - @SalaryTableColumn(text = "累计公积金个人合计", width = "10%", column = "addUpAccumulationFundTotal") + @SalaryTableColumn(text = "累计公积金个人合计", width = "10%", column = "addUpAccumulationFundTotal", transmethod = "com.engine.salary.transmethod.EncryptTransMethod.decrypt") @ExcelProperty(index = 10) private String addUpAccumulationFundTotal; //累计子女教育 - @SalaryTableColumn(text = "累计子女教育", width = "10%", column = "addUpChildEducation") + @SalaryTableColumn(text = "累计子女教育", width = "10%", column = "addUpChildEducation", transmethod = "com.engine.salary.transmethod.EncryptTransMethod.decrypt") @ExcelProperty(index = 11) private String addUpChildEducation; //累计继续教育 - @SalaryTableColumn(text = "累计继续教育", width = "10%", column = "addUpContinuingEducation") + @SalaryTableColumn(text = "累计继续教育", width = "10%", column = "addUpContinuingEducation", transmethod = "com.engine.salary.transmethod.EncryptTransMethod.decrypt") @ExcelProperty(index = 12) private String addUpContinuingEducation; //累计住房贷款利息 - @SalaryTableColumn(text = "累计住房贷款利息", width = "10%", column = "addUpHousingLoanInterest") + @SalaryTableColumn(text = "累计住房贷款利息", width = "10%", column = "addUpHousingLoanInterest", transmethod = "com.engine.salary.transmethod.EncryptTransMethod.decrypt") @ExcelProperty(index = 13) private String addUpHousingLoanInterest; //累计住房租金 - @SalaryTableColumn(text = "累计住房租金", width = "10%", column = "addUpHousingRent") + @SalaryTableColumn(text = "累计住房租金", width = "10%", column = "addUpHousingRent", transmethod = "com.engine.salary.transmethod.EncryptTransMethod.decrypt") @ExcelProperty(index = 14) private String addUpHousingRent; //累计赡养老人 - @SalaryTableColumn(text = "累计赡养老人", width = "10%", column = "addUpSupportElderly") + @SalaryTableColumn(text = "累计赡养老人", width = "10%", column = "addUpSupportElderly", transmethod = "com.engine.salary.transmethod.EncryptTransMethod.decrypt") @ExcelProperty(index = 15) private String addUpSupportElderly; //累计大病医疗 - @SalaryTableColumn(text = "累计大病医疗", width = "10%", column = "addUpIllnessMedical") + @SalaryTableColumn(text = "累计大病医疗", width = "10%", column = "addUpIllnessMedical", transmethod = "com.engine.salary.transmethod.EncryptTransMethod.decrypt") @ExcelProperty(index = 16) private String addUpIllnessMedical; //累计企业（职业）年金及其他福利 - @SalaryTableColumn(text = "累计企业（职业）年金及其他福利", width = "10%", column = "addUpEnterpriseAndOther") + @SalaryTableColumn(text = "累计企业（职业）年金及其他福利", width = "10%", column = "addUpEnterpriseAndOther", transmethod = "com.engine.salary.transmethod.EncryptTransMethod.decrypt") @ExcelProperty(index = 17) private String addUpEnterpriseAndOther; //累计其他扣除 - @SalaryTableColumn(text = "累计其他扣除", width = "10%", column = "addUpOtherDeduction") + @SalaryTableColumn(text = "累计其他扣除", width = "10%", column = "addUpOtherDeduction", transmethod = "com.engine.salary.transmethod.EncryptTransMethod.decrypt") @ExcelProperty(index = 18) private String addUpOtherDeduction; //累计免税收入 - @SalaryTableColumn(text = "累计免税收入", width = "10%", column = "addUpTaxExemptIncome") + @SalaryTableColumn(text = "累计免税收入", width = "10%", column = "addUpTaxExemptIncome", transmethod = "com.engine.salary.transmethod.EncryptTransMethod.decrypt") @ExcelProperty(index = 19) private String addUpTaxExemptIncome; //累计准予扣除的捐赠额 - @SalaryTableColumn(text = "累计准予扣除的捐赠额", width = "10%", column = "addUpAllowedDonation") + @SalaryTableColumn(text = "累计准予扣除的捐赠额", width = "10%", column = "addUpAllowedDonation", transmethod = "com.engine.salary.transmethod.EncryptTransMethod.decrypt") @ExcelProperty(index = 20) private String addUpAllowedDonation; //累计减免税额 - @SalaryTableColumn(text = "累计减免税额", width = "10%", column = "addUpTaxSavings") + @SalaryTableColumn(text = "累计减免税额", width = "10%", column = "addUpTaxSavings", transmethod = "com.engine.salary.transmethod.EncryptTransMethod.decrypt") @ExcelProperty(index = 21) private String addUpTaxSavings; //累计已预扣预缴税额 - @SalaryTableColumn(text = "累计已预扣预缴税额", width = "10%", column = "addUpAdvanceTax") + @SalaryTableColumn(text = "累计已预扣预缴税额", width = "10%", column = "addUpAdvanceTax", transmethod = "com.engine.salary.transmethod.EncryptTransMethod.decrypt") @ExcelProperty(index = 22) private String addUpAdvanceTax; //累计婴幼儿照护 @ExcelProperty(index = 23) - @SalaryTableColumn(text = "累计婴幼儿照护", width = "10%", column = "addUpInfantCare") + @SalaryTableColumn(text = "累计婴幼儿照护", width = "10%", column = "addUpInfantCare", transmethod = "com.engine.salary.transmethod.EncryptTransMethod.decrypt") private String addUpInfantCare; @SalaryTableColumn(text = "操作", width = "20%", column = "operate") diff --git a/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java index 9ab9fdc15..e9b93aee1 100644 --- a/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java @@ -165,9 +165,8 @@ public class SalaryAcctResultServiceImpl extends Service implements SalaryAcctRe return Collections.emptyList(); } List salaryAcctResultPOS = getSalaryAcctResultMapper().listSome(SalaryAcctResultPO.builder().salaryAcctEmpIds(salaryAcctEmployeeIds).build()); - SalaryAcctResultPOEncrypt.decryptList(salaryAcctResultPOS); // 解密 - salaryAcctResultPOS.forEach(item -> item.setResultValue(AESEncryptUtil.encrypt(item.getResultValue()))); + SalaryAcctResultPOEncrypt.decryptList(salaryAcctResultPOS); return salaryAcctResultPOS; } @@ -355,6 +354,8 @@ public class SalaryAcctResultServiceImpl extends Service implements SalaryAcctRe deleteBySalaryAcctEmployeeIds(Collections.singleton(saveParam.getSalaryAcctEmpId())); // 保存薪资核算结果 if (CollectionUtils.isNotEmpty(salaryAcctResultPOS)) { + // 加密 + SalaryAcctResultPOEncrypt.encryptList(salaryAcctResultPOS); getSalaryAcctResultMapper().batchInsert(salaryAcctResultPOS); } // 查询操作日志的targetName @@ -548,6 +549,8 @@ public class SalaryAcctResultServiceImpl extends Service implements SalaryAcctRe } // 保存薪资的薪资核算结果 List salaryAcctResultPOS = SalaryAcctResultBO.convert2ResultPO(salaryAcctResultTempPOS); + // 数据加密 + SalaryAcctResultPOEncrypt.encryptList(salaryAcctResultPOS); batchSave(salaryAcctResultPOS); // 删除薪资核算临时存储表中的数据 getSalaryAcctResultTempService(user).deleteByCalculateKey(calculateKey); diff --git a/src/com/engine/salary/service/impl/SalarySendServiceImpl.java b/src/com/engine/salary/service/impl/SalarySendServiceImpl.java index 749dbf9ef..72c582c73 100644 --- a/src/com/engine/salary/service/impl/SalarySendServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalarySendServiceImpl.java @@ -358,7 +358,6 @@ public class SalarySendServiceImpl extends Service implements SalarySendService acctPo.setEmployeeId(currentEmployeeId); List salaryAcctResultPOS = getSalaryAcctResultMapper().listSome(acctPo); SalaryAcctResultPOEncrypt.decryptList(salaryAcctResultPOS); - salaryAcctResultPOS.forEach(item -> item.setResultValue(AESEncryptUtil.decrypt(item.getResultValue()))); List> salaryAcctResultS = salaryAcctResultPOS.stream().map(m -> { Map map = new LinkedHashMap<>(); map.put("salaryItemId", m.getSalaryItemId()); @@ -535,7 +534,6 @@ public class SalarySendServiceImpl extends Service implements SalarySendService po.setSalaryAcctRecordId(salaryAccountingId); List salaryAccountingResults = getSalaryAcctResultMapper().listSome(po); SalaryAcctResultPOEncrypt.decryptList(salaryAccountingResults); - salaryAccountingResults.forEach(item -> item.setResultValue(AESEncryptUtil.decrypt(item.getResultValue()))); // 动态列 list.forEach(e -> { Map map = new LinkedHashMap<>(); diff --git a/src/com/engine/salary/wrapper/SalaryArchiveItemWrapper.java b/src/com/engine/salary/wrapper/SalaryArchiveItemWrapper.java index 9e2e3462b..8eddb320c 100644 --- a/src/com/engine/salary/wrapper/SalaryArchiveItemWrapper.java +++ b/src/com/engine/salary/wrapper/SalaryArchiveItemWrapper.java @@ -2,6 +2,7 @@ package com.engine.salary.wrapper; import com.engine.common.util.ServiceUtil; import com.engine.core.impl.Service; +import com.engine.salary.encrypt.archive.SalaryItemAdjustRecordListDTOEncrypt; import com.engine.salary.entity.salaryarchive.dto.SalaryArchiveItemFormDTO; import com.engine.salary.entity.salaryarchive.dto.SalaryItemAdjustRecordListDTO; import com.engine.salary.entity.salaryarchive.dto.SingleSalaryItemAdjustRecordListDTO; @@ -226,6 +227,7 @@ public class SalaryArchiveItemWrapper extends Service { //所有调整记录 List listAll = getSalaryArchiveItemService(user).salaryItemAdjustRecordList(SalaryItemAdjustRecordQueryParam.builder().build(), salaryItemIds); + SalaryItemAdjustRecordListDTOEncrypt.decryptSalaryItemAdjustRecordListDTOList(listAll); //操作记录 //根据条件分页查询调整记录 PageInfo adjustlistByParamPage = getSalaryArchiveItemService(user).salaryItemAdjustRecordListPage(adjustRecordQueryParam, salaryItemIds);