From 0749fffcdb98841f9de37cdd3dd53de3696433be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Tue, 11 Apr 2023 14:00:41 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E7=BB=B4=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SalaryStatisticsDimensionWrapper.java     | 33 +++++++++++++++++--
 1 file changed, 31 insertions(+), 2 deletions(-)

diff --git a/src/com/engine/salary/report/wrapper/SalaryStatisticsDimensionWrapper.java b/src/com/engine/salary/report/wrapper/SalaryStatisticsDimensionWrapper.java
index d7a8d4540..50f9bce7d 100644
--- a/src/com/engine/salary/report/wrapper/SalaryStatisticsDimensionWrapper.java
+++ b/src/com/engine/salary/report/wrapper/SalaryStatisticsDimensionWrapper.java
@@ -2,7 +2,11 @@ package com.engine.salary.report.wrapper;
 
 import com.engine.common.util.ServiceUtil;
 import com.engine.core.impl.Service;
+import com.engine.salary.component.WeaFormOption;
+import com.engine.salary.entity.salaryitem.po.SalaryItemPO;
+import com.engine.salary.enums.salaryitem.SalaryDataTypeEnum;
 import com.engine.salary.exception.SalaryRunTimeException;
+import com.engine.salary.report.common.constant.SalaryStatisticsDimensionConstant;
 import com.engine.salary.report.entity.dto.SalaryStatisticsDimensionFormDTO;
 import com.engine.salary.report.entity.dto.SalaryStatisticsDimensionListDTO;
 import com.engine.salary.report.entity.param.SalaryStatisticsDimensionQueryParam;
@@ -17,6 +21,7 @@ import com.engine.salary.util.JsonUtil;
 import com.engine.salary.util.SalaryI18nUtil;
 import com.engine.salary.util.page.PageInfo;
 import com.engine.salary.util.page.SalaryPageUtil;
+import com.google.common.collect.Lists;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.stereotype.Component;
 import weaver.hrm.User;
@@ -71,12 +76,36 @@ public class SalaryStatisticsDimensionWrapper extends Service {
      */
     public SalaryStatisticsDimensionFormDTO getFrom(Long id) {
 
+        List<WeaFormOption> statsDimOptions = Lists.newArrayList();
+        statsDimOptions.add(new WeaFormOption(SalaryStatisticsDimensionConstant.DM_SEX, SalaryI18nUtil.getI18nLabel(98622, "性别")));
+        statsDimOptions.add(new WeaFormOption(SalaryStatisticsDimensionConstant.DM_JOB_CALL, SalaryI18nUtil.getI18nLabel(173995, "职称")));
+//        statsDimOptions.add(new WeaFormOption("", SalaryI18nUtil.getI18nLabel(173996, "办公地点")));
+        statsDimOptions.add(new WeaFormOption(SalaryStatisticsDimensionConstant.DM_SUPERIOR, SalaryI18nUtil.getI18nLabel(173997, "上级")));
+        statsDimOptions.add(new WeaFormOption(SalaryStatisticsDimensionConstant.DM_MARITAL_STATUS, SalaryI18nUtil.getI18nLabel(174007, "婚姻状况")));
+        statsDimOptions.add(new WeaFormOption(SalaryStatisticsDimensionConstant.DM_EDUCATION, SalaryI18nUtil.getI18nLabel(174005, "学历")));
+        statsDimOptions.add(new WeaFormOption(SalaryStatisticsDimensionConstant.DM_DEGREE, SalaryI18nUtil.getI18nLabel(174004, "学位")));
+        statsDimOptions.add(new WeaFormOption(SalaryStatisticsDimensionConstant.DM_NATION, SalaryI18nUtil.getI18nLabel(174107, "民族")));
+        statsDimOptions.add(new WeaFormOption(SalaryStatisticsDimensionConstant.DM_HOUSEHOLD_TYPE, SalaryI18nUtil.getI18nLabel(174106, "户口类型")));
+        statsDimOptions.add(new WeaFormOption(SalaryStatisticsDimensionConstant.DM_POLITICS_STATUS, SalaryI18nUtil.getI18nLabel(174105, "政治面貌")));
+        statsDimOptions.add(new WeaFormOption(SalaryStatisticsDimensionConstant.DM_AGE, SalaryI18nUtil.getI18nLabel(174001, "年龄")));
+        statsDimOptions.add(new WeaFormOption(SalaryStatisticsDimensionConstant.DM_WORK_YEAR, SalaryI18nUtil.getI18nLabel(174000, "工龄")));
+//        statsDimOptions.add(new WeaFormOption(SalaryStatisticsDimensionConstant.DM_COMPANY_YEAR, SalaryI18nUtil.getI18nLabel(174003, "司龄")));
+
+        List<WeaFormOption> groupDimOptions = Lists.newArrayList();
+        groupDimOptions.add(new WeaFormOption(SalaryStatisticsDimensionConstant.DM_AGE, SalaryI18nUtil.getI18nLabel(174001, "年龄")));
+        groupDimOptions.add(new WeaFormOption(SalaryStatisticsDimensionConstant.DM_WORK_YEAR, SalaryI18nUtil.getI18nLabel(174000, "工龄")));
+//        groupDimOptions.add(new WeaFormOption(SalaryStatisticsDimensionConstant.DM_COMPANY_YEAR, SalaryI18nUtil.getI18nLabel(174003, "司龄")));
+        List<SalaryItemPO> salaryItemList = salaryItemService(user).listAll();
+        groupDimOptions.addAll(salaryItemList.stream()
+                .filter(item -> SalaryDataTypeEnum.NUMBER.getValue().equals(item.getDataType()))
+                .map(item -> new WeaFormOption(item.getId().toString(), item.getName())).collect(Collectors.toList()));
+        // 1.构建基础信息表单
         Map baseForm = new HashMap<>();
+        baseForm.put("statsDimOptions",statsDimOptions);
+        baseForm.put("groupDimOptions",groupDimOptions);
         // 2.分组设置
         String groupSetting = "[]";
         if (id != null) {
-
-
             SalaryStatisticsDimensionPO po = this.salaryStatisticsDimensionService(user).getById(id);
             if (po == null) {
                 throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(161116, "薪酬统计维度不存在"));