From 86ba593d1fe80c4261c1b21b1d5e4485a690a294 Mon Sep 17 00:00:00 2001
From: sy <sy666666>
Date: Mon, 19 Sep 2022 11:01:17 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E8=96=AA=E9=85=AC=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=96=B9=E5=BC=8F=E9=85=8D=E7=BD=AE-?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=87=87=E9=9B=86-=E7=B4=AF=E8=AE=A1?=
 =?UTF-8?q?=E9=99=84=E5=8A=A0=E4=B8=93=E9=A1=B9=E6=89=A3=E9=99=A4-?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5,=E6=B7=BB=E5=8A=A0=E5=AF=BC=E5=85=A5?=
 =?UTF-8?q?=E4=BA=BA=E5=91=98=E7=AD=9B=E9=80=89=E9=85=8D=E7=BD=AE=E5=8C=96?=
 =?UTF-8?q?=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/AddUpDeductionServiceImpl.java       | 24 ++++++++++++-------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java b/src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java
index ca99f5b1f..d71068350 100644
--- a/src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java
+++ b/src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java
@@ -5,6 +5,7 @@ import com.api.browser.bean.SearchConditionItem;
 import com.api.browser.bean.SearchConditionOption;
 import com.api.browser.util.ConditionFactory;
 import com.api.browser.util.ConditionType;
+import com.api.formmode.mybatis.util.SqlProxyHandle;
 import com.engine.common.util.ServiceUtil;
 import com.engine.core.impl.Service;
 import com.engine.salary.biz.AddUpDeductionBiz;
@@ -28,7 +29,9 @@ import com.engine.salary.enums.UserStatusEnum;
 import com.engine.salary.enums.salaryaccounting.SalaryAcctRecordStatusEnum;
 import com.engine.salary.exception.SalaryRunTimeException;
 import com.engine.salary.mapper.datacollection.AddUpDeductionMapper;
+import com.engine.salary.mapper.sys.SalarySysConfMapper;
 import com.engine.salary.service.*;
+import com.engine.salary.sys.entity.po.SalarySysConfPO;
 import com.engine.salary.util.SalaryDateUtil;
 import com.engine.salary.util.SalaryI18nUtil;
 import com.engine.salary.util.db.MapperProxyFactory;
@@ -87,6 +90,10 @@ public class AddUpDeductionServiceImpl extends Service implements AddUpDeduction
         return ServiceUtil.getService(SalaryEmployeeServiceImpl.class, user);
     }
 
+    private SalarySysConfMapper getSalarySysConfMapper() {
+        return SqlProxyHandle.getProxy(SalarySysConfMapper.class);
+    }
+
 
     @Override
     public Map<String, Object> getSearchCondition(Map<String, Object> params) {
@@ -199,6 +206,9 @@ public class AddUpDeductionServiceImpl extends Service implements AddUpDeduction
         Date declareMonth = SalaryDateUtil.localDateToDate(LocalDate.parse(declareMonthStr + "-01", SalaryDateUtil.DATE_FORMATTER));
         List<AddUpDeduction> list = getAddUpDeductionMapper().listSome(AddUpDeduction.builder().declareMonth(declareMonth).build());
 
+        //查询对于人员信息导入筛选的全局配置
+        SalarySysConfPO salarySysConfPO = getSalarySysConfMapper().getOneByCode("matchEmployeeMode");
+
         InputStream fileInputStream = null;
         try {
             fileInputStream = ImageFileManager.getInputStreamById(Integer.parseInt(imageId));
@@ -238,16 +248,12 @@ public class AddUpDeductionServiceImpl extends Service implements AddUpDeduction
                 String userName = dto.getUsername();
                 String deparmentName = dto.getDepartmentName();
                 String mobile = dto.getMobile();
-//                List<DataCollectionEmployee> employeeSameIds = employees.stream().filter(e -> (StringUtils.isBlank(userName) || Objects.equals(e.getUsername(), userName))
-//                                && (StringUtils.isBlank(deparmentName) || Objects.equals(e.getDepartmentName(), deparmentName)))
-//                        .collect(Collectors.toList());
-                //20220824需求迭代，增加手机号作为导入校验项
-                List<DataCollectionEmployee> employeeSameIds = employees.stream().filter(e -> (StringUtils.isBlank(userName) || Objects.equals(e.getUsername(), userName))
-                        && (StringUtils.isBlank(deparmentName) || Objects.equals(e.getDepartmentName(), deparmentName))
-                        && (StringUtils.isBlank(mobile) || Objects.equals(e.getMobile(), mobile)))
-                        .collect(Collectors.toList());
+                String workcode = dto.getJobNum();
 
-                if (StringUtils.isBlank(userName)) {
+                //筛选导入人员信息可以在人力资源池中匹配到的人员信息
+                List<DataCollectionEmployee> employeeSameIds = getSalaryAcctEmployeeService(user).matchImportEmployee(employees, userName, deparmentName, mobile, workcode);
+
+                if (StringUtils.isBlank(userName) && "0".equals(salarySysConfPO.getConfValue())) {
                     //姓名 不能为空
                     //错误消息对象
                     Map<String, String> errorMessageMap = Maps.newHashMap();

From eb033d64fdc460f8c8cb572f893f6cb6f2d3a5ba Mon Sep 17 00:00:00 2001
From: sy <sy666666>
Date: Mon, 19 Sep 2022 14:14:17 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E8=96=AA=E9=85=AC=E7=B3=BB=E7=BB=9F-?=
 =?UTF-8?q?=E7=A6=8F=E5=88=A9=E5=8F=B0=E8=B4=A6=EF=BC=8C=E8=A1=A5=E7=BC=B4?=
 =?UTF-8?q?=E9=A1=B5=E6=96=B0=E5=A2=9E=E8=A1=A5=E7=BC=B4=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8C=E6=A0=A1=E9=AA=8C=E6=95=B0=E6=8D=AE=E5=BA=93?=
 =?UTF-8?q?=E4=B8=AD=E6=98=AF=E5=90=A6=E5=B7=B2=E6=9C=89=E8=AF=A5=E7=BB=84?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E7=9A=84=E8=A1=A5=E7=BC=B4=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/com/engine/salary/biz/SIAccountBiz.java       |  5 +++++
 .../siaccount/InsuranceAccountDetailMapper.java   | 10 ++++++++++
 .../siaccount/InsuranceAccountDetailMapper.xml    | 15 +++++++++++++++
 3 files changed, 30 insertions(+)

diff --git a/src/com/engine/salary/biz/SIAccountBiz.java b/src/com/engine/salary/biz/SIAccountBiz.java
index b3b13015c..7a9939a05 100644
--- a/src/com/engine/salary/biz/SIAccountBiz.java
+++ b/src/com/engine/salary/biz/SIAccountBiz.java
@@ -904,6 +904,11 @@ public class SIAccountBiz extends Service {
         //核算结果集
         List<InsuranceAccountDetailPO> pos = new ArrayList<>();
         baseList.forEach(baseParam -> {
+            //判断人员id+账单月份+补缴月份在表中的唯一性
+            List<InsuranceAccountDetailPO> supplementList = getInsuranceAccountDetailMapper().querySupplementList(baseParam.getBillMonth(), baseParam.getPaymentOrganization(), baseParam.getEmployeeId(), baseParam.getSupplementaryMonth());
+            if (supplementList.size() > 0) {
+                throw new SalaryRunTimeException("当前人员和账单月份已存在该补缴月份的数据！无法再次创建！");
+            }
             InsuranceAccountDetailPO insuranceAccountDetailPO = accountSingleEmployeeBill(baseParam, longInsuranceArchivesAccountPOMap.get(baseParam.getEmployeeId()), employeeId);
             pos.add(insuranceAccountDetailPO);
         });
diff --git a/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.java b/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.java
index a75581cf9..d7c8ffa63 100644
--- a/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.java
+++ b/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.java
@@ -72,6 +72,16 @@ public interface InsuranceAccountDetailMapper {
 
     List<InsuranceAccountDetailPO> queryList(@Param("billMonth") String billMonth, @Param("paymentOrganization") Long paymentOrganization, @Param("employeeIds") Collection<Long> employeeIds);
 
+    /**
+     * 查询补缴数据
+     * @param billMonth
+     * @param paymentOrganization
+     * @param employeeId
+     * @param supplementaryMonth
+     * @return
+     */
+    List<InsuranceAccountDetailPO> querySupplementList(@Param("billMonth") String billMonth, @Param("paymentOrganization") Long paymentOrganization, @Param("employeeId") Long employeeId, @Param("supplementaryMonth") String supplementaryMonth);
+
 
     /**
      * 根据账单月份删除
diff --git a/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.xml b/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.xml
index e41efcd8d..09c8d58b8 100644
--- a/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.xml
+++ b/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.xml
@@ -188,6 +188,21 @@
         </if>
     </select>
 
+    <select id="querySupplementList" resultMap="BaseResultMap">
+        SELECT
+        t.employee_id,t.social_per_json,t.social_com_json,
+        t.fund_per_json,t.fund_com_json,t.other_per_json,
+        t.other_com_json,t.social_per_sum,t.social_com_sum,
+        t.fund_per_sum,t.fund_com_sum,t.other_per_sum,
+        t.other_com_sum,t.per_sum,t.com_sum
+        FROM
+        hrsa_bill_detail t
+        WHERE t.delete_type = 0
+        AND t.bill_month = #{billMonth}
+        AND t.payment_organization = #{paymentOrganization}
+        AND t.employee_id = #{employeeId}
+        AND t.supplementary_month = #{supplementaryMonth}
+    </select>
 
     <select id="selectAccountIds" resultType="java.lang.Long">
         SELECT DISTINCT a.ID

From b0cc2cc19dcb47ecae39fc8288c56ba1d5f1831e Mon Sep 17 00:00:00 2001
From: sy <sy666666>
Date: Mon, 19 Sep 2022 15:11:27 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E8=96=AA=E9=85=AC=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=96=B9=E5=BC=8F=E9=85=8D=E7=BD=AE-?=
 =?UTF-8?q?=E4=BA=BA=E5=91=98=E5=8C=B9=E9=85=8D=E5=85=A8=E5=B1=80=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E7=9A=84confValue=E9=BB=98=E8=AE=A4=E8=AE=BE=E4=B8=BA?=
 =?UTF-8?q?0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/AddUpDeductionServiceImpl.java       |  3 +-
 .../service/impl/SIAccountServiceImpl.java    | 37 ++++++++++++++++++-
 .../service/impl/SISchemeServiceImpl.java     |  3 +-
 .../impl/SalaryAcctEmployeeServiceImpl.java   |  5 ++-
 .../impl/SalaryAcctExcelServiceImpl.java      |  3 +-
 5 files changed, 44 insertions(+), 7 deletions(-)

diff --git a/src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java b/src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java
index d71068350..f9ce2476f 100644
--- a/src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java
+++ b/src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java
@@ -208,6 +208,7 @@ public class AddUpDeductionServiceImpl extends Service implements AddUpDeduction
 
         //查询对于人员信息导入筛选的全局配置
         SalarySysConfPO salarySysConfPO = getSalarySysConfMapper().getOneByCode("matchEmployeeMode");
+        String confValue = (salarySysConfPO != null && salarySysConfPO.getConfValue() != null && !"".equals(salarySysConfPO.getConfValue())) ? salarySysConfPO.getConfValue() : "0";
 
         InputStream fileInputStream = null;
         try {
@@ -253,7 +254,7 @@ public class AddUpDeductionServiceImpl extends Service implements AddUpDeduction
                 //筛选导入人员信息可以在人力资源池中匹配到的人员信息
                 List<DataCollectionEmployee> employeeSameIds = getSalaryAcctEmployeeService(user).matchImportEmployee(employees, userName, deparmentName, mobile, workcode);
 
-                if (StringUtils.isBlank(userName) && "0".equals(salarySysConfPO.getConfValue())) {
+                if (StringUtils.isBlank(userName) && "0".equals(confValue)) {
                     //姓名 不能为空
                     //错误消息对象
                     Map<String, String> errorMessageMap = Maps.newHashMap();
diff --git a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java
index 8a7b11a3f..e01d6fdaa 100644
--- a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java
@@ -1036,7 +1036,7 @@ public class SIAccountServiceImpl extends Service implements SIAccountService {
 
         //查询对于人员信息导入筛选的全局配置
         SalarySysConfPO salarySysConfPO = getSalarySysConfMapper().getOneByCode("matchEmployeeMode");
-
+        String confValue = (salarySysConfPO != null && salarySysConfPO.getConfValue() != null && !"".equals(salarySysConfPO.getConfValue())) ? salarySysConfPO.getConfValue() : "0";
         //检验参数
         //excel文件id
         String imageId = Util.null2String(importParam.getImageId());
@@ -1125,7 +1125,7 @@ public class SIAccountServiceImpl extends Service implements SIAccountService {
 
                     if (StringUtils.equals(SalaryI18nUtil.getI18nLabel(85429, "姓名"), dataKey.toString())) {
                         //当人员信息导入筛选的全局配置为"0"时，姓名才是必填项
-                        if (StringUtils.isEmpty(dataValue) && "0".equals(salarySysConfPO.getConfValue())) {
+                        if (StringUtils.isEmpty(dataValue) && "0".equals(confValue)) {
                             isError = true;
                             Map<String, String> errorMessageMap = Maps.newHashMap();
                             errorMessageMap.put("message", row + SalaryI18nUtil.getI18nLabel(102838, "姓名不能为空"));
@@ -1247,6 +1247,39 @@ public class SIAccountServiceImpl extends Service implements SIAccountService {
         }
     }
 
+    /**
+     * 导出“福利核算-补缴导入”模板
+     */
+    @Override
+    public XSSFWorkbook exportSupplyImportTemplate(InsuranceAcctDetailImportTemplateParam param) {
+        ValidUtil.doValidator(param);
+
+        // 必须选择导入模板所需的薪资项目(福利项)
+        if (CollectionUtils.isEmpty(param.getWelfareNames())) {
+            throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(99019, "参数错误，请选择导入模板所需的福利项目核算项"));
+        }
+
+        // 模板表头(默认必带"个税扣缴义务人"、"姓名")
+        List<Object> headerList = Lists.newArrayList(SalaryI18nUtil.getI18nLabel(85429, "姓名"),
+                "部门",
+                SalaryI18nUtil.getI18nLabel(86186, "手机号"),
+                SalaryI18nUtil.getI18nLabel(86317, "工号"),
+                SalaryI18nUtil.getI18nLabel(86184, "个税扣缴义务人"),
+                "账单月份",
+                "补缴月份");
+//        List<String> dataIndexList = Lists.newArrayList("username", "departmentName", "mobile", "taxAgentName", "billMonth");
+        // 查询福利核算项目
+        List<String> welfareNames = (List<String>) param.getWelfareNames();
+        headerList.addAll(welfareNames);
+
+        // excel导出的数据
+        List<List<Object>> rows = new ArrayList<>();
+        rows.add(headerList);
+
+        String sheetName = "福利核算导入模板";
+        return ExcelUtil.genWorkbookV2(rows, sheetName);
+    }
+
 
     /**
      * 将更新的数据设置到老的insuranceAccountDetailPO对象中
diff --git a/src/com/engine/salary/service/impl/SISchemeServiceImpl.java b/src/com/engine/salary/service/impl/SISchemeServiceImpl.java
index 8469d03ba..526b1dce0 100644
--- a/src/com/engine/salary/service/impl/SISchemeServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SISchemeServiceImpl.java
@@ -698,10 +698,11 @@ public class SISchemeServiceImpl extends Service implements SISchemeService {
 
         //查询对于人员信息导入筛选的全局配置
         SalarySysConfPO salarySysConfPO = getSalarySysConfMapper().getOneByCode("matchEmployeeMode");
+        String confValue = (salarySysConfPO != null && salarySysConfPO.getConfValue() != null && !"".equals(salarySysConfPO.getConfValue())) ? salarySysConfPO.getConfValue() : "0";
 
         String rowIndex = "第" + index + "行";
         //仅在全局人员筛选配置为“0”时，才对用户名、部门名称、手机号有要求
-        if (StringUtils.isBlank(userName) && StringUtils.isBlank(deparmentName) && StringUtils.isBlank(mobile) && "0".equals(salarySysConfPO.getConfValue())) {
+        if (StringUtils.isBlank(userName) && StringUtils.isBlank(deparmentName) && StringUtils.isBlank(mobile) && "0".equals(confValue)) {
             Map<String, String> errorMessageMap = Maps.newHashMap();
             errorMessageMap.put("message", rowIndex + " 用户名、部门名称、手机号" + SalaryI18nUtil.getI18nLabel(100303, "不能同时为空"));
             excelComments.add(errorMessageMap);
diff --git a/src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java
index fc5275fc4..18c65b4a0 100644
--- a/src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java
@@ -491,14 +491,15 @@ public class SalaryAcctEmployeeServiceImpl extends Service implements SalaryAcct
 
         //查询对于人员信息导入筛选的全局配置
         SalarySysConfPO salarySysConfPO = getSalarySysConfMapper().getOneByCode("matchEmployeeMode");
+        String confValue = (salarySysConfPO != null && salarySysConfPO.getConfValue() != null && !"".equals(salarySysConfPO.getConfValue())) ? salarySysConfPO.getConfValue() : "0";
         List<DataCollectionEmployee> employees = new ArrayList<>();
         //“0”代表姓名+部门+手机号的匹配原则，“1”代表工号为唯一匹配原则
-        if ("0".equals(salarySysConfPO.getConfValue())) {
+        if ("0".equals(confValue)) {
             employees = employeeList.stream().filter(e -> (StringUtils.isBlank(userName) || Objects.equals(e.getUsername(), userName))
                     && (StringUtils.isBlank(deparmentName) || Objects.equals(e.getDepartmentName(), deparmentName))
                     && (StringUtils.isBlank(mobile) || Objects.equals(e.getMobile(), mobile)))
                     .collect(Collectors.toList());
-        } else if ("1".equals(salarySysConfPO.getConfValue())) {
+        } else if ("1".equals(confValue)) {
             employees = employeeList.stream().filter(e -> (StringUtils.isBlank(workcode) || Objects.equals(e.getWorkcode(), workcode)))
                     .collect(Collectors.toList());
         }
diff --git a/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java
index 3a4d85d35..4741b7fa5 100644
--- a/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java
@@ -530,6 +530,7 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc
 
         //查询对于人员信息导入筛选的全局配置
         SalarySysConfPO salarySysConfPO = getSalarySysConfMapper().getOneByCode("matchEmployeeMode");
+        String confValue = (salarySysConfPO != null && salarySysConfPO.getConfValue() != null && !"".equals(salarySysConfPO.getConfValue())) ? salarySysConfPO.getConfValue() : "0";
 
         // 薪资核算记录的id
         Long salaryAcctRecordId = param.getSalaryAcctRecordId();
@@ -628,7 +629,7 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc
 
                     if (StringUtils.equals(SalaryI18nUtil.getI18nLabel(85429, "姓名"), dataKey.toString())) {
                         usernameIndex = j;
-                        if (StringUtils.isEmpty(dataValue) && "0".equals(salarySysConfPO.getConfValue())) {
+                        if (StringUtils.isEmpty(dataValue) && "0".equals(confValue)) {
                             isError = true;
                             Map<String, String> errorMessageMap = Maps.newHashMap();
                             errorMessageMap.put("message", row + SalaryI18nUtil.getI18nLabel(102838, "姓名不能为空"));

From f54481bbf19cab1c0d8ce669cc0580cccb584aa2 Mon Sep 17 00:00:00 2001
From: sy <sy666666>
Date: Mon, 19 Sep 2022 15:13:30 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E8=96=AA=E9=85=AC=E7=B3=BB=E7=BB=9F-?=
 =?UTF-8?q?=E7=A6=8F=E5=88=A9=E5=8F=B0=E8=B4=A6=E8=A1=A5=E7=BC=B4=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E5=BC=80=E5=8F=91v1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../salary/service/SIAccountService.java      |  5 +++
 .../salary/web/SIAccountController.java       | 38 +++++++++++++++++++
 2 files changed, 43 insertions(+)

diff --git a/src/com/engine/salary/service/SIAccountService.java b/src/com/engine/salary/service/SIAccountService.java
index 9070c7516..7f268fc89 100644
--- a/src/com/engine/salary/service/SIAccountService.java
+++ b/src/com/engine/salary/service/SIAccountService.java
@@ -222,5 +222,10 @@ public interface SIAccountService {
      * 预览“福利核算导入”模板导入的数据
      */
     Map<String, Object> preview(InsuranceAcctImportParam insuranceAcctImportParam);
+
+    /**
+     * 导出“福利核算-补缴导入模板”
+     */
+    XSSFWorkbook exportSupplyImportTemplate(InsuranceAcctDetailImportTemplateParam param);
 }
 
diff --git a/src/com/engine/salary/web/SIAccountController.java b/src/com/engine/salary/web/SIAccountController.java
index 9313acfac..e23a1babd 100644
--- a/src/com/engine/salary/web/SIAccountController.java
+++ b/src/com/engine/salary/web/SIAccountController.java
@@ -458,4 +458,42 @@ public class SIAccountController {
         return new ResponseResult<InsuranceAcctImportParam, Map<String, Object>>(user).run(getService(user)::preview, insuranceAcctImportParam);
     }
 
+    /**
+     * 导出“福利核算-补缴导入”模板
+     */
+    @GET
+    @Path("/welfare/supplyimporttemplate/export")
+    @Produces(MediaType.APPLICATION_OCTET_STREAM)
+    public Response exportSupplyImportTemplate(@Context HttpServletRequest request, @Context HttpServletResponse response) {
+        try {
+            InsuranceAcctDetailImportTemplateParam param = new InsuranceAcctDetailImportTemplateParam();
+
+            String welfareNames = request.getParameter("welfareNames");
+            if (StringUtils.isNotBlank(welfareNames)) {
+                param.setWelfareNames(Arrays.stream(welfareNames.split(",")).map(String::valueOf).collect(Collectors.toList()));
+            }
+
+            User user = HrmUserVarify.getUser(request, response);
+            XSSFWorkbook workbook = getService(user).exportSupplyImportTemplate(param);
+            String time = LocalDate.now().toString();
+            String fileName = "福利核算-补缴导入模板" + time;
+            try {
+                fileName = URLEncoder.encode(fileName + ".xlsx", "UTF-8");
+            } catch (UnsupportedEncodingException e) {
+                e.printStackTrace();
+            }
+            StreamingOutput output = outputStream -> {
+                workbook.write(outputStream);
+                outputStream.flush();
+            };
+            response.setContentType("application/octet-stream");
+            return Response.ok(output).header("Content-disposition", "attachment;filename=" + fileName).header("Cache-Control", "no-cache").build();
+        } catch (Exception e) {
+            log.error("福利核算-补缴导入模板导出异常", e);
+            throw e;
+        }
+
+    }
+
+
 }

From 44b3c76a8ef3128a55550cd7173c8322620ebd6a Mon Sep 17 00:00:00 2001
From: Harryxzy <xuzhuoyan_xzy@163.com>
Date: Mon, 19 Sep 2022 16:05:59 +0800
Subject: [PATCH 5/5] =?UTF-8?q?xzy-=E5=90=8C=E6=AF=94=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E4=BA=BA=E5=91=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/SalaryAcctEmployeeService.java    | 16 ++++++++
 .../impl/SalaryAcctEmployeeServiceImpl.java   | 40 ++++++++++++++++++-
 .../salary/web/SalaryAcctController.java      | 10 +++++
 .../wrapper/SalaryAcctEmployeeWrapper.java    | 16 ++++++++
 4 files changed, 80 insertions(+), 2 deletions(-)

diff --git a/src/com/engine/salary/service/SalaryAcctEmployeeService.java b/src/com/engine/salary/service/SalaryAcctEmployeeService.java
index da76bb27c..86ddd4495 100644
--- a/src/com/engine/salary/service/SalaryAcctEmployeeService.java
+++ b/src/com/engine/salary/service/SalaryAcctEmployeeService.java
@@ -146,6 +146,14 @@ public interface SalaryAcctEmployeeService {
      */
     PageInfo<SalaryAcctEmployeePO> listPageByParam4Reduce(SalaryAcctEmployeeQueryParam queryParam);
 
+    /**
+     * 根据列表查询条件查询同比增加的薪资核算人员（分页）
+     *
+     * @param queryParam 列表查询条件
+     * @return
+     */
+    PageInfo<SalaryAcctEmployeePO> listPageByParam4Add(SalaryAcctEmployeeQueryParam queryParam);
+
     /**
      * 根据列表查询条件查询同比减少的薪资核算人员
      *
@@ -154,6 +162,14 @@ public interface SalaryAcctEmployeeService {
      */
     List<SalaryAcctEmployeePO> listByParam4Reduce(SalaryAcctEmployeeQueryParam queryParam);
 
+    /**
+     * 根据列表查询条件查询同比增加的薪资核算人员
+     *
+     * @param queryParam 列表查询条件
+     * @return
+     */
+    List<SalaryAcctEmployeePO> listByParam4Add(SalaryAcctEmployeeQueryParam queryParam);
+
     /**
      * 根据列表查询条件查询合并计税的薪资核算人员（分页）
      *
diff --git a/src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java
index 18c65b4a0..94824062f 100644
--- a/src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java
@@ -13,7 +13,6 @@ import com.engine.salary.entity.salaryacct.po.SalaryAcctRecordPO;
 import com.engine.salary.entity.salaryarchive.dto.SalaryArchiveDataDTO;
 import com.engine.salary.entity.salarysob.dto.SalarySobCycleDTO;
 import com.engine.salary.entity.salarysob.po.SalarySobPO;
-import com.engine.salary.enums.UserStatusEnum;
 import com.engine.salary.enums.salaryaccounting.SalaryAcctRecordStatusEnum;
 import com.engine.salary.exception.SalaryRunTimeException;
 import com.engine.salary.mapper.salaryacct.SalaryAcctEmployeeMapper;
@@ -28,7 +27,6 @@ import com.engine.salary.util.page.PageInfo;
 import com.engine.salary.util.page.SalaryPageUtil;
 import com.engine.salary.util.valid.ValidUtil;
 import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
@@ -223,6 +221,8 @@ public class SalaryAcctEmployeeServiceImpl extends Service implements SalaryAcct
         return salaryAcctEmployeePOS;
     }
 
+
+
     @Override
     public PageInfo<SalaryAcctEmployeePO> listPageByParam4Reduce(SalaryAcctEmployeeQueryParam queryParam) {
 
@@ -235,6 +235,18 @@ public class SalaryAcctEmployeeServiceImpl extends Service implements SalaryAcct
         return salaryAcctEmployeePOPageInfo;
     }
 
+    @Override
+    public PageInfo<SalaryAcctEmployeePO> listPageByParam4Add(SalaryAcctEmployeeQueryParam queryParam) {
+        // 查询薪资核算人员
+        List<SalaryAcctEmployeePO> salaryAcctEmployeePOS = listByParam4Add(queryParam);
+        PageInfo<SalaryAcctEmployeePO> salaryAcctEmployeePOPageInfo = SalaryPageUtil.buildPage(queryParam.getCurrent(), queryParam.getPageSize(), SalaryAcctEmployeePO.class);
+        // 分页参数
+        salaryAcctEmployeePOPageInfo.setTotal(salaryAcctEmployeePOS.size());
+        salaryAcctEmployeePOPageInfo.setList(SalaryPageUtil.subList(queryParam.getCurrent(), queryParam.getPageSize(), salaryAcctEmployeePOS));
+        return salaryAcctEmployeePOPageInfo;
+    }
+
+
     @Override
     public List<SalaryAcctEmployeePO> listByParam4Reduce(SalaryAcctEmployeeQueryParam queryParam) {
         // 查询上个月的薪资核算记录（同一个薪资账套）
@@ -258,6 +270,30 @@ public class SalaryAcctEmployeeServiceImpl extends Service implements SalaryAcct
         return resultList;
     }
 
+    @Override
+    public List<SalaryAcctEmployeePO> listByParam4Add(SalaryAcctEmployeeQueryParam queryParam) {
+        // 查询上个月的薪资核算记录（同一个薪资账套）
+        List<SalaryAcctRecordPO> salaryAcctRecordPOS = getSalaryAcctRecordService(user).listById4LastSalaryMonth(queryParam.getSalaryAcctRecordId());
+        if (CollectionUtils.isEmpty(salaryAcctRecordPOS)) {
+            return Collections.emptyList();
+        }
+        Set<Long> lastMonthSalaryAcctRecordIds = SalaryEntityUtil.properties(salaryAcctRecordPOS, SalaryAcctRecordPO::getId);
+        // 上个月的核算人员
+        List<SalaryAcctEmployeePO> lastMonthSalaryAcctEmployeePOS = listBySalaryAcctRecordIds(lastMonthSalaryAcctRecordIds);
+        Map<String, SalaryAcctEmployeePO> lastMonthSalaryAcctEmployeePOMap = SalaryEntityUtil.convert2Map(lastMonthSalaryAcctEmployeePOS, salaryAcctEmployeePO -> salaryAcctEmployeePO.getEmployeeId() + "-" + salaryAcctEmployeePO.getTaxAgentId());
+        // 本月的核算人员
+        List<SalaryAcctEmployeePO> salaryAcctEmployeePOS = listByParam(queryParam);
+//        Set<String> keySet = SalaryEntityUtil.properties(salaryAcctEmployeePOS, salaryAcctEmployeePO -> salaryAcctEmployeePO.getEmployeeId() + "-" + salaryAcctEmployeePO.getTaxAgentId());
+        Map<String, SalaryAcctEmployeePO> thisMonthSalaryAcctEmployeePOMap = SalaryEntityUtil.convert2Map(salaryAcctEmployeePOS, salaryAcctEmployeePO -> salaryAcctEmployeePO.getEmployeeId() + "-" + salaryAcctEmployeePO.getTaxAgentId());
+        List<SalaryAcctEmployeePO> resultList = Lists.newArrayList();
+        thisMonthSalaryAcctEmployeePOMap.forEach((k,v)->{
+            if(!lastMonthSalaryAcctEmployeePOMap.containsKey(k)){
+                resultList.add(v);
+            }
+        });
+        return resultList;
+    }
+
 
     @Override
     public PageInfo<SalaryAcctEmployeePO> listPageByParam4ConsolidatedTax(SalaryAcctEmployeeQueryParam queryParam) {
diff --git a/src/com/engine/salary/web/SalaryAcctController.java b/src/com/engine/salary/web/SalaryAcctController.java
index f6f227993..28de9a568 100644
--- a/src/com/engine/salary/web/SalaryAcctController.java
+++ b/src/com/engine/salary/web/SalaryAcctController.java
@@ -173,6 +173,16 @@ public class SalaryAcctController {
         return new ResponseResult<SalaryAcctEmployeeQueryParam, PageInfo<SalaryAccEmployeeListDTO>>(user).run(getSalaryAcctEmployeeWrapper(user)::listPage4Reduce, param);
     }
 
+    //薪资核算环比上期添加人员列表
+    @POST
+    @Path("/addedemployee/list")
+    @Produces(MediaType.APPLICATION_JSON)
+    public String listAddEmployee(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody SalaryAcctEmployeeQueryParam param) {
+        User user = HrmUserVarify.getUser(request, response);
+        return new ResponseResult<SalaryAcctEmployeeQueryParam, PageInfo<SalaryAccEmployeeListDTO>>(user).run(getSalaryAcctEmployeeWrapper(user)::listPage4Add, param);
+    }
+
+
     //添加薪资核算人员
     @POST
     @Path("/acctemployee/save")
diff --git a/src/com/engine/salary/wrapper/SalaryAcctEmployeeWrapper.java b/src/com/engine/salary/wrapper/SalaryAcctEmployeeWrapper.java
index 2bf4b4ca3..150ccfa06 100644
--- a/src/com/engine/salary/wrapper/SalaryAcctEmployeeWrapper.java
+++ b/src/com/engine/salary/wrapper/SalaryAcctEmployeeWrapper.java
@@ -79,6 +79,21 @@ public class SalaryAcctEmployeeWrapper extends Service {
         return dtoPage;
     }
 
+    /**
+     * 同比增加的薪资核算人员列表
+     *
+     * @param queryParam 列表查询参数
+     * @return
+     */
+    public PageInfo<SalaryAccEmployeeListDTO> listPage4Add(SalaryAcctEmployeeQueryParam queryParam) {
+        // 查询同比减少的薪资核算人员（分页）
+        PageInfo<SalaryAcctEmployeePO> page = getSalaryAcctEmployeeService(user).listPageByParam4Add(queryParam);
+        // 转换成列表dto
+        PageInfo<SalaryAccEmployeeListDTO> dtoPage = convert2ListDTO(page);
+
+        return dtoPage;
+    }
+
     /**
      * 转换成列表dto
      *
@@ -179,4 +194,5 @@ public class SalaryAcctEmployeeWrapper extends Service {
     public void refreshTaxAgent(Long salaryAcctRecordId) {
         getSalaryAcctEmployeeService(user).refresh(salaryAcctRecordId);
     }
+
 }