From 8543d70a6654fe507fab0aa0f8870f1b524ab20f Mon Sep 17 00:00:00 2001
From: Harryxzy <xuzhuoyan_xzy@163.com>
Date: Thu, 14 Mar 2024 11:07:01 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A4=BE=E4=BF=9D=E5=8A=A0=E8=A7=A3=E5=AF=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../siaccount/ExcelInsuranceDetailMapper.xml  | 50 ++++++++++++++++++-
 .../InsuranceAccountDetailMapper.xml          | 23 +++++++++
 .../mapper/siarchives/FundSchemeMapper.xml    |  7 +++
 .../mapper/siarchives/OtherSchemeMapper.xml   |  7 +++
 .../mapper/siarchives/SocialSchemeMapper.xml  |  7 +++
 .../impl/SalarySysConfServiceImpl.java        | 44 ++++++++++++++--
 6 files changed, 134 insertions(+), 4 deletions(-)

diff --git a/src/com/engine/salary/mapper/siaccount/ExcelInsuranceDetailMapper.xml b/src/com/engine/salary/mapper/siaccount/ExcelInsuranceDetailMapper.xml
index 6372d29dd..53c1265b1 100644
--- a/src/com/engine/salary/mapper/siaccount/ExcelInsuranceDetailMapper.xml
+++ b/src/com/engine/salary/mapper/siaccount/ExcelInsuranceDetailMapper.xml
@@ -313,7 +313,55 @@
     </select>
     <select id="listAll" resultType="com.engine.salary.entity.siaccount.po.ExcelInsuranceDetailPO">
         SELECT
-        <include refid="baseColumns"/>
+            t
+                .
+                id
+             , t.employee_id
+             , t.bill_month
+             , t.bill_status
+             , t.payment_status
+             , t.supplementary_month
+             , t.supplementary_projects
+             , t.resource_from
+             , t.social_pay_org
+             , t.social_account
+             , t.fund_pay_org
+             , t.fund_account
+             , t.supplement_fund_account
+             , t.other_pay_org
+             , t.social_scheme_id
+             , t.social_payment_base_string
+             , t.social_payment_com_base_string
+             , t.fund_scheme_id
+             , t.fund_payment_base_string
+             , t.fund_payment_com_base_string
+             , t.other_scheme_id
+             , t.other_payment_base_string
+             , t.other_payment_com_base_string
+             , t.social_per_json
+             , t.social_per_sum
+             , t.fund_per_json
+             , t.fund_per_sum
+             , t.other_per_json
+             , t.other_per_sum
+             , t.per_sum
+             , t.social_com_json
+             , t.social_com_sum
+             , t.fund_com_json
+             , t.fund_com_sum
+             , t.other_com_json
+             , t.other_com_sum
+             , t.com_sum
+             , t.social_sum
+             , t.fund_sum
+             , t.other_sum
+             , t.total
+             , t.creator
+             , t.delete_type
+             , t.create_time
+             , t.update_time
+             , t.tenant_key
+             , t.payment_organization
         FROM
         hrsa_excel_bill_detail t
         WHERE t.delete_type = 0
diff --git a/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.xml b/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.xml
index f99f6ef0c..2b3754e64 100644
--- a/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.xml
+++ b/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.xml
@@ -1143,6 +1143,29 @@
                     </if>
                 </foreach>
             </trim>
+
+            <trim prefix="social_payment_com_base_string =case" suffix="end,">
+                <foreach collection="collection" item="item" index="index">
+                    <if test="item.socialPaymentComBaseString!=null">
+                        when id=#{item.id} then #{item.socialPaymentComBaseString}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="fund_payment_com_base_string =case" suffix="end,">
+                <foreach collection="collection" item="item" index="index">
+                    <if test="item.fundPaymentComBaseString!=null">
+                        when id=#{item.id} then #{item.fundPaymentComBaseString}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="other_payment_com_base_string =case" suffix="end,">
+                <foreach collection="collection" item="item" index="index">
+                    <if test="item.otherPaymentComBaseString!=null">
+                        when id=#{item.id} then #{item.otherPaymentComBaseString}
+                    </if>
+                </foreach>
+            </trim>
+
             <trim prefix="social_per_json =case" suffix="end,">
                 <foreach collection="collection" item="item" index="index">
                     <if test="item.socialPerJson!=null">
diff --git a/src/com/engine/salary/mapper/siarchives/FundSchemeMapper.xml b/src/com/engine/salary/mapper/siarchives/FundSchemeMapper.xml
index afdde68a1..750d36814 100644
--- a/src/com/engine/salary/mapper/siarchives/FundSchemeMapper.xml
+++ b/src/com/engine/salary/mapper/siarchives/FundSchemeMapper.xml
@@ -285,6 +285,13 @@
                     </if>
                 </foreach>
             </trim>
+            <trim prefix="fund_payment_com_base_string =case" suffix="end,">
+                <foreach collection="collection" item="item" index="index">
+                    <if test="item.fundPaymentComBaseString!=null">
+                        when id=#{item.id} then #{item.fundPaymentComBaseString}
+                    </if>
+                </foreach>
+            </trim>
             <trim prefix="delete_type =case" suffix="end,">
                 <foreach collection="collection" item="item" index="index">
                     <if test="item.deleteType!=null">
diff --git a/src/com/engine/salary/mapper/siarchives/OtherSchemeMapper.xml b/src/com/engine/salary/mapper/siarchives/OtherSchemeMapper.xml
index 12adf7fb4..7885d7358 100644
--- a/src/com/engine/salary/mapper/siarchives/OtherSchemeMapper.xml
+++ b/src/com/engine/salary/mapper/siarchives/OtherSchemeMapper.xml
@@ -275,6 +275,13 @@
                     </if>
                 </foreach>
             </trim>
+            <trim prefix="other_payment_com_base_string =case" suffix="end,">
+                <foreach collection="collection" item="item" index="index">
+                    <if test="item.otherPaymentComBaseString!=null">
+                        when id=#{item.id} then #{item.otherPaymentComBaseString}
+                    </if>
+                </foreach>
+            </trim>
             <trim prefix="delete_type =case" suffix="end,">
                 <foreach collection="collection" item="item" index="index">
                     <if test="item.deleteType!=null">
diff --git a/src/com/engine/salary/mapper/siarchives/SocialSchemeMapper.xml b/src/com/engine/salary/mapper/siarchives/SocialSchemeMapper.xml
index 79562932f..14bc0be8e 100644
--- a/src/com/engine/salary/mapper/siarchives/SocialSchemeMapper.xml
+++ b/src/com/engine/salary/mapper/siarchives/SocialSchemeMapper.xml
@@ -929,6 +929,13 @@
                     </if>
                 </foreach>
             </trim>
+            <trim prefix="social_payment_com_base_string =case" suffix="end,">
+                <foreach collection="collection" item="item" index="index">
+                    <if test="item.socialPaymentComBaseString!=null">
+                        when id=#{item.id} then #{item.socialPaymentComBaseString}
+                    </if>
+                </foreach>
+            </trim>
             <trim prefix="delete_type =case" suffix="end,">
                 <foreach collection="collection" item="item" index="index">
                     <if test="item.deleteType!=null">
diff --git a/src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java b/src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java
index 8dc814429..24050fafc 100644
--- a/src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java
+++ b/src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java
@@ -1121,12 +1121,50 @@ public class SalarySysConfServiceImpl extends Service implements SalarySysConfSe
                     if (CollectionUtils.isNotEmpty(excelInsuranceDetailPOS)) {
                         excelInsuranceDetailPOS.forEach(po -> {
                             if (OpenEnum.OFF.getValue().equals(isOpenEncrypt)) {
-                                encryptUtil.decrypt(po, ExcelInsuranceDetailPO.class);
+                                po.setSocialPaymentBaseString(AESEncryptUtil.closeEncryptSetting(po.getSocialPaymentBaseString(), sysConfPo));
+                                po.setSocialPaymentComBaseString(AESEncryptUtil.closeEncryptSetting(po.getSocialPaymentComBaseString(), sysConfPo));
+                                po.setFundPaymentBaseString(AESEncryptUtil.closeEncryptSetting(po.getFundPaymentBaseString(), sysConfPo));
+                                po.setFundPaymentComBaseString(AESEncryptUtil.closeEncryptSetting(po.getFundPaymentComBaseString(), sysConfPo));
+                                po.setOtherPaymentBaseString(AESEncryptUtil.closeEncryptSetting(po.getOtherPaymentBaseString(), sysConfPo));
+                                po.setOtherPaymentComBaseString(AESEncryptUtil.closeEncryptSetting(po.getOtherPaymentComBaseString(), sysConfPo));
+                                po.setSocialPerJson(AESEncryptUtil.closeEncryptSetting(po.getSocialPerJson(), sysConfPo));
+                                po.setSocialPerSum(AESEncryptUtil.closeEncryptSetting(po.getSocialPerSum(), sysConfPo));
+                                po.setFundPerJson(AESEncryptUtil.closeEncryptSetting(po.getFundPerJson(), sysConfPo));
+                                po.setFundPerSum(AESEncryptUtil.closeEncryptSetting(po.getFundPerSum(), sysConfPo));
+                                po.setOtherPerJson(AESEncryptUtil.closeEncryptSetting(po.getOtherPerJson(), sysConfPo));
+                                po.setOtherPerSum(AESEncryptUtil.closeEncryptSetting(po.getOtherPerSum(), sysConfPo));
+                                po.setPerSum(AESEncryptUtil.closeEncryptSetting(po.getPerSum(), sysConfPo));
+                                po.setSocialComJson(AESEncryptUtil.closeEncryptSetting(po.getSocialComJson(), sysConfPo));
+                                po.setSocialComSum(AESEncryptUtil.closeEncryptSetting(po.getSocialComSum(), sysConfPo));
+                                po.setComSum(AESEncryptUtil.closeEncryptSetting(po.getComSum(), sysConfPo));
+                                po.setSocialSum(AESEncryptUtil.closeEncryptSetting(po.getSocialSum(), sysConfPo));
+                                po.setFundSum(AESEncryptUtil.closeEncryptSetting(po.getFundSum(), sysConfPo));
+                                po.setOtherSum(AESEncryptUtil.closeEncryptSetting(po.getOtherSum(), sysConfPo));
+                                po.setTotal(AESEncryptUtil.closeEncryptSetting(po.getTotal(), sysConfPo));
                             } else {
-                                encryptUtil.encrypt(po, ExcelInsuranceDetailPO.class);
+                                po.setSocialPaymentBaseString(AESEncryptUtil.encrypt(po.getSocialPaymentBaseString()));
+                                po.setSocialPaymentComBaseString(AESEncryptUtil.encrypt(po.getSocialPaymentComBaseString()));
+                                po.setFundPaymentBaseString(AESEncryptUtil.encrypt(po.getFundPaymentBaseString()));
+                                po.setFundPaymentComBaseString(AESEncryptUtil.encrypt(po.getFundPaymentComBaseString()));
+                                po.setOtherPaymentBaseString(AESEncryptUtil.encrypt(po.getOtherPaymentBaseString()));
+                                po.setOtherPaymentComBaseString(AESEncryptUtil.encrypt(po.getOtherPaymentComBaseString()));
+                                po.setSocialPerJson(AESEncryptUtil.encrypt(po.getSocialPerJson()));
+                                po.setSocialPerSum(AESEncryptUtil.encrypt(po.getSocialPerSum()));
+                                po.setFundPerJson(AESEncryptUtil.encrypt(po.getFundPerJson()));
+                                po.setFundPerSum(AESEncryptUtil.encrypt(po.getFundPerSum()));
+                                po.setOtherPerJson(AESEncryptUtil.encrypt(po.getOtherPerJson()));
+                                po.setOtherPerSum(AESEncryptUtil.encrypt(po.getOtherPerSum()));
+                                po.setPerSum(AESEncryptUtil.encrypt(po.getPerSum()));
+                                po.setSocialComJson(AESEncryptUtil.encrypt(po.getSocialComJson()));
+                                po.setSocialComSum(AESEncryptUtil.encrypt(po.getSocialComSum()));
+                                po.setComSum(AESEncryptUtil.encrypt(po.getComSum()));
+                                po.setSocialSum(AESEncryptUtil.encrypt(po.getSocialSum()));
+                                po.setFundSum(AESEncryptUtil.encrypt(po.getFundSum()));
+                                po.setOtherSum(AESEncryptUtil.encrypt(po.getOtherSum()));
+                                po.setTotal(AESEncryptUtil.encrypt(po.getTotal()));
                             }
                         });
-                        List<List<ExcelInsuranceDetailPO>> partition = Lists.partition(excelInsuranceDetailPOS, 50);
+                        List<List<ExcelInsuranceDetailPO>> partition = Lists.partition(excelInsuranceDetailPOS, 10);
                         ExcelInsuranceDetailMapper mapper = sqlSession.getMapper(ExcelInsuranceDetailMapper.class);
                         partition.forEach(mapper::updateBatchSelective);
                         sqlSession.commit();