From 93a7dcd59f15d99f0d9165b520b9e90de6bae579 Mon Sep 17 00:00:00 2001 From: Harryxzy Date: Thu, 8 Jun 2023 18:04:25 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=80=8F=E8=A7=86=20fix=20We?= =?UTF-8?q?aTable?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wrapper/SalaryStatisticsReportWrapper.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/com/engine/salary/report/wrapper/SalaryStatisticsReportWrapper.java b/src/com/engine/salary/report/wrapper/SalaryStatisticsReportWrapper.java index 24467c869..162248e6c 100644 --- a/src/com/engine/salary/report/wrapper/SalaryStatisticsReportWrapper.java +++ b/src/com/engine/salary/report/wrapper/SalaryStatisticsReportWrapper.java @@ -1,19 +1,17 @@ package com.engine.salary.report.wrapper; import com.alibaba.fastjson.JSONArray; +import com.cloudstore.eccom.pc.table.WeaTable; import com.cloudstore.eccom.pc.table.WeaTableColumn; import com.cloudstore.eccom.result.WeaResultMsg; import com.engine.common.util.ServiceUtil; import com.engine.core.impl.Service; -import com.engine.salary.component.SalaryWeaTable; import com.engine.salary.component.WeaFormOption; import com.engine.salary.component.WeaTableColumnGroup; -import com.engine.salary.entity.salaryarchive.dto.SalaryArchiveListDTO; import com.engine.salary.entity.salaryitem.po.SalaryItemPO; import com.engine.salary.exception.SalaryRunTimeException; import com.engine.salary.report.common.constant.SalaryConstant; import com.engine.salary.report.entity.bo.SalaryStatisticsReportBO; -import com.engine.salary.report.entity.dto.SalaryStatisticsEmployeeDetailResultDTO; import com.engine.salary.report.entity.param.*; import com.engine.salary.report.entity.po.SalaryStatisticsDimensionPO; import com.engine.salary.report.entity.po.SalaryStatisticsItemPO; @@ -41,6 +39,7 @@ import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.MapUtils; import org.apache.commons.lang3.StringUtils; import org.apache.poi.xssf.usermodel.XSSFWorkbook; +import weaver.general.PageIdConst; import weaver.hrm.User; import java.util.*; @@ -350,7 +349,13 @@ public class SalaryStatisticsReportWrapper extends Service { // 列表columns List weaTableColumns = buildDataPerspectiveTableColumns(itemList); - SalaryWeaTable table = new SalaryWeaTable(user, SalaryStatisticsEmployeeDetailResultDTO.class); + WeaTable table = new WeaTable(); + String pageId="a4f85an7-9576-4125-adn9-7d06e7sy69f2"; + table.setPageID(pageId); + table.setPageUID(pageId+user.getUID()); + table.setPagesize(PageIdConst.getPageSize(pageId, user.getUID())); + table.setBackfields(""); + table.setColumns(weaTableColumns); WeaResultMsg result = new WeaResultMsg(false);