From 95dd20dc7b5834f327acb06c6394ff9d33dcb3ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Tue, 18 Apr 2023 18:55:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/SalaryStatisticsReportController.java |  5 ++--
 .../SalaryStatisticsReportWrapper.java        | 23 ++++++++++++++-----
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/src/com/engine/salary/report/web/SalaryStatisticsReportController.java b/src/com/engine/salary/report/web/SalaryStatisticsReportController.java
index 0d66ec25a..ed8a52760 100644
--- a/src/com/engine/salary/report/web/SalaryStatisticsReportController.java
+++ b/src/com/engine/salary/report/web/SalaryStatisticsReportController.java
@@ -4,7 +4,6 @@ import com.engine.common.util.ServiceUtil;
 import com.engine.salary.report.entity.param.SalaryStatisticsReportDataQueryParam;
 import com.engine.salary.report.entity.param.SalaryStatisticsReportQueryParam;
 import com.engine.salary.report.entity.param.SalaryStatisticsReportSaveParam;
-import com.engine.salary.report.entity.po.SalaryStatisticsReportPO;
 import com.engine.salary.report.wrapper.SalaryStatisticsReportWrapper;
 import com.engine.salary.util.ResponseResult;
 import io.swagger.v3.oas.annotations.parameters.RequestBody;
@@ -55,7 +54,7 @@ public class SalaryStatisticsReportController {
     @Produces(MediaType.APPLICATION_JSON)
     public String getForm(@Context HttpServletRequest request, @Context HttpServletResponse response, @QueryParam(value = "id") Long id) {
         User user = HrmUserVarify.getUser(request, response);
-        return new ResponseResult<Long, SalaryStatisticsReportPO>(user).run(getSalaryStatisticsReportWrapper(user)::getFrom, id);
+        return new ResponseResult<Long, Map<String,Object>>(user).run(getSalaryStatisticsReportWrapper(user)::getFrom, id);
     }
 
     /**
@@ -116,7 +115,7 @@ public class SalaryStatisticsReportController {
     @POST
     @Path("/getData")
     @Produces(MediaType.APPLICATION_JSON)
-    public String delete(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody SalaryStatisticsReportDataQueryParam param) {
+    public String getData(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody SalaryStatisticsReportDataQueryParam param) {
         User user = HrmUserVarify.getUser(request, response);
         return new ResponseResult<SalaryStatisticsReportDataQueryParam, Map<String, Object>>(user).run(getSalaryStatisticsReportWrapper(user)::getData, param);
     }
diff --git a/src/com/engine/salary/report/wrapper/SalaryStatisticsReportWrapper.java b/src/com/engine/salary/report/wrapper/SalaryStatisticsReportWrapper.java
index 44d33738c..a0b4d18cc 100644
--- a/src/com/engine/salary/report/wrapper/SalaryStatisticsReportWrapper.java
+++ b/src/com/engine/salary/report/wrapper/SalaryStatisticsReportWrapper.java
@@ -3,6 +3,7 @@ package com.engine.salary.report.wrapper;
 import com.cloudstore.eccom.pc.table.WeaTableColumn;
 import com.engine.common.util.ServiceUtil;
 import com.engine.core.impl.Service;
+import com.engine.salary.component.WeaFormOption;
 import com.engine.salary.exception.SalaryRunTimeException;
 import com.engine.salary.report.entity.bo.SalaryStatisticsReportBO;
 import com.engine.salary.report.entity.param.SalaryStatisticsReportDataQueryParam;
@@ -95,17 +96,27 @@ public class SalaryStatisticsReportWrapper extends Service {
      * @param
      * @return
      */
-    public SalaryStatisticsReportPO getFrom(Long id) {
+    public Map<String,Object> getFrom(Long id) {
 
         List<SalaryStatisticsDimensionPO> salaryStatisticsDimensions = getSalaryStatisticsDimensionService(user).listAll();
 
-        String placeholder = SalaryI18nUtil.getI18nLabel(85987, "请输入");
+        List<WeaFormOption> statsDimOptions = salaryStatisticsDimensions.stream().map(sd -> new WeaFormOption(sd.getId().toString(), sd.getDimName())).collect(Collectors.toList());
+        // 1.构建基础信息表单
+        Map<String,Object> weaForm = new HashMap<>();
+        weaForm.put("statsDimOptions",statsDimOptions);
 
-        SalaryStatisticsReportPO po = this.getSalaryStatisticsReportService(user).getById(id);
-        if (po == null) {
-            throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(161845, "薪酬统计报表不存在"));
+
+        if (id != null) {
+            SalaryStatisticsReportPO po = this.getSalaryStatisticsReportService(user).getById(id);
+            if (po == null) {
+                throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(161845, "薪酬统计报表不存在"));
+            }
+            Map<String, Object> dataMap = JsonUtil.parseMap(po, Object.class);
+            dataMap.put("dimension", Arrays.asList(po.getDimension().split(",")));
+            weaForm.put("data",dataMap);
         }
-        return po;
+
+        return weaForm;
     }
 
     /**