From bb76df37185c9975d2dd6511f8aeae9bc0748174 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Tue, 4 Apr 2023 17:29:56 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E5=85=BB=E8=80=81=E9=87=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../archive/SalaryArchiveItemPOEncrypt.java | 49 ------- .../SalaryItemAdjustRecordListDTOEncrypt.java | 20 --- .../datacollection/AddUpDeductionEncrypt.java | 78 ---------- .../AddUpDeductionRecordStrDTOEncrypt.java | 55 ------- .../AddUpDeductionStrDTOEncrypt.java | 35 ----- .../AddUpSituationDTOEncrypt.java | 81 ----------- .../datacollection/AddUpSituationEncrypt.java | 132 ----------------- .../AddUpSituationRecordDTOEncrypt.java | 64 --------- .../OtherDeductionListDTOEncrypt.java | 66 --------- .../OtherDeductionPOEncrypt.java | 56 -------- .../OtherDeductionRecordDTOEncrypt.java | 65 --------- .../SpecialAddDeductionEncrypt.java | 94 ------------ .../SalaryAcctResultReportPOEncrypt.java | 35 ----- .../salaryacct/ExcelAcctResultPOEncrypt.java | 67 --------- .../salaryacct/SalaryAcctResultPOEncrypt.java | 52 ------- .../ExcelInsuranceDetailPOEncrypt.java | 112 --------------- .../InsuranceAccountDetailPOEncrypt.java | 136 ------------------ .../InsuranceAccountDetailTempPOEncrypt.java | 86 ----------- .../encrypt/siaccount/SiAccountEncrypt.java | 61 -------- .../InsuranceArchivesFundSchemePOEncrypt.java | 45 ------ ...InsuranceArchivesOtherSchemePOEncrypt.java | 45 ------ ...nsuranceArchivesSocialSchemePOEncrypt.java | 45 ------ .../siexport/AccountExportPOEncrypt.java | 86 ----------- .../siexport/ExcelAccountExportPOEncrypt.java | 86 ----------- .../InsuranceSchemeDetailPOEncrypt.java | 54 ------- .../TaxDeclarationDetailEncrypt.java | 36 ----- .../TaxDeclarationDetailPOEncrypt.java | 54 ------- .../impl/OtherDeductionServiceImpl.java | 9 +- .../impl/SalaryAcctResultServiceImpl.java | 4 +- .../impl/SalarySysConfServiceImpl.java | 2 + 30 files changed, 12 insertions(+), 1798 deletions(-) delete mode 100644 src/com/engine/salary/encrypt/archive/SalaryArchiveItemPOEncrypt.java delete mode 100644 src/com/engine/salary/encrypt/archive/SalaryItemAdjustRecordListDTOEncrypt.java delete mode 100644 src/com/engine/salary/encrypt/datacollection/AddUpDeductionEncrypt.java delete mode 100644 src/com/engine/salary/encrypt/datacollection/AddUpDeductionRecordStrDTOEncrypt.java delete mode 100644 src/com/engine/salary/encrypt/datacollection/AddUpDeductionStrDTOEncrypt.java delete mode 100644 src/com/engine/salary/encrypt/datacollection/AddUpSituationDTOEncrypt.java delete mode 100644 src/com/engine/salary/encrypt/datacollection/AddUpSituationEncrypt.java delete mode 100644 src/com/engine/salary/encrypt/datacollection/AddUpSituationRecordDTOEncrypt.java delete mode 100644 src/com/engine/salary/encrypt/datacollection/OtherDeductionListDTOEncrypt.java delete mode 100644 src/com/engine/salary/encrypt/datacollection/OtherDeductionPOEncrypt.java delete mode 100644 src/com/engine/salary/encrypt/datacollection/OtherDeductionRecordDTOEncrypt.java delete mode 100644 src/com/engine/salary/encrypt/datacollection/SpecialAddDeductionEncrypt.java delete mode 100644 src/com/engine/salary/encrypt/report/SalaryAcctResultReportPOEncrypt.java delete mode 100644 src/com/engine/salary/encrypt/salaryacct/ExcelAcctResultPOEncrypt.java delete mode 100644 src/com/engine/salary/encrypt/salaryacct/SalaryAcctResultPOEncrypt.java delete mode 100644 src/com/engine/salary/encrypt/siaccount/ExcelInsuranceDetailPOEncrypt.java delete mode 100644 src/com/engine/salary/encrypt/siaccount/InsuranceAccountDetailPOEncrypt.java delete mode 100644 src/com/engine/salary/encrypt/siaccount/InsuranceAccountDetailTempPOEncrypt.java delete mode 100644 src/com/engine/salary/encrypt/siaccount/SiAccountEncrypt.java delete mode 100644 src/com/engine/salary/encrypt/siarchives/InsuranceArchivesFundSchemePOEncrypt.java delete mode 100644 src/com/engine/salary/encrypt/siarchives/InsuranceArchivesOtherSchemePOEncrypt.java delete mode 100644 src/com/engine/salary/encrypt/siarchives/InsuranceArchivesSocialSchemePOEncrypt.java delete mode 100644 src/com/engine/salary/encrypt/siexport/AccountExportPOEncrypt.java delete mode 100644 src/com/engine/salary/encrypt/siexport/ExcelAccountExportPOEncrypt.java delete mode 100644 src/com/engine/salary/encrypt/sischeme/InsuranceSchemeDetailPOEncrypt.java delete mode 100644 src/com/engine/salary/encrypt/taxdeclaration/TaxDeclarationDetailEncrypt.java delete mode 100644 src/com/engine/salary/encrypt/taxdeclaration/TaxDeclarationDetailPOEncrypt.java diff --git a/src/com/engine/salary/encrypt/archive/SalaryArchiveItemPOEncrypt.java b/src/com/engine/salary/encrypt/archive/SalaryArchiveItemPOEncrypt.java deleted file mode 100644 index b307616a8..000000000 --- a/src/com/engine/salary/encrypt/archive/SalaryArchiveItemPOEncrypt.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.engine.salary.encrypt.archive; - -import com.engine.salary.encrypt.AESEncryptUtil; -import com.engine.salary.entity.salaryarchive.po.SalaryArchiveItemPO; - -import java.util.List; - -/** - * hrsa_salary_archive_item: 加解密 - * 字段： - * item_value - */ -@Deprecated -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())); - }); - return list; - } - - public static List decryptSalaryArchiveItemPOList(List list) { - if(list == null || list.size() == 0) { - return list; - } - list.forEach(item -> { - item.setItemValue(AESEncryptUtil.decrypt(item.getItemValue())); - }); - return list; - } - - 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 deleted file mode 100644 index 404b0b3f4..000000000 --- a/src/com/engine/salary/encrypt/archive/SalaryItemAdjustRecordListDTOEncrypt.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.engine.salary.encrypt.archive; - -import com.engine.salary.encrypt.AESEncryptUtil; -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) { - 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 deleted file mode 100644 index 848c56ab2..000000000 --- a/src/com/engine/salary/encrypt/datacollection/AddUpDeductionEncrypt.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.engine.salary.encrypt.datacollection; - -import com.engine.salary.encrypt.AESEncryptUtil; -import com.engine.salary.entity.datacollection.AddUpDeduction; - -import java.util.List; - -/** - * hrsa_add_up_deduction: 数据加解密 - * 字段： - * add_up_child_education - * add_up_continuing_education - * add_up_housing_loan_interest - * add_up_housing_rent - * add_up_support_elderly - * add_up_illness_medical - * add_up_infant_care - */ -@Deprecated -public class AddUpDeductionEncrypt { - @Deprecated - public static List encryptAddUpDeductionList(List list) { - list.forEach(item -> { - item.setAddUpChildEducation(AESEncryptUtil.encrypt(item.getAddUpChildEducation())); - item.setAddUpContinuingEducation(AESEncryptUtil.encrypt(item.getAddUpContinuingEducation())); - item.setAddUpHousingLoanInterest(AESEncryptUtil.encrypt(item.getAddUpHousingLoanInterest())); - item.setAddUpHousingRent(AESEncryptUtil.encrypt(item.getAddUpHousingRent())); - item.setAddUpSupportElderly(AESEncryptUtil.encrypt(item.getAddUpSupportElderly())); - item.setAddUpIllnessMedical(AESEncryptUtil.encrypt(item.getAddUpIllnessMedical())); - item.setAddUpInfantCare(AESEncryptUtil.encrypt(item.getAddUpInfantCare())); - }); - return list; - } - - @Deprecated - public static List decryptAddUpDeductionList(List list) { - list.forEach(item -> { - item.setAddUpChildEducation(AESEncryptUtil.decrypt(item.getAddUpChildEducation())); - item.setAddUpContinuingEducation(AESEncryptUtil.decrypt(item.getAddUpContinuingEducation())); - item.setAddUpHousingLoanInterest(AESEncryptUtil.decrypt(item.getAddUpHousingLoanInterest())); - item.setAddUpHousingRent(AESEncryptUtil.decrypt(item.getAddUpHousingRent())); - item.setAddUpSupportElderly(AESEncryptUtil.decrypt(item.getAddUpSupportElderly())); - item.setAddUpIllnessMedical(AESEncryptUtil.decrypt(item.getAddUpIllnessMedical())); - item.setAddUpInfantCare(AESEncryptUtil.decrypt(item.getAddUpInfantCare())); - }); - return list; - } - - @Deprecated - 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())); - item.setAddUpHousingRent(AESEncryptUtil.encrypt(item.getAddUpHousingRent())); - item.setAddUpSupportElderly(AESEncryptUtil.encrypt(item.getAddUpSupportElderly())); - item.setAddUpIllnessMedical(AESEncryptUtil.encrypt(item.getAddUpIllnessMedical())); - item.setAddUpInfantCare(AESEncryptUtil.encrypt(item.getAddUpInfantCare())); - return item; - } - - @Deprecated - 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())); - item.setAddUpHousingRent(AESEncryptUtil.decrypt(item.getAddUpHousingRent())); - item.setAddUpSupportElderly(AESEncryptUtil.decrypt(item.getAddUpSupportElderly())); - item.setAddUpIllnessMedical(AESEncryptUtil.decrypt(item.getAddUpIllnessMedical())); - item.setAddUpInfantCare(AESEncryptUtil.decrypt(item.getAddUpInfantCare())); - return item; - } -} diff --git a/src/com/engine/salary/encrypt/datacollection/AddUpDeductionRecordStrDTOEncrypt.java b/src/com/engine/salary/encrypt/datacollection/AddUpDeductionRecordStrDTOEncrypt.java deleted file mode 100644 index 0750a6422..000000000 --- a/src/com/engine/salary/encrypt/datacollection/AddUpDeductionRecordStrDTOEncrypt.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.engine.salary.encrypt.datacollection; - -import com.engine.salary.encrypt.AESEncryptUtil; -import com.engine.salary.entity.datacollection.dto.AddUpDeductionRecordDTO; - -import java.util.ArrayList; -import java.util.List; -import java.util.stream.Collectors; - -/** - * hrsa_add_up_deduction: 数据加解密 - * 字段： - * add_up_child_education - * add_up_continuing_education - * add_up_housing_loan_interest - * add_up_housing_rent - * add_up_support_elderly - */ -@Deprecated -public class AddUpDeductionRecordStrDTOEncrypt { - public static List decryptAddUpDeductionRecordDTO(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())); - item.setAddUpHousingLoanInterest(AESEncryptUtil.decrypt(item.getAddUpHousingLoanInterest())); - item.setAddUpHousingRent(AESEncryptUtil.decrypt(item.getAddUpHousingRent())); - item.setAddUpSupportElderly(AESEncryptUtil.decrypt(item.getAddUpSupportElderly())); - item.setAddUpIllnessMedical(AESEncryptUtil.decrypt(item.getAddUpIllnessMedical())); - item.setAddUpInfantCare(AESEncryptUtil.decrypt(item.getAddUpInfantCare())); - }); - return list.stream().map(item -> { - return AddUpDeductionRecordDTO.builder() - .id(item.getId()) - .employeeId(item.getEmployeeId()) - .username(item.getUsername()) - .declareMonth(item.getDeclareMonth()) - .taxAgentName(item.getTaxAgentName()) - .taxAgentId(item.getTaxAgentId()) - .departmentName(item.getDepartmentName()) - .mobile(item.getMobile()) - .jobNum(item.getJobNum()) - .addUpChildEducation(item.getAddUpChildEducation()) - .addUpContinuingEducation(item.getAddUpContinuingEducation()) - .addUpHousingLoanInterest(item.getAddUpHousingLoanInterest()) - .addUpHousingRent(item.getAddUpHousingRent()) - .addUpSupportElderly(item.getAddUpSupportElderly()) - .addUpIllnessMedical(item.getAddUpIllnessMedical()) - .addUpInfantCare(item.getAddUpInfantCare()) - .build(); - }).collect(Collectors.toList()); - } -} diff --git a/src/com/engine/salary/encrypt/datacollection/AddUpDeductionStrDTOEncrypt.java b/src/com/engine/salary/encrypt/datacollection/AddUpDeductionStrDTOEncrypt.java deleted file mode 100644 index 4877fe406..000000000 --- a/src/com/engine/salary/encrypt/datacollection/AddUpDeductionStrDTOEncrypt.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.engine.salary.encrypt.datacollection; - -import com.engine.salary.encrypt.AESEncryptUtil; -import com.engine.salary.entity.datacollection.dto.AddUpDeductionDTO; - -import java.util.List; - -/** - * hrsa_add_up_deduction: 数据加解密 - * 字段： - * add_up_child_education - * add_up_continuing_education - * add_up_housing_loan_interest - * add_up_housing_rent - * add_up_support_elderly - */ -@Deprecated -public class AddUpDeductionStrDTOEncrypt { - public static void decryptAddUpDeductionList(List list) { - if (list == null || list.size() == 0) { - return; - } - list.forEach(item -> { - item.setAddUpChildEducation(AESEncryptUtil.decrypt(item.getAddUpChildEducation())); - item.setAddUpContinuingEducation(AESEncryptUtil.decrypt(item.getAddUpContinuingEducation())); - item.setAddUpHousingLoanInterest(AESEncryptUtil.decrypt(item.getAddUpHousingLoanInterest())); - item.setAddUpHousingRent(AESEncryptUtil.decrypt(item.getAddUpHousingRent())); - item.setAddUpSupportElderly(AESEncryptUtil.decrypt(item.getAddUpSupportElderly())); - item.setAddUpIllnessMedical(AESEncryptUtil.decrypt(item.getAddUpIllnessMedical())); - item.setAddUpInfantCare(AESEncryptUtil.decrypt(item.getAddUpInfantCare())); - }); - - } - -} diff --git a/src/com/engine/salary/encrypt/datacollection/AddUpSituationDTOEncrypt.java b/src/com/engine/salary/encrypt/datacollection/AddUpSituationDTOEncrypt.java deleted file mode 100644 index a8b369c80..000000000 --- a/src/com/engine/salary/encrypt/datacollection/AddUpSituationDTOEncrypt.java +++ /dev/null @@ -1,81 +0,0 @@ -package com.engine.salary.encrypt.datacollection; - -import com.engine.salary.encrypt.AESEncryptUtil; -import com.engine.salary.entity.datacollection.dto.AddUpSituationDTO; - -import java.util.List; - -/** - * hrsa_add_up_situation: 加解密 - * 字段： - * add_up_income - * add_up_subtraction - * add_up_social_security_total - * add_up_accumulation_fund_total - * add_up_child_education - * add_up_continuing_education - * add_up_housing_loan_interest - * add_up_housing_rent - * add_up_support_elderly - * add_up_enterprise_and_other - * add_up_other_deduction - * add_up_tax_exempt_income - * add_up_allowed_donation - * add_up_advance_tax - */ -@Deprecated -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())); - item.setAddUpSocialSecurityTotal(AESEncryptUtil.encrypt(item.getAddUpSocialSecurityTotal())); - item.setAddUpAccumulationFundTotal(AESEncryptUtil.encrypt(item.getAddUpAccumulationFundTotal())); - item.setAddUpChildEducation(AESEncryptUtil.encrypt(item.getAddUpChildEducation())); - item.setAddUpContinuingEducation(AESEncryptUtil.encrypt(item.getAddUpContinuingEducation())); - item.setAddUpHousingLoanInterest(AESEncryptUtil.encrypt(item.getAddUpHousingLoanInterest())); - item.setAddUpHousingRent(AESEncryptUtil.encrypt(item.getAddUpHousingRent())); - item.setAddUpSupportElderly(AESEncryptUtil.encrypt(item.getAddUpSupportElderly())); - item.setAddUpEnterpriseAndOther(AESEncryptUtil.encrypt(item.getAddUpEnterpriseAndOther())); - item.setAddUpTaxExemptIncome(AESEncryptUtil.encrypt(item.getAddUpTaxExemptIncome())); - item.setAddUpAllowedDonation(AESEncryptUtil.encrypt(item.getAddUpAllowedDonation())); - item.setAddUpAdvanceTax(AESEncryptUtil.encrypt(item.getAddUpAdvanceTax())); - - item.setAddUpIllnessMedical(AESEncryptUtil.encrypt(item.getAddUpIllnessMedical())); - item.setAddUpOtherDeduction(AESEncryptUtil.encrypt(item.getAddUpOtherDeduction())); - item.setAddUpTaxSavings(AESEncryptUtil.encrypt(item.getAddUpTaxSavings())); - item.setAddUpInfantCare(AESEncryptUtil.encrypt(item.getAddUpInfantCare())); - }); - return list; - } - - 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())); - item.setAddUpSocialSecurityTotal(AESEncryptUtil.decrypt(item.getAddUpSocialSecurityTotal())); - item.setAddUpAccumulationFundTotal(AESEncryptUtil.decrypt(item.getAddUpAccumulationFundTotal())); - item.setAddUpChildEducation(AESEncryptUtil.decrypt(item.getAddUpChildEducation())); - item.setAddUpContinuingEducation(AESEncryptUtil.decrypt(item.getAddUpContinuingEducation())); - item.setAddUpHousingLoanInterest(AESEncryptUtil.decrypt(item.getAddUpHousingLoanInterest())); - item.setAddUpHousingRent(AESEncryptUtil.decrypt(item.getAddUpHousingRent())); - item.setAddUpSupportElderly(AESEncryptUtil.decrypt(item.getAddUpSupportElderly())); - item.setAddUpEnterpriseAndOther(AESEncryptUtil.decrypt(item.getAddUpEnterpriseAndOther())); - item.setAddUpTaxExemptIncome(AESEncryptUtil.decrypt(item.getAddUpTaxExemptIncome())); - item.setAddUpAllowedDonation(AESEncryptUtil.decrypt(item.getAddUpAllowedDonation())); - item.setAddUpAdvanceTax(AESEncryptUtil.decrypt(item.getAddUpAdvanceTax())); - - item.setAddUpIllnessMedical(AESEncryptUtil.decrypt(item.getAddUpIllnessMedical())); - item.setAddUpOtherDeduction(AESEncryptUtil.decrypt(item.getAddUpOtherDeduction())); - item.setAddUpTaxSavings(AESEncryptUtil.decrypt(item.getAddUpTaxSavings())); - item.setAddUpInfantCare(AESEncryptUtil.decrypt(item.getAddUpInfantCare())); - }); - return list; - } -} diff --git a/src/com/engine/salary/encrypt/datacollection/AddUpSituationEncrypt.java b/src/com/engine/salary/encrypt/datacollection/AddUpSituationEncrypt.java deleted file mode 100644 index b6debb195..000000000 --- a/src/com/engine/salary/encrypt/datacollection/AddUpSituationEncrypt.java +++ /dev/null @@ -1,132 +0,0 @@ -package com.engine.salary.encrypt.datacollection; - -import com.engine.salary.encrypt.AESEncryptUtil; -import com.engine.salary.entity.datacollection.AddUpSituation; - -import java.util.List; - -/** - * hrsa_add_up_situation: 加解密 - * 字段： - * add_up_income - * add_up_subtraction - * add_up_social_security_total - * add_up_accumulation_fund_total - * add_up_child_education - * add_up_continuing_education - * add_up_housing_loan_interest - * add_up_housing_rent - * add_up_support_elderly - * add_up_enterprise_and_other - * add_up_other_deduction - * add_up_tax_exempt_income - * add_up_allowed_donation - * add_up_advance_tax - */ -@Deprecated -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())); - item.setAddUpSocialSecurityTotal(AESEncryptUtil.encrypt(item.getAddUpSocialSecurityTotal())); - item.setAddUpAccumulationFundTotal(AESEncryptUtil.encrypt(item.getAddUpAccumulationFundTotal())); - item.setAddUpChildEducation(AESEncryptUtil.encrypt(item.getAddUpChildEducation())); - item.setAddUpContinuingEducation(AESEncryptUtil.encrypt(item.getAddUpContinuingEducation())); - item.setAddUpHousingLoanInterest(AESEncryptUtil.encrypt(item.getAddUpHousingLoanInterest())); - item.setAddUpHousingRent(AESEncryptUtil.encrypt(item.getAddUpHousingRent())); - item.setAddUpSupportElderly(AESEncryptUtil.encrypt(item.getAddUpSupportElderly())); - item.setAddUpEnterpriseAndOther(AESEncryptUtil.encrypt(item.getAddUpEnterpriseAndOther())); - item.setAddUpTaxExemptIncome(AESEncryptUtil.encrypt(item.getAddUpTaxExemptIncome())); - item.setAddUpAllowedDonation(AESEncryptUtil.encrypt(item.getAddUpAllowedDonation())); - item.setAddUpAdvanceTax(AESEncryptUtil.encrypt(item.getAddUpAdvanceTax())); - - item.setAddUpIllnessMedical(AESEncryptUtil.encrypt(item.getAddUpIllnessMedical())); - item.setAddUpOtherDeduction(AESEncryptUtil.encrypt(item.getAddUpOtherDeduction())); - item.setAddUpTaxSavings(AESEncryptUtil.encrypt(item.getAddUpTaxSavings())); - item.setAddUpInfantCare(AESEncryptUtil.encrypt(item.getAddUpInfantCare())); - - }); - return list; - } - - 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())); - item.setAddUpSocialSecurityTotal(AESEncryptUtil.decrypt(item.getAddUpSocialSecurityTotal())); - item.setAddUpAccumulationFundTotal(AESEncryptUtil.decrypt(item.getAddUpAccumulationFundTotal())); - item.setAddUpChildEducation(AESEncryptUtil.decrypt(item.getAddUpChildEducation())); - item.setAddUpContinuingEducation(AESEncryptUtil.decrypt(item.getAddUpContinuingEducation())); - item.setAddUpHousingLoanInterest(AESEncryptUtil.decrypt(item.getAddUpHousingLoanInterest())); - item.setAddUpHousingRent(AESEncryptUtil.decrypt(item.getAddUpHousingRent())); - item.setAddUpSupportElderly(AESEncryptUtil.decrypt(item.getAddUpSupportElderly())); - item.setAddUpEnterpriseAndOther(AESEncryptUtil.decrypt(item.getAddUpEnterpriseAndOther())); - item.setAddUpTaxExemptIncome(AESEncryptUtil.decrypt(item.getAddUpTaxExemptIncome())); - item.setAddUpAllowedDonation(AESEncryptUtil.decrypt(item.getAddUpAllowedDonation())); - item.setAddUpAdvanceTax(AESEncryptUtil.decrypt(item.getAddUpAdvanceTax())); - - item.setAddUpIllnessMedical(AESEncryptUtil.decrypt(item.getAddUpIllnessMedical())); - item.setAddUpOtherDeduction(AESEncryptUtil.decrypt(item.getAddUpOtherDeduction())); - item.setAddUpTaxSavings(AESEncryptUtil.decrypt(item.getAddUpTaxSavings())); - item.setAddUpInfantCare(AESEncryptUtil.decrypt(item.getAddUpInfantCare())); - }); - return list; - } - - 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())); - item.setAddUpAccumulationFundTotal(AESEncryptUtil.encrypt(item.getAddUpAccumulationFundTotal())); - item.setAddUpChildEducation(AESEncryptUtil.encrypt(item.getAddUpChildEducation())); - item.setAddUpContinuingEducation(AESEncryptUtil.encrypt(item.getAddUpContinuingEducation())); - item.setAddUpHousingLoanInterest(AESEncryptUtil.encrypt(item.getAddUpHousingLoanInterest())); - item.setAddUpHousingRent(AESEncryptUtil.encrypt(item.getAddUpHousingRent())); - item.setAddUpSupportElderly(AESEncryptUtil.encrypt(item.getAddUpSupportElderly())); - item.setAddUpEnterpriseAndOther(AESEncryptUtil.encrypt(item.getAddUpEnterpriseAndOther())); - item.setAddUpTaxExemptIncome(AESEncryptUtil.encrypt(item.getAddUpTaxExemptIncome())); - item.setAddUpAllowedDonation(AESEncryptUtil.encrypt(item.getAddUpAllowedDonation())); - item.setAddUpAdvanceTax(AESEncryptUtil.encrypt(item.getAddUpAdvanceTax())); - - item.setAddUpIllnessMedical(AESEncryptUtil.encrypt(item.getAddUpIllnessMedical())); - item.setAddUpOtherDeduction(AESEncryptUtil.encrypt(item.getAddUpOtherDeduction())); - item.setAddUpTaxSavings(AESEncryptUtil.encrypt(item.getAddUpTaxSavings())); - item.setAddUpInfantCare(AESEncryptUtil.encrypt(item.getAddUpInfantCare())); - return item; - } - - 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())); - item.setAddUpAccumulationFundTotal(AESEncryptUtil.decrypt(item.getAddUpAccumulationFundTotal())); - item.setAddUpChildEducation(AESEncryptUtil.decrypt(item.getAddUpChildEducation())); - item.setAddUpContinuingEducation(AESEncryptUtil.decrypt(item.getAddUpContinuingEducation())); - item.setAddUpHousingLoanInterest(AESEncryptUtil.decrypt(item.getAddUpHousingLoanInterest())); - item.setAddUpHousingRent(AESEncryptUtil.decrypt(item.getAddUpHousingRent())); - item.setAddUpSupportElderly(AESEncryptUtil.decrypt(item.getAddUpSupportElderly())); - item.setAddUpEnterpriseAndOther(AESEncryptUtil.decrypt(item.getAddUpEnterpriseAndOther())); - item.setAddUpTaxExemptIncome(AESEncryptUtil.decrypt(item.getAddUpTaxExemptIncome())); - item.setAddUpAllowedDonation(AESEncryptUtil.decrypt(item.getAddUpAllowedDonation())); - item.setAddUpAdvanceTax(AESEncryptUtil.decrypt(item.getAddUpAdvanceTax())); - - item.setAddUpIllnessMedical(AESEncryptUtil.encrypt(item.getAddUpIllnessMedical())); - item.setAddUpOtherDeduction(AESEncryptUtil.encrypt(item.getAddUpOtherDeduction())); - item.setAddUpTaxSavings(AESEncryptUtil.encrypt(item.getAddUpTaxSavings())); - item.setAddUpInfantCare(AESEncryptUtil.encrypt(item.getAddUpInfantCare())); - return item; - } -} diff --git a/src/com/engine/salary/encrypt/datacollection/AddUpSituationRecordDTOEncrypt.java b/src/com/engine/salary/encrypt/datacollection/AddUpSituationRecordDTOEncrypt.java deleted file mode 100644 index dd39664f9..000000000 --- a/src/com/engine/salary/encrypt/datacollection/AddUpSituationRecordDTOEncrypt.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.engine.salary.encrypt.datacollection; - -import com.engine.salary.encrypt.AESEncryptUtil; -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) { - return list; - } - list.forEach(item -> { - item.setAddUpIncome(AESEncryptUtil.encrypt(item.getAddUpIncome())); - item.setAddUpSubtraction(AESEncryptUtil.encrypt(item.getAddUpSubtraction())); - item.setAddUpSocialSecurityTotal(AESEncryptUtil.encrypt(item.getAddUpSocialSecurityTotal())); - item.setAddUpAccumulationFundTotal(AESEncryptUtil.encrypt(item.getAddUpAccumulationFundTotal())); - item.setAddUpChildEducation(AESEncryptUtil.encrypt(item.getAddUpChildEducation())); - item.setAddUpContinuingEducation(AESEncryptUtil.encrypt(item.getAddUpContinuingEducation())); - item.setAddUpHousingLoanInterest(AESEncryptUtil.encrypt(item.getAddUpHousingLoanInterest())); - item.setAddUpHousingRent(AESEncryptUtil.encrypt(item.getAddUpHousingRent())); - item.setAddUpSupportElderly(AESEncryptUtil.encrypt(item.getAddUpSupportElderly())); - - item.setAddUpIllnessMedical(AESEncryptUtil.encrypt(item.getAddUpIllnessMedical())); - item.setAddUpOtherDeduction(AESEncryptUtil.encrypt(item.getAddUpOtherDeduction())); - item.setAddUpTaxSavings(AESEncryptUtil.encrypt(item.getAddUpTaxSavings())); - item.setAddUpInfantCare(AESEncryptUtil.encrypt(item.getAddUpInfantCare())); - - item.setAddUpEnterpriseAndOther(AESEncryptUtil.encrypt(item.getAddUpEnterpriseAndOther())); - item.setAddUpTaxExemptIncome(AESEncryptUtil.encrypt(item.getAddUpTaxExemptIncome())); - item.setAddUpAllowedDonation(AESEncryptUtil.encrypt(item.getAddUpAllowedDonation())); - item.setAddUpAdvanceTax(AESEncryptUtil.encrypt(item.getAddUpAdvanceTax())); - }); - return list; - } - - 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())); - item.setAddUpSocialSecurityTotal(AESEncryptUtil.decrypt(item.getAddUpSocialSecurityTotal())); - item.setAddUpAccumulationFundTotal(AESEncryptUtil.decrypt(item.getAddUpAccumulationFundTotal())); - item.setAddUpChildEducation(AESEncryptUtil.decrypt(item.getAddUpChildEducation())); - item.setAddUpContinuingEducation(AESEncryptUtil.decrypt(item.getAddUpContinuingEducation())); - item.setAddUpHousingLoanInterest(AESEncryptUtil.decrypt(item.getAddUpHousingLoanInterest())); - item.setAddUpHousingRent(AESEncryptUtil.decrypt(item.getAddUpHousingRent())); - item.setAddUpSupportElderly(AESEncryptUtil.decrypt(item.getAddUpSupportElderly())); - item.setAddUpEnterpriseAndOther(AESEncryptUtil.decrypt(item.getAddUpEnterpriseAndOther())); - item.setAddUpTaxExemptIncome(AESEncryptUtil.decrypt(item.getAddUpTaxExemptIncome())); - item.setAddUpAllowedDonation(AESEncryptUtil.decrypt(item.getAddUpAllowedDonation())); - item.setAddUpAdvanceTax(AESEncryptUtil.decrypt(item.getAddUpAdvanceTax())); - - item.setAddUpIllnessMedical(AESEncryptUtil.decrypt(item.getAddUpIllnessMedical())); - item.setAddUpOtherDeduction(AESEncryptUtil.decrypt(item.getAddUpOtherDeduction())); - item.setAddUpTaxSavings(AESEncryptUtil.decrypt(item.getAddUpTaxSavings())); - item.setAddUpInfantCare(AESEncryptUtil.decrypt(item.getAddUpInfantCare())); - }); - return list; - } -} diff --git a/src/com/engine/salary/encrypt/datacollection/OtherDeductionListDTOEncrypt.java b/src/com/engine/salary/encrypt/datacollection/OtherDeductionListDTOEncrypt.java deleted file mode 100644 index 6d099a631..000000000 --- a/src/com/engine/salary/encrypt/datacollection/OtherDeductionListDTOEncrypt.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.engine.salary.encrypt.datacollection; - -import com.engine.salary.encrypt.AESEncryptUtil; -import com.engine.salary.entity.datacollection.dto.OtherDeductionListDTO; - -import java.util.List; - - -/** - * hrsa_other_deduction: 加解密 - * 字段： - * business_healthy_insurance - * tax_delay_endowment_insurance - * other_deduction - * deduction_allowed_donation - */ -@Deprecated -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())); - item.setOtherDeduction(AESEncryptUtil.encrypt(item.getOtherDeduction())); - item.setDeductionAllowedDonation(AESEncryptUtil.encrypt(item.getDeductionAllowedDonation())); - }); - return list; - } - - 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())); - item.setOtherDeduction(AESEncryptUtil.decrypt(item.getOtherDeduction())); - item.setDeductionAllowedDonation(AESEncryptUtil.decrypt(item.getDeductionAllowedDonation())); - }); - return list; - } - - 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())); - item.setDeductionAllowedDonation(AESEncryptUtil.encrypt(item.getDeductionAllowedDonation())); - return item; - } - - 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())); - item.setDeductionAllowedDonation(AESEncryptUtil.decrypt(item.getDeductionAllowedDonation())); - return item; - } -} diff --git a/src/com/engine/salary/encrypt/datacollection/OtherDeductionPOEncrypt.java b/src/com/engine/salary/encrypt/datacollection/OtherDeductionPOEncrypt.java deleted file mode 100644 index bed9cd935..000000000 --- a/src/com/engine/salary/encrypt/datacollection/OtherDeductionPOEncrypt.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.engine.salary.encrypt.datacollection; - -import com.engine.salary.encrypt.AESEncryptUtil; -import com.engine.salary.entity.datacollection.po.OtherDeductionPO; - -import java.util.List; -@Deprecated -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())); - item.setOtherDeduction(AESEncryptUtil.encrypt(item.getOtherDeduction())); - item.setDeductionAllowedDonation(AESEncryptUtil.encrypt(item.getDeductionAllowedDonation())); - }); - return list; - } - - 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())); - item.setOtherDeduction(AESEncryptUtil.decrypt(item.getOtherDeduction())); - item.setDeductionAllowedDonation(AESEncryptUtil.decrypt(item.getDeductionAllowedDonation())); - }); - return list; - } - - 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())); - item.setDeductionAllowedDonation(AESEncryptUtil.encrypt(item.getDeductionAllowedDonation())); - return item; - } - - 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())); - item.setDeductionAllowedDonation(AESEncryptUtil.decrypt(item.getDeductionAllowedDonation())); - return item; - } -} diff --git a/src/com/engine/salary/encrypt/datacollection/OtherDeductionRecordDTOEncrypt.java b/src/com/engine/salary/encrypt/datacollection/OtherDeductionRecordDTOEncrypt.java deleted file mode 100644 index 44fffcc1b..000000000 --- a/src/com/engine/salary/encrypt/datacollection/OtherDeductionRecordDTOEncrypt.java +++ /dev/null @@ -1,65 +0,0 @@ -package com.engine.salary.encrypt.datacollection; - -import com.engine.salary.encrypt.AESEncryptUtil; -import com.engine.salary.entity.datacollection.dto.OtherDeductionRecordDTO; - -import java.util.List; - -/** - * hrsa_other_deduction: 加解密 - * 字段： - * business_healthy_insurance - * tax_delay_endowment_insurance - * other_deduction - * deduction_allowed_donation - */ -@Deprecated -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())); - item.setOtherDeduction(AESEncryptUtil.encrypt(item.getOtherDeduction())); - item.setDeductionAllowedDonation(AESEncryptUtil.encrypt(item.getDeductionAllowedDonation())); - }); - return list; - } - - 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())); - item.setOtherDeduction(AESEncryptUtil.decrypt(item.getOtherDeduction())); - item.setDeductionAllowedDonation(AESEncryptUtil.decrypt(item.getDeductionAllowedDonation())); - }); - return list; - } - - 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())); - item.setDeductionAllowedDonation(AESEncryptUtil.encrypt(item.getDeductionAllowedDonation())); - return item; - } - - 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())); - item.setDeductionAllowedDonation(AESEncryptUtil.decrypt(item.getDeductionAllowedDonation())); - return item; - } -} diff --git a/src/com/engine/salary/encrypt/datacollection/SpecialAddDeductionEncrypt.java b/src/com/engine/salary/encrypt/datacollection/SpecialAddDeductionEncrypt.java deleted file mode 100644 index 448fb2010..000000000 --- a/src/com/engine/salary/encrypt/datacollection/SpecialAddDeductionEncrypt.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.engine.salary.encrypt.datacollection; - -import com.engine.salary.encrypt.AESEncryptUtil; - -import java.lang.reflect.Field; -import java.util.Arrays; -import java.util.List; -import java.util.stream.Collectors; - -/** - * hrsa_special_add_deduction: 加解密 - * 字段： - * children_education - * continuing_education - * housing_loan_interest - * housing_rent - * supporting_elder - * serious_illness_treatment - * infant_care - */ -@Deprecated -public class SpecialAddDeductionEncrypt { - private static final List FIELDS = Arrays.asList( - "childrenEducation", "continuingEducation", "supportingElder", "housingLoanInterest", - "housingRent", "seriousIllnessTreatment", "infantCare"); - - public static T encrypt(T obj) { - if (obj == null) { - return obj; - } - if(obj instanceof List) { - return encrypt(obj); - } - Class clazz = obj.getClass(); - Field[] fields = clazz.getDeclaredFields(); - for (Field field : fields) { - field.setAccessible(true); - if (FIELDS.contains(field.getName())) { - try { - Object o = field.get(obj); - if (o instanceof String) { - Object value = AESEncryptUtil.encrypt((String)o); - field.set(obj, value); - } - } catch (IllegalAccessException e) { - //ignore - } - } - } - return obj; - } - - public static List encrypt(List list) { - if (list == null || list.isEmpty()) { - return list; - } - return list.stream().map(SpecialAddDeductionEncrypt::encrypt) - .collect(Collectors.toList()); - } - - public static T decrypt(T obj) { - if (obj == null) { - return obj; - } - if(obj instanceof List) { - return encrypt(obj); - } - Class clazz = obj.getClass(); - Field[] fields = clazz.getDeclaredFields(); - for (Field field : fields) { - field.setAccessible(true); - if (FIELDS.contains(field.getName())) { - try { - Object o = field.get(obj); - if (o instanceof String) { - Object value = AESEncryptUtil.decrypt((String)o); - field.set(obj, value); - } - } catch (IllegalAccessException e) { - //ignore - } - } - } - return obj; - } - - public static List decrypt(List list) { - if (list == null || list.isEmpty()) { - return list; - } - return list.stream().map(SpecialAddDeductionEncrypt::decrypt) - .collect(Collectors.toList()); - } -} diff --git a/src/com/engine/salary/encrypt/report/SalaryAcctResultReportPOEncrypt.java b/src/com/engine/salary/encrypt/report/SalaryAcctResultReportPOEncrypt.java deleted file mode 100644 index 7c34d4dc9..000000000 --- a/src/com/engine/salary/encrypt/report/SalaryAcctResultReportPOEncrypt.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.engine.salary.encrypt.report; - -import com.engine.salary.encrypt.AESEncryptUtil; -import com.engine.salary.entity.report.po.SalaryAcctResultReportPO; - -import java.util.Collection; - -/** - * 薪资核算报表 - */ -@Deprecated -public class SalaryAcctResultReportPOEncrypt { - - public static Collection encryptList(Collection list) { - if (list == null || list.size() == 0) { - return list; - } - list.forEach(item -> { - item.setEmployeeId(AESEncryptUtil.encrypt(item.getEmployeeId())); - item.setSalaryAcctEmpId(AESEncryptUtil.encrypt(item.getSalaryAcctEmpId())); - }); - return list; - } - - public static Collection decryptList(Collection list) { - if (list == null || list.size() == 0) { - return list; - } - list.forEach(item -> { - item.setEmployeeId(AESEncryptUtil.decrypt(item.getEmployeeId())); - item.setSalaryAcctEmpId(AESEncryptUtil.decrypt(item.getSalaryAcctEmpId())); - }); - return list; - } -} \ No newline at end of file diff --git a/src/com/engine/salary/encrypt/salaryacct/ExcelAcctResultPOEncrypt.java b/src/com/engine/salary/encrypt/salaryacct/ExcelAcctResultPOEncrypt.java deleted file mode 100644 index c19d16689..000000000 --- a/src/com/engine/salary/encrypt/salaryacct/ExcelAcctResultPOEncrypt.java +++ /dev/null @@ -1,67 +0,0 @@ -package com.engine.salary.encrypt.salaryacct; - -import com.engine.salary.encrypt.AESEncryptUtil; -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) { - if(list == null || list.size() == 0) { - return list; - } - list.forEach(item -> { - item.setResultValue(AESEncryptUtil.encrypt(item.getResultValue())); - }); - return list; - } - - public static Collection decryptList(Collection list) { - if(list == null || list.size() == 0) { - return list; - } - list.forEach(item -> { - item.setResultValue(AESEncryptUtil.decrypt(item.getResultValue())); - }); - return list; - } - - public static List encryptList(List list) { - if(list == null || list.size() == 0) { - return list; - } - list.forEach(item -> { - item.setResultValue(AESEncryptUtil.encrypt(item.getResultValue())); - }); - return list; - } - - public static List decryptList(List list) { - if(list == null || list.size() == 0) { - return list; - } - list.forEach(item -> { - item.setResultValue(AESEncryptUtil.decrypt(item.getResultValue())); - }); - return list; - } - - 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 deleted file mode 100644 index b148d85ad..000000000 --- a/src/com/engine/salary/encrypt/salaryacct/SalaryAcctResultPOEncrypt.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.engine.salary.encrypt.salaryacct; - -import com.engine.salary.encrypt.AESEncryptUtil; -import com.engine.salary.entity.salaryacct.po.SalaryAcctResultPO; - -import java.util.List; - -@Deprecated -public class SalaryAcctResultPOEncrypt { - - @Deprecated - public static List encryptList(List list) { - if(list == null || list.size() == 0) { - return list; - } - list.forEach(item -> { - item.setResultValue(AESEncryptUtil.encrypt(item.getResultValue())); - item.setOriginResultValue(AESEncryptUtil.encrypt(item.getOriginResultValue())); - }); - return list; - } - - @Deprecated - public static List decryptList(List list) { - if(list == null || list.size() == 0) { - return list; - } - list.forEach(item -> { - item.setResultValue(AESEncryptUtil.decrypt(item.getResultValue())); - item.setOriginResultValue(AESEncryptUtil.decrypt(item.getOriginResultValue())); - }); - return list; - } - - @Deprecated - public static SalaryAcctResultPO encryptItem(SalaryAcctResultPO item) { - if(item == null) { - return item; - } - item.setResultValue(AESEncryptUtil.encrypt(item.getResultValue())); - return item; - } - - @Deprecated - 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/ExcelInsuranceDetailPOEncrypt.java b/src/com/engine/salary/encrypt/siaccount/ExcelInsuranceDetailPOEncrypt.java deleted file mode 100644 index 592ba011a..000000000 --- a/src/com/engine/salary/encrypt/siaccount/ExcelInsuranceDetailPOEncrypt.java +++ /dev/null @@ -1,112 +0,0 @@ -package com.engine.salary.encrypt.siaccount; - -import com.engine.salary.encrypt.AESEncryptUtil; -import com.engine.salary.entity.siaccount.po.ExcelInsuranceDetailPO; - -import java.util.List; - -/** - * hrsa_excel_bill_detail: 加解密 - * 字段： - * social_payment_base_string - * fund_payment_base_string - * other_payment_base_string - * social_per_json - * social_per_sum - * fund_per_json - * fund_per_sum - * other_per_json - * other_per_sum - * per_sum - * social_com_json - * social_com_sum - * fund_com_json - * fund_com_sum - * other_com_json - * other_com_sum - * com_sum - * social_sum - * fund_sum - * other_sum - * total - */ -@Deprecated -public class ExcelInsuranceDetailPOEncrypt { - public static List encryptInsuranceAccountDetailPOList(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())); - item.setOtherPaymentBaseString(AESEncryptUtil.encrypt(item.getOtherPaymentBaseString())); - item.setSocialPerJson(AESEncryptUtil.encrypt(item.getSocialPerJson())); - item.setSocialPerSum(AESEncryptUtil.encrypt(item.getSocialPerSum())); - item.setFundPerJson(AESEncryptUtil.encrypt(item.getFundPerJson())); - item.setFundPerSum(AESEncryptUtil.encrypt(item.getFundPerSum())); - item.setOtherPerJson(AESEncryptUtil.encrypt(item.getOtherPerJson())); - item.setOtherPerSum(AESEncryptUtil.encrypt(item.getOtherPerSum())); - item.setPerSum(AESEncryptUtil.encrypt(item.getPerSum())); - item.setSocialComJson(AESEncryptUtil.encrypt(item.getSocialComJson())); - item.setSocialComSum(AESEncryptUtil.encrypt(item.getSocialComSum())); - item.setComSum(AESEncryptUtil.encrypt(item.getComSum())); - item.setSocialSum(AESEncryptUtil.encrypt(item.getSocialSum())); - item.setFundSum(AESEncryptUtil.encrypt(item.getFundSum())); - item.setOtherSum(AESEncryptUtil.encrypt(item.getOtherSum())); - item.setTotal(AESEncryptUtil.encrypt(item.getTotal())); - }); - return list; - } - - 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())); - item.setOtherPaymentBaseString(AESEncryptUtil.decrypt(item.getOtherPaymentBaseString())); - item.setSocialPerJson(AESEncryptUtil.decrypt(item.getSocialPerJson())); - item.setSocialPerSum(AESEncryptUtil.decrypt(item.getSocialPerSum())); - item.setFundPerJson(AESEncryptUtil.decrypt(item.getFundPerJson())); - item.setFundPerSum(AESEncryptUtil.decrypt(item.getFundPerSum())); - item.setOtherPerJson(AESEncryptUtil.decrypt(item.getOtherPerJson())); - item.setOtherPerSum(AESEncryptUtil.decrypt(item.getOtherPerSum())); - item.setPerSum(AESEncryptUtil.decrypt(item.getPerSum())); - item.setSocialComJson(AESEncryptUtil.decrypt(item.getSocialComJson())); - item.setSocialComSum(AESEncryptUtil.decrypt(item.getSocialComSum())); - item.setComSum(AESEncryptUtil.decrypt(item.getComSum())); - item.setSocialSum(AESEncryptUtil.decrypt(item.getSocialSum())); - item.setFundSum(AESEncryptUtil.decrypt(item.getFundSum())); - item.setOtherSum(AESEncryptUtil.decrypt(item.getOtherSum())); - item.setTotal(AESEncryptUtil.decrypt(item.getTotal())); - }); - return list; - } - - public static ExcelInsuranceDetailPO decryptItem(ExcelInsuranceDetailPO item) { - if(item == null) { - return item; - } - item.setSocialPaymentBaseString(AESEncryptUtil.decrypt(item.getSocialPaymentBaseString())); - item.setFundPaymentBaseString(AESEncryptUtil.decrypt(item.getFundPaymentBaseString())); - item.setOtherPaymentBaseString(AESEncryptUtil.decrypt(item.getOtherPaymentBaseString())); - item.setSocialPerJson(AESEncryptUtil.decrypt(item.getSocialPerJson())); - item.setSocialPerSum(AESEncryptUtil.decrypt(item.getSocialPerSum())); - item.setFundPerJson(AESEncryptUtil.decrypt(item.getFundPerJson())); - item.setFundPerSum(AESEncryptUtil.decrypt(item.getFundPerSum())); - item.setOtherPerJson(AESEncryptUtil.decrypt(item.getOtherPerJson())); - item.setOtherPerSum(AESEncryptUtil.decrypt(item.getOtherPerSum())); - item.setPerSum(AESEncryptUtil.decrypt(item.getPerSum())); - item.setSocialComJson(AESEncryptUtil.decrypt(item.getSocialComJson())); - item.setSocialComSum(AESEncryptUtil.decrypt(item.getSocialComSum())); - item.setComSum(AESEncryptUtil.decrypt(item.getComSum())); - item.setSocialSum(AESEncryptUtil.decrypt(item.getSocialSum())); - item.setFundSum(AESEncryptUtil.decrypt(item.getFundSum())); - item.setOtherSum(AESEncryptUtil.decrypt(item.getOtherSum())); - item.setTotal(AESEncryptUtil.decrypt(item.getTotal())); - return item; - } - - -} diff --git a/src/com/engine/salary/encrypt/siaccount/InsuranceAccountDetailPOEncrypt.java b/src/com/engine/salary/encrypt/siaccount/InsuranceAccountDetailPOEncrypt.java deleted file mode 100644 index 73153f629..000000000 --- a/src/com/engine/salary/encrypt/siaccount/InsuranceAccountDetailPOEncrypt.java +++ /dev/null @@ -1,136 +0,0 @@ -package com.engine.salary.encrypt.siaccount; - -import com.engine.salary.encrypt.AESEncryptUtil; -import com.engine.salary.entity.siaccount.po.InsuranceAccountDetailPO; - -import java.util.List; - -/** - * hrsa_bill_detail: 加解密 - * 字段： - * social_payment_base_string - * fund_payment_base_string - * other_payment_base_string - * social_per_json - * social_per_sum - * fund_per_json - * fund_per_sum - * other_per_json - * other_per_sum - * per_sum - * social_com_json - * social_com_sum - * fund_com_json - * fund_com_sum - * other_com_json - * other_com_sum - * com_sum - * social_sum - * fund_sum - * other_sum - * total - */ -@Deprecated -public class InsuranceAccountDetailPOEncrypt { - public static List encryptInsuranceAccountDetailPOList(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())); - item.setOtherPaymentBaseString(AESEncryptUtil.encrypt(item.getOtherPaymentBaseString())); - item.setSocialPerJson(AESEncryptUtil.encrypt(item.getSocialPerJson())); - item.setSocialPerSum(AESEncryptUtil.encrypt(item.getSocialPerSum())); - item.setFundPerJson(AESEncryptUtil.encrypt(item.getFundPerJson())); - item.setFundPerSum(AESEncryptUtil.encrypt(item.getFundPerSum())); - item.setOtherPerJson(AESEncryptUtil.encrypt(item.getOtherPerJson())); - item.setOtherPerSum(AESEncryptUtil.encrypt(item.getOtherPerSum())); - item.setPerSum(AESEncryptUtil.encrypt(item.getPerSum())); - item.setSocialComJson(AESEncryptUtil.encrypt(item.getSocialComJson())); - item.setSocialComSum(AESEncryptUtil.encrypt(item.getSocialComSum())); - item.setComSum(AESEncryptUtil.encrypt(item.getComSum())); - item.setSocialSum(AESEncryptUtil.encrypt(item.getSocialSum())); - item.setFundSum(AESEncryptUtil.encrypt(item.getFundSum())); - item.setOtherSum(AESEncryptUtil.encrypt(item.getOtherSum())); - item.setTotal(AESEncryptUtil.encrypt(item.getTotal())); - }); - return list; - } - - 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())); - item.setOtherPaymentBaseString(AESEncryptUtil.decrypt(item.getOtherPaymentBaseString())); - item.setSocialPerJson(AESEncryptUtil.decrypt(item.getSocialPerJson())); - item.setSocialPerSum(AESEncryptUtil.decrypt(item.getSocialPerSum())); - item.setFundPerJson(AESEncryptUtil.decrypt(item.getFundPerJson())); - item.setFundPerSum(AESEncryptUtil.decrypt(item.getFundPerSum())); - item.setOtherPerJson(AESEncryptUtil.decrypt(item.getOtherPerJson())); - item.setOtherPerSum(AESEncryptUtil.decrypt(item.getOtherPerSum())); - item.setPerSum(AESEncryptUtil.decrypt(item.getPerSum())); - item.setSocialComJson(AESEncryptUtil.decrypt(item.getSocialComJson())); - item.setSocialComSum(AESEncryptUtil.decrypt(item.getSocialComSum())); - item.setComSum(AESEncryptUtil.decrypt(item.getComSum())); - item.setSocialSum(AESEncryptUtil.decrypt(item.getSocialSum())); - item.setFundSum(AESEncryptUtil.decrypt(item.getFundSum())); - item.setOtherSum(AESEncryptUtil.decrypt(item.getOtherSum())); - item.setTotal(AESEncryptUtil.decrypt(item.getTotal())); - }); - return list; - } - - public static InsuranceAccountDetailPO decryptItem(InsuranceAccountDetailPO item) { - if(item == null) { - return item; - } - item.setSocialPaymentBaseString(AESEncryptUtil.decrypt(item.getSocialPaymentBaseString())); - item.setFundPaymentBaseString(AESEncryptUtil.decrypt(item.getFundPaymentBaseString())); - item.setOtherPaymentBaseString(AESEncryptUtil.decrypt(item.getOtherPaymentBaseString())); - item.setSocialPerJson(AESEncryptUtil.decrypt(item.getSocialPerJson())); - item.setSocialPerSum(AESEncryptUtil.decrypt(item.getSocialPerSum())); - item.setFundPerJson(AESEncryptUtil.decrypt(item.getFundPerJson())); - item.setFundPerSum(AESEncryptUtil.decrypt(item.getFundPerSum())); - item.setOtherPerJson(AESEncryptUtil.decrypt(item.getOtherPerJson())); - item.setOtherPerSum(AESEncryptUtil.decrypt(item.getOtherPerSum())); - item.setPerSum(AESEncryptUtil.decrypt(item.getPerSum())); - item.setSocialComJson(AESEncryptUtil.decrypt(item.getSocialComJson())); - item.setSocialComSum(AESEncryptUtil.decrypt(item.getSocialComSum())); - item.setComSum(AESEncryptUtil.decrypt(item.getComSum())); - item.setSocialSum(AESEncryptUtil.decrypt(item.getSocialSum())); - item.setFundSum(AESEncryptUtil.decrypt(item.getFundSum())); - item.setOtherSum(AESEncryptUtil.decrypt(item.getOtherSum())); - item.setTotal(AESEncryptUtil.decrypt(item.getTotal())); - return item; - } - - public static InsuranceAccountDetailPO encryptItem(InsuranceAccountDetailPO item) { - if(item == null) { - return item; - } - item.setSocialPaymentBaseString(AESEncryptUtil.encrypt(item.getSocialPaymentBaseString())); - item.setFundPaymentBaseString(AESEncryptUtil.encrypt(item.getFundPaymentBaseString())); - item.setOtherPaymentBaseString(AESEncryptUtil.encrypt(item.getOtherPaymentBaseString())); - item.setSocialPerJson(AESEncryptUtil.encrypt(item.getSocialPerJson())); - item.setSocialPerSum(AESEncryptUtil.encrypt(item.getSocialPerSum())); - item.setFundPerJson(AESEncryptUtil.encrypt(item.getFundPerJson())); - item.setFundPerSum(AESEncryptUtil.encrypt(item.getFundPerSum())); - item.setOtherPerJson(AESEncryptUtil.encrypt(item.getOtherPerJson())); - item.setOtherPerSum(AESEncryptUtil.encrypt(item.getOtherPerSum())); - item.setPerSum(AESEncryptUtil.encrypt(item.getPerSum())); - item.setSocialComJson(AESEncryptUtil.encrypt(item.getSocialComJson())); - item.setSocialComSum(AESEncryptUtil.encrypt(item.getSocialComSum())); - item.setComSum(AESEncryptUtil.encrypt(item.getComSum())); - item.setSocialSum(AESEncryptUtil.encrypt(item.getSocialSum())); - item.setFundSum(AESEncryptUtil.encrypt(item.getFundSum())); - item.setOtherSum(AESEncryptUtil.encrypt(item.getOtherSum())); - item.setTotal(AESEncryptUtil.encrypt(item.getTotal())); - return item; - } - - -} diff --git a/src/com/engine/salary/encrypt/siaccount/InsuranceAccountDetailTempPOEncrypt.java b/src/com/engine/salary/encrypt/siaccount/InsuranceAccountDetailTempPOEncrypt.java deleted file mode 100644 index 5e5f32724..000000000 --- a/src/com/engine/salary/encrypt/siaccount/InsuranceAccountDetailTempPOEncrypt.java +++ /dev/null @@ -1,86 +0,0 @@ -package com.engine.salary.encrypt.siaccount; - -import com.engine.salary.encrypt.AESEncryptUtil; -import com.engine.salary.entity.siaccount.po.InsuranceAccountDetailTempPO; - -import java.util.List; - -/** - * hrsa_bill_detail: 加解密 - * 字段： - * social_payment_base_string - * fund_payment_base_string - * other_payment_base_string - * social_per_json - * social_per_sum - * fund_per_json - * fund_per_sum - * other_per_json - * other_per_sum - * per_sum - * social_com_json - * social_com_sum - * fund_com_json - * fund_com_sum - * other_com_json - * other_com_sum - * com_sum - * social_sum - * fund_sum - * other_sum - * total - */ -@Deprecated -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())); - item.setOtherPaymentBaseString(AESEncryptUtil.encrypt(item.getOtherPaymentBaseString())); - item.setSocialPerJson(AESEncryptUtil.encrypt(item.getSocialPerJson())); - item.setSocialPerSum(AESEncryptUtil.encrypt(item.getSocialPerSum())); - item.setFundPerJson(AESEncryptUtil.encrypt(item.getFundPerJson())); - item.setFundPerSum(AESEncryptUtil.encrypt(item.getFundPerSum())); - item.setOtherPerJson(AESEncryptUtil.encrypt(item.getOtherPerJson())); - item.setOtherPerSum(AESEncryptUtil.encrypt(item.getOtherPerSum())); - item.setPerSum(AESEncryptUtil.encrypt(item.getPerSum())); - item.setSocialComJson(AESEncryptUtil.encrypt(item.getSocialComJson())); - item.setSocialComSum(AESEncryptUtil.encrypt(item.getSocialComSum())); - item.setComSum(AESEncryptUtil.encrypt(item.getComSum())); - item.setSocialSum(AESEncryptUtil.encrypt(item.getSocialSum())); - item.setFundSum(AESEncryptUtil.encrypt(item.getFundSum())); - item.setOtherSum(AESEncryptUtil.encrypt(item.getOtherSum())); - item.setTotal(AESEncryptUtil.encrypt(item.getTotal())); - }); - return list; - } - - 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())); - item.setOtherPaymentBaseString(AESEncryptUtil.decrypt(item.getOtherPaymentBaseString())); - item.setSocialPerJson(AESEncryptUtil.decrypt(item.getSocialPerJson())); - item.setSocialPerSum(AESEncryptUtil.decrypt(item.getSocialPerSum())); - item.setFundPerJson(AESEncryptUtil.decrypt(item.getFundPerJson())); - item.setFundPerSum(AESEncryptUtil.decrypt(item.getFundPerSum())); - item.setOtherPerJson(AESEncryptUtil.decrypt(item.getOtherPerJson())); - item.setOtherPerSum(AESEncryptUtil.decrypt(item.getOtherPerSum())); - item.setPerSum(AESEncryptUtil.decrypt(item.getPerSum())); - item.setSocialComJson(AESEncryptUtil.decrypt(item.getSocialComJson())); - item.setSocialComSum(AESEncryptUtil.decrypt(item.getSocialComSum())); - item.setComSum(AESEncryptUtil.decrypt(item.getComSum())); - item.setSocialSum(AESEncryptUtil.decrypt(item.getSocialSum())); - item.setFundSum(AESEncryptUtil.decrypt(item.getFundSum())); - item.setOtherSum(AESEncryptUtil.decrypt(item.getOtherSum())); - item.setTotal(AESEncryptUtil.decrypt(item.getTotal())); - }); - return list; - } -} diff --git a/src/com/engine/salary/encrypt/siaccount/SiAccountEncrypt.java b/src/com/engine/salary/encrypt/siaccount/SiAccountEncrypt.java deleted file mode 100644 index 73a627e5f..000000000 --- a/src/com/engine/salary/encrypt/siaccount/SiAccountEncrypt.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.engine.salary.encrypt.siaccount; - -import com.engine.salary.encrypt.AESEncryptUtil; -import com.engine.salary.entity.siaccount.po.InsuranceAccountBatchPO; - -import java.util.List; - -/** - * hrsa_bill_batch 加解密 - * 字段: - * other_pay - * social_pay - * fund_pay - */ -@Deprecated -public class SiAccountEncrypt { - @Deprecated - public static List encryptInsuranceAccountBatchList(List list) { - list.forEach(item -> { - item.setOtherPay(AESEncryptUtil.encrypt(item.getOtherPay())); - item.setSocialPay(AESEncryptUtil.encrypt(item.getSocialPay())); - item.setFundPay(AESEncryptUtil.encrypt(item.getFundPay())); - }); - return list; - } - - @Deprecated - 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())); - item.setFundPay(AESEncryptUtil.decrypt(item.getFundPay())); - }); - return list; - } - - @Deprecated - 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())); - return item; - } - - @Deprecated - 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())); - return item; - } -} diff --git a/src/com/engine/salary/encrypt/siarchives/InsuranceArchivesFundSchemePOEncrypt.java b/src/com/engine/salary/encrypt/siarchives/InsuranceArchivesFundSchemePOEncrypt.java deleted file mode 100644 index 18233ed58..000000000 --- a/src/com/engine/salary/encrypt/siarchives/InsuranceArchivesFundSchemePOEncrypt.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.engine.salary.encrypt.siarchives; - -import com.engine.salary.encrypt.AESEncryptUtil; -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) { - return list; - } - list.forEach(item -> { - item.setFundPaymentBaseString(AESEncryptUtil.encrypt(item.getFundPaymentBaseString())); - }); - return list; - } - - public static List decryptList(List list) { - if(list == null || list.size() == 0) { - return list; - } - list.forEach(item -> { - item.setFundPaymentBaseString(AESEncryptUtil.decrypt(item.getFundPaymentBaseString())); - }); - return list; - } - - 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 deleted file mode 100644 index d24b22e89..000000000 --- a/src/com/engine/salary/encrypt/siarchives/InsuranceArchivesOtherSchemePOEncrypt.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.engine.salary.encrypt.siarchives; - -import com.engine.salary.encrypt.AESEncryptUtil; -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) { - return list; - } - list.forEach(item -> { - item.setOtherPaymentBaseString(AESEncryptUtil.encrypt(item.getOtherPaymentBaseString())); - }); - return list; - } - - public static List decryptList(List list) { - if(list == null || list.size() == 0) { - return list; - } - list.forEach(item -> { - item.setOtherPaymentBaseString(AESEncryptUtil.decrypt(item.getOtherPaymentBaseString())); - }); - return list; - } - - 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 deleted file mode 100644 index 7490ad352..000000000 --- a/src/com/engine/salary/encrypt/siarchives/InsuranceArchivesSocialSchemePOEncrypt.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.engine.salary.encrypt.siarchives; - -import com.engine.salary.encrypt.AESEncryptUtil; -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) { - return list; - } - list.forEach(item -> { - item.setSocialPaymentBaseString(AESEncryptUtil.encrypt(item.getSocialPaymentBaseString())); - }); - return list; - } - - public static List decryptList(List list) { - if(list == null || list.size() == 0) { - return list; - } - list.forEach(item -> { - item.setSocialPaymentBaseString(AESEncryptUtil.decrypt(item.getSocialPaymentBaseString())); - }); - return list; - } - - 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 deleted file mode 100644 index 564993785..000000000 --- a/src/com/engine/salary/encrypt/siexport/AccountExportPOEncrypt.java +++ /dev/null @@ -1,86 +0,0 @@ -package com.engine.salary.encrypt.siexport; - -import com.engine.salary.encrypt.AESEncryptUtil; -import com.engine.salary.entity.siexport.po.AccountExportPO; - -import java.util.List; - -/** - * hrsa_bill_detail: 加解密 - * 字段： - * social_payment_base_string - * fund_payment_base_string - * other_payment_base_string - * social_per_json - * social_per_sum - * fund_per_json - * fund_per_sum - * other_per_json - * other_per_sum - * per_sum - * social_com_json - * social_com_sum - * fund_com_json - * fund_com_sum - * other_com_json - * other_com_sum - * com_sum - * social_sum - * fund_sum - * other_sum - * total - */ -@Deprecated -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())); - item.setOtherPaymentBaseString(AESEncryptUtil.encrypt(item.getOtherPaymentBaseString())); - item.setSocialPerJson(AESEncryptUtil.encrypt(item.getSocialPerJson())); - item.setSocialPerSum(AESEncryptUtil.encrypt(item.getSocialPerSum())); - item.setFundPerJson(AESEncryptUtil.encrypt(item.getFundPerJson())); - item.setFundPerSum(AESEncryptUtil.encrypt(item.getFundPerSum())); - item.setOtherPerJson(AESEncryptUtil.encrypt(item.getOtherPerJson())); - item.setOtherPerSum(AESEncryptUtil.encrypt(item.getOtherPerSum())); - item.setPerSum(AESEncryptUtil.encrypt(item.getPerSum())); - item.setSocialComJson(AESEncryptUtil.encrypt(item.getSocialComJson())); - item.setSocialComSum(AESEncryptUtil.encrypt(item.getSocialComSum())); - item.setComSum(AESEncryptUtil.encrypt(item.getComSum())); - item.setSocialSum(AESEncryptUtil.encrypt(item.getSocialSum())); - item.setFundSum(AESEncryptUtil.encrypt(item.getFundSum())); - item.setOtherSum(AESEncryptUtil.encrypt(item.getOtherSum())); - item.setTotal(AESEncryptUtil.encrypt(item.getTotal())); - }); - return list; - } - - 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())); - item.setOtherPaymentBaseString(AESEncryptUtil.decrypt(item.getOtherPaymentBaseString())); - item.setSocialPerJson(AESEncryptUtil.decrypt(item.getSocialPerJson())); - item.setSocialPerSum(AESEncryptUtil.decrypt(item.getSocialPerSum())); - item.setFundPerJson(AESEncryptUtil.decrypt(item.getFundPerJson())); - item.setFundPerSum(AESEncryptUtil.decrypt(item.getFundPerSum())); - item.setOtherPerJson(AESEncryptUtil.decrypt(item.getOtherPerJson())); - item.setOtherPerSum(AESEncryptUtil.decrypt(item.getOtherPerSum())); - item.setPerSum(AESEncryptUtil.decrypt(item.getPerSum())); - item.setSocialComJson(AESEncryptUtil.decrypt(item.getSocialComJson())); - item.setSocialComSum(AESEncryptUtil.decrypt(item.getSocialComSum())); - item.setComSum(AESEncryptUtil.decrypt(item.getComSum())); - item.setSocialSum(AESEncryptUtil.decrypt(item.getSocialSum())); - item.setFundSum(AESEncryptUtil.decrypt(item.getFundSum())); - item.setOtherSum(AESEncryptUtil.decrypt(item.getOtherSum())); - item.setTotal(AESEncryptUtil.decrypt(item.getTotal())); - }); - return list; - } -} diff --git a/src/com/engine/salary/encrypt/siexport/ExcelAccountExportPOEncrypt.java b/src/com/engine/salary/encrypt/siexport/ExcelAccountExportPOEncrypt.java deleted file mode 100644 index d562ac937..000000000 --- a/src/com/engine/salary/encrypt/siexport/ExcelAccountExportPOEncrypt.java +++ /dev/null @@ -1,86 +0,0 @@ -package com.engine.salary.encrypt.siexport; - -import com.engine.salary.encrypt.AESEncryptUtil; -import com.engine.salary.entity.siexport.po.ExcelAccountExportPO; - -import java.util.List; - -/** - * hrsa_excel_bill_detail: 加解密 - * 字段： - * social_payment_base_string - * fund_payment_base_string - * other_payment_base_string - * social_per_json - * social_per_sum - * fund_per_json - * fund_per_sum - * other_per_json - * other_per_sum - * per_sum - * social_com_json - * social_com_sum - * fund_com_json - * fund_com_sum - * other_com_json - * other_com_sum - * com_sum - * social_sum - * fund_sum - * other_sum - * total - */ -@Deprecated -public class ExcelAccountExportPOEncrypt { - public static List encryptExcelAccountExportPOList(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())); - item.setOtherPaymentBaseString(AESEncryptUtil.encrypt(item.getOtherPaymentBaseString())); - item.setSocialPerJson(AESEncryptUtil.encrypt(item.getSocialPerJson())); - item.setSocialPerSum(AESEncryptUtil.encrypt(item.getSocialPerSum())); - item.setFundPerJson(AESEncryptUtil.encrypt(item.getFundPerJson())); - item.setFundPerSum(AESEncryptUtil.encrypt(item.getFundPerSum())); - item.setOtherPerJson(AESEncryptUtil.encrypt(item.getOtherPerJson())); - item.setOtherPerSum(AESEncryptUtil.encrypt(item.getOtherPerSum())); - item.setPerSum(AESEncryptUtil.encrypt(item.getPerSum())); - item.setSocialComJson(AESEncryptUtil.encrypt(item.getSocialComJson())); - item.setSocialComSum(AESEncryptUtil.encrypt(item.getSocialComSum())); - item.setComSum(AESEncryptUtil.encrypt(item.getComSum())); - item.setSocialSum(AESEncryptUtil.encrypt(item.getSocialSum())); - item.setFundSum(AESEncryptUtil.encrypt(item.getFundSum())); - item.setOtherSum(AESEncryptUtil.encrypt(item.getOtherSum())); - item.setTotal(AESEncryptUtil.encrypt(item.getTotal())); - }); - return list; - } - - public static List decryptExcelAccountExportPOList(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())); - item.setOtherPaymentBaseString(AESEncryptUtil.decrypt(item.getOtherPaymentBaseString())); - item.setSocialPerJson(AESEncryptUtil.decrypt(item.getSocialPerJson())); - item.setSocialPerSum(AESEncryptUtil.decrypt(item.getSocialPerSum())); - item.setFundPerJson(AESEncryptUtil.decrypt(item.getFundPerJson())); - item.setFundPerSum(AESEncryptUtil.decrypt(item.getFundPerSum())); - item.setOtherPerJson(AESEncryptUtil.decrypt(item.getOtherPerJson())); - item.setOtherPerSum(AESEncryptUtil.decrypt(item.getOtherPerSum())); - item.setPerSum(AESEncryptUtil.decrypt(item.getPerSum())); - item.setSocialComJson(AESEncryptUtil.decrypt(item.getSocialComJson())); - item.setSocialComSum(AESEncryptUtil.decrypt(item.getSocialComSum())); - item.setComSum(AESEncryptUtil.decrypt(item.getComSum())); - item.setSocialSum(AESEncryptUtil.decrypt(item.getSocialSum())); - item.setFundSum(AESEncryptUtil.decrypt(item.getFundSum())); - item.setOtherSum(AESEncryptUtil.decrypt(item.getOtherSum())); - item.setTotal(AESEncryptUtil.decrypt(item.getTotal())); - }); - return list; - } -} diff --git a/src/com/engine/salary/encrypt/sischeme/InsuranceSchemeDetailPOEncrypt.java b/src/com/engine/salary/encrypt/sischeme/InsuranceSchemeDetailPOEncrypt.java deleted file mode 100644 index 2f75436c8..000000000 --- a/src/com/engine/salary/encrypt/sischeme/InsuranceSchemeDetailPOEncrypt.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.engine.salary.encrypt.sischeme; - -import com.engine.salary.encrypt.AESEncryptUtil; -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) { - return list; - } - list.forEach(item -> { - item.setLowerLimit(AESEncryptUtil.encrypt(item.getLowerLimit())); - item.setFixedCost(AESEncryptUtil.encrypt(item.getFixedCost())); - item.setUpperLimit(AESEncryptUtil.encrypt(item.getUpperLimit())); - }); - return list; - } - - 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())); - item.setUpperLimit(AESEncryptUtil.decrypt(item.getUpperLimit())); - }); - return list; - } - - 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())); - return item; - } - - 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())); - return item; - } -} diff --git a/src/com/engine/salary/encrypt/taxdeclaration/TaxDeclarationDetailEncrypt.java b/src/com/engine/salary/encrypt/taxdeclaration/TaxDeclarationDetailEncrypt.java deleted file mode 100644 index b1bde8463..000000000 --- a/src/com/engine/salary/encrypt/taxdeclaration/TaxDeclarationDetailEncrypt.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.engine.salary.encrypt.taxdeclaration; - -import com.engine.salary.encrypt.AESEncryptUtil; -import com.engine.salary.entity.taxdeclaration.po.TaxDeclarationDetailPO; - -import java.util.List; - -/** - * hrsa_tax_declaration_detail: 加解密 - * 字段： - * field_value - */ - -@Deprecated -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())); - }); - return list; - } - - public static List decryptTaxDeclarationDetailList(List list) { - if(list == null || list.size() == 0) { - return list; - } - list.forEach(item -> { - item.setFieldValue(AESEncryptUtil.decrypt(item.getFieldValue())); - }); - return list; - } - -} diff --git a/src/com/engine/salary/encrypt/taxdeclaration/TaxDeclarationDetailPOEncrypt.java b/src/com/engine/salary/encrypt/taxdeclaration/TaxDeclarationDetailPOEncrypt.java deleted file mode 100644 index 0cbc88a29..000000000 --- a/src/com/engine/salary/encrypt/taxdeclaration/TaxDeclarationDetailPOEncrypt.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.engine.salary.encrypt.taxdeclaration; - -import com.engine.salary.encrypt.AESEncryptUtil; -import com.engine.salary.entity.taxdeclaration.po.TaxDeclarationDetailPO; - -import java.util.Collection; -import java.util.List; - -/** - * hrsa_tax_declaration_detail: 加解密 - * 字段： - * field_value - */ -@Deprecated -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())); - }); - 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; - } - list.forEach(item -> { - item.setFieldValue(AESEncryptUtil.decrypt(item.getFieldValue())); - }); - 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/service/impl/OtherDeductionServiceImpl.java b/src/com/engine/salary/service/impl/OtherDeductionServiceImpl.java index a9c754fda..eb8ea02ba 100644 --- a/src/com/engine/salary/service/impl/OtherDeductionServiceImpl.java +++ b/src/com/engine/salary/service/impl/OtherDeductionServiceImpl.java @@ -585,7 +585,14 @@ public class OtherDeductionServiceImpl extends Service implements OtherDeduction } } ArrayList updateList = new ArrayList<>(); - OtherDeductionPO build = OtherDeductionPO.builder().id(otherDeductionParam.getId()).businessHealthyInsurance(otherDeductionParam.getBusinessHealthyInsurance()).taxDelayEndowmentInsurance(otherDeductionParam.getTaxDelayEndowmentInsurance()).otherDeduction(otherDeductionParam.getOtherDeduction()).deductionAllowedDonation(otherDeductionParam.getDeductionAllowedDonation()).build(); + OtherDeductionPO build = OtherDeductionPO.builder() + .id(otherDeductionParam.getId()) + .businessHealthyInsurance(otherDeductionParam.getBusinessHealthyInsurance()) + .taxDelayEndowmentInsurance(otherDeductionParam.getTaxDelayEndowmentInsurance()) + .otherDeduction(otherDeductionParam.getOtherDeduction()) + .deductionAllowedDonation(otherDeductionParam.getDeductionAllowedDonation()) + .privatePension(otherDeductionParam.getPrivatePension()) + .build(); updateList.add(build); OtherDeductionBiz.batchUpdate(updateList); } diff --git a/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java index 1f1bd0c68..04c2c5eb4 100644 --- a/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java @@ -5,7 +5,6 @@ import com.engine.core.impl.Service; import com.engine.salary.cache.SalaryCacheKey; import com.engine.salary.common.LocalDateRange; import com.engine.salary.encrypt.EncryptUtil; -import com.engine.salary.encrypt.salaryacct.SalaryAcctResultPOEncrypt; import com.engine.salary.entity.datacollection.DataCollectionEmployee; import com.engine.salary.entity.datacollection.dto.AttendQuoteFieldListDTO; import com.engine.salary.entity.report.bo.SalaryAcctResultReportBO; @@ -864,7 +863,8 @@ public class SalaryAcctResultServiceImpl extends Service implements SalaryAcctRe if (CollectionUtils.isEmpty(salaryAcctRecordIds) || CollectionUtils.isEmpty(salaryItemIds) ) { return Collections.emptyList(); } - return SalaryAcctResultPOEncrypt.decryptList(getSalaryAcctResultMapper().listSome(SalaryAcctResultPO.builder().salaryAcctRecordIds(salaryAcctRecordIds).salaryItemIds(salaryItemIds).build())); + List list = getSalaryAcctResultMapper().listSome(SalaryAcctResultPO.builder().salaryAcctRecordIds(salaryAcctRecordIds).salaryItemIds(salaryItemIds).build()); + return encryptUtil.decryptList(list,SalaryAcctResultPO.class); } diff --git a/src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java b/src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java index 9dbec31e9..edc4b5a86 100644 --- a/src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java +++ b/src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java @@ -850,11 +850,13 @@ public class SalarySysConfServiceImpl extends Service implements SalarySysConfSe po.setTaxDelayEndowmentInsurance(AESEncryptUtil.closeEncryptSetting(po.getTaxDelayEndowmentInsurance())); po.setOtherDeduction(AESEncryptUtil.closeEncryptSetting(po.getOtherDeduction())); po.setDeductionAllowedDonation(AESEncryptUtil.closeEncryptSetting(po.getDeductionAllowedDonation())); + po.setPrivatePension(AESEncryptUtil.closeEncryptSetting(po.getPrivatePension())); } else { po.setBusinessHealthyInsurance(AESEncryptUtil.encrypt(po.getBusinessHealthyInsurance())); po.setTaxDelayEndowmentInsurance(AESEncryptUtil.encrypt(po.getTaxDelayEndowmentInsurance())); po.setOtherDeduction(AESEncryptUtil.encrypt(po.getOtherDeduction())); po.setDeductionAllowedDonation(AESEncryptUtil.encrypt(po.getDeductionAllowedDonation())); + po.setPrivatePension(AESEncryptUtil.encrypt(po.getPrivatePension())); } }); List> partition = Lists.partition(otherDeductionPos, 50);