From 88da1b9907715ab7ac7be08534726abe84234463 Mon Sep 17 00:00:00 2001 From: wxz Date: Wed, 17 May 2023 10:14:19 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9:=E3=80=90=E7=81=B5=E5=B1=B1-?= =?UTF-8?q?=E7=BA=A2=E8=89=B2=E5=BE=85=E5=8A=9E=E3=80=91=E5=A4=A7=E5=B1=8F?= =?UTF-8?q?-=E6=9C=8D=E5=8A=A1=E5=88=97=E8=A1=A8=EF=BC=8C=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0agentId=E4=BB=A3=E5=8A=9E=E5=91=98id=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/controller/LingShanAgentServiceController.java | 5 +++-- .../java/com/epmet/service/LingShanAgentServiceService.java | 2 +- .../epmet/service/impl/LingShanAgentServiceServiceImpl.java | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/LingShanAgentServiceController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/LingShanAgentServiceController.java index e6cbb2311e..541462c10b 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/LingShanAgentServiceController.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/LingShanAgentServiceController.java @@ -279,9 +279,10 @@ public class LingShanAgentServiceController { @GetMapping("screen/serviceList") public Result> screenServiceList(@RequestParam("orgType") String orgType, @RequestParam("orgId") String orgId, - @RequestParam("dataType") String dataType) { + @RequestParam("dataType") String dataType, + @RequestParam(value = "agentId", required = false) String agentId) { - List rl = lingShanServiceAgentService.screenServiceList(orgType, orgId, dataType); + List rl = lingShanServiceAgentService.screenServiceList(orgType, orgId, dataType, agentId); return new Result>().ok(rl); } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/LingShanAgentServiceService.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/LingShanAgentServiceService.java index adbcb0bbcd..992244d76b 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/LingShanAgentServiceService.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/LingShanAgentServiceService.java @@ -33,7 +33,7 @@ public interface LingShanAgentServiceService { List screenAgentList(String orgType, String orgId); - List screenServiceList(String orgType, String orgId, String dataType); + List screenServiceList(String orgType, String orgId, String dataType, String agentId); List serviceCategoryAnalysis(String orgType, String orgId); diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/LingShanAgentServiceServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/LingShanAgentServiceServiceImpl.java index ae8510d524..cfa4aef5ee 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/LingShanAgentServiceServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/LingShanAgentServiceServiceImpl.java @@ -474,7 +474,7 @@ public class LingShanAgentServiceServiceImpl implements LingShanAgentServiceServ } @Override - public List screenServiceList(String orgType, String orgId, String dataType) { + public List screenServiceList(String orgType, String orgId, String dataType, String agentId) { String orgIdPath; if (StringUtils.isAnyBlank(orgType, orgId)) { @@ -503,6 +503,7 @@ public class LingShanAgentServiceServiceImpl implements LingShanAgentServiceServ LambdaQueryWrapper q = new LambdaQueryWrapper<>(); q.likeRight(LingshanAgentServiceRecordEntity::getOrgIdPath, orgIdPath); q.eq(LingshanAgentServiceRecordEntity::getProcessStatus, processStatus); + q.eq(StringUtils.isNotBlank(agentId), LingshanAgentServiceRecordEntity::getAgentId, agentId); List serviceRecords = agentServiceRecordDao.selectList(q); return serviceRecords.stream().map(rec -> {