From e73ed7142f703f3eff9a7a257f9471a0cd78cd0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Thu, 2 Mar 2023 13:37:28 +0800
Subject: [PATCH] =?UTF-8?q?=E6=AD=A3=E5=B8=B8=E6=A0=B8=E7=AE=97=E5=B7=A5?=
 =?UTF-8?q?=E8=B5=84=E5=8D=95=E6=A8=A1=E6=9D=BF=E5=90=8C=E6=AD=A5=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../salary/wrapper/SalaryTemplateWrapper.java | 41 ++++++++++++-------
 1 file changed, 26 insertions(+), 15 deletions(-)

diff --git a/src/com/engine/salary/wrapper/SalaryTemplateWrapper.java b/src/com/engine/salary/wrapper/SalaryTemplateWrapper.java
index 1c2f6d49f..bd97476a7 100644
--- a/src/com/engine/salary/wrapper/SalaryTemplateWrapper.java
+++ b/src/com/engine/salary/wrapper/SalaryTemplateWrapper.java
@@ -16,10 +16,10 @@ import com.engine.salary.enums.salarybill.SalaryTemplateWhetherEnum;
 import com.engine.salary.exception.SalaryRunTimeException;
 import com.engine.salary.service.*;
 import com.engine.salary.service.impl.*;
+import com.engine.salary.util.JsonUtil;
 import com.engine.salary.util.SalaryEntityUtil;
 import com.engine.salary.util.SalaryI18nUtil;
 import com.engine.salary.util.db.DBType;
-import com.mzlion.core.json.fastjson.JsonUtil;
 import com.mzlion.core.utils.BeanUtils;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -55,6 +55,10 @@ public class SalaryTemplateWrapper extends Service {
         return ServiceUtil.getService(SalaryItemServiceImpl.class, user);
     }
 
+    private SalarySobItemGroupService getSalarySobItemGroupService(User user) {
+        return ServiceUtil.getService(SalarySobItemGroupServiceImpl.class, user);
+    }
+
     private TaxAgentService getTaxAgentService(User user) {
         return ServiceUtil.getService(TaxAgentServiceImpl.class, user);
     }
@@ -213,27 +217,32 @@ public class SalaryTemplateWrapper extends Service {
             salaryTemplateShowSetDTO.setSalaryItemZeroStatus(po.getSalaryItemZeroStatus().equals(SalaryTemplateWhetherEnum.TRUE.getValue()));
         }
 
-        // 主题及其他设置
-//        WeaForm salaryTemplateShowSet = SalaryFormatUtil.<SalaryTemplateShowSetDTO>getInstance().buildForm(SalaryTemplateShowSetDTO.class, new SalaryTemplateShowSetDTO());
-//
-//        WeaFormItem textContentItem = salaryTemplateShowSet.getItems().get("textContent");
-//        Map<String, Object> otherParams = Maps.newHashMap();
-//        otherParams.put("showCount", true);
-//        otherParams.put("placeholder", SalaryI18nUtil.getI18nLabel(tenantKey, employeeId, 85987, "请输入"));
-//        textContentItem.setOtherParams(otherParams);
-//        salaryTemplateShowSet.getItems().put("textContent", textContentItem);
-//
-//        salaryTemplateShowSet.setData(JsonUtil.parseMap(salaryTemplateShowSetDTO, Object.class));
-
         Map<String, Object> salaryTemplateShowSet = new HashMap<>();
         salaryTemplateShowSet.put("data", salaryTemplateShowSetDTO);
 
         // 薪资项目设置
         List<SalaryTemplateSalaryItemSetListDTO> salaryTemplateShowSetData = new ArrayList<>();
         if (StringUtils.isNotEmpty(po.getSalaryItemSetting())) {
-            salaryTemplateShowSetData = JsonUtil.fromJson(po.getSalaryItemSetting(), List.class);
+            salaryTemplateShowSetData = JsonUtil.parseList(po.getSalaryItemSetting(), SalaryTemplateSalaryItemSetListDTO.class);
         }
 
+        //同步项目名称
+        List<SalaryItemPO> itemPOS = getSalaryItemService(user).listAll();
+        Map<Long, String> itemIdNameMap = SalaryEntityUtil.convert2Map(itemPOS, SalaryItemPO::getId, SalaryItemPO::getName);
+
+//        List<SalarySobItemGroupPO> groupPOS = getSalarySobItemGroupService(user).listBySalarySobId(po.getSalarySobId());
+//        Map<Long, String> groupIdNameMap = SalaryEntityUtil.convert2Map(groupPOS, SalarySobItemGroupPO::getId, SalarySobItemGroupPO::getName);
+
+        if (CollectionUtils.isNotEmpty(salaryTemplateShowSetData)) {
+            salaryTemplateShowSetData.stream()
+                    //排除人员消息
+                    .filter(data -> !StringUtils.equals(data.getGroupId(), "111111111111111111"))
+                    .forEach(data -> {
+                        data.getItems().forEach(item -> item.setName(itemIdNameMap.getOrDefault(Long.valueOf(item.getSalaryItemId()), item.getName())));
+                    });
+        }
+
+
         return SalaryTemplateShowFormDTO.builder()
                 .id(id)
                 .vars(Arrays.stream(SalaryTemplateVarEnum.values()).map(SalaryTemplateVarEnum::getValue).collect(Collectors.toList()))
@@ -372,7 +381,7 @@ public class SalaryTemplateWrapper extends Service {
             }
             BeanUtils.copyProperties(po, salaryTemplateReplenishSetDTO);
             if (StringUtils.isNotEmpty(po.getReplenishSalaryItemSetting())) {
-                replenishSalaryItemSetting = JsonUtil.fromJson(po.getReplenishSalaryItemSetting(), List.class);
+                replenishSalaryItemSetting = JsonUtil.parseList(po.getReplenishSalaryItemSetting(), SalaryTemplateSalaryItemSetListDTO.class);
             } else {
                 replenishSalaryItemSetting = getReplenishSalaryItemSet(replenishFormQueryParam.getSalarySobId());
             }
@@ -388,6 +397,7 @@ public class SalaryTemplateWrapper extends Service {
 
     /**
      * 获取单个分组下，没有被加入到模板的薪资项目
+     *
      * @param param 入参
      * @return 单个分组下剩余的薪资项目
      */
@@ -410,6 +420,7 @@ public class SalaryTemplateWrapper extends Service {
 
     /**
      * 获取账套下没有被加入的分组
+     *
      * @param param 入参
      * @return 分组与下属
      */