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 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; } 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; } /** 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..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 @@ -1121,6 +1121,9 @@ and SAR_STAND_ATTR_INFO.CLLX = #{page.applyArctic} + + and SAR_STAND_ATTR_INFO.SYRZ = #{page.syzd} + and (${page.advanceSearchStr}) @@ -1510,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