From 193e28758cd30221973af4ac50de76c32a91b342 Mon Sep 17 00:00:00 2001
From: sy <sy666666>
Date: Mon, 10 Jul 2023 10:26:08 +0800
Subject: [PATCH 01/11] =?UTF-8?q?=E8=96=AA=E9=85=AC=E7=B3=BB=E7=BB=9F-?=
 =?UTF-8?q?=E8=96=AA=E8=B5=84=E6=A0=B8=E7=AE=97=E3=80=81=E8=96=AA=E8=B5=84?=
 =?UTF-8?q?=E6=A1=A3=E6=A1=88=E3=80=81=E7=A6=8F=E5=88=A9=E6=A1=A3=E6=A1=88?=
 =?UTF-8?q?=EF=BC=8C=E9=AB=98=E7=BA=A7=E6=90=9C=E7=B4=A2=E4=B8=AD=E7=9A=84?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=9D=A1=E4=BB=B6=E6=94=B9=E4=B8=BA=E6=95=B0?=
 =?UTF-8?q?=E7=BB=84=E7=B1=BB=E5=9E=8B=E7=9A=84=E5=85=A5=E5=8F=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/SIAccountServiceImpl.java    | 76 ++++++++++++++++++-
 1 file changed, 75 insertions(+), 1 deletion(-)

diff --git a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java
index 794b64cbf..4db81131b 100644
--- a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java
@@ -869,7 +869,20 @@ public class SIAccountServiceImpl extends Service implements SIAccountService {
         if (insuranceAccountBatchPO == null || Objects.equals(BillStatusEnum.NOT_ARCHIVED.getValue(), insuranceAccountBatchPO.getBillStatus())) {
             return Lists.newArrayList();
         }
-        List<InsuranceAccountDetailPO> list = queryList(billMonth, taxAgentId, employeeIds);
+//        List<InsuranceAccountDetailPO> list = queryList(billMonth, taxAgentId, employeeIds);
+        //20230707增加福利核算明细中的缴纳状态+合计的数据项
+        List<InsuranceAccountDetailPO> insuranceAccountDetailPOS = getInsuranceAccountDetailMapper().queryList(billMonth, taxAgentId, employeeIds);
+        //退差数据不参与薪资核算
+        insuranceAccountDetailPOS = insuranceAccountDetailPOS.stream()
+                .filter(f -> f.getPaymentStatus().equals(PaymentStatusEnum.COMMON.getValue())
+                        || f.getPaymentStatus().equals(PaymentStatusEnum.REPAIR.getValue())
+                        || f.getPaymentStatus().equals(PaymentStatusEnum.BALANCE.getValue()) )
+                .collect(Collectors.toList());
+        List<InsuranceAccountDetailPO> list = buildNewInsuranceDetailPOS(insuranceAccountDetailPOS);
+        Map<String, InsuranceAccountDetailPO> siAcctResultWithEmpAndPayStatus = insuranceAccountDetailPOS.stream()
+                .collect(Collectors.toMap(po -> po.getEmployeeId() + "_" + po.getPaymentStatus(), a -> a, (a, b) -> a));
+
+
         List<Map<String, Object>> result = new ArrayList<>();
         list.stream().forEach(item -> {
             Map<String, Object> record = new HashMap<>();
@@ -921,6 +934,39 @@ public class SIAccountServiceImpl extends Service implements SIAccountService {
             record.put("otherComSum", item.getOtherComSum());
             record.put("perSum", item.getPerSum());
             record.put("comSum", item.getComSum());
+
+            //20230707增加福利核算明细中的缴纳状态+合计的数据项
+            InsuranceAccountDetailPO commonSiAcct = siAcctResultWithEmpAndPayStatus.get(item.getEmployeeId() + "_" + PaymentStatusEnum.COMMON.getValue());
+            InsuranceAccountDetailPO repairSiAcct = siAcctResultWithEmpAndPayStatus.get(item.getEmployeeId() + "_" + PaymentStatusEnum.REPAIR.getValue());
+            InsuranceAccountDetailPO balanceSiAcct = siAcctResultWithEmpAndPayStatus.get(item.getEmployeeId() + "_" + PaymentStatusEnum.BALANCE.getValue());
+            record.put("socialPerCommonSum", commonSiAcct != null ? commonSiAcct.getSocialPerSum() : new BigDecimal("0"));
+            record.put("socialComCommonSum", commonSiAcct != null ? commonSiAcct.getSocialComSum() : new BigDecimal("0"));
+            record.put("socialPerRepairSum", repairSiAcct != null ? repairSiAcct.getSocialPerSum() : new BigDecimal("0"));
+            record.put("socialComRepairSum", repairSiAcct != null ? repairSiAcct.getSocialComSum() : new BigDecimal("0"));
+            record.put("socialPerBalanceSum", balanceSiAcct != null ? balanceSiAcct.getSocialPerSum() : new BigDecimal("0"));
+            record.put("socialComBalanceSum", balanceSiAcct != null ? balanceSiAcct.getSocialComSum() : new BigDecimal("0"));
+
+            record.put("fundPerCommonSum", commonSiAcct != null ? commonSiAcct.getFundPerSum() : new BigDecimal("0"));
+            record.put("fundComCommonSum", commonSiAcct != null ? commonSiAcct.getFundComSum() : new BigDecimal("0"));
+            record.put("fundPerRepairSum", repairSiAcct != null ? repairSiAcct.getFundPerSum() : new BigDecimal("0"));
+            record.put("fundComRepairSum", repairSiAcct != null ? repairSiAcct.getFundComSum() : new BigDecimal("0"));
+            record.put("fundPerBalanceSum", balanceSiAcct != null ? balanceSiAcct.getFundPerSum() : new BigDecimal("0"));
+            record.put("fundComBalanceSum", balanceSiAcct != null ? balanceSiAcct.getFundComSum() : new BigDecimal("0"));
+
+            record.put("otherPerCommonSum", commonSiAcct != null ? commonSiAcct.getOtherPerSum() : new BigDecimal("0"));
+            record.put("otherComCommonSum", commonSiAcct != null ? commonSiAcct.getOtherComSum() : new BigDecimal("0"));
+            record.put("otherPerRepairSum", repairSiAcct != null ? repairSiAcct.getOtherPerSum() : new BigDecimal("0"));
+            record.put("otherComRepairSum", repairSiAcct != null ? repairSiAcct.getOtherComSum() : new BigDecimal("0"));
+            record.put("otherPerBalanceSum", balanceSiAcct != null ? balanceSiAcct.getOtherPerSum() : new BigDecimal("0"));
+            record.put("otherComBalanceSum", balanceSiAcct != null ? balanceSiAcct.getOtherComSum() : new BigDecimal("0"));
+
+            record.put("perCommonSum", commonSiAcct != null ? commonSiAcct.getPerSum() : new BigDecimal("0"));
+            record.put("comCommonSum", commonSiAcct != null ? commonSiAcct.getComSum() : new BigDecimal("0"));
+            record.put("perRepairSum", repairSiAcct != null ? repairSiAcct.getPerSum() : new BigDecimal("0"));
+            record.put("comRepairSum", repairSiAcct != null ? repairSiAcct.getComSum() : new BigDecimal("0"));
+            record.put("perBalanceSum", balanceSiAcct != null ? balanceSiAcct.getPerSum() : new BigDecimal("0"));
+            record.put("comBalanceSum", balanceSiAcct != null ? balanceSiAcct.getComSum() : new BigDecimal("0"));
+
             result.add(record);
         });
         return result;
@@ -939,6 +985,20 @@ public class SIAccountServiceImpl extends Service implements SIAccountService {
         result.put(SalaryI18nUtil.getI18nLabel(100388, "社保个人合计"), "socialPerSum");
         result.put(SalaryI18nUtil.getI18nLabel(100390, "公积金个人合计"), "fundPerSum");
         result.put(SalaryI18nUtil.getI18nLabel(100392, "其他福利个人合计"), "otherPerSum");
+
+        result.put(SalaryI18nUtil.getI18nLabel(0, "个人正常缴纳合计"), "perCommonSum");
+        result.put(SalaryI18nUtil.getI18nLabel(0, "社保个人正常缴纳合计"), "socialPerCommonSum");
+        result.put(SalaryI18nUtil.getI18nLabel(0, "公积金个人正常缴纳合计"), "fundPerCommonSum");
+        result.put(SalaryI18nUtil.getI18nLabel(0, "其他福利个人正常缴纳合计"), "otherPerCommonSum");
+        result.put(SalaryI18nUtil.getI18nLabel(0, "个人补缴合计"), "perRepairSum");
+        result.put(SalaryI18nUtil.getI18nLabel(0, "社保个人补缴合计"), "socialPerRepairSum");
+        result.put(SalaryI18nUtil.getI18nLabel(0, "公积金个人补缴合计"), "fundPerRepairSum");
+        result.put(SalaryI18nUtil.getI18nLabel(0, "其他福利个人补缴合计"), "otherPerRepairSum");
+        result.put(SalaryI18nUtil.getI18nLabel(0, "个人补差合计"), "perBalanceSum");
+        result.put(SalaryI18nUtil.getI18nLabel(0, "社保个人补差合计"), "socialPerBalanceSum");
+        result.put(SalaryI18nUtil.getI18nLabel(0, "公积金个人补差合计"), "fundPerBalanceSum");
+        result.put(SalaryI18nUtil.getI18nLabel(0, "其他福利个人补差合计"), "otherPerBalanceSum");
+
         Map<String, String> categoryIdNameMap = getSICategoryService(user).categoryIdNameMap();
         list.stream().forEach(item -> {
             if (Objects.equals(WelfareTypeEnum.SOCIAL_SECURITY.getValue(), item.getWelfareType())) {
@@ -955,6 +1015,20 @@ public class SIAccountServiceImpl extends Service implements SIAccountService {
         result.put(SalaryI18nUtil.getI18nLabel(100394, "社保单位合计"), "socialComSum");
         result.put(SalaryI18nUtil.getI18nLabel(100395, "公积金单位合计"), "fundComSum");
         result.put(SalaryI18nUtil.getI18nLabel(100396, "其他福利单位合计"), "otherComSum");
+
+        result.put(SalaryI18nUtil.getI18nLabel(0, "单位正常缴纳合计"), "comCommonSum");
+        result.put(SalaryI18nUtil.getI18nLabel(0, "社保单位正常缴纳合计"), "socialComCommonSum");
+        result.put(SalaryI18nUtil.getI18nLabel(0, "公积金单位正常缴纳合计"), "fundComCommonSum");
+        result.put(SalaryI18nUtil.getI18nLabel(0, "其他福利单位正常缴纳合计"), "otherComCommonSum");
+        result.put(SalaryI18nUtil.getI18nLabel(0, "单位补缴合计"), "comRepairSum");
+        result.put(SalaryI18nUtil.getI18nLabel(0, "社保单位补缴合计"), "socialComRepairSum");
+        result.put(SalaryI18nUtil.getI18nLabel(0, "公积金单位补缴合计"), "fundComRepairSum");
+        result.put(SalaryI18nUtil.getI18nLabel(0, "其他福利单位补缴合计"), "otherComRepairSum");
+        result.put(SalaryI18nUtil.getI18nLabel(0, "单位补差合计"), "comBalanceSum");
+        result.put(SalaryI18nUtil.getI18nLabel(0, "社保单位补差合计"), "socialComBalanceSum");
+        result.put(SalaryI18nUtil.getI18nLabel(0, "公积金单位补差合计"), "fundComBalanceSum");
+        result.put(SalaryI18nUtil.getI18nLabel(0, "其他福利单位补差合计"), "otherComBalanceSum");
+
         list.stream().forEach(item -> {
             if (Objects.equals(WelfareTypeEnum.SOCIAL_SECURITY.getValue(), item.getWelfareType())) {
                 result.put(categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(100289, "单位"), item.getId() + "socialCom");

From 47dc9e35bd8b1178eb90c5305af2b1173287585e Mon Sep 17 00:00:00 2001
From: sy <sy666666>
Date: Tue, 11 Jul 2023 17:56:45 +0800
Subject: [PATCH 02/11] =?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=E5=B7=B2=E5=BD=92?=
 =?UTF-8?q?=E6=A1=A3=E7=8A=B6=E6=80=81=E4=B8=8B=E9=87=8D=E6=96=B0=E6=A0=B8?=
 =?UTF-8?q?=E7=AE=97=E6=8C=89=E9=92=AE=E5=A2=9E=E5=8A=A0=E6=98=AF=E5=90=A6?=
 =?UTF-8?q?=E8=A2=AB=E8=96=AA=E8=B5=84=E6=A0=B8=E7=AE=97=E5=BC=95=E7=94=A8?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/com/engine/salary/biz/SIAccountBiz.java   | 23 ++++++++++++++++---
 .../siaccount/bo/InsuranceAccountBO.java      |  4 ++--
 .../siaccount/dto/SIAccountUtilDTO.java       | 10 ++++++++
 .../mapper/siaccount/SIAccountUtilMapper.xml  |  2 +-
 .../service/impl/SIAccountServiceImpl.java    | 10 ++++----
 5 files changed, 38 insertions(+), 11 deletions(-)

diff --git a/src/com/engine/salary/biz/SIAccountBiz.java b/src/com/engine/salary/biz/SIAccountBiz.java
index 96b6d0e0d..4d0bdbcd3 100644
--- a/src/com/engine/salary/biz/SIAccountBiz.java
+++ b/src/com/engine/salary/biz/SIAccountBiz.java
@@ -59,6 +59,7 @@ import org.springframework.beans.BeanUtils;
 import weaver.hrm.User;
 
 import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -1197,6 +1198,14 @@ public class SIAccountBiz extends Service {
         InsuranceAccountBatchPO insuranceAccountBatchPO = getInsuranceAccountBatchMapper().getByBillMonth(param.getBillMonth(), param.getPaymentOrganization());
         encryptUtil.decrypt(insuranceAccountBatchPO, InsuranceAccountBatchPO.class);
         SalaryAssert.notNull(insuranceAccountBatchPO, SalaryI18nUtil.getI18nLabel(84026, "参数错误"));
+//        if (insuranceAccountBatchPO.getBillStatus().equals(BillStatusEnum.ARCHIVED.getValue())) {
+//            int num = checkIfBusinessaccounting(insuranceAccountBatchPO);
+//            //表示已经被核算过不能重新核算
+//            if (num > 0) {
+//                throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0, "已被薪酬核算给核算过，无法删除！"));
+//            }
+//        }
+
 //        if(param.getPaymentOrganization()==null){
 //            throw new SalaryRunTimeException("个税扣缴义务人为空");
 //        }
@@ -2359,11 +2368,19 @@ public class SIAccountBiz extends Service {
      */
     public int checkIfBusinessaccounting(InsuranceAccountBatchPO param) {
         List<SIAccountUtilDTO> list = getSIAccountUtilMapper().checkIfBusinessaccounting(param.getId());
-        return (int) list.stream().filter(e -> e.getBillmonth().equals(e.getTaxcycle().substring(0, 7))).count();
-
-
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM");
+        return (int) list.stream().filter( f -> {
+            String billMonthBySob = sdf.format(convertSalaryMonthToBillMonth(f.getSalaryMonth(), f.getSocialSecurityCycleType()));
+            return f.getBillmonth().equals(billMonthBySob.substring(0, 7));
+        }).count();
     }
 
+    public Date convertSalaryMonthToBillMonth(Date salaryMonth, Integer socialSecurityCycleType) {
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(salaryMonth);
+        calendar.add(Calendar.MONTH, socialSecurityCycleType - 3);
+        return calendar.getTime();
+    }
     /**
      * 更新薪资台账
      *
diff --git a/src/com/engine/salary/entity/siaccount/bo/InsuranceAccountBO.java b/src/com/engine/salary/entity/siaccount/bo/InsuranceAccountBO.java
index cc31abebf..8aa28ab09 100644
--- a/src/com/engine/salary/entity/siaccount/bo/InsuranceAccountBO.java
+++ b/src/com/engine/salary/entity/siaccount/bo/InsuranceAccountBO.java
@@ -54,8 +54,8 @@ public class InsuranceAccountBO {
             .id(e.getId())
             .accountant(e.getAccountant())
             .billMonth(e.getBillMonth())
-            .billStatus(queryLabelId(e.getBillStatus()).getDefaultLabel())
-//            .billStatus(e.getBillStatus().toString())
+//            .billStatus(queryLabelId(e.getBillStatus()).getDefaultLabel())
+            .billStatus(e.getBillStatus().toString())
             .fundNum(e.getFundNum())
             .fundPay(SalaryEntityUtil.thousandthConvert(e.getFundPay()))
             .lastTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(e.getUpdateTime()))
diff --git a/src/com/engine/salary/entity/siaccount/dto/SIAccountUtilDTO.java b/src/com/engine/salary/entity/siaccount/dto/SIAccountUtilDTO.java
index 841753485..63921df3c 100644
--- a/src/com/engine/salary/entity/siaccount/dto/SIAccountUtilDTO.java
+++ b/src/com/engine/salary/entity/siaccount/dto/SIAccountUtilDTO.java
@@ -6,6 +6,8 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.util.Date;
+
 @Data
 @Builder
 @NoArgsConstructor
@@ -23,4 +25,12 @@ public class SIAccountUtilDTO {
      * 税款所属期
      */
     private String taxcycle;
+    /**
+     * 薪资所属月
+     */
+    private Date salaryMonth;
+    /**
+     * 社保福利所属期。1:上上月、2:上月、3:本月、4:下月
+     */
+    private Integer socialSecurityCycleType;
 }
diff --git a/src/com/engine/salary/mapper/siaccount/SIAccountUtilMapper.xml b/src/com/engine/salary/mapper/siaccount/SIAccountUtilMapper.xml
index 4b559aff3..6d02de0c6 100644
--- a/src/com/engine/salary/mapper/siaccount/SIAccountUtilMapper.xml
+++ b/src/com/engine/salary/mapper/siaccount/SIAccountUtilMapper.xml
@@ -10,7 +10,7 @@
 
     <select id="checkIfBusinessaccounting" resultMap="BaseResultMap">
         SELECT
-        a.bill_month billmonth,c.tax_cycle taxcycle
+        a.bill_month billmonth,c.tax_cycle taxcycle, c.salary_month salaryMonth, b.social_security_cycle_type socialSecurityCycleType
         FROM
         hrsa_bill_batch a,hrsa_salary_sob b,hrsa_salary_acct_record c
         WHERE
diff --git a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java
index 4db81131b..5181b615e 100644
--- a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java
@@ -1267,11 +1267,11 @@ public class SIAccountServiceImpl extends Service implements SIAccountService {
     @Override
     public void socialSecurityBenefitsRecalculate(InsuranceAccountBatchPO param) {
         //fixme 重新核算的校验逻辑  1、先取台账对应扣缴义务人下的所有账套 2、取账套下所有核算记录 3、判断核算记录有没有使用对应月份的福利台账
-//        int num = getSiAccountBiz(user).checkIfBusinessaccounting(param);
-//        //表示已经被核算过不能重新核算
-//        if (num > 0) {
-//            throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(98831, "已被薪酬核算给核算过，无法重新核算！"));
-//        }
+        int num = getSiAccountBiz(user).checkIfBusinessaccounting(param);
+        //表示已经被核算过不能重新核算
+        if (num > 0) {
+            throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0, "已被薪酬核算给核算过，无法重新核算！"));
+        }
         param.setBillStatus(0);
         getSiAccountBiz(user).updateById(param);
     }

From c78c8375f0ee553ee7fa94bd5ae1d5e9d14e15a1 Mon Sep 17 00:00:00 2001
From: sy <sy666666>
Date: Wed, 12 Jul 2023 15:20:02 +0800
Subject: [PATCH 03/11] =?UTF-8?q?=E8=96=AA=E9=85=AC=E7=B3=BB=E7=BB=9F-?=
 =?UTF-8?q?=E8=96=AA=E8=B5=84=E6=A0=B8=E7=AE=97=EF=BC=8C=E8=87=AA=E5=AE=9A?=
 =?UTF-8?q?=E4=B9=89=E5=AF=BC=E5=87=BA=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../salary/constant/SalaryItemConstant.java   |   5 +
 .../param/SalaryAcctResultQueryParam.java     |   3 +
 .../service/SalaryAcctExcelService.java       |  10 ++
 .../impl/SalaryAcctExcelServiceImpl.java      | 106 +++++++++++++++++-
 .../salary/web/SalaryAcctController.java      |  50 +++++++++
 5 files changed, 169 insertions(+), 5 deletions(-)

diff --git a/src/com/engine/salary/constant/SalaryItemConstant.java b/src/com/engine/salary/constant/SalaryItemConstant.java
index 790a288cb..26bac736b 100644
--- a/src/com/engine/salary/constant/SalaryItemConstant.java
+++ b/src/com/engine/salary/constant/SalaryItemConstant.java
@@ -20,5 +20,10 @@ public class SalaryItemConstant {
      */
     public static final String RESULT_IMPORT_FIELD_SIGN="_salaryAcctResultImportFieldSign";
 
+    /**
+     * 薪资核算导出缓存表头字段key
+     */
+    public static final String RESULT_EXPORT_FIELD_SIGN="_salaryAcctResultExportFieldSign";
+
 
 }
diff --git a/src/com/engine/salary/entity/salaryacct/param/SalaryAcctResultQueryParam.java b/src/com/engine/salary/entity/salaryacct/param/SalaryAcctResultQueryParam.java
index 21221a4b3..939163a9d 100644
--- a/src/com/engine/salary/entity/salaryacct/param/SalaryAcctResultQueryParam.java
+++ b/src/com/engine/salary/entity/salaryacct/param/SalaryAcctResultQueryParam.java
@@ -57,4 +57,7 @@ public class SalaryAcctResultQueryParam extends BaseQueryParam {
     private Collection<Long> ids;
 
     private String workcode;
+
+    //薪资项目id
+    private Collection<Long> salaryItemIds;
 }
diff --git a/src/com/engine/salary/service/SalaryAcctExcelService.java b/src/com/engine/salary/service/SalaryAcctExcelService.java
index 147c38eea..25dbc0d18 100644
--- a/src/com/engine/salary/service/SalaryAcctExcelService.java
+++ b/src/com/engine/salary/service/SalaryAcctExcelService.java
@@ -73,6 +73,14 @@ public interface SalaryAcctExcelService {
      */
     SalaryAcctImportFieldDTO getImportField(Long salaryAcctId);
 
+    /**
+     * 薪资核算导出时候薪资项目按取值方式分组
+     *
+     * @param salaryAcctId
+     * @return
+     */
+    SalaryAcctImportFieldDTO getExportField(Long salaryAcctId);
+
     /**
      * 下载薪资核算导入模板
      *
@@ -110,6 +118,8 @@ public interface SalaryAcctExcelService {
 
     void cacheImportField(List<Long> salaryItems);
 
+    void cacheExportField(List<Long> salaryItems);
+
 //
 //    /**
 //     * 薪资核算结果校验异常导出
diff --git a/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java
index 6cba27124..486073fbf 100644
--- a/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java
@@ -287,12 +287,38 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc
         List<WeaTableColumnGroup> headerColumnGroup = Lists.newArrayList();
         // 查询列表的表头
         List<WeaTableColumnGroup> weaTableColumns = listWeaTableColumn(salaryAcctRecordPO);
-        parseHeader(headerColumnGroup, weaTableColumns);
+
+        //判断是否按照自定义字段导出表头
+        List<WeaTableColumnGroup> finalWeaTableColumns = new ArrayList<>();
+        if (queryParam.getSalaryItemIds() != null ) {
+            // 必须选择导出所需的薪资项目
+            if (CollectionUtils.isEmpty(queryParam.getSalaryItemIds())) {
+                throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(99019, "参数错误，请选择导入模板所需的薪资项目"));
+            }
+            List<Object> headerRangeList = new ArrayList<>();
+            List<SalaryItemPO> salaryItemPOS = getSalaryItemService(user).listByIds(queryParam.getSalaryItemIds());
+            for (SalaryItemPO salaryItemPO : salaryItemPOS) {
+                headerRangeList.add(salaryItemPO.getId().toString());
+            }
+            for (WeaTableColumnGroup tableColumn : weaTableColumns) {
+                WeaTableColumnGroup columnGroupItem = (WeaTableColumnGroup) tableColumn;
+                if (columnGroupItem.getChildren() != null) {
+                    List<WeaTableColumnGroup> childrenColumns = columnGroupItem.getChildren().stream().filter(f -> headerRangeList.contains(f.getColumn())).collect(Collectors.toList());
+                    if (childrenColumns.size() > 0) {
+                        columnGroupItem.setChildren(childrenColumns);
+                        finalWeaTableColumns.add(columnGroupItem);
+                    }
+                } else if (headerRangeList.contains(columnGroupItem.getColumn())) {
+                    finalWeaTableColumns.add(columnGroupItem);
+                }
+
+            }
+        } else {
+            finalWeaTableColumns = weaTableColumns;
+        }
+//        parseHeader(headerColumnGroup, weaTableColumns);
+        parseHeader(headerColumnGroup, finalWeaTableColumns);
 //        // excel导出的表头
-//        String[] headers = headerColumnGroup.stream()
-//                .map(WeaTableColumn::getText)
-//                .toArray(String[]::new);
-//        List<Object> headerList = new ArrayList<>(Arrays.asList(headers));
         List<Object> headerList = new ArrayList<>(weaTableColumns);
         // 查询薪资核算结果
         List<Map<String, Object>> resultMapList = getSalaryAcctResultService(user).listByParam(queryParam);
@@ -461,6 +487,70 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc
         return SalaryAcctImportFieldDTO.builder().itemsByGroup(itemsByGroup).checkItems(checkItems).build();
     }
 
+    @Override
+    public SalaryAcctImportFieldDTO getExportField(Long salaryAcctRecordId) {
+        // 查询薪资核算记录
+        SalaryAcctRecordPO salaryAcctRecordPO = getSalaryAcctRecordService(user).getById(salaryAcctRecordId);
+        if (Objects.isNull(salaryAcctRecordPO)) {
+            throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(98747, "薪资核算记录不存在或已被删除"));
+        }
+        // 查询薪资核算记录所用的薪资账套的薪资项目副本
+        List<SalarySobItemPO> salarySobItems = getSalarySobItemService(user).listBySalarySobId(salaryAcctRecordPO.getSalarySobId());
+        Set<Long> salaryItemIds = SalaryEntityUtil.properties(salarySobItems, SalarySobItemPO::getSalaryItemId);
+        // 查询薪资项目
+        List<SalaryItemPO> salaryItems = getSalaryItemService(user).listByIds(salaryItemIds);
+        Map<Long, SalaryItemPO> salaryItemMap = SalaryEntityUtil.convert2Map(salaryItems, SalaryItemPO::getId);
+
+        Map<Long, List<SalarySobItemPO>> salarySobItemPOMap = SalaryEntityUtil.group2Map(salarySobItems, SalarySobItemPO::getSalarySobItemGroupId);
+
+        // 查询薪资账套的薪资项目分类
+        List<SalarySobItemGroupPO> salarySobItemGroupPOS = getSalarySobItemGroupService(user).listBySalarySobId(salaryAcctRecordPO.getSalarySobId());
+        // 对分组进行排序
+        salarySobItemGroupPOS = SalaryAcctResultBO.sortGroup(salarySobItemGroupPOS);
+        // 对分组内薪资项目排序
+        SalaryAcctResultBO.sortItem(salarySobItemPOMap);
+        // 根据账套分组封装薪资项目的值
+        List<SalaryAcctImportFieldDTO.ImportFieldByGroupDTO> itemsByGroup = new ArrayList<>();
+        for(SalarySobItemGroupPO groupPO : salarySobItemGroupPOS){
+            List<SalarySobItemPO> groupItems = salarySobItemPOMap.getOrDefault(groupPO.getId(),Collections.emptyList());
+            List<SalaryAcctImportFieldDTO.ImportFieldDTO> items = groupItems.stream()
+                    .map(salarySobItemPO -> SalaryAcctImportFieldDTO.ImportFieldDTO.builder()
+                            .salaryItemId(salarySobItemPO.getSalaryItemId())
+                            .salaryItemName(Optional.ofNullable(salaryItemMap.get(salarySobItemPO.getSalaryItemId())).map(SalaryItemPO::getName).orElse(StringUtils.EMPTY))
+                            .build())
+                    .collect(Collectors.toList());
+
+            itemsByGroup.add(SalaryAcctImportFieldDTO.ImportFieldByGroupDTO.builder()
+                    .salarySobItemGroupId(groupPO.getId())
+                    .salarySobItemGroupName(groupPO.getName())
+                    .salaryItems(items)
+                    .sortedIndex(groupPO.getSortedIndex()).build() );
+        }
+        // 未分类
+        List<SalarySobItemPO> noGroupItems = salarySobItemPOMap.getOrDefault(0L, Collections.emptyList());
+        if(CollectionUtils.isNotEmpty(noGroupItems)){
+            List<SalaryAcctImportFieldDTO.ImportFieldDTO> items = noGroupItems.stream()
+                    .map(salarySobItemPO ->SalaryAcctImportFieldDTO.ImportFieldDTO.builder()
+                            .salaryItemId(salarySobItemPO.getSalaryItemId())
+                            .salaryItemName(Optional.ofNullable(salaryItemMap.get(salarySobItemPO.getSalaryItemId())).map(SalaryItemPO::getName).orElse(StringUtils.EMPTY))
+                            .build())
+                    .collect(Collectors.toList());
+
+            itemsByGroup.add(SalaryAcctImportFieldDTO.ImportFieldByGroupDTO.builder()
+                    .salarySobItemGroupId(0L)
+                    .salarySobItemGroupName("未分类")
+                    .salaryItems(items)
+                    .sortedIndex(itemsByGroup.size()).build());
+        }
+        // 缓存勾选
+        String cacheKey = user.getUID() + SalaryItemConstant.RESULT_EXPORT_FIELD_SIGN;
+        String cacheValue = (String)Util_DataCache.getObjVal(cacheKey);
+        List<Long> checkItems = JsonUtil.parseList(cacheValue, Long.class) == null ? new ArrayList<>() : JsonUtil.parseList(cacheValue, Long.class);
+        // 转换成dto
+//        return SalaryAcctImportFieldDTO.builder().formulaItems(formulaItems).sqlItems(sqlItems).inputItems(inputItems).checkItems(checkItems).build();
+        return SalaryAcctImportFieldDTO.builder().itemsByGroup(itemsByGroup).checkItems(checkItems).build();
+    }
+
     @Override
     public XSSFWorkbook exportImportTemplate(SalaryAcctImportTemplateParam param) {
         ValidUtil.doValidator(param);
@@ -697,6 +787,12 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc
         Util_DataCache.setObjVal(cacheKey, JsonUtil.toJsonString(salaryItems));
     }
 
+    @Override
+    public void cacheExportField(List<Long> salaryItems) {
+        String cacheKey = user.getUID() + SalaryItemConstant.RESULT_EXPORT_FIELD_SIGN;
+        Util_DataCache.setObjVal(cacheKey, JsonUtil.toJsonString(salaryItems));
+    }
+
     @Override
     public Map<String, Object> previewImportSalaryAcctResult(SalaryAcctImportParam param) {
 
diff --git a/src/com/engine/salary/web/SalaryAcctController.java b/src/com/engine/salary/web/SalaryAcctController.java
index 8df680db0..3167e4e1c 100644
--- a/src/com/engine/salary/web/SalaryAcctController.java
+++ b/src/com/engine/salary/web/SalaryAcctController.java
@@ -481,6 +481,38 @@ public class SalaryAcctController {
         }
     }
 
+    //导出核算结果(自定义导出字段)
+    @GET
+    @Path("/acctresult/exportWithCustomFields")
+    @Produces(MediaType.APPLICATION_OCTET_STREAM)
+    public Response exportSalaryAcctResultWithCustomFields(@Context HttpServletRequest request, @Context HttpServletResponse response) {
+        try {
+            SalaryAcctResultQueryParam param = new SalaryAcctResultQueryParam();
+            setSalaryAcctResultQueryParam(request, param);
+            String salaryItemIds = request.getParameter("salaryItemIds");
+            if (StringUtils.isNotBlank(salaryItemIds)) {
+                param.setSalaryItemIds(Arrays.stream(salaryItemIds.split(",")).map(Long::valueOf).collect(Collectors.toList()));
+            }
+            User user = HrmUserVarify.getUser(request, response);
+            XSSFWorkbook workbook = getSalaryAcctExcelWrapper(user).exportSalaryAcctResult(param);
+            String fileName = "薪资核算结果" + LocalDate.now();
+            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;
+        }
+    }
+
 
     //导入核算结果前生成导入模板时可选的薪资项目
     @GET
@@ -491,6 +523,15 @@ public class SalaryAcctController {
         return new ResponseResult<Long, SalaryAcctImportFieldDTO>(user).run(getSalaryAcctExcelService(user)::getImportField, salaryAcctRecordId);
     }
 
+    //导出核算结果前生成可选的薪资项目
+    @GET
+    @Path("/acctresult/exportField")
+    @Produces(MediaType.APPLICATION_JSON)
+    public String exportField(@Context HttpServletRequest request, @Context HttpServletResponse response, @QueryParam(value = "salaryAcctRecordId") Long salaryAcctRecordId) {
+        User user = HrmUserVarify.getUser(request, response);
+        return new ResponseResult<Long, SalaryAcctImportFieldDTO>(user).run(getSalaryAcctExcelService(user)::getExportField, salaryAcctRecordId);
+    }
+
     // 薪资核算导入字段缓存
     @POST
     @Path("/acctresult/cacheImportField")
@@ -500,6 +541,15 @@ public class SalaryAcctController {
         return new ResponseResult<List<Long>, String>(user).run(getSalaryAcctExcelService(user)::cacheImportField, param.getSalaryItems());
     }
 
+    // 薪资核算导出字段缓存
+    @POST
+    @Path("/acctresult/cacheExportField")
+    @Produces(MediaType.APPLICATION_JSON)
+    public String cacheExportField(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody SalaryAcctImportParam param) {
+        User user = HrmUserVarify.getUser(request, response);
+        return new ResponseResult<List<Long>, String>(user).run(getSalaryAcctExcelService(user)::cacheExportField, param.getSalaryItems());
+    }
+
     //导出导入模板
     @GET
     @Path("/acctresult/importtemplate/export")

From b007b1b351e31928853eb32bb59fa7a8bc88ae0e Mon Sep 17 00:00:00 2001
From: sy <sy666666>
Date: Thu, 13 Jul 2023 14:43:54 +0800
Subject: [PATCH 04/11] =?UTF-8?q?=E8=96=AA=E9=85=AC=E7=B3=BB=E7=BB=9F-?=
 =?UTF-8?q?=E8=96=AA=E8=B5=84=E6=A0=B8=E7=AE=97=EF=BC=8C=E8=87=AA=E5=AE=9A?=
 =?UTF-8?q?=E4=B9=89=E5=AF=BC=E5=87=BA=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/com/engine/salary/web/SalaryAcctController.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/com/engine/salary/web/SalaryAcctController.java b/src/com/engine/salary/web/SalaryAcctController.java
index 3167e4e1c..b6b0d7e38 100644
--- a/src/com/engine/salary/web/SalaryAcctController.java
+++ b/src/com/engine/salary/web/SalaryAcctController.java
@@ -489,6 +489,7 @@ public class SalaryAcctController {
         try {
             SalaryAcctResultQueryParam param = new SalaryAcctResultQueryParam();
             setSalaryAcctResultQueryParam(request, param);
+            //设置自定义导出字段
             String salaryItemIds = request.getParameter("salaryItemIds");
             if (StringUtils.isNotBlank(salaryItemIds)) {
                 param.setSalaryItemIds(Arrays.stream(salaryItemIds.split(",")).map(Long::valueOf).collect(Collectors.toList()));

From 3571797e122a82ed2a259254f03b6548c485573a Mon Sep 17 00:00:00 2001
From: sy <sy666666>
Date: Fri, 14 Jul 2023 09:13:19 +0800
Subject: [PATCH 05/11] =?UTF-8?q?=E8=96=AA=E9=85=AC=E7=B3=BB=E7=BB=9F-?=
 =?UTF-8?q?=E8=96=AA=E8=B5=84=E6=A0=B8=E7=AE=97=EF=BC=8C=E8=96=AA=E8=B5=84?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=87=BD=E6=95=B0=E4=B8=AD=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E7=A6=8F=E5=88=A9=E6=A0=B8=E7=AE=97=E6=98=8E=E7=BB=86=E9=A1=B9?=
 =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E7=BC=B4=E7=BA=B3=E7=8A=B6=E6=80=81=E7=9A=84?=
 =?UTF-8?q?=E7=BB=86=E5=88=86=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/SIAccountServiceImpl.java    | 194 +++++++++++++++---
 1 file changed, 169 insertions(+), 25 deletions(-)

diff --git a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java
index 5181b615e..aef9ef3c2 100644
--- a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java
@@ -935,28 +935,145 @@ public class SIAccountServiceImpl extends Service implements SIAccountService {
             record.put("perSum", item.getPerSum());
             record.put("comSum", item.getComSum());
 
-            //20230707增加福利核算明细中的缴纳状态+合计的数据项
+            //20230707增加福利核算明细中的缴纳状态+合计的数据项、缴纳状态+福利项的数据项
             InsuranceAccountDetailPO commonSiAcct = siAcctResultWithEmpAndPayStatus.get(item.getEmployeeId() + "_" + PaymentStatusEnum.COMMON.getValue());
             InsuranceAccountDetailPO repairSiAcct = siAcctResultWithEmpAndPayStatus.get(item.getEmployeeId() + "_" + PaymentStatusEnum.REPAIR.getValue());
             InsuranceAccountDetailPO balanceSiAcct = siAcctResultWithEmpAndPayStatus.get(item.getEmployeeId() + "_" + PaymentStatusEnum.BALANCE.getValue());
+            //社保-正常缴纳
+            if (StringUtils.isNotEmpty(commonSiAcct.getSocialPerJson())) {
+                Map<String, Object> socialJson = JSON.parseObject(commonSiAcct.getSocialPerJson(), new HashMap<String, Object>().getClass());
+                socialJson.forEach((k, v) -> {
+                    record.put(k + "socialCommonPer", v);
+                });
+            }
+            if (StringUtils.isNotEmpty(commonSiAcct.getSocialComJson())) {
+                Map<String, Object> socialJson = JSON.parseObject(commonSiAcct.getSocialComJson(), new HashMap<String, Object>().getClass());
+                socialJson.forEach((k, v) -> {
+                    record.put(k + "socialCommonCom", v);
+                });
+            }
             record.put("socialPerCommonSum", commonSiAcct != null ? commonSiAcct.getSocialPerSum() : new BigDecimal("0"));
             record.put("socialComCommonSum", commonSiAcct != null ? commonSiAcct.getSocialComSum() : new BigDecimal("0"));
+            //社保-补缴
+            if (StringUtils.isNotEmpty(repairSiAcct.getSocialPerJson())) {
+                Map<String, Object> socialJson = JSON.parseObject(repairSiAcct.getSocialPerJson(), new HashMap<String, Object>().getClass());
+                socialJson.forEach((k, v) -> {
+                    record.put(k + "socialRepairPer", v);
+                });
+            }
+            if (StringUtils.isNotEmpty(repairSiAcct.getSocialComJson())) {
+                Map<String, Object> socialJson = JSON.parseObject(repairSiAcct.getSocialComJson(), new HashMap<String, Object>().getClass());
+                socialJson.forEach((k, v) -> {
+                    record.put(k + "socialRepairCom", v);
+                });
+            }
             record.put("socialPerRepairSum", repairSiAcct != null ? repairSiAcct.getSocialPerSum() : new BigDecimal("0"));
             record.put("socialComRepairSum", repairSiAcct != null ? repairSiAcct.getSocialComSum() : new BigDecimal("0"));
+            //社保-补差
+            if (StringUtils.isNotEmpty(balanceSiAcct.getSocialPerJson())) {
+                Map<String, Object> socialJson = JSON.parseObject(balanceSiAcct.getSocialPerJson(), new HashMap<String, Object>().getClass());
+                socialJson.forEach((k, v) -> {
+                    record.put(k + "socialBalancePer", v);
+                });
+            }
+            if (StringUtils.isNotEmpty(balanceSiAcct.getSocialComJson())) {
+                Map<String, Object> socialJson = JSON.parseObject(balanceSiAcct.getSocialComJson(), new HashMap<String, Object>().getClass());
+                socialJson.forEach((k, v) -> {
+                    record.put(k + "socialBalanceCom", v);
+                });
+            }
             record.put("socialPerBalanceSum", balanceSiAcct != null ? balanceSiAcct.getSocialPerSum() : new BigDecimal("0"));
             record.put("socialComBalanceSum", balanceSiAcct != null ? balanceSiAcct.getSocialComSum() : new BigDecimal("0"));
 
+            //公积金-正常缴纳
+            if (StringUtils.isNotEmpty(commonSiAcct.getFundPerJson())) {
+                Map<String, Object> socialJson = JSON.parseObject(commonSiAcct.getFundPerJson(), new HashMap<String, Object>().getClass());
+                socialJson.forEach((k, v) -> {
+                    record.put(k + "fundCommonPer", v);
+                });
+            }
+            if (StringUtils.isNotEmpty(commonSiAcct.getFundComJson())) {
+                Map<String, Object> socialJson = JSON.parseObject(commonSiAcct.getFundComJson(), new HashMap<String, Object>().getClass());
+                socialJson.forEach((k, v) -> {
+                    record.put(k + "fundCommonCom", v);
+                });
+            }
             record.put("fundPerCommonSum", commonSiAcct != null ? commonSiAcct.getFundPerSum() : new BigDecimal("0"));
             record.put("fundComCommonSum", commonSiAcct != null ? commonSiAcct.getFundComSum() : new BigDecimal("0"));
+            //公积金-补缴
+            if (StringUtils.isNotEmpty(repairSiAcct.getFundPerJson())) {
+                Map<String, Object> fundJson = JSON.parseObject(repairSiAcct.getFundPerJson(), new HashMap<String, Object>().getClass());
+                fundJson.forEach((k, v) -> {
+                    record.put(k + "fundRepairPer", v);
+                });
+            }
+            if (StringUtils.isNotEmpty(repairSiAcct.getFundComJson())) {
+                Map<String, Object> fundJson = JSON.parseObject(repairSiAcct.getFundComJson(), new HashMap<String, Object>().getClass());
+                fundJson.forEach((k, v) -> {
+                    record.put(k + "fundRepairCom", v);
+                });
+            }
             record.put("fundPerRepairSum", repairSiAcct != null ? repairSiAcct.getFundPerSum() : new BigDecimal("0"));
             record.put("fundComRepairSum", repairSiAcct != null ? repairSiAcct.getFundComSum() : new BigDecimal("0"));
+            //公积金-补差
+            if (StringUtils.isNotEmpty(balanceSiAcct.getFundPerJson())) {
+                Map<String, Object> fundJson = JSON.parseObject(balanceSiAcct.getFundPerJson(), new HashMap<String, Object>().getClass());
+                fundJson.forEach((k, v) -> {
+                    record.put(k + "fundBalancePer", v);
+                });
+            }
+            if (StringUtils.isNotEmpty(balanceSiAcct.getFundComJson())) {
+                Map<String, Object> fundJson = JSON.parseObject(balanceSiAcct.getFundComJson(), new HashMap<String, Object>().getClass());
+                fundJson.forEach((k, v) -> {
+                    record.put(k + "fundBalanceCom", v);
+                });
+            }
             record.put("fundPerBalanceSum", balanceSiAcct != null ? balanceSiAcct.getFundPerSum() : new BigDecimal("0"));
             record.put("fundComBalanceSum", balanceSiAcct != null ? balanceSiAcct.getFundComSum() : new BigDecimal("0"));
 
+            //其他福利-正常缴纳
+            if (StringUtils.isNotEmpty(commonSiAcct.getOtherPerJson())) {
+                Map<String, Object> otherJson = JSON.parseObject(commonSiAcct.getOtherPerJson(), new HashMap<String, Object>().getClass());
+                otherJson.forEach((k, v) -> {
+                    record.put(k + "otherCommonPer", v);
+                });
+            }
+            if (StringUtils.isNotEmpty(commonSiAcct.getOtherComJson())) {
+                Map<String, Object> otherJson = JSON.parseObject(commonSiAcct.getOtherComJson(), new HashMap<String, Object>().getClass());
+                otherJson.forEach((k, v) -> {
+                    record.put(k + "otherCommonCom", v);
+                });
+            }
             record.put("otherPerCommonSum", commonSiAcct != null ? commonSiAcct.getOtherPerSum() : new BigDecimal("0"));
             record.put("otherComCommonSum", commonSiAcct != null ? commonSiAcct.getOtherComSum() : new BigDecimal("0"));
+            //其他福利-补缴
+            if (StringUtils.isNotEmpty(repairSiAcct.getOtherPerJson())) {
+                Map<String, Object> otherJson = JSON.parseObject(repairSiAcct.getOtherPerJson(), new HashMap<String, Object>().getClass());
+                otherJson.forEach((k, v) -> {
+                    record.put(k + "otherRepairPer", v);
+                });
+            }
+            if (StringUtils.isNotEmpty(repairSiAcct.getOtherComJson())) {
+                Map<String, Object> otherJson = JSON.parseObject(repairSiAcct.getOtherComJson(), new HashMap<String, Object>().getClass());
+                otherJson.forEach((k, v) -> {
+                    record.put(k + "otherRepairCom", v);
+                });
+            }
             record.put("otherPerRepairSum", repairSiAcct != null ? repairSiAcct.getOtherPerSum() : new BigDecimal("0"));
             record.put("otherComRepairSum", repairSiAcct != null ? repairSiAcct.getOtherComSum() : new BigDecimal("0"));
+            //其他福利-补差
+            if (StringUtils.isNotEmpty(balanceSiAcct.getOtherPerJson())) {
+                Map<String, Object> otherJson = JSON.parseObject(balanceSiAcct.getOtherPerJson(), new HashMap<String, Object>().getClass());
+                otherJson.forEach((k, v) -> {
+                    record.put(k + "otherBalancePer", v);
+                });
+            }
+            if (StringUtils.isNotEmpty(balanceSiAcct.getOtherComJson())) {
+                Map<String, Object> otherJson = JSON.parseObject(balanceSiAcct.getOtherComJson(), new HashMap<String, Object>().getClass());
+                otherJson.forEach((k, v) -> {
+                    record.put(k + "otherBalanceCom", v);
+                });
+            }
             record.put("otherPerBalanceSum", balanceSiAcct != null ? balanceSiAcct.getOtherPerSum() : new BigDecimal("0"));
             record.put("otherComBalanceSum", balanceSiAcct != null ? balanceSiAcct.getOtherComSum() : new BigDecimal("0"));
 
@@ -981,34 +1098,48 @@ public class SIAccountServiceImpl extends Service implements SIAccountService {
         }
 
         Map<String, String> result = new LinkedHashMap<>();
+
+        Map<String, String> commonResult = new LinkedHashMap<>();
+        Map<String, String> repairResult = new LinkedHashMap<>();
+        Map<String, String> balanceResult = new LinkedHashMap<>();
+
         result.put(SalaryI18nUtil.getI18nLabel(100393, "个人合计"), "perSum");
         result.put(SalaryI18nUtil.getI18nLabel(100388, "社保个人合计"), "socialPerSum");
         result.put(SalaryI18nUtil.getI18nLabel(100390, "公积金个人合计"), "fundPerSum");
         result.put(SalaryI18nUtil.getI18nLabel(100392, "其他福利个人合计"), "otherPerSum");
 
-        result.put(SalaryI18nUtil.getI18nLabel(0, "个人正常缴纳合计"), "perCommonSum");
-        result.put(SalaryI18nUtil.getI18nLabel(0, "社保个人正常缴纳合计"), "socialPerCommonSum");
-        result.put(SalaryI18nUtil.getI18nLabel(0, "公积金个人正常缴纳合计"), "fundPerCommonSum");
-        result.put(SalaryI18nUtil.getI18nLabel(0, "其他福利个人正常缴纳合计"), "otherPerCommonSum");
-        result.put(SalaryI18nUtil.getI18nLabel(0, "个人补缴合计"), "perRepairSum");
-        result.put(SalaryI18nUtil.getI18nLabel(0, "社保个人补缴合计"), "socialPerRepairSum");
-        result.put(SalaryI18nUtil.getI18nLabel(0, "公积金个人补缴合计"), "fundPerRepairSum");
-        result.put(SalaryI18nUtil.getI18nLabel(0, "其他福利个人补缴合计"), "otherPerRepairSum");
-        result.put(SalaryI18nUtil.getI18nLabel(0, "个人补差合计"), "perBalanceSum");
-        result.put(SalaryI18nUtil.getI18nLabel(0, "社保个人补差合计"), "socialPerBalanceSum");
-        result.put(SalaryI18nUtil.getI18nLabel(0, "公积金个人补差合计"), "fundPerBalanceSum");
-        result.put(SalaryI18nUtil.getI18nLabel(0, "其他福利个人补差合计"), "otherPerBalanceSum");
+        commonResult.put(SalaryI18nUtil.getI18nLabel(0, "个人正常缴纳合计"), "perCommonSum");
+        commonResult.put(SalaryI18nUtil.getI18nLabel(0, "社保个人正常缴纳合计"), "socialPerCommonSum");
+        commonResult.put(SalaryI18nUtil.getI18nLabel(0, "公积金个人正常缴纳合计"), "fundPerCommonSum");
+        commonResult.put(SalaryI18nUtil.getI18nLabel(0, "其他福利个人正常缴纳合计"), "otherPerCommonSum");
+        repairResult.put(SalaryI18nUtil.getI18nLabel(0, "个人补缴合计"), "perRepairSum");
+        repairResult.put(SalaryI18nUtil.getI18nLabel(0, "社保个人补缴合计"), "socialPerRepairSum");
+        repairResult.put(SalaryI18nUtil.getI18nLabel(0, "公积金个人补缴合计"), "fundPerRepairSum");
+        repairResult.put(SalaryI18nUtil.getI18nLabel(0, "其他福利个人补缴合计"), "otherPerRepairSum");
+        balanceResult.put(SalaryI18nUtil.getI18nLabel(0, "个人补差合计"), "perBalanceSum");
+        balanceResult.put(SalaryI18nUtil.getI18nLabel(0, "社保个人补差合计"), "socialPerBalanceSum");
+        balanceResult.put(SalaryI18nUtil.getI18nLabel(0, "公积金个人补差合计"), "fundPerBalanceSum");
+        balanceResult.put(SalaryI18nUtil.getI18nLabel(0, "其他福利个人补差合计"), "otherPerBalanceSum");
 
         Map<String, String> categoryIdNameMap = getSICategoryService(user).categoryIdNameMap();
         list.stream().forEach(item -> {
             if (Objects.equals(WelfareTypeEnum.SOCIAL_SECURITY.getValue(), item.getWelfareType())) {
                 result.put(categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(87159, "个人"), item.getId() + "socialPer");
+                commonResult.put(categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(0, "正常缴纳个人"), item.getId() + "socialCommonPer");
+                repairResult.put(categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(0, "补缴个人"), item.getId() + "socialRepairPer");
+                balanceResult.put(categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(0, "补差个人"), item.getId() + "socialBalancePer");
             }
             if (Objects.equals(WelfareTypeEnum.ACCUMULATION_FUND.getValue(), item.getWelfareType())) {
                 result.put(categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(87159, "个人"), item.getId() + "fundPer");
+                commonResult.put(categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(0, "正常缴纳个人"), item.getId() + "fundCommonPer");
+                repairResult.put(categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(0, "补缴个人"), item.getId() + "fundRepairPer");
+                balanceResult.put(categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(0, "补差个人"), item.getId() + "fundBalancePer");
             }
             if (Objects.equals(WelfareTypeEnum.OTHER.getValue(), item.getWelfareType())) {
                 result.put(categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(87159, "个人"), item.getId() + "otherPer");
+                commonResult.put(categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(0, "正常缴纳个人"), item.getId() + "otherCommonPer");
+                repairResult.put(categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(0, "补缴个人"), item.getId() + "otherRepairPer");
+                balanceResult.put(categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(0, "补差个人"), item.getId() + "otherBalancePer");
             }
         });
         result.put(SalaryI18nUtil.getI18nLabel(100397, "单位合计"), "comSum");
@@ -1016,30 +1147,43 @@ public class SIAccountServiceImpl extends Service implements SIAccountService {
         result.put(SalaryI18nUtil.getI18nLabel(100395, "公积金单位合计"), "fundComSum");
         result.put(SalaryI18nUtil.getI18nLabel(100396, "其他福利单位合计"), "otherComSum");
 
-        result.put(SalaryI18nUtil.getI18nLabel(0, "单位正常缴纳合计"), "comCommonSum");
-        result.put(SalaryI18nUtil.getI18nLabel(0, "社保单位正常缴纳合计"), "socialComCommonSum");
-        result.put(SalaryI18nUtil.getI18nLabel(0, "公积金单位正常缴纳合计"), "fundComCommonSum");
-        result.put(SalaryI18nUtil.getI18nLabel(0, "其他福利单位正常缴纳合计"), "otherComCommonSum");
-        result.put(SalaryI18nUtil.getI18nLabel(0, "单位补缴合计"), "comRepairSum");
-        result.put(SalaryI18nUtil.getI18nLabel(0, "社保单位补缴合计"), "socialComRepairSum");
-        result.put(SalaryI18nUtil.getI18nLabel(0, "公积金单位补缴合计"), "fundComRepairSum");
-        result.put(SalaryI18nUtil.getI18nLabel(0, "其他福利单位补缴合计"), "otherComRepairSum");
-        result.put(SalaryI18nUtil.getI18nLabel(0, "单位补差合计"), "comBalanceSum");
-        result.put(SalaryI18nUtil.getI18nLabel(0, "社保单位补差合计"), "socialComBalanceSum");
-        result.put(SalaryI18nUtil.getI18nLabel(0, "公积金单位补差合计"), "fundComBalanceSum");
-        result.put(SalaryI18nUtil.getI18nLabel(0, "其他福利单位补差合计"), "otherComBalanceSum");
+        commonResult.put(SalaryI18nUtil.getI18nLabel(0, "单位正常缴纳合计"), "comCommonSum");
+        commonResult.put(SalaryI18nUtil.getI18nLabel(0, "社保单位正常缴纳合计"), "socialComCommonSum");
+        commonResult.put(SalaryI18nUtil.getI18nLabel(0, "公积金单位正常缴纳合计"), "fundComCommonSum");
+        commonResult.put(SalaryI18nUtil.getI18nLabel(0, "其他福利单位正常缴纳合计"), "otherComCommonSum");
+        repairResult.put(SalaryI18nUtil.getI18nLabel(0, "单位补缴合计"), "comRepairSum");
+        repairResult.put(SalaryI18nUtil.getI18nLabel(0, "社保单位补缴合计"), "socialComRepairSum");
+        repairResult.put(SalaryI18nUtil.getI18nLabel(0, "公积金单位补缴合计"), "fundComRepairSum");
+        repairResult.put(SalaryI18nUtil.getI18nLabel(0, "其他福利单位补缴合计"), "otherComRepairSum");
+        balanceResult.put(SalaryI18nUtil.getI18nLabel(0, "单位补差合计"), "comBalanceSum");
+        balanceResult.put(SalaryI18nUtil.getI18nLabel(0, "社保单位补差合计"), "socialComBalanceSum");
+        balanceResult.put(SalaryI18nUtil.getI18nLabel(0, "公积金单位补差合计"), "fundComBalanceSum");
+        balanceResult.put(SalaryI18nUtil.getI18nLabel(0, "其他福利单位补差合计"), "otherComBalanceSum");
 
         list.stream().forEach(item -> {
             if (Objects.equals(WelfareTypeEnum.SOCIAL_SECURITY.getValue(), item.getWelfareType())) {
                 result.put(categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(100289, "单位"), item.getId() + "socialCom");
+                commonResult.put(categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(0, "正常缴纳单位"), item.getId() + "socialCommonCom");
+                repairResult.put(categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(0, "补缴单位"), item.getId() + "socialRepairCom");
+                balanceResult.put(categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(0, "补差单位"), item.getId() + "socialBalanceCom");
             }
             if (Objects.equals(WelfareTypeEnum.ACCUMULATION_FUND.getValue(), item.getWelfareType())) {
                 result.put(categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(100289, "单位"), item.getId() + "fundCom");
+                commonResult.put(categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(0, "正常缴纳单位"), item.getId() + "fundCommonCom");
+                repairResult.put(categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(0, "补缴单位"), item.getId() + "fundRepairCom");
+                balanceResult.put(categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(0, "补差单位"), item.getId() + "fundBalanceCom");
             }
             if (Objects.equals(WelfareTypeEnum.OTHER.getValue(), item.getWelfareType())) {
                 result.put(categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(100289, "单位"), item.getId() + "otherCom");
+                commonResult.put(categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(0, "正常缴纳单位"), item.getId() + "otherCommonCom");
+                repairResult.put(categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(0, "补缴单位"), item.getId() + "otherRepairCom");
+                balanceResult.put(categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(0, "补差单位"), item.getId() + "otherBalanceCom");
             }
         });
+
+        result.putAll(commonResult);
+        result.putAll(repairResult);
+        result.putAll(balanceResult);
         return result;
     }
 

From 2e2954f70653ecdb5ab9d8f8614858ea0b0e3e35 Mon Sep 17 00:00:00 2001
From: sy <sy666666>
Date: Fri, 14 Jul 2023 14:43:30 +0800
Subject: [PATCH 06/11] =?UTF-8?q?=E8=96=AA=E9=85=AC=E7=B3=BB=E7=BB=9F-?=
 =?UTF-8?q?=E8=96=AA=E8=B5=84=E6=A0=B8=E7=AE=97=EF=BC=8C=E8=A1=A5=E7=BC=B4?=
 =?UTF-8?q?=E5=92=8C=E8=A1=A5=E5=B7=AE=E4=B8=AA=E4=BA=BA=E7=A6=8F=E5=88=A9?=
 =?UTF-8?q?=E9=A1=B9=E6=98=8E=E7=BB=86=E6=A0=B8=E7=AE=97=E5=A4=B1=E8=B4=A5?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/SIAccountServiceImpl.java    | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java
index aef9ef3c2..c7bb46933 100644
--- a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java
@@ -955,13 +955,13 @@ public class SIAccountServiceImpl extends Service implements SIAccountService {
             record.put("socialPerCommonSum", commonSiAcct != null ? commonSiAcct.getSocialPerSum() : new BigDecimal("0"));
             record.put("socialComCommonSum", commonSiAcct != null ? commonSiAcct.getSocialComSum() : new BigDecimal("0"));
             //社保-补缴
-            if (StringUtils.isNotEmpty(repairSiAcct.getSocialPerJson())) {
+            if (repairSiAcct != null && StringUtils.isNotEmpty(repairSiAcct.getSocialPerJson())) {
                 Map<String, Object> socialJson = JSON.parseObject(repairSiAcct.getSocialPerJson(), new HashMap<String, Object>().getClass());
                 socialJson.forEach((k, v) -> {
                     record.put(k + "socialRepairPer", v);
                 });
             }
-            if (StringUtils.isNotEmpty(repairSiAcct.getSocialComJson())) {
+            if (repairSiAcct != null && StringUtils.isNotEmpty(repairSiAcct.getSocialComJson())) {
                 Map<String, Object> socialJson = JSON.parseObject(repairSiAcct.getSocialComJson(), new HashMap<String, Object>().getClass());
                 socialJson.forEach((k, v) -> {
                     record.put(k + "socialRepairCom", v);
@@ -970,13 +970,13 @@ public class SIAccountServiceImpl extends Service implements SIAccountService {
             record.put("socialPerRepairSum", repairSiAcct != null ? repairSiAcct.getSocialPerSum() : new BigDecimal("0"));
             record.put("socialComRepairSum", repairSiAcct != null ? repairSiAcct.getSocialComSum() : new BigDecimal("0"));
             //社保-补差
-            if (StringUtils.isNotEmpty(balanceSiAcct.getSocialPerJson())) {
+            if (balanceSiAcct != null && StringUtils.isNotEmpty(balanceSiAcct.getSocialPerJson())) {
                 Map<String, Object> socialJson = JSON.parseObject(balanceSiAcct.getSocialPerJson(), new HashMap<String, Object>().getClass());
                 socialJson.forEach((k, v) -> {
                     record.put(k + "socialBalancePer", v);
                 });
             }
-            if (StringUtils.isNotEmpty(balanceSiAcct.getSocialComJson())) {
+            if (balanceSiAcct != null && StringUtils.isNotEmpty(balanceSiAcct.getSocialComJson())) {
                 Map<String, Object> socialJson = JSON.parseObject(balanceSiAcct.getSocialComJson(), new HashMap<String, Object>().getClass());
                 socialJson.forEach((k, v) -> {
                     record.put(k + "socialBalanceCom", v);
@@ -1001,13 +1001,13 @@ public class SIAccountServiceImpl extends Service implements SIAccountService {
             record.put("fundPerCommonSum", commonSiAcct != null ? commonSiAcct.getFundPerSum() : new BigDecimal("0"));
             record.put("fundComCommonSum", commonSiAcct != null ? commonSiAcct.getFundComSum() : new BigDecimal("0"));
             //公积金-补缴
-            if (StringUtils.isNotEmpty(repairSiAcct.getFundPerJson())) {
+            if (repairSiAcct != null && StringUtils.isNotEmpty(repairSiAcct.getFundPerJson())) {
                 Map<String, Object> fundJson = JSON.parseObject(repairSiAcct.getFundPerJson(), new HashMap<String, Object>().getClass());
                 fundJson.forEach((k, v) -> {
                     record.put(k + "fundRepairPer", v);
                 });
             }
-            if (StringUtils.isNotEmpty(repairSiAcct.getFundComJson())) {
+            if (repairSiAcct != null && StringUtils.isNotEmpty(repairSiAcct.getFundComJson())) {
                 Map<String, Object> fundJson = JSON.parseObject(repairSiAcct.getFundComJson(), new HashMap<String, Object>().getClass());
                 fundJson.forEach((k, v) -> {
                     record.put(k + "fundRepairCom", v);
@@ -1016,13 +1016,13 @@ public class SIAccountServiceImpl extends Service implements SIAccountService {
             record.put("fundPerRepairSum", repairSiAcct != null ? repairSiAcct.getFundPerSum() : new BigDecimal("0"));
             record.put("fundComRepairSum", repairSiAcct != null ? repairSiAcct.getFundComSum() : new BigDecimal("0"));
             //公积金-补差
-            if (StringUtils.isNotEmpty(balanceSiAcct.getFundPerJson())) {
+            if (balanceSiAcct != null && StringUtils.isNotEmpty(balanceSiAcct.getFundPerJson())) {
                 Map<String, Object> fundJson = JSON.parseObject(balanceSiAcct.getFundPerJson(), new HashMap<String, Object>().getClass());
                 fundJson.forEach((k, v) -> {
                     record.put(k + "fundBalancePer", v);
                 });
             }
-            if (StringUtils.isNotEmpty(balanceSiAcct.getFundComJson())) {
+            if (balanceSiAcct != null && StringUtils.isNotEmpty(balanceSiAcct.getFundComJson())) {
                 Map<String, Object> fundJson = JSON.parseObject(balanceSiAcct.getFundComJson(), new HashMap<String, Object>().getClass());
                 fundJson.forEach((k, v) -> {
                     record.put(k + "fundBalanceCom", v);
@@ -1047,13 +1047,13 @@ public class SIAccountServiceImpl extends Service implements SIAccountService {
             record.put("otherPerCommonSum", commonSiAcct != null ? commonSiAcct.getOtherPerSum() : new BigDecimal("0"));
             record.put("otherComCommonSum", commonSiAcct != null ? commonSiAcct.getOtherComSum() : new BigDecimal("0"));
             //其他福利-补缴
-            if (StringUtils.isNotEmpty(repairSiAcct.getOtherPerJson())) {
+            if (repairSiAcct != null && StringUtils.isNotEmpty(repairSiAcct.getOtherPerJson())) {
                 Map<String, Object> otherJson = JSON.parseObject(repairSiAcct.getOtherPerJson(), new HashMap<String, Object>().getClass());
                 otherJson.forEach((k, v) -> {
                     record.put(k + "otherRepairPer", v);
                 });
             }
-            if (StringUtils.isNotEmpty(repairSiAcct.getOtherComJson())) {
+            if (repairSiAcct != null && StringUtils.isNotEmpty(repairSiAcct.getOtherComJson())) {
                 Map<String, Object> otherJson = JSON.parseObject(repairSiAcct.getOtherComJson(), new HashMap<String, Object>().getClass());
                 otherJson.forEach((k, v) -> {
                     record.put(k + "otherRepairCom", v);
@@ -1062,13 +1062,13 @@ public class SIAccountServiceImpl extends Service implements SIAccountService {
             record.put("otherPerRepairSum", repairSiAcct != null ? repairSiAcct.getOtherPerSum() : new BigDecimal("0"));
             record.put("otherComRepairSum", repairSiAcct != null ? repairSiAcct.getOtherComSum() : new BigDecimal("0"));
             //其他福利-补差
-            if (StringUtils.isNotEmpty(balanceSiAcct.getOtherPerJson())) {
+            if (balanceSiAcct != null && StringUtils.isNotEmpty(balanceSiAcct.getOtherPerJson())) {
                 Map<String, Object> otherJson = JSON.parseObject(balanceSiAcct.getOtherPerJson(), new HashMap<String, Object>().getClass());
                 otherJson.forEach((k, v) -> {
                     record.put(k + "otherBalancePer", v);
                 });
             }
-            if (StringUtils.isNotEmpty(balanceSiAcct.getOtherComJson())) {
+            if (balanceSiAcct != null && StringUtils.isNotEmpty(balanceSiAcct.getOtherComJson())) {
                 Map<String, Object> otherJson = JSON.parseObject(balanceSiAcct.getOtherComJson(), new HashMap<String, Object>().getClass());
                 otherJson.forEach((k, v) -> {
                     record.put(k + "otherBalanceCom", v);

From b0e8da2ad4c1f02c3c800c86fac18c12b949aa87 Mon Sep 17 00:00:00 2001
From: sy <sy666666>
Date: Fri, 14 Jul 2023 17:32:16 +0800
Subject: [PATCH 07/11] =?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=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F=E8=A7=84=E5=88=99=E8=B4=A6=E5=8D=95=E6=9C=88?=
 =?UTF-8?q?=E4=BB=BD=E9=80=86=E5=BA=8F=E3=80=81=E6=9B=B4=E6=96=B0=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E9=80=86=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../salary/mapper/siaccount/InsuranceAccountBatchMapper.xml     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/engine/salary/mapper/siaccount/InsuranceAccountBatchMapper.xml b/src/com/engine/salary/mapper/siaccount/InsuranceAccountBatchMapper.xml
index 4aeeafc25..784c6e848 100644
--- a/src/com/engine/salary/mapper/siaccount/InsuranceAccountBatchMapper.xml
+++ b/src/com/engine/salary/mapper/siaccount/InsuranceAccountBatchMapper.xml
@@ -156,7 +156,7 @@
         left join hrsa_tax_agent t1 on t.payment_organization = t1.id
         WHERE t.delete_type = 0
         <include refid="paramSql"/>
-        ORDER BY t.bill_month DESC
+        ORDER BY t.bill_month DESC, t.update_time DESC
     </select>
 
     <select id="listByTimeRange" resultMap="BaseResultMap">

From f93090b063c502842013d8a641d8efc445e4db55 Mon Sep 17 00:00:00 2001
From: sy <sy666666>
Date: Mon, 17 Jul 2023 17:53:59 +0800
Subject: [PATCH 08/11] =?UTF-8?q?=E8=96=AA=E9=85=AC=E7=B3=BB=E7=BB=9F-?=
 =?UTF-8?q?=E8=96=AA=E8=B5=84=E6=A0=B8=E7=AE=97=EF=BC=8C=E8=87=AA=E5=AE=9A?=
 =?UTF-8?q?=E4=B9=89=E5=AF=BC=E5=87=BA=E5=AD=97=E6=AE=B5=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E6=9C=AA=E5=88=86=E7=B1=BB=E5=AD=97=E6=AE=B5=E8=AF=86=E5=88=AB?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/SalaryAcctExcelServiceImpl.java      | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java
index 486073fbf..3e808cb80 100644
--- a/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java
@@ -44,6 +44,7 @@ import com.engine.salary.util.excel.ExcelSupport;
 import com.engine.salary.util.excel.ExcelUtilPlus;
 import com.engine.salary.util.page.Column;
 import com.engine.salary.util.valid.ValidUtil;
+import com.engine.salary.wrapper.SalarySobItemWrapper;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
@@ -102,10 +103,6 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc
         return (SalaryItemService) ServiceUtil.getService(SalaryItemServiceImpl.class, user);
     }
 
-//    private SalaryFormulaService getSalaryFormulaService(User user) {
-//        return (SalaryFormulaService) ServiceUtil.getService(SalaryFormulaServiceImpl.class, user);
-//    }
-
     private SalaryComparisonResultService getSalaryComparisonResultService(User user) {
         return (SalaryComparisonResultService) ServiceUtil.getService(SalaryComparisonResultServiceImpl.class, user);
     }
@@ -123,12 +120,6 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc
         return ServiceUtil.getService(SalarySobItemGroupServiceImpl.class, user);
     }
 
-    private SalaryCheckResultService salaryCheckResultService;
-
-    private SalaryCheckResultDetailService salaryCheckResultDetailService;
-
-    private SalarySobCheckRuleService salarySobCheckRuleService;
-
     private SalaryAcctReportService getSalaryAcctReportService(User user) {
         return ServiceUtil.getService(SalaryAcctReportServiceImpl.class, user);
     }
@@ -145,6 +136,10 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc
         return ServiceUtil.getService(SalaryAcctResultLogServiceImpl.class, user);
     }
 
+    private SalarySobItemWrapper getSalarySobItemWrapper(User user) {
+        return ServiceUtil.getService(SalarySobItemWrapper.class, user);
+    }
+
     @Override
     public XSSFWorkbook exportSalaryAcctEmployee(SalaryAcctEmployeeQueryParam queryParam) {
         ValidUtil.doValidator(queryParam);
@@ -291,6 +286,10 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc
         //判断是否按照自定义字段导出表头
         List<WeaTableColumnGroup> finalWeaTableColumns = new ArrayList<>();
         if (queryParam.getSalaryItemIds() != null ) {
+            //获取人员基本信息字段（汇总）
+            Collection<Map<String, String>> empFieldList = getSalarySobItemWrapper(user).empFieldList();
+            List<String> empFieldIdList= new ArrayList<>();
+            empFieldList.forEach(f -> empFieldIdList.add(f.get("id")));
             // 必须选择导出所需的薪资项目
             if (CollectionUtils.isEmpty(queryParam.getSalaryItemIds())) {
                 throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(99019, "参数错误，请选择导入模板所需的薪资项目"));
@@ -308,7 +307,7 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc
                         columnGroupItem.setChildren(childrenColumns);
                         finalWeaTableColumns.add(columnGroupItem);
                     }
-                } else if (headerRangeList.contains(columnGroupItem.getColumn())) {
+                } else if (empFieldIdList.contains(tableColumn.getColumn()) || headerRangeList.contains(tableColumn.getColumn())){
                     finalWeaTableColumns.add(columnGroupItem);
                 }
 
@@ -319,7 +318,8 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc
 //        parseHeader(headerColumnGroup, weaTableColumns);
         parseHeader(headerColumnGroup, finalWeaTableColumns);
 //        // excel导出的表头
-        List<Object> headerList = new ArrayList<>(weaTableColumns);
+//        List<Object> headerList = new ArrayList<>(weaTableColumns);
+        List<Object> headerList = new ArrayList<>(finalWeaTableColumns);
         // 查询薪资核算结果
         List<Map<String, Object>> resultMapList = getSalaryAcctResultService(user).listByParam(queryParam);
 

From 7c3c929fcd07a8bfc1de5aa50e6798bdb583269a Mon Sep 17 00:00:00 2001
From: sy <sy666666>
Date: Tue, 18 Jul 2023 09:33:07 +0800
Subject: [PATCH 09/11] =?UTF-8?q?=E8=96=AA=E9=85=AC=E7=B3=BB=E7=BB=9F-?=
 =?UTF-8?q?=E7=A6=8F=E5=88=A9=E6=96=B9=E6=A1=88=EF=BC=8C=E8=87=AA=E5=AE=9A?=
 =?UTF-8?q?=E4=B9=89=E7=A6=8F=E5=88=A9=E9=A1=B9=E5=90=AF=E7=94=A8=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/com/engine/salary/biz/SICategoryBiz.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/engine/salary/biz/SICategoryBiz.java b/src/com/engine/salary/biz/SICategoryBiz.java
index 36cb4f218..6fb23037d 100644
--- a/src/com/engine/salary/biz/SICategoryBiz.java
+++ b/src/com/engine/salary/biz/SICategoryBiz.java
@@ -161,7 +161,7 @@ public class SICategoryBiz {
                 throw new SalaryRunTimeException("isUse is required");
             }
             List<InsuranceSchemeDetailPO> insuranceSchemeDetailPOS = new SISchemeBiz().queryListByInsuranceIdIsPayment(id, IsPaymentEnum.YES.getValue());
-            if(CollectionUtils.isNotEmpty(insuranceSchemeDetailPOS)) {
+            if(CollectionUtils.isNotEmpty(insuranceSchemeDetailPOS) && isUse == 0) {
                 throw new SalaryRunTimeException("该福利开启缴费，不可删除(或停用)");
             }
             ICategoryPO iCategoryPO = getByID(id);

From 47b02e4d5d3ede871e66a0a482566f07acae6299 Mon Sep 17 00:00:00 2001
From: sy <sy666666>
Date: Wed, 19 Jul 2023 10:03:29 +0800
Subject: [PATCH 10/11] =?UTF-8?q?=E8=96=AA=E9=85=AC=E7=B3=BB=E7=BB=9F-?=
 =?UTF-8?q?=E8=96=AA=E8=B5=84=E6=A0=B8=E7=AE=97=EF=BC=8C=E5=BD=92=E6=A1=A3?=
 =?UTF-8?q?action?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../action/SalaryAcctFileByIdAction.java      | 59 +++++++++++++++++++
 1 file changed, 59 insertions(+)
 create mode 100644 src/com/engine/salary/action/SalaryAcctFileByIdAction.java

diff --git a/src/com/engine/salary/action/SalaryAcctFileByIdAction.java b/src/com/engine/salary/action/SalaryAcctFileByIdAction.java
new file mode 100644
index 000000000..9674aa9f4
--- /dev/null
+++ b/src/com/engine/salary/action/SalaryAcctFileByIdAction.java
@@ -0,0 +1,59 @@
+package com.engine.salary.action;
+
+import com.engine.common.util.ServiceUtil;
+import com.engine.salary.service.SalaryAcctRecordService;
+import com.engine.salary.service.impl.SalaryAcctRecordServiceImpl;
+import lombok.extern.slf4j.Slf4j;
+import weaver.general.Util;
+import weaver.hrm.User;
+import weaver.interfaces.workflow.action.Action;
+import weaver.soa.workflow.request.Property;
+import weaver.soa.workflow.request.RequestInfo;
+
+import java.util.Arrays;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * @Author: sy
+ * @Description: 通过薪资核算id归档台账记录
+ * @Date: 2023/7/18
+ **/
+@Slf4j
+public class SalaryAcctFileByIdAction implements Action {
+    private SalaryAcctRecordService getSalaryAcctRecordService(User user) {
+        return ServiceUtil.getService(SalaryAcctRecordServiceImpl.class, user);
+    }
+
+    private String acctRecordId;
+
+    public String getAcctRecordId() {
+        return acctRecordId;
+    }
+
+    public void setAcctRecordId(String acctRecordId) {
+        this.acctRecordId = acctRecordId;
+    }
+
+    @Override
+    public String execute(RequestInfo requestInfo) {
+        User user = requestInfo.getRequestManager().getUser();
+
+        Property[] properties = requestInfo.getMainTableInfo().getProperty();
+        Map<String, String> fieldMap = Arrays.stream(properties).collect(Collectors.toMap(Property::getName,
+                property -> Util.null2String(property.getValue())));
+
+        Long salaryAcctId = fieldMap.get(acctRecordId) != null ? Long.parseLong(fieldMap.get(acctRecordId)) : 0L;
+
+        if (!salaryAcctId.equals(0L)) {
+            try {
+                getSalaryAcctRecordService(user).file(salaryAcctId);
+            } catch (Exception e) {
+                log.error("薪资核算归档异常", e);
+                requestInfo.getRequestManager().setMessage(e.getMessage());
+                return FAILURE_AND_CONTINUE;
+            }
+        }
+        return SUCCESS;
+    }
+}

From 1c83f1ab0e7b556b5e1643165092db3e13928e99 Mon Sep 17 00:00:00 2001
From: sy <sy666666>
Date: Wed, 19 Jul 2023 18:02:44 +0800
Subject: [PATCH 11/11] =?UTF-8?q?=E8=96=AA=E9=85=AC=E7=B3=BB=E7=BB=9F-?=
 =?UTF-8?q?=E8=96=AA=E8=B5=84=E6=A0=B8=E7=AE=97=EF=BC=8C=E5=BD=92=E6=A1=A3?=
 =?UTF-8?q?action=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/com/engine/salary/action/SalaryAcctFileByIdAction.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/com/engine/salary/action/SalaryAcctFileByIdAction.java b/src/com/engine/salary/action/SalaryAcctFileByIdAction.java
index 9674aa9f4..710233ecb 100644
--- a/src/com/engine/salary/action/SalaryAcctFileByIdAction.java
+++ b/src/com/engine/salary/action/SalaryAcctFileByIdAction.java
@@ -3,7 +3,9 @@ package com.engine.salary.action;
 import com.engine.common.util.ServiceUtil;
 import com.engine.salary.service.SalaryAcctRecordService;
 import com.engine.salary.service.impl.SalaryAcctRecordServiceImpl;
+import com.engine.salary.util.SalaryI18nUtil;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
 import weaver.general.Util;
 import weaver.hrm.User;
 import weaver.interfaces.workflow.action.Action;
@@ -43,7 +45,7 @@ public class SalaryAcctFileByIdAction implements Action {
         Map<String, String> fieldMap = Arrays.stream(properties).collect(Collectors.toMap(Property::getName,
                 property -> Util.null2String(property.getValue())));
 
-        Long salaryAcctId = fieldMap.get(acctRecordId) != null ? Long.parseLong(fieldMap.get(acctRecordId)) : 0L;
+        Long salaryAcctId = StringUtils.isNotBlank(fieldMap.get(acctRecordId)) ? Long.parseLong(fieldMap.get(acctRecordId)) : 0L;
 
         if (!salaryAcctId.equals(0L)) {
             try {
@@ -53,6 +55,9 @@ public class SalaryAcctFileByIdAction implements Action {
                 requestInfo.getRequestManager().setMessage(e.getMessage());
                 return FAILURE_AND_CONTINUE;
             }
+        } else {
+            requestInfo.getRequestManager().setMessage(SalaryI18nUtil.getI18nLabel(542300, "薪资核算记录不存在或已被删除"));
+            return FAILURE_AND_CONTINUE;
         }
         return SUCCESS;
     }