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

bug: 体系搜索国内标准实施日期处理

Browse Source
This commit is contained in:
wxyclub
2023-11-29 19:26:16 +08:00
parent 9cfbafe2af
commit 4be04ee92a
2 changed files with 34 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/entity/StandSystemDTO.java
+26
View File
@@ -85,6 +85,11 @@ public class StandSystemDTO {
@ApiModelProperty(value = "开始实施日期")
private Date startImplementDate;
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd")
@ApiModelProperty(value = "开始实施日期")
private String startImplementDateString;
@Excel(name = "实施日期", width = 25, orderNum = "5", exportFormat = "yyyy-MM-dd")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd")
@@ -96,6 +101,11 @@ public class StandSystemDTO {
@ApiModelProperty(value = "结束实施日期")
private Date endImplementDate;
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd")
@ApiModelProperty(value = "结束实施日期")
private String endImplementDateString;
@Excel(name = "代替标准", width = 25, orderNum = "5")
@ApiModelProperty(value = "代替标准")
private String replaceStandardNo;
@@ -167,6 +177,22 @@ public class StandSystemDTO {
}
}
public void setStartImplementDate(Date startImplementDate) {
this.startImplementDate = startImplementDate;
if (startImplementDate != null) {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
this.startImplementDateString = sdf.format(startImplementDate);
}
}
public void setEndImplementDate(Date endImplementDate) {
this.endImplementDate = endImplementDate;
if (endImplementDate != null) {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
this.endImplementDateString = sdf.format(endImplementDate);
}
}
public void setStandSystemId(String standSystemId) {
this.standSystemId = standSystemId;
if (StrUtil.isNotBlank(standSystemId)) {
adc-da-slrs/src/main/resources/mybatis/mapper/SarStandMenu/SarStandMenuMapper.xml
+8 -5
View File
@@ -186,7 +186,10 @@
WHEN gb.ISSUE_TIME = '' THEN NULL
ELSE gb.ISSUE_TIME
END AS releaseDate,
gb.PUT_TIME AS implementDate,
CASE
WHEN gba.SSRQ = '' THEN NULL
ELSE gba.SSRQ
END AS implementDate,
gb.REPLACE_STAND_NUM AS replaceStandardNo,
gba.QCDW AS dept,
gba.WSSMR AS draftUserName,
@@ -231,11 +234,11 @@
AND gb.ISSUE_TIME <= CONCAT(#{param.endReleaseDateString}, ' 23:59:59')
</if>
<!-- 实施日期 -->
<if test="param.startImplementDate != null">
AND gb.PUT_TIME >= #{param.startImplementDate}
<if test="param.startImplementDateString != null and param.startImplementDateString != ''">
AND gba.SSRQ >= #{param.startImplementDateString}
</if>
<if test="param.endImplementDate != null">
AND gb.PUT_TIME &lt;= CONCAT(#{param.endImplementDate}, ' 23:59:59')
<if test="param.endImplementDateString != null and param.endImplementDateString != '' ">
AND gba.SSRQ &lt;= CONCAT(#{param.endImplementDateString}, ' 23:59:59')
</if>
<!--代替标准-->
<if test="param.replaceStandardNo != null and param.replaceStandardNo != ''">