From a406eed4b97865bcbf66461b10c491e8b51f5bc0 Mon Sep 17 00:00:00 2001
From: Harryxzy <xuzhuoyan_xzy@163.com>
Date: Thu, 27 Oct 2022 13:59:11 +0800
Subject: [PATCH] =?UTF-8?q?=E7=B4=AF=E8=AE=A1=E4=B8=93=E9=A1=B9=E9=99=84?=
 =?UTF-8?q?=E5=8A=A0=E6=89=A3=E9=99=A4-=E6=96=B0=E5=A2=9E=E3=80=81?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=89=80=E9=80=89=E3=80=81=E4=B8=80=E9=94=AE?=
 =?UTF-8?q?=E6=B8=85=E7=A9=BA=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../engine/salary/biz/AddUpDeductionBiz.java  | 16 ++++
 .../AddUpDeductionRecordDeleteParam.java      |  2 +-
 .../datacollection/AddUpDeductionMapper.java  |  9 ++
 .../datacollection/AddUpDeductionMapper.xml   | 11 +++
 .../salary/service/AddUpDeductionService.java |  2 +-
 .../impl/AddUpDeductionServiceImpl.java       | 84 +++++++++++++------
 .../salary/web/AddUpDeductionController.java  |  4 +-
 .../salary/wrapper/AddUpDeductionWrapper.java |  4 +-
 8 files changed, 100 insertions(+), 32 deletions(-)

diff --git a/src/com/engine/salary/biz/AddUpDeductionBiz.java b/src/com/engine/salary/biz/AddUpDeductionBiz.java
index c54f72c78..ba1b48ef7 100644
--- a/src/com/engine/salary/biz/AddUpDeductionBiz.java
+++ b/src/com/engine/salary/biz/AddUpDeductionBiz.java
@@ -203,4 +203,20 @@ public class AddUpDeductionBiz extends BaseBean {
     }
 
 
+    public void batchDeleteByIDS(List<Long> ids) {
+        if (CollectionUtils.isEmpty(ids)) {
+            return;
+        }
+        SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession();
+        try {
+            AddUpDeductionMapper mapper = sqlSession.getMapper(AddUpDeductionMapper.class);
+            List<List<Long>> partition = Lists.partition(ids, 100);
+            partition.forEach(mapper::deleteData);
+            sqlSession.commit();
+        } finally {
+            sqlSession.close();
+        }
+    }
+
+
 }
diff --git a/src/com/engine/salary/entity/datacollection/param/AddUpDeductionRecordDeleteParam.java b/src/com/engine/salary/entity/datacollection/param/AddUpDeductionRecordDeleteParam.java
index b469b3f37..fa1e8bcac 100644
--- a/src/com/engine/salary/entity/datacollection/param/AddUpDeductionRecordDeleteParam.java
+++ b/src/com/engine/salary/entity/datacollection/param/AddUpDeductionRecordDeleteParam.java
@@ -19,7 +19,7 @@ import java.util.List;
 public class AddUpDeductionRecordDeleteParam {
 
     // 删除id
-    private List<Long> id;
+    private List<Long> ids;
 
     // 申报月份
     private String declareMonth;
diff --git a/src/com/engine/salary/mapper/datacollection/AddUpDeductionMapper.java b/src/com/engine/salary/mapper/datacollection/AddUpDeductionMapper.java
index 4a27ec7b9..15c1953af 100644
--- a/src/com/engine/salary/mapper/datacollection/AddUpDeductionMapper.java
+++ b/src/com/engine/salary/mapper/datacollection/AddUpDeductionMapper.java
@@ -62,4 +62,13 @@ public interface AddUpDeductionMapper {
 	void updateData(@Param("collection") List<AddUpDeduction> updateList);
 
 	List<AddUpDeductionRecordDTO> recordList(@Param("param") AddUpDeductionQueryParam param);
+
+
+	/**
+	 * @description 批量删除
+	 * @return void
+	 * @author Harryxzy
+	 * @date 2022/10/27 9:54
+	 */
+	void deleteData(@Param("collection")List<Long> longs);
 }
\ No newline at end of file
diff --git a/src/com/engine/salary/mapper/datacollection/AddUpDeductionMapper.xml b/src/com/engine/salary/mapper/datacollection/AddUpDeductionMapper.xml
index a8bf7f84a..0e65d8e79 100644
--- a/src/com/engine/salary/mapper/datacollection/AddUpDeductionMapper.xml
+++ b/src/com/engine/salary/mapper/datacollection/AddUpDeductionMapper.xml
@@ -42,6 +42,17 @@
         , t.add_up_infant_care
     </sql>
 
+   <!-- 批量删除 -->
+    <update id="deleteData">
+        UPDATE hrsa_add_up_deduction t
+        SET delete_type = 1
+        WHERE delete_type = 0
+        AND id IN
+        <foreach collection="collection" open="(" item="id" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
+
     <!-- 查询全部 -->
     <select id="listAll" resultMap="BaseResultMap">
         SELECT
diff --git a/src/com/engine/salary/service/AddUpDeductionService.java b/src/com/engine/salary/service/AddUpDeductionService.java
index 8b72f9893..ed8d39888 100644
--- a/src/com/engine/salary/service/AddUpDeductionService.java
+++ b/src/com/engine/salary/service/AddUpDeductionService.java
@@ -138,5 +138,5 @@ public interface AddUpDeductionService {
      * @author Harryxzy
      * @date 2022/10/26 16:35
      */
-    void deleteAllAddUpDeduction(String declareMonthStr);
+    void deleteAllAddUpDeduction(AddUpDeductionRecordDeleteParam deleteParam);
 }
diff --git a/src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java b/src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java
index c542e3b57..e2cc0e9b9 100644
--- a/src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java
+++ b/src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java
@@ -417,8 +417,6 @@ public class AddUpDeductionServiceImpl extends Service implements AddUpDeduction
     public void createAddUpDeduction(AddUpDeductionRecordParam addUpDeductionRecordParam) {
         long currentEmployeeId = user.getUID();
         Boolean openDevolution = getTaxAgentService(user).isOpenDevolution();
-
-        Map<String, Object> apidatas = new HashMap<String, Object>();
         EmployBiz employBiz = new EmployBiz();
         AddUpDeductionBiz addUpDeductionBiz = new AddUpDeductionBiz();
 
@@ -452,11 +450,6 @@ public class AddUpDeductionServiceImpl extends Service implements AddUpDeduction
                 .updateTime(now)
                 .creator((long) user.getUID())
                 .declareMonth(declareMonth).build();
-
-        //相同的姓名
-        String userName = addUpDeductionRecordParam.getUsername();
-
-        Long employeeId = employees.get(0).getEmployeeId();
         boolean employeeSameId = employees.stream().anyMatch(e -> e.getEmployeeId() == addUpDeductionRecordParam.getEmployeeId());
         if (!employeeSameId) {
             throw new SalaryRunTimeException("员工信息不存在");
@@ -523,28 +516,67 @@ public class AddUpDeductionServiceImpl extends Service implements AddUpDeduction
 
     @Override
     public void deleteSelectAddUpDeduction(AddUpDeductionRecordDeleteParam deleteParam) {
-//        AddUpDeductionBiz addUpDeductionBiz = new AddUpDeductionBiz();
-//        String declareMonthStr = deleteParam.getDeclareMonth();
-//        // 已经核算过的不可操作
-//        // 获取已经核算的数据
-//        List<SalaryAcctEmployeePO> salaryAcctEmployees = getAccountedEmployeeData(declareMonthStr);
-//        // 判断是否有核算过
-//        if (CollectionUtils.isNotEmpty(salaryAcctEmployees)) {
-//            Optional<SalaryAcctEmployeePO> optionalAcctEmp = salaryAcctEmployees.stream().filter(f -> f.getEmployeeId().equals(addUpDeduction.getEmployeeId()) && f.getTaxAgentId().equals(addUpDeduction.getTaxAgentId())).findFirst();
-//            if (optionalAcctEmp.isPresent()) {
-//                throw new SalaryRunTimeException("该年月这条数据已经核算过,不可进行编辑！");
-//            }else {
-//                ArrayList<AddUpDeduction> updateList = new ArrayList<>();
-//                AddUpDeduction build = AddUpDeduction.builder().id(addUpDeduction.getId()).addUpChildEducation(addUpDeduction.getAddUpChildEducation()).addUpContinuingEducation(addUpDeduction.getAddUpContinuingEducation()).addUpHousingLoanInterest(addUpDeduction.getAddUpHousingLoanInterest()).addUpHousingRent(addUpDeduction.getAddUpHousingRent()).addUpSupportElderly(addUpDeduction.getAddUpSupportElderly()).addUpIllnessMedical(addUpDeduction.getAddUpIllnessMedical()).addUpInfantCare(addUpDeduction.getAddUpInfantCare()).build();
-//                updateList.add(build);
-//                addUpDeductionBiz.batchUpdate(updateList);
-//            }
-//        }
+        long currentEmployeeId = user.getUID();
+        // 获取所有个税扣缴义务人
+        Collection<TaxAgentManageRangeEmployeeDTO> taxAgentList = getTaxAgentService(user).listTaxAgentAndEmployeeTree(currentEmployeeId);
+        AddUpDeductionBiz addUpDeductionBiz = new AddUpDeductionBiz();
+        String declareMonthStr = deleteParam.getDeclareMonth();
+        List<Long> deleteIds = deleteParam.getIds();
+        // 已经核算过的不可操作
+        // 获取已经核算的数据
+        List<SalaryAcctEmployeePO> salaryAcctEmployees = getAccountedEmployeeData(declareMonthStr);
+        // 判断是否有核算过
+        List<Long> deleteList = new ArrayList<>();
+        for(int i=0; i<deleteIds.size(); i++){
+            Long id = deleteIds.get(i);
+            AddUpDeduction byId = addUpDeductionBiz.getById(id);
+            // 判断是否在个税扣缴义务人范围内
+            Optional<TaxAgentManageRangeEmployeeDTO> first = taxAgentList.stream().filter(m -> m.getTaxAgentId() == byId.getTaxAgentId()).findFirst();
+            if(!first.isPresent()){
+                throw new SalaryRunTimeException("个税扣缴义务人不存在或不在权限范围内");
+            }
+            // 判断用户是否存在
+            if (CollectionUtils.isNotEmpty(salaryAcctEmployees)) {
+                Optional<SalaryAcctEmployeePO> optionalAcctEmp = salaryAcctEmployees.stream().filter(f -> f.getEmployeeId().equals(byId.getEmployeeId()) && f.getTaxAgentId().equals(byId.getTaxAgentId())).findFirst();
+                if (optionalAcctEmp.isPresent()) {
+                    throw new SalaryRunTimeException("所选数据在该年月中已经核算过,不可进行删除！");
+                }
+            }
+            deleteList.add(byId.getId());
+        }
+        addUpDeductionBiz.batchDeleteByIDS(deleteList);
     }
 
     @Override
-    public void deleteAllAddUpDeduction(String declareMonthStr) {
-
+    public void deleteAllAddUpDeduction(AddUpDeductionRecordDeleteParam deleteParam) {
+        String declareMonthStr = deleteParam.getDeclareMonth();
+        long currentEmployeeId = user.getUID();
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        // 获取所有个税扣缴义务人
+        Collection<TaxAgentManageRangeEmployeeDTO> taxAgentList = getTaxAgentService(user).listTaxAgentAndEmployeeTree(currentEmployeeId);
+        List<Long> taxagentIds = taxAgentList.stream().map(TaxAgentManageRangeEmployeeDTO::getTaxAgentId).collect(Collectors.toList());
+        AddUpDeductionBiz addUpDeductionBiz = new AddUpDeductionBiz();
+        ArrayList<Date> declareMonthDate = new ArrayList<>();
+        try {
+            declareMonthDate.add(sdf.parse(declareMonthStr+"-01"));
+        }catch (Exception e){
+            throw new SalaryRunTimeException("日期异常");
+        }
+        AddUpDeductionQueryParam queryParam = AddUpDeductionQueryParam.builder().declareMonthDate(declareMonthDate).taxAgentIds(taxagentIds).build();
+        // 获取所有想要删除的数据
+        List<AddUpDeductionDTO> list = addUpDeductionBiz.list(queryParam);
+        // 获取已经核算的数据
+        List<SalaryAcctEmployeePO> salaryAcctEmployees = getAccountedEmployeeData(declareMonthStr);
+        for(AddUpDeductionDTO item : list){
+            if (CollectionUtils.isNotEmpty(salaryAcctEmployees)) {
+                Optional<SalaryAcctEmployeePO> optionalAcctEmp = salaryAcctEmployees.stream().filter(f -> f.getEmployeeId().equals(item.getEmployeeId()) && f.getTaxAgentId().equals(item.getTaxAgentId())).findFirst();
+                if (optionalAcctEmp.isPresent()) {
+                    throw new SalaryRunTimeException("员工："+item.getUsername()+",在该年月中已经核算过，不能进行一键清空！");
+                }
+            }
+        }
+        List<Long> deleteIds = list.stream().map(AddUpDeductionDTO::getId).collect(Collectors.toList());
+        addUpDeductionBiz.batchDeleteByIDS(deleteIds);
     }
 
 
diff --git a/src/com/engine/salary/web/AddUpDeductionController.java b/src/com/engine/salary/web/AddUpDeductionController.java
index 9214e0215..a60f30601 100644
--- a/src/com/engine/salary/web/AddUpDeductionController.java
+++ b/src/com/engine/salary/web/AddUpDeductionController.java
@@ -311,9 +311,9 @@ public class AddUpDeductionController {
     @POST
     @Path("/deleteAllAddUpDeduction")
     @Produces(MediaType.APPLICATION_JSON)
-    public String deleteAllAddUpDeduction(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody String declareMonth) {
+    public String deleteAllAddUpDeduction(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody AddUpDeductionRecordDeleteParam deleteParam) {
         User user = HrmUserVarify.getUser(request, response);
-        return new ResponseResult<String, Map<String, Object>>(user).run(getAddUpDeductionWrapper(user)::deleteAllAddUpDeduction, declareMonth);
+        return new ResponseResult<AddUpDeductionRecordDeleteParam, Map<String, Object>>(user).run(getAddUpDeductionWrapper(user)::deleteAllAddUpDeduction, deleteParam);
     }
 
 
diff --git a/src/com/engine/salary/wrapper/AddUpDeductionWrapper.java b/src/com/engine/salary/wrapper/AddUpDeductionWrapper.java
index 1621201df..f46e2cc89 100644
--- a/src/com/engine/salary/wrapper/AddUpDeductionWrapper.java
+++ b/src/com/engine/salary/wrapper/AddUpDeductionWrapper.java
@@ -155,7 +155,7 @@ public class AddUpDeductionWrapper extends Service {
         getAddUpDeductionService(user).deleteSelectAddUpDeduction(deleteParam);
     }
 
-    public void deleteAllAddUpDeduction(String declareMonthStr) {
-        getAddUpDeductionService(user).deleteAllAddUpDeduction(declareMonthStr);
+    public void deleteAllAddUpDeduction(AddUpDeductionRecordDeleteParam deleteParam) {
+        getAddUpDeductionService(user).deleteAllAddUpDeduction(deleteParam);
     }
 }