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

feat: 体系数据列表筛选条件失效BUG

Browse Source
This commit is contained in:
mzaxd
2023-11-16 14:35:05 +08:00
parent 55ba8d09e8
commit 8430e92b2b
3 changed files with 39 additions and 3 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
+27
View File
@@ -8,6 +8,7 @@ import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
import org.springframework.format.annotation.DateTimeFormat;
import java.text.SimpleDateFormat;
import java.util.Collections;
import java.util.Date;
import java.util.List;
@@ -45,6 +46,11 @@ public class StandSystemDTO {
@ApiModelProperty(value = "开始发布日期")
private Date startReleaseDate;
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd")
@ApiModelProperty(value = "开始发布日期字符串")
private String startReleaseDateString;
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd")
@ApiModelProperty(value = "发布日期")
@@ -55,6 +61,11 @@ public class StandSystemDTO {
@ApiModelProperty(value = "结束发布日期")
private Date endReleaseDate;
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd")
@ApiModelProperty(value = "结束发布日期字符串")
private String endReleaseDateString;
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd")
@ApiModelProperty(value = "开始实施日期")
@@ -117,4 +128,20 @@ public class StandSystemDTO {
this.selectIds = selectIds;
this.selectIdList = java.util.Arrays.asList(selectIds.split(","));
}
public void setStartReleaseDate(Date startReleaseDate) {
this.startReleaseDate = startReleaseDate;
if (startReleaseDate != null) {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
this.startReleaseDateString = sdf.format(startReleaseDate);
}
}
public void setEndReleaseDate(Date endReleaseDate) {
this.endReleaseDate = endReleaseDate;
if (endReleaseDate != null) {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
this.endReleaseDateString = sdf.format(endReleaseDate);
}
}
}
adc-da-slrs/src/main/resources/mybatis/mapper/SarStandMenu/SarStandMenuMapper.xml
+8 -3
View File
@@ -199,8 +199,9 @@
AND gb.STAND_NAME LIKE CONCAT('%',#{param.standName},'%')
</if>
<!--发布时间-->
<if test="param.startReleaseDate != null and param.endReleaseDate != ''">
AND gb.ISSUE_TIME BETWEEN #{param.startReleaseDate} AND #{param.endReleaseDate}
<if test="param.startReleaseDateString != null and param.startReleaseDateString != '' and
param.endReleaseDateString != null and param.endReleaseDateString != ''">
AND gb.ISSUE_TIME BETWEEN #{param.startReleaseDateString} AND #{param.endReleaseDateString}
</if>
<!--实施日期-->
<if test="param.startImplementDate != null and param.endImplementDate != ''">
@@ -218,8 +219,12 @@
<if test="param.draftUserName != null and param.draftUserName != ''">
AND gba.WSSMR LIKE CONCAT('%',#{param.draftUserName},'%')
</if>
<!--数据来源-->
<!--搜索条件数据来源-->
<if test="param.dataSource != null and param.dataSource != ''">
AND gb.STAND_TYPE = #{param.dataSource}
</if>
<!--SQL复用数据来源-->
<if test="dataSource != null and dataSource != ''">
AND gb.STAND_TYPE = #{dataSource}
</if>
<if test="param.selectIdList != null and param.selectIdList.size() > 0">
adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml
+4
View File
@@ -1341,6 +1341,10 @@
<if test="param.draftUserName != null and param.draftUserName != ''">
AND esa.QCRBUSS LIKE CONCAT('%',#{param.draftUserName},'%')
</if>
<!--数据来源-->
<if test="param.dataSource != null and param.dataSource != ''">
AND 'ENTERPRISE' = #{param.dataSource}
</if>
<if test="param.selectIdList != null and param.selectIdList.size() > 0">
AND es.ID IN
<foreach item="item" index="index" collection="param.selectIdList" open="(" separator="," close=")">