From ff5f0348189cb6c3b6b4e51a53545183dc3bf758 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Tue, 15 Oct 2024 17:02:46 +0800 Subject: [PATCH] =?UTF-8?q?fix=2090669=20=E4=BC=81=E4=B8=9A=E6=A0=87?= =?UTF-8?q?=E5=87=86=E8=AE=A1=E5=88=92=E5=BA=93--=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=90=8E=E5=8B=BE=E9=80=89=E5=AF=BC=E5=87=BA=EF=BC=8C=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E7=9A=84=E6=98=AF=E6=9F=A5=E8=AF=A2=E7=9A=84=E6=95=B0?= =?UTF-8?q?=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EnterpriseStandardPlanController.java | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardPlanController.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardPlanController.java index dcb5d218..984dc5de 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardPlanController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardPlanController.java @@ -9,6 +9,7 @@ import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.exception.JeroBootException; import com.jero.common.system.base.controller.JeroController; import com.jero.common.util.MessageUtils; +import com.jero.common.util.oConvertUtils; import com.jero.modules.laws.enterprise.entity.EnterpriseStandardPlan; import com.jero.modules.laws.enterprise.entity.vo.EnterpriseStandardPlanVo; import com.jero.modules.laws.enterprise.service.EnterpriseStandardPlanService; @@ -25,7 +26,9 @@ import org.springframework.web.servlet.ModelAndView; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import java.util.Arrays; import java.util.List; +import java.util.stream.Collectors; /** * @Description: 企业标准计划库 @@ -113,8 +116,16 @@ public class EnterpriseStandardPlanController extends JeroController pageList = esPlanService.queryPageList(enterpriseStandardPlan, req, page); // 获取数据 List records = pageList.getRecords(); - - return super.exportListXls(records, EnterpriseStandardPlanVo.class, "企业标准计划库"); + // 过滤选中数据 + List exportList; + String selections = req.getParameter("selections"); + if (oConvertUtils.isNotEmpty(selections)) { + List selectionList = Arrays.asList(selections.split(",")); + exportList = records.stream().filter(item -> selectionList.contains(item.getId())).collect(Collectors.toList()); + } else { + exportList = records; + } + return super.exportListXls(exportList, EnterpriseStandardPlanVo.class, "企业标准计划库"); } }