From 29028fb4af4c9dc36eac0690dbefe2565e624a5f Mon Sep 17 00:00:00 2001 From: "396572590@qq.com" Date: Thu, 21 Jul 2022 15:49:28 +0800 Subject: [PATCH 1/3] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20=205?= =?UTF-8?q?6624=20=20=E5=9B=BD=E5=AE=B6=E5=9C=B0=E5=8C=BA=E6=B8=85?= =?UTF-8?q?=E5=8D=95=E7=9A=84=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2=EF=BC=8C?= =?UTF-8?q?=E6=A0=87=E5=87=86=E5=8F=B7=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E6=97=A0=E4=BD=9C=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarLawsAttrDetailedListMapper.xml | 95 +++++++++++++++---- 1 file changed, 74 insertions(+), 21 deletions(-) diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml index e64b06c1..174966fa 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml @@ -145,28 +145,81 @@ From 9425165adb14bd644b5b2ab759a6a61476e69294 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Thu, 21 Jul 2022 17:04:05 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=A9=BA=E6=A0=BC=20?= =?UTF-8?q?=E5=AF=BC=E8=87=B4=E6=9F=A5=E8=AF=A2=E7=B2=BE=E5=BA=A6=E5=87=BA?= =?UTF-8?q?=E7=8E=B0=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SarStandardComplianceAssessResultController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java index 39ce8a4a..975fed7d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java @@ -50,7 +50,7 @@ public class SarStandardComplianceAssessResultController { @ApiOperation(value = "条件查询标准清单") @GetMapping("/standard") public ResponseMessage selectStandard(SarStandardsInfoEO eo) throws Exception { - + eo.setStandNumber(eo.getStandNumber().replace(" ","  ")); if (eo.getStandApplicationType() == 1) { QueryWrapper queryWrapper = new QueryWrapper<>(); IPage iPage = new Page<>(eo.getCurrent(), eo.getSize()); From 54bcdac1dcd1e6561b13bfead5257bf635fe33a3 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Fri, 22 Jul 2022 17:59:55 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=A0=87=E5=87=86=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/SarStandardsInfoServiceImpl.java | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java index 23de453a..3dac3652 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java @@ -254,6 +254,9 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl wrapper=new QueryWrapper<>(); + wrapper.in("MENU_NAME",sarStandardsInfoEO.getStandSystem()); + wrapper.orderByDesc("length(PARENT_IDS)"); + List standards=iSarMenuStandardService.list(wrapper); + if (null!=standards && standards.size()>0) { + List ids=new ArrayList<>(); + if (StringUtils.isNotBlank(standards.get(0).getParentIds())){ + if (standards.get(0).getParentIds().contains(",")){ + ids=new ArrayList<>(Arrays.asList(standards.get(0).getParentIds().split(","))); + }else { + ids.add(standards.get(0).getParentIds()); + } + } + QueryWrapper wrapper1 = new QueryWrapper<>(); + wrapper1.in("id", ids); + List res = iSarMenuStandardService.list(wrapper1); + if (null!=res && res.size()>0){ + Map map=new HashMap<>(); + res.forEach(sarMenuStandard -> {map.put(sarMenuStandard.getId(),sarMenuStandard.getMenuName());}); + String result=""; + for (String s:ids) { + result +="/"+map.get(s); + } + sarStandardsInfoEO.setStandSystem(result.substring(1,result.length())); + } + } + + return sarStandardsInfoEO; }