From 26905d00fbf45acb1093ce891fa149630680c8e0 Mon Sep 17 00:00:00 2001 From: zhangjun Date: Thu, 22 Sep 2022 20:36:00 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=A1=AE=E8=AE=A4?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=80=82=E7=94=A8=E8=AE=A4=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../slrs/sarStandardsInfo/entity/SarStandardsInfoEOPage.java | 1 + .../mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml | 3 +++ 2 files changed, 4 insertions(+) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfoEOPage.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfoEOPage.java index 02438782..b0ac4bd3 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfoEOPage.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfoEOPage.java @@ -90,6 +90,7 @@ public class SarStandardsInfoEOPage extends BasePage { private String orderByA = ""; private String orderBy1 = "SAR_STANDARDS_INFO.issue_time"; private String order1 = ""; + private String syzd = ""; // syncParam == sync private String syncParam; diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml index 15687b2d..36ed714a 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml @@ -1121,6 +1121,9 @@ and SAR_STAND_ATTR_INFO.CLLX = #{page.applyArctic} + + and SAR_STAND_ATTR_INFO.SYRZ = #{page.syzd} + and (${page.advanceSearchStr}) From 9cd13bb8807925a26e0b1618afb36778e1c6dad2 Mon Sep 17 00:00:00 2001 From: zhangjun <879913833@qq.com> Date: Fri, 23 Sep 2022 15:28:28 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E5=88=B6=E4=BF=AE=E8=AE=A2=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E8=B7=91=E5=AE=8C=E5=85=A5=E5=BA=93=E6=8A=A5=E9=94=99?= =?UTF-8?q?=E4=BA=86=EF=BC=8C=E6=B5=81=E7=A8=8B=E6=B2=A1=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java index 6e8a7fe7..16d8d732 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java @@ -135,6 +135,8 @@ public class EsRevisePlanServiceImpl extends ServiceImpl Date: Mon, 26 Sep 2022 10:24:42 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E5=88=B6=E4=BF=AE=E8=AE=A2=E6=B5=81?= =?UTF-8?q?=E7=A8=8B-=E4=BA=A7=E5=93=81=E6=A0=87=E5=87=86=EF=BC=8C?= =?UTF-8?q?=E4=BF=AE=E8=AE=A2=EF=BC=8C=E6=B5=81=E7=A8=8B=E7=BB=93=E6=9D=9F?= =?UTF-8?q?=E4=B9=8B=E5=90=8E=EF=BC=8C=E4=BC=81=E6=A0=87=E5=BA=93=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SarBussionessStandServiceImpl.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java index 3c7ea73e..88ee51e1 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java @@ -283,6 +283,9 @@ public class SarBussionessStandServiceImpl extends ServiceImpl Date: Mon, 26 Sep 2022 10:48:53 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E6=B5=81=E7=A8=8B=EF=BC=8C=E7=82=B9=E5=87=BB?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=A0=87=E5=87=86=EF=BC=8C=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E2=80=9C=E9=80=82=E7=94=A8?= =?UTF-8?q?=E8=AE=A4=E8=AF=81=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml index 36ed714a..353fcf07 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml @@ -1513,6 +1513,9 @@ select count(1) from (select count(*) from SAR_STANDARDS_INFO left join SAR_STAND_ATTR_INFO on (SAR_STAND_ATTR_INFO.stand_id = SAR_STANDARDS_INFO.id and SAR_STAND_ATTR_INFO.valid_flag=0) + + and SAR_STAND_ATTR_INFO.SYRZ = #{syzd} + GROUP BY SAR_STANDARDS_INFO.id) a From 1b36e1b6a1f1faf20518d789865989ee79e38cd3 Mon Sep 17 00:00:00 2001 From: zhangjun <879913833@qq.com> Date: Mon, 26 Sep 2022 13:31:34 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=88=86=E8=A7=A3?= =?UTF-8?q?=E5=8D=95=E9=80=82=E7=94=A8=E8=BD=A6=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/SarStandItemsServiceImpl.java | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java index ea7ad48e..2cec40fa 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java @@ -13,6 +13,8 @@ import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfo; import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfoEOPage; import com.adc.da.slrs.sarStandardsInfo.service.ISarStandardsInfoService; import com.adc.da.slrs.sysInfo.service.SysInfoEOService; +import com.adc.da.sys.entity.DicTypeEO; +import com.adc.da.sys.service.IDicTypeEOService; import com.adc.da.utils.util.InitStandAttrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -47,6 +49,8 @@ public class SarStandItemsServiceImpl extends ServiceImpl queryItemsByList(SarStandItemsEOPage page, String resType){ List itemsEOList = dao.queryItemsByList(page); @@ -282,6 +286,24 @@ public class SarStandItemsServiceImpl extends ServiceImpl sarStandItems = dao.querySarItemAndInterpretation(page); sarStandItems.forEach(sarStandItems1 -> sarStandItems1.setTermsConditions(StringUtils.replace(sarStandItems1.getTermsConditions(),"''","'"))); + List dicTypeEOList = iDicTypeEOService.getTypeIdByDicIdAndTypeName("VBMNNTHJG", null, null, null); + Map dicTypeMap = dicTypeEOList.stream().collect(Collectors.toMap(DicTypeEO::getDicTypeCode,DicTypeEO::getDicTypeName)); + for (SarStandItems sarStandItems1 : sarStandItems){ + String srcx = sarStandItems1.getApplyArctic(); + List srcxList = new ArrayList<>(); + if (!srcx.contains("[")){ + String[] srcxArray = srcx.split(","); + for (String srcxString : srcxArray){ + String ss = dicTypeMap.get(srcxString); + if (null != ss) { + srcxList.add(ss); + } + } + } + if (!CollectionUtils.isEmpty(srcxList)){ + sarStandItems1.setApplyArctic(String.join(",",srcxList)); + } + } return sarStandItems; } From a08b8cdc41e0befef24357f457ca91af8b84a756 Mon Sep 17 00:00:00 2001 From: zhangjun <879913833@qq.com> Date: Mon, 26 Sep 2022 13:38:35 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E6=A0=87=E5=87=86=E9=A2=84=E8=AD=A6?= =?UTF-8?q?=E6=9F=A5=E7=9C=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/Impl/EarlyWarningEOServiceImpl.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/Impl/EarlyWarningEOServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/Impl/EarlyWarningEOServiceImpl.java index 6fc179f0..35470a63 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/Impl/EarlyWarningEOServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/Impl/EarlyWarningEOServiceImpl.java @@ -114,7 +114,13 @@ public class EarlyWarningEOServiceImpl extends ServiceImpl getStandWarning(StandWarningEO queryPage) { IPage iPage = new Page<>(queryPage.getPage(),queryPage.getPageSize()); - return earlyWarningEODao.selectWarningPage(iPage,queryPage); + IPage standWarningEOIPage = earlyWarningEODao.selectWarningPage(iPage,queryPage); + for (StandWarningEO standWarningEO : standWarningEOIPage.getRecords()) { + if (null != standWarningEO.getApplyType()) { + standWarningEO.setApplyType(standWarningEO.getApplyType().replace("[", "").replace("]", "").replace("\"", "")); + } + } + return standWarningEOIPage; } /**