From 0853260f47cbb8c11c8d8df6f73124a5de449093 Mon Sep 17 00:00:00 2001
From: Harryxzy <xuzhuoyan_xzy@163.com>
Date: Fri, 8 Mar 2024 14:11:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=87=E4=BC=97=E8=A7=A3=E5=AF=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../salaryacct/SalaryAcctResultWZMapper.java  | 10 ++++-
 .../salaryacct/SalaryAcctResultWZMapper.xml   | 41 +++++++++++++++++++
 .../service/SalaryAcctResultService.java      |  2 +
 .../impl/SalaryAcctResultServiceImpl.java     | 35 ++++++++++++++--
 .../salary/web/SalaryAcctController.java      | 21 ++++------
 .../wrapper/SalaryAcctResultWrapper.java      |  4 ++
 6 files changed, 97 insertions(+), 16 deletions(-)

diff --git a/src/com/engine/salary/mapper/salaryacct/SalaryAcctResultWZMapper.java b/src/com/engine/salary/mapper/salaryacct/SalaryAcctResultWZMapper.java
index 236f93c79..898e6fe51 100644
--- a/src/com/engine/salary/mapper/salaryacct/SalaryAcctResultWZMapper.java
+++ b/src/com/engine/salary/mapper/salaryacct/SalaryAcctResultWZMapper.java
@@ -9,7 +9,8 @@ import java.util.List;
 public interface SalaryAcctResultWZMapper {
 
 
-    
+    List<SalaryAcctResultPO> listAll();
+
     /**
      * 条件查询
      *
@@ -23,4 +24,11 @@ public interface SalaryAcctResultWZMapper {
      * @param salaryAccountingResults
      */
     void batchInsert(@Param("collection") Collection<SalaryAcctResultPO> salaryAccountingResults);
+
+
+    /**
+     * 批量修改
+     * @param pos
+     */
+    int batchUpdate(@Param("collection") List<SalaryAcctResultPO> pos);
 }
\ No newline at end of file
diff --git a/src/com/engine/salary/mapper/salaryacct/SalaryAcctResultWZMapper.xml b/src/com/engine/salary/mapper/salaryacct/SalaryAcctResultWZMapper.xml
index 3cba55c5a..c4ac7e5aa 100644
--- a/src/com/engine/salary/mapper/salaryacct/SalaryAcctResultWZMapper.xml
+++ b/src/com/engine/salary/mapper/salaryacct/SalaryAcctResultWZMapper.xml
@@ -37,6 +37,47 @@
         , t.tenant_key
     </sql>
 
+    <select id="listAll" resultMap="BaseResultMap">
+        SELECT
+        <include refid="baseColumns"/>
+        FROM hrsa_salary_acct_result_wz t
+        WHERE delete_type = 0
+    </select>
+
+    <update id="batchUpdate" parameterType="java.util.List">
+        update hrsa_salary_acct_result_wz
+        <trim prefix="set" suffixOverrides=",">
+            <trim prefix="result_value =case" suffix="end,">
+                <foreach collection="collection" item="item" index="index">
+                    <if test="item.resultValue!=null">
+                        when id=#{item.id} then #{item.resultValue}
+                    </if>
+                </foreach>
+            </trim>
+
+            <trim prefix="origin_result_value =case" suffix="end,">
+                <foreach collection="collection" item="item" index="index">
+                    <if test="item.originResultValue!=null">
+                        when id=#{item.id} then #{item.originResultValue}
+                    </if>
+                </foreach>
+            </trim>
+
+            <trim prefix="delete_type =case" suffix="end,">
+                <foreach collection="collection" item="item" index="index">
+                    <if test="item.deleteType!=null">
+                        when id=#{item.id} then #{item.deleteType}
+                    </if>
+                </foreach>
+            </trim>
+        </trim>
+        where
+        id in
+        <foreach collection="collection" item="item" index="index" separator="," open="(" close=")">
+            #{item.id}
+        </foreach>
+    </update>
+
     <!-- 条件查询 -->
     <select id="listSome" resultMap="BaseResultMap"
             parameterType="com.engine.salary.entity.salaryacct.po.SalaryAcctResultPO">
diff --git a/src/com/engine/salary/service/SalaryAcctResultService.java b/src/com/engine/salary/service/SalaryAcctResultService.java
index f993a6dc1..e9586b2dc 100644
--- a/src/com/engine/salary/service/SalaryAcctResultService.java
+++ b/src/com/engine/salary/service/SalaryAcctResultService.java
@@ -221,4 +221,6 @@ public interface SalaryAcctResultService {
     void batchUpdate(SalaryAcctResultBatchUpdateParam param);
 
     String handleWzResult();
+
+    String handleWzResult2();
 }
diff --git a/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
index 2951ab469..17dbb84ed 100644
--- a/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
@@ -35,6 +35,7 @@ import com.engine.salary.enums.salaryitem.SalaryDataTypeEnum;
 import com.engine.salary.enums.salarysob.IncomeCategoryEnum;
 import com.engine.salary.exception.SalaryRunTimeException;
 import com.engine.salary.mapper.salaryacct.SalaryAcctResultMapper;
+import com.engine.salary.mapper.salaryacct.SalaryAcctResultWZMapper;
 import com.engine.salary.mapper.salaryacct.SalaryAcctTemplateWzMapper;
 import com.engine.salary.report.service.SalaryStatisticsReportService;
 import com.engine.salary.report.service.impl.SalaryStatisticsReportServiceImpl;
@@ -93,8 +94,8 @@ public class SalaryAcctResultServiceImpl extends Service implements SalaryAcctRe
         return MapperProxyFactory.getProxy(SalaryAcctResultMapper.class);
     }
 
-    private SalaryAcctResultMapper getSalaryAcctResultWzMapper() {
-        return MapperProxyFactory.getProxy(SalaryAcctResultMapper.class);
+    private SalaryAcctResultWZMapper getSalaryAcctResultWzMapper() {
+        return MapperProxyFactory.getProxy(SalaryAcctResultWZMapper.class);
     }
 
     private SalaryAcctEmployeeService getSalaryAcctEmployeeService(User user) {
@@ -1375,7 +1376,35 @@ public class SalaryAcctResultServiceImpl extends Service implements SalaryAcctRe
                     po.setOriginResultValue(AESEncryptUtil.closeEncryptSetting(po.getOriginResultValue(), sysConfPo));
                 });
                 List<List<SalaryAcctResultPO>> partition = Lists.partition(salaryAcctResultPos, 50);
-                SalaryAcctResultMapper mapper = sqlSession.getMapper(SalaryAcctResultMapper.class);
+                SalaryAcctResultWZMapper mapper = sqlSession.getMapper(SalaryAcctResultWZMapper.class);
+                partition.forEach(mapper::batchUpdate);
+                sqlSession.commit();
+                log.info("finish hrsa_salary_acct_result_wx");
+            }
+        } catch (Exception e) {
+            sqlSession.rollback();
+            log.error("fail hrsa_salary_acct_result_wx", e);
+            return "fail";
+        } finally {
+            sqlSession.close();
+        }
+        return "success";
+    }
+
+
+
+    public String handleWzResult2() {
+        SalarySysConfPO sysConfPo = getSalarySysConfService(user).getOneByCode(SalarySysConstant.OPEN_APPLICATION_ENCRYPT);
+        SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession();
+        try {
+            List<SalaryAcctResultPO> salaryAcctResultPos = getSalaryAcctResultWzMapper().listAll();
+            if (org.apache.commons.collections.CollectionUtils.isNotEmpty(salaryAcctResultPos)) {
+                salaryAcctResultPos.forEach(po -> {
+                    po.setResultValue(AESEncryptUtil.encrypt(po.getResultValue()));
+                    po.setOriginResultValue(AESEncryptUtil.encrypt(po.getOriginResultValue()));
+                });
+                List<List<SalaryAcctResultPO>> partition = Lists.partition(salaryAcctResultPos, 50);
+                SalaryAcctResultWZMapper mapper = sqlSession.getMapper(SalaryAcctResultWZMapper.class);
                 partition.forEach(mapper::batchUpdate);
                 sqlSession.commit();
                 log.info("finish hrsa_salary_acct_result_wx");
diff --git a/src/com/engine/salary/web/SalaryAcctController.java b/src/com/engine/salary/web/SalaryAcctController.java
index 8bfe9e423..55a29fc9f 100644
--- a/src/com/engine/salary/web/SalaryAcctController.java
+++ b/src/com/engine/salary/web/SalaryAcctController.java
@@ -1,32 +1,22 @@
 package com.engine.salary.web;
 
 import com.engine.common.util.ServiceUtil;
-import com.engine.salary.encrypt.AESEncryptUtil;
 import com.engine.salary.entity.salaryacct.dto.*;
 import com.engine.salary.entity.salaryacct.param.*;
-import com.engine.salary.entity.salaryacct.po.SalaryAcctResultPO;
 import com.engine.salary.entity.salaryacct.po.SalaryAcctTemplateWzPO;
 import com.engine.salary.entity.salarysob.dto.SalarySobCycleDTO;
 import com.engine.salary.enums.salarysob.SalaryEmployeeStatusEnum;
-import com.engine.salary.mapper.salaryacct.SalaryAcctResultMapper;
 import com.engine.salary.service.SalaryAcctExcelService;
 import com.engine.salary.service.impl.SalaryAcctExcelServiceImpl;
-import com.engine.salary.sys.constant.SalarySysConstant;
-import com.engine.salary.sys.entity.po.SalarySysConfPO;
-import com.engine.salary.sys.enums.OpenEnum;
 import com.engine.salary.util.ResponseResult;
 import com.engine.salary.util.SalaryDateUtil;
 import com.engine.salary.util.page.PageInfo;
 import com.engine.salary.wrapper.*;
-import com.google.common.collect.Lists;
 import io.swagger.v3.oas.annotations.parameters.RequestBody;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.ibatis.session.SqlSession;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.jetbrains.annotations.NotNull;
-import weaver.conn.mybatis.MyBatisFactory;
 import weaver.hrm.HrmUserVarify;
 import weaver.hrm.User;
 
@@ -44,7 +34,6 @@ import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.Future;
 import java.util.stream.Collectors;
 
 /**
@@ -682,12 +671,20 @@ public class SalaryAcctController {
 
     @GET
     @Path("/wz/handleWzResult")
-    @Produces(MediaType.APPLICATION_OCTET_STREAM)
+    @Produces(MediaType.APPLICATION_JSON)
     public String handleWzResult(@Context HttpServletRequest request, @Context HttpServletResponse response) {
         User user = HrmUserVarify.getUser(request, response);
         return new ResponseResult<Void, String>(user).run(getSalaryAcctResultWrapper(user)::handleWzResult);
     }
 
+    // @GET
+    // @Path("/wz/handleWzResult2")
+    // @Produces(MediaType.APPLICATION_JSON)
+    // public String handleWzResult2(@Context HttpServletRequest request, @Context HttpServletResponse response) {
+    //     User user = HrmUserVarify.getUser(request, response);
+    //     return new ResponseResult<Void, String>(user).run(getSalaryAcctResultWrapper(user)::handleWzResult2);
+    // }
+
 
     @POST
     @Path("/acctresult/sumForWorkflow")
diff --git a/src/com/engine/salary/wrapper/SalaryAcctResultWrapper.java b/src/com/engine/salary/wrapper/SalaryAcctResultWrapper.java
index 01ff9c6a8..3594f310c 100644
--- a/src/com/engine/salary/wrapper/SalaryAcctResultWrapper.java
+++ b/src/com/engine/salary/wrapper/SalaryAcctResultWrapper.java
@@ -398,6 +398,10 @@ public class SalaryAcctResultWrapper extends Service {
         return getSalaryAcctResultService(user).handleWzResult();
     }
 
+    public String handleWzResult2() {
+        return getSalaryAcctResultService(user).handleWzResult2();
+    }
+
     /**
      * 薪资核算-校验
      *