From 411d79af7b1b755535fa9a9ee6ed94f682fca09a Mon Sep 17 00:00:00 2001 From: “linengliang” <vanSuperEnergy@163.com> Date: 星期四, 21 十二月 2023 17:19:18 +0800 Subject: [PATCH] 保养标准导入 --- lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EquipmentReportRepairServiceImpl.java | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EquipmentReportRepairServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EquipmentReportRepairServiceImpl.java index 606c9bb..4a974b9 100644 --- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EquipmentReportRepairServiceImpl.java +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EquipmentReportRepairServiceImpl.java @@ -22,10 +22,8 @@ import java.text.DateFormat; import java.text.ParseException; import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.Map; +import java.util.*; +import java.util.stream.Collectors; /** * @Description: equipment_report_repair @@ -105,6 +103,10 @@ SysUser sysUser = userMapper.selectById((String)params.get("userId")); params.put("teamId",sysUser.getTeamId()); } - return super.getBaseMapper().getReportRepairList(pageData, params) ; + List<String> equipNums = new ArrayList<>(); + if(StringUtils.isNotBlank((String)params.get("nums"))){ + equipNums = Arrays.asList(((String) params.get("nums")).trim().split("\n")).stream().filter(num->!num.equals("\n")).collect(Collectors.toList()); + } + return super.getBaseMapper().getReportRepairList(pageData, params,equipNums) ; } } -- Gitblit v1.9.3