FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop_master' into develop_master

Browse Source
This commit is contained in:
庄新伟
2022-03-15 13:31:40 +08:00
parent f9f4c0c0b4 76c7769625
commit 1379ab889e
6 changed files with 56 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/EarlyWarningEO.java
+1
View File
@@ -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")
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java
+21 -3
View File
@@ -98,7 +98,13 @@ public class SarStandardsInfoController extends BaseController<SarStandardsInfo>
if (StringUtils.isNotBlank(page.getAdvanceSearchVOStr())) {
List<SarAdvanceSearchVO> 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<SarStandardsInfo>
if (StringUtils.isNotBlank(page.getAdvanceSearchVOStr())) {
List<SarAdvanceSearchVO> 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<SarStandardsInfo>
if (StringUtils.isNotBlank(page.getAdvanceSearchVOStr())) {
List<SarAdvanceSearchVO> 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 {
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java
+2 -1
View File
@@ -33,7 +33,8 @@ public interface SarStandardsInfoDao extends BaseMapper<SarStandardsInfo> {
List<SarStandardsInfo> selectStandardsByStandnumber(SarStandardsInfo sarStandardsInfoEO);
List<SarStandardsInfo> queryStandInfoByList(@Param("limit") Integer limit,@Param("typeCode") String typeCode);
List<SarStandardsInfo> queryStandInfoByList(@Param("limit") Integer limit);
// List<SarStandardsInfo> queryStandInfoByList(@Param("limit") Integer limit,@Param("typeCode") String typeCode);
Integer selectStandColumn(@Param("columnName") String columnName);
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
+28 -14
View File
@@ -1618,6 +1618,13 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
if (StringUtils.isNotBlank(attrStr)) {
newMap = JSONObject.fromObject(attrStr);
}
//更新日志bug修复
Map<String,String> 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<SarStandardsInfoDao
}
if (org.apache.commons.lang.StringUtils.isNotBlank(page.getAdvanceSearchVOStr())) {
List<SarAdvanceSearchVO> 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<SarStandardsInfoDao
@Override
public List<SarStandardsInfo> getStandInfoByList(String limit){
//查询文本状态为即将实施的
QueryWrapper<TsDictionary> dictionaryWrapper = new QueryWrapper<>();
dictionaryWrapper.select("ID")
.eq("DICTIONARY_NAME","文本状态");
List<Map<String, Object>> dicMaps = tsDictionaryDao.selectMaps(dictionaryWrapper);
// //查询文本状态为即将实施的
// QueryWrapper<TsDictionary> dictionaryWrapper = new QueryWrapper<>();
// dictionaryWrapper.select("ID")
// .eq("DICTIONARY_NAME","文本状态");
// List<Map<String, Object>> dicMaps = tsDictionaryDao.selectMaps(dictionaryWrapper);
//
//
// QueryWrapper<TsDicType> dicTypeWrapper = new QueryWrapper<>();
// dicTypeWrapper.select("DIC_TYPE_CODE")
// .eq("DIC_ID",dicMaps.get(0).get("ID").toString())
// .eq("DIC_TYPE_NAME","即将实施");
// List<Map<String, Object>> typeMaps = tsDicTypeDao.selectMaps(dicTypeWrapper);
QueryWrapper<TsDicType> dicTypeWrapper = new QueryWrapper<>();
dicTypeWrapper.select("DIC_TYPE_CODE")
.eq("DIC_ID",dicMaps.get(0).get("ID").toString())
.eq("DIC_TYPE_NAME","即将实施");
// List<SarStandardsInfo> standInfoList = dao.queryStandInfoByList(Integer.valueOf(limit), typeMaps.get(0).get("DIC_TYPE_CODE").toString());
List<Map<String, Object>> typeMaps = tsDicTypeDao.selectMaps(dicTypeWrapper);
List<SarStandardsInfo> standInfoList = dao.queryStandInfoByList(Integer.valueOf(limit), typeMaps.get(0).get("DIC_TYPE_CODE").toString());
List<SarStandardsInfo> standInfoList = dao.queryStandInfoByList(Integer.valueOf(limit));
return standInfoList;
}
adc-da-slrs/src/main/java/com/adc/da/utils/util/FieldConvertUtil.java
+1 -2
View File
@@ -35,8 +35,7 @@ public class FieldConvertUtil {
"文本状态,发布日期"; // 导出基础表字段 //删除 实施日期 2021-05-28
public static String exportBaseFieldNamesForeign = "标准类别,标准编号,标准年份,中文名称,英文名称," +
"文本状态,发布日期,是否纳入认证清单,体系类别,标签,适用认证,能源类型," +
"关联文件,发布稿,增补件,勘误件,草案"; // 导出基础表字段
"文本状态,发布日期,是否纳入认证清单,标准体系,适用认证,能源类型";// 导出基础表字段
public static String exportAttrFieldNamesInland = "归口管理部门,发布机构,工作组信息,我司参与深度,适用车辆类型,要求类型," +
"标签,发布稿（必读）,增补件（必读）,报批稿,送审稿,征求意见稿,草案,相关资料,新车型实施日期（文本）,在产车实施日期（文本）," +
adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml
+3 -3
View File
@@ -1118,7 +1118,7 @@
<if test="page.applyArctic != null and page.applyArctic != ''">
and SAR_STAND_ATTR_INFO.CLLX = #{page.applyArctic}
</if>
<if test="page.advanceSearchStr != null and page.advanceSearchStr != ''">
<if test="null != page.advanceSearchStr and page.advanceSearchStr != ''">
and (${page.advanceSearchStr})
</if>
</trim>
@@ -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}
</select>
<!--AND TEXT_STATUS=#{typeCode}-->
<!-- 查询表中是否存在某字段-->
<select id="selectStandColumn" resultType="java.lang.Integer" parameterType="java.lang.String">