From 1b376464c4dc0428b9cf66668e7d5e088fea8dbd Mon Sep 17 00:00:00 2001
From: sy <sy666666>
Date: Mon, 12 Dec 2022 15:43:12 +0800
Subject: [PATCH] =?UTF-8?q?=E8=96=AA=E9=85=AC=E7=B3=BB=E7=BB=9F-=E7=A6=8F?=
 =?UTF-8?q?=E5=88=A9=E6=A1=A3=E6=A1=88=EF=BC=8C=E5=88=A0=E9=99=A4=E5=BE=85?=
 =?UTF-8?q?=E5=8A=9E=E5=8A=9F=E8=83=BD=EF=BC=88=E5=BE=85=E5=87=8F=E5=91=98?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/siarchives/FundSchemeMapper.java   |  6 ++++
 .../mapper/siarchives/FundSchemeMapper.xml    | 13 ++++++++
 .../siarchives/InsuranceBaseInfoMapper.java   |  7 +++-
 .../siarchives/InsuranceBaseInfoMapper.xml    |  8 +++++
 .../mapper/siarchives/OtherSchemeMapper.java  |  6 ++++
 .../mapper/siarchives/OtherSchemeMapper.xml   | 13 ++++++++
 .../mapper/siarchives/SocialSchemeMapper.java |  6 ++++
 .../mapper/siarchives/SocialSchemeMapper.xml  | 13 ++++++++
 .../salary/service/SIArchivesService.java     |  6 ++++
 .../service/impl/SIArchivesServiceImpl.java   | 33 +++++++++++++++++++
 .../salary/web/SIArchivesController.java      |  8 +++++
 11 files changed, 118 insertions(+), 1 deletion(-)

diff --git a/src/com/engine/salary/mapper/siarchives/FundSchemeMapper.java b/src/com/engine/salary/mapper/siarchives/FundSchemeMapper.java
index a6043041c..cc1fe88b3 100644
--- a/src/com/engine/salary/mapper/siarchives/FundSchemeMapper.java
+++ b/src/com/engine/salary/mapper/siarchives/FundSchemeMapper.java
@@ -74,4 +74,10 @@ public interface FundSchemeMapper {
     void batchUpdateEndTime(@Param("ids")List<Long> ids, @Param("endTime")String endTime);
 
     int updateById(InsuranceArchivesFundSchemePO insuranceArchivesFundSchemePO);
+
+    /**
+     * 批量更新最后缴纳月为null
+     * @param ids
+     */
+    void batchUpdateEndTimeToNull(@Param("ids")List<Long> ids);
 }
diff --git a/src/com/engine/salary/mapper/siarchives/FundSchemeMapper.xml b/src/com/engine/salary/mapper/siarchives/FundSchemeMapper.xml
index e38f50f35..c5d865fec 100644
--- a/src/com/engine/salary/mapper/siarchives/FundSchemeMapper.xml
+++ b/src/com/engine/salary/mapper/siarchives/FundSchemeMapper.xml
@@ -300,4 +300,17 @@
         </set>
         WHERE id = #{id} AND delete_type = 0
     </update>
+
+    <!-- 批量更新最后缴纳月为null -->
+    <update id="batchUpdateEndTimeToNull">
+        UPDATE hrsa_fund_archives
+        SET fund_end_time = null
+        WHERE delete_type = 0
+        <if test="ids != null and ids.size()>0">
+            AND id IN
+            <foreach collection="ids" open="(" item="id" separator="," close=")">
+                #{id}
+            </foreach>
+        </if>
+    </update>
 </mapper>
\ No newline at end of file
diff --git a/src/com/engine/salary/mapper/siarchives/InsuranceBaseInfoMapper.java b/src/com/engine/salary/mapper/siarchives/InsuranceBaseInfoMapper.java
index f159a7c20..02e63cfe5 100644
--- a/src/com/engine/salary/mapper/siarchives/InsuranceBaseInfoMapper.java
+++ b/src/com/engine/salary/mapper/siarchives/InsuranceBaseInfoMapper.java
@@ -23,12 +23,17 @@ public interface InsuranceBaseInfoMapper {
     List<InsuranceArchivesBaseInfoPO> listAll();
 
     /**
-     * 查询对应id记录
+     * 查询对应id集合的记录
      *
      * @return 返回集合，没有返回空List
      */
     List<InsuranceArchivesBaseInfoPO> listByIds(@Param("ids")Collection<Long> ids);
 
+    /**
+     * 查询对应id的记录
+     */
+    InsuranceArchivesBaseInfoPO getById(@Param("id")Long id);
+
     /**
      * 获取当前福利档案基础信息（由当前的社保、公积金、其他福利信息表获取）
      * 当设置employeeIds时，则是通过人员id、社保、公积金、其他福利信息表获取指定人员的福利档案基础信息
diff --git a/src/com/engine/salary/mapper/siarchives/InsuranceBaseInfoMapper.xml b/src/com/engine/salary/mapper/siarchives/InsuranceBaseInfoMapper.xml
index a1647a502..4537304e0 100644
--- a/src/com/engine/salary/mapper/siarchives/InsuranceBaseInfoMapper.xml
+++ b/src/com/engine/salary/mapper/siarchives/InsuranceBaseInfoMapper.xml
@@ -52,6 +52,14 @@
         </foreach>
     </select>
 
+    <select id="getById" resultMap="BaseResultMap">
+        SELECT
+        <include refid="baseColumns"/>
+        FROM hrsa_insurance_base_info t
+        WHERE id = #{id}
+        AND delete_type = 0
+    </select>
+
     <select id="getInsuranceBaseInfoListByInsuranceDetail" resultType="com.engine.salary.entity.siarchives.po.InsuranceArchivesBaseInfoPO">
         SELECT social.employee_id,
         social.id AS socialArchivesId,
diff --git a/src/com/engine/salary/mapper/siarchives/OtherSchemeMapper.java b/src/com/engine/salary/mapper/siarchives/OtherSchemeMapper.java
index 6a389f772..68aa76146 100644
--- a/src/com/engine/salary/mapper/siarchives/OtherSchemeMapper.java
+++ b/src/com/engine/salary/mapper/siarchives/OtherSchemeMapper.java
@@ -67,4 +67,10 @@ public interface OtherSchemeMapper {
     void batchUpdateEndTime(@Param("ids")List<Long> ids, @Param("endTime")String endTime);
 
     int updateById(InsuranceArchivesOtherSchemePO insuranceArchivesOtherSchemePO);
+
+    /**
+     * 批量更新最后缴纳月为null
+     * @param ids
+     */
+    void batchUpdateEndTimeToNull(@Param("ids")List<Long> ids);
 }
diff --git a/src/com/engine/salary/mapper/siarchives/OtherSchemeMapper.xml b/src/com/engine/salary/mapper/siarchives/OtherSchemeMapper.xml
index d66a1b02b..c049d2640 100644
--- a/src/com/engine/salary/mapper/siarchives/OtherSchemeMapper.xml
+++ b/src/com/engine/salary/mapper/siarchives/OtherSchemeMapper.xml
@@ -280,4 +280,17 @@
         </set>
         WHERE id = #{id} AND delete_type = 0
     </update>
+
+    <!-- 批量更新最后缴纳月为null -->
+    <update id="batchUpdateEndTimeToNull">
+        UPDATE hrsa_other_archives
+        SET other_end_time = null
+        WHERE delete_type = 0
+        <if test="ids != null and ids.size()>0">
+            AND id IN
+            <foreach collection="ids" open="(" item="id" separator="," close=")">
+                #{id}
+            </foreach>
+        </if>
+    </update>
 </mapper>
\ No newline at end of file
diff --git a/src/com/engine/salary/mapper/siarchives/SocialSchemeMapper.java b/src/com/engine/salary/mapper/siarchives/SocialSchemeMapper.java
index 5e6aa828b..8dca91da0 100644
--- a/src/com/engine/salary/mapper/siarchives/SocialSchemeMapper.java
+++ b/src/com/engine/salary/mapper/siarchives/SocialSchemeMapper.java
@@ -102,4 +102,10 @@ public interface SocialSchemeMapper {
      * @return
      */
     int updateById(InsuranceArchivesSocialSchemePO insuranceArchivesSocialSchemePO);
+
+    /**
+     * 批量更新最后缴纳月为null
+     * @param ids
+     */
+    void batchUpdateEndTimeToNull(@Param("ids")List<Long> ids);
 }
diff --git a/src/com/engine/salary/mapper/siarchives/SocialSchemeMapper.xml b/src/com/engine/salary/mapper/siarchives/SocialSchemeMapper.xml
index d9de5a6dc..329ecfb70 100644
--- a/src/com/engine/salary/mapper/siarchives/SocialSchemeMapper.xml
+++ b/src/com/engine/salary/mapper/siarchives/SocialSchemeMapper.xml
@@ -673,4 +673,17 @@
         </set>
         WHERE id = #{id} AND delete_type = 0
     </update>
+
+    <!-- 批量更新最后缴纳月为null -->
+    <update id="batchUpdateEndTimeToNull">
+        UPDATE hrsa_social_archives
+        SET social_end_time = null
+        WHERE delete_type = 0
+        <if test="ids != null and ids.size()>0">
+            AND id IN
+            <foreach collection="ids" open="(" item="id" separator="," close=")">
+                #{id}
+            </foreach>
+        </if>
+    </update>
 </mapper>
\ No newline at end of file
diff --git a/src/com/engine/salary/service/SIArchivesService.java b/src/com/engine/salary/service/SIArchivesService.java
index 96b5cda36..e5c6f3b5f 100644
--- a/src/com/engine/salary/service/SIArchivesService.java
+++ b/src/com/engine/salary/service/SIArchivesService.java
@@ -85,4 +85,10 @@ public interface SIArchivesService {
      * 批量增员
      */
     Map<String, Object> stayAddToPay(Collection<Long> ids);
+
+    /**
+     * 删除待办
+     * 入参runStatus来区分待增员和待减员页面的删除待办
+     */
+    void cancelStayDelOrStayAdd(InsuranceArchivesBaseInfoPO insuranceArchivesBaseInfoPO);
 }
diff --git a/src/com/engine/salary/service/impl/SIArchivesServiceImpl.java b/src/com/engine/salary/service/impl/SIArchivesServiceImpl.java
index a55f1d8f8..f2e028d2e 100644
--- a/src/com/engine/salary/service/impl/SIArchivesServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SIArchivesServiceImpl.java
@@ -944,5 +944,38 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService
         }
     }
 
+    /**
+     * 删除待办
+     * 入参runStatus来区分待增员和待减员页面的删除待办
+     */
+    @Override
+    public void cancelStayDelOrStayAdd(InsuranceArchivesBaseInfoPO insuranceArchivesBaseInfoPO) {
+
+        if (insuranceArchivesBaseInfoPO.getIds() == null || StringUtils.isBlank(insuranceArchivesBaseInfoPO.getRunStatus())) {
+            throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(84026, "参数错误"));
+        }
+
+        if (insuranceArchivesBaseInfoPO.getRunStatus().equals(EmployeeStatusEnum.STAY_DEL.getValue())) {
+            List<InsuranceArchivesBaseInfoPO> nowList = getInsuranceBaseInfoMapper().listByIds(insuranceArchivesBaseInfoPO.getIds());
+            //置空社保、公积金、其他福利档案的最后缴纳月信息，并将福利档案基础信息表的状态置为“正在缴纳”
+            if (nowList.size() > 0) {
+                List<Long> socialIds = nowList.stream()
+                        .map(InsuranceArchivesBaseInfoPO::getSocialArchivesId).collect(Collectors.toList());
+                List<Long> fundIds = nowList.stream()
+                        .map(InsuranceArchivesBaseInfoPO::getFundArchivesId).collect(Collectors.toList());
+                List<Long> otherIds = nowList.stream()
+                        .map(InsuranceArchivesBaseInfoPO::getOtherArchivesId).collect(Collectors.toList());
+
+                getSocialSchemeMapper().batchUpdateEndTimeToNull(socialIds);
+                getFundSchemeMapper().batchUpdateEndTimeToNull(fundIds);
+                getOtherSchemeMapper().batchUpdateEndTimeToNull(otherIds);
+
+                insuranceArchivesBaseInfoPO.setRunStatus(EmployeeStatusEnum.PAYING.getValue());
+                getInsuranceBaseInfoMapper().updateRunStatusByIds(insuranceArchivesBaseInfoPO);
+            }
+
+        }
+    }
+
 
 }
diff --git a/src/com/engine/salary/web/SIArchivesController.java b/src/com/engine/salary/web/SIArchivesController.java
index 9a49a6dbc..d248b7d0b 100644
--- a/src/com/engine/salary/web/SIArchivesController.java
+++ b/src/com/engine/salary/web/SIArchivesController.java
@@ -151,6 +151,14 @@ public class SIArchivesController  {
      * 删除待办
      * 入参runStatus来区分待增员和待减员页面的删除待办
      */
+    @POST
+    @Path("/cancelStayDelOrStayAdd")
+    @Produces(MediaType.APPLICATION_JSON)
+    public String cancelStayDelOrStayAdd(@Context HttpServletRequest request, @Context HttpServletResponse response,@RequestBody InsuranceArchivesBaseInfoPO po) {
+        User user = HrmUserVarify.getUser(request, response);
+        return new ResponseResult<InsuranceArchivesBaseInfoPO, String>(user).run(getService(user)::cancelStayDelOrStayAdd, po);
+    }
+
     @POST
     @Path("/updateRunStatus")
     @Produces(MediaType.APPLICATION_JSON)