From d639d1648cf707aae4a73b8e88ec0fae99dfe337 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Sun, 12 Sep 2021 13:45:55 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=AB=E7=A0=81=E7=B2=BE=E7=81=B5=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/UdiInfoExportLogController.java | 15 +++++++++++++++ .../api/admin/req/basic/FilterUdiInfoRequest.java | 4 ++++ 2 files changed, 19 insertions(+) diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiInfoExportLogController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiInfoExportLogController.java index 93dd0c03..32302127 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiInfoExportLogController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiInfoExportLogController.java @@ -153,6 +153,21 @@ public class UdiInfoExportLogController { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } + + if (filterUdiInfoRequest.getThirdSys() != null && filterUdiInfoRequest.getThirdCode() != null) { + if ("thirdId1".equals(filterUdiInfoRequest.getThirdSys())) { + filterUdiInfoRequest.setThirdId1(filterUdiInfoRequest.getThirdCode()); + } else if ("thirdId2".equals(filterUdiInfoRequest.getThirdSys())) { + filterUdiInfoRequest.setThirdId2(filterUdiInfoRequest.getThirdCode()); + } else if ("thirdId3".equals(filterUdiInfoRequest.getThirdSys())) { + filterUdiInfoRequest.setThirdId3(filterUdiInfoRequest.getThirdCode()); + } else if ("thirdId4".equals(filterUdiInfoRequest.getThirdSys())) { + filterUdiInfoRequest.setThirdId4(filterUdiInfoRequest.getThirdCode()); + } else { + filterUdiInfoRequest.setThirdId(filterUdiInfoRequest.getThirdCode()); + } + } + List udiRelevanceResponses = null; udiRelevanceResponses = udiRelevanceService.filterUdiRelevance(filterUdiInfoRequest); diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/basic/FilterUdiInfoRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/basic/FilterUdiInfoRequest.java index 26bd0dba..167de31d 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/basic/FilterUdiInfoRequest.java +++ b/api-admin/src/main/java/com/glxp/api/admin/req/basic/FilterUdiInfoRequest.java @@ -19,4 +19,8 @@ public class FilterUdiInfoRequest extends ListPageRequest { private String thirdId3; private String thirdId4; + + private String thirdCode; + private String thirdSys; + }