diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/EarlyWarningEO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/EarlyWarningEO.java index fec3d95e..65e8ae2e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/EarlyWarningEO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/EarlyWarningEO.java @@ -61,6 +61,7 @@ public class EarlyWarningEO extends BaseEntity { private String standName; @ExcelProperty(value = "发布日期",index = 5) + @ColumnWidth(20) @ApiModelProperty("发布日期") @TableField(exist = false) @DateTimeFormat(pattern="yyyy-MM-dd") 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/dao/SarStandardsInfoDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java index 07a0949b..b5a26655 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java @@ -33,7 +33,8 @@ public interface SarStandardsInfoDao extends BaseMapper { List selectStandardsByStandnumber(SarStandardsInfo sarStandardsInfoEO); - List queryStandInfoByList(@Param("limit") Integer limit,@Param("typeCode") String typeCode); + List queryStandInfoByList(@Param("limit") Integer limit); +// List queryStandInfoByList(@Param("limit") Integer limit,@Param("typeCode") String typeCode); Integer selectStandColumn(@Param("columnName") String columnName); 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 5a93a513..51ffcac8 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); // 增加关联事件 @@ -1809,7 +1816,13 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl searchList = com.alibaba.fastjson.JSONObject.parseArray(page.getAdvanceSearchVOStr(), SarAdvanceSearchVO.class); - String advanceStr = SarAdvanceSearchUtil.createSql(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 { @@ -2485,22 +2498,23 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl getStandInfoByList(String limit){ - //查询文本状态为即将实施的 - QueryWrapper dictionaryWrapper = new QueryWrapper<>(); - dictionaryWrapper.select("ID") - .eq("DICTIONARY_NAME","文本状态"); - List> dicMaps = tsDictionaryDao.selectMaps(dictionaryWrapper); +// //查询文本状态为即将实施的 +// QueryWrapper dictionaryWrapper = new QueryWrapper<>(); +// dictionaryWrapper.select("ID") +// .eq("DICTIONARY_NAME","文本状态"); +// List> dicMaps = tsDictionaryDao.selectMaps(dictionaryWrapper); +// +// +// QueryWrapper dicTypeWrapper = new QueryWrapper<>(); +// dicTypeWrapper.select("DIC_TYPE_CODE") +// .eq("DIC_ID",dicMaps.get(0).get("ID").toString()) +// .eq("DIC_TYPE_NAME","即将实施"); +// List> typeMaps = tsDicTypeDao.selectMaps(dicTypeWrapper); - QueryWrapper dicTypeWrapper = new QueryWrapper<>(); - dicTypeWrapper.select("DIC_TYPE_CODE") - .eq("DIC_ID",dicMaps.get(0).get("ID").toString()) - .eq("DIC_TYPE_NAME","即将实施"); +// List standInfoList = dao.queryStandInfoByList(Integer.valueOf(limit), typeMaps.get(0).get("DIC_TYPE_CODE").toString()); - List> typeMaps = tsDicTypeDao.selectMaps(dicTypeWrapper); - - - List standInfoList = dao.queryStandInfoByList(Integer.valueOf(limit), typeMaps.get(0).get("DIC_TYPE_CODE").toString()); + List standInfoList = dao.queryStandInfoByList(Integer.valueOf(limit)); return standInfoList; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/utils/util/FieldConvertUtil.java b/adc-da-slrs/src/main/java/com/adc/da/utils/util/FieldConvertUtil.java index 7b7035d0..2e36ae93 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/utils/util/FieldConvertUtil.java +++ b/adc-da-slrs/src/main/java/com/adc/da/utils/util/FieldConvertUtil.java @@ -35,8 +35,7 @@ public class FieldConvertUtil { "文本状态,发布日期"; // 导出基础表字段 //删除 实施日期 2021-05-28 public static String exportBaseFieldNamesForeign = "标准类别,标准编号,标准年份,中文名称,英文名称," + - "文本状态,发布日期,是否纳入认证清单,体系类别,标签,适用认证,能源类型," + - "关联文件,发布稿,增补件,勘误件,草案"; // 导出基础表字段 + "文本状态,发布日期,是否纳入认证清单,标准体系,适用认证,能源类型";// 导出基础表字段 public static String exportAttrFieldNamesInland = "归口管理部门,发布机构,工作组信息,我司参与深度,适用车辆类型,要求类型," + "标签,发布稿（必读）,增补件（必读）,报批稿,送审稿,征求意见稿,草案,相关资料,新车型实施日期（文本）,在产车实施日期（文本）," + 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 d3a8b9a0..58ea160b 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}) @@ -1490,16 +1490,16 @@ FROM sar_standards_info LEFT JOIN sar_stand_attr_info ssai ON ssai.STAND_ID = SAR_STANDARDS_INFO.ID WHERE - DATE_FORMAT(ssai.SSRQ, '%Y-%m-%d') >= DATE_FORMAT( + DATE_FORMAT( LEFT (ssai.SSRQ,10), '%Y-%m-%d') >= DATE_FORMAT( SAR_STANDARDS_INFO.ISSUE_TIME, '%Y-%m-%d' ) AND sar_standards_info.VALID_FLAG='0' - AND TEXT_STATUS=#{typeCode} ORDER BY SAR_STANDARDS_INFO.ISSUE_TIME DESC LIMIT #{limit} +