diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java index 437de305..9a3ba52b 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java @@ -98,7 +98,13 @@ public class SarStandardsInfoController extends BaseController if (StringUtils.isNotBlank(page.getAdvanceSearchVOStr())) { List searchList = JSONObject.parseArray(page.getAdvanceSearchVOStr(),SarAdvanceSearchVO.class); - String advanceStr = SarAdvanceSearchUtil.createStandSql(searchList,"SAR_STAND_ATTR_INFO"); + //不改传参强行置换 + searchList.forEach(sarAdvanceSearchVO -> { + if ("TXLB".equals(sarAdvanceSearchVO.getField())){ + sarAdvanceSearchVO.setField("STAND_SYSTEM"); + } + }); + String advanceStr = SarAdvanceSearchUtil.createStandSql(searchList,"sar_standards_info"); if (StringUtils.isNotBlank(advanceStr)) { page.setAdvanceSearchStr(advanceStr); } else { @@ -136,7 +142,13 @@ public class SarStandardsInfoController extends BaseController if (StringUtils.isNotBlank(page.getAdvanceSearchVOStr())) { List searchList = JSONObject.parseArray(page.getAdvanceSearchVOStr(),SarAdvanceSearchVO.class); - String advanceStr = SarAdvanceSearchUtil.createStandSql(searchList,"SAR_STAND_ATTR_INFO"); + //不改传参强行置换 + searchList.forEach(sarAdvanceSearchVO -> { + if ("TXLB".equals(sarAdvanceSearchVO.getField())){ + sarAdvanceSearchVO.setField("STAND_SYSTEM"); + } + }); + String advanceStr = SarAdvanceSearchUtil.createStandSql(searchList,"sar_standards_info"); if (StringUtils.isNotBlank(advanceStr)) { page.setAdvanceSearchStr(advanceStr); } else { @@ -215,7 +227,13 @@ public class SarStandardsInfoController extends BaseController if (StringUtils.isNotBlank(page.getAdvanceSearchVOStr())) { List searchList = JSONObject.parseArray(page.getAdvanceSearchVOStr(),SarAdvanceSearchVO.class); - String advanceStr = SarAdvanceSearchUtil.createStandSql(searchList,"SAR_STAND_ATTR_INFO"); + //不改传参强行置换 + searchList.forEach(sarAdvanceSearchVO -> { + if ("TXLB".equals(sarAdvanceSearchVO.getField())){ + sarAdvanceSearchVO.setField("STAND_SYSTEM"); + } + }); + String advanceStr = SarAdvanceSearchUtil.createStandSql(searchList,"sar_standards_info"); if (StringUtils.isNotBlank(advanceStr)) { page.setAdvanceSearchStr(advanceStr); } else { 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 679bd783..62ba2ef9 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 @@ -1618,6 +1618,13 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl map=new HashMap<>(); + map.put("1","是"); + map.put("2","否"); + sarStandardsInfoEO.setIsRelateAccess(map.get(sarStandardsInfoEO.getIsRelateAccess())); + beforeSarStandardsInfo.setIsRelateAccess(map.get(beforeSarStandardsInfo.getIsRelateAccess())); + newMap = changeMap(sarStandardsInfoEO, newMap); oldMap = changeMap(beforeSarStandardsInfo, oldMap); // 增加关联事件 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 cc61e967..ab21d3e4 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 @@ -1118,7 +1118,7 @@ and SAR_STAND_ATTR_INFO.CLLX = #{page.applyArctic} - + and (${page.advanceSearchStr})