From e5a30525f01b3d9591405eb03971616a0c8fe0ac Mon Sep 17 00:00:00 2001 From: dxfeng Date: Thu, 12 Sep 2024 13:24:33 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8A=B1=E5=90=8D=E5=86=8C-Excel=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E5=88=97=E5=B1=95=E7=A4=BA=E9=A1=BA=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ExportCommonServiceImpl.java | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/src/com/engine/organization/service/impl/ExportCommonServiceImpl.java b/src/com/engine/organization/service/impl/ExportCommonServiceImpl.java index 24298290..c182cba0 100644 --- a/src/com/engine/organization/service/impl/ExportCommonServiceImpl.java +++ b/src/com/engine/organization/service/impl/ExportCommonServiceImpl.java @@ -15,7 +15,6 @@ import com.engine.organization.entity.department.bo.DepartmentBO; import com.engine.organization.entity.department.dto.DepartmentListDTO; import com.engine.organization.entity.department.po.DepartmentPO; import com.engine.organization.entity.hrmresource.po.JclOrgCustomTemplatePO; -import com.engine.organization.entity.hrmresource.po.SearchTemplatePO; import com.engine.organization.entity.hrmresource.vo.HrmResourceVO; import com.engine.organization.entity.staff.po.StaffPO; import com.engine.organization.entity.staff.vo.StaffTableVO; @@ -45,7 +44,6 @@ import weaver.systeminfo.SystemEnv; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.math.BigDecimal; -import java.math.RoundingMode; import java.util.*; import java.util.stream.Collectors; @@ -169,6 +167,7 @@ public class ExportCommonServiceImpl extends Service implements ExportCommonServ List columnList = Arrays.asList(columns.split(",")); String propValue = new BaseBean().getPropValue("hrmOrganization", "orgId"); + Map columnMap = new HashMap<>(); BigDecimal decimal = new BigDecimal(100 / columnList.size()); @@ -196,16 +195,18 @@ public class ExportCommonServiceImpl extends Service implements ExportCommonServ weaTableColumn.setOtherpara(columnName); //weaTableColumn.setWidth(decimal.setScale(2, RoundingMode.HALF_UP).doubleValue() + "%"); - if (weaTableColumn.getDisplay().getBoolVal()) { - weaTableColumnList.add(weaTableColumn); - headerList.add(weaTableColumn.getColumn()); - headerNameList.add(weaTableColumn.getText()); - } + columnMap.put(columnName, weaTableColumn); } } - //todo 修复导出excel与列定制顺序 - + for (String columnName : columnList) { + WeaTableColumn weaTableColumn = columnMap.get(columnName); + if (weaTableColumn != null && weaTableColumn.getDisplay().getBoolVal()) { + weaTableColumnList.add(weaTableColumn); + headerList.add(weaTableColumn.getColumn()); + headerNameList.add(weaTableColumn.getText()); + } + } // 增加id字段,跳转人员卡片