fix(meetings): selectList 加 7 个筛选 if (P0#1), Date 字段加 @DateTimeFormat 让字符串能 Spring 绑定
This commit is contained in:
@@ -3,6 +3,7 @@ package com.ruoyi.business.domain;
|
|||||||
import java.math.BigDecimal;
|
import java.math.BigDecimal;
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
|
import org.springframework.format.annotation.DateTimeFormat;
|
||||||
import com.ruoyi.common.annotation.Excel;
|
import com.ruoyi.common.annotation.Excel;
|
||||||
import com.ruoyi.common.core.domain.BaseEntity;
|
import com.ruoyi.common.core.domain.BaseEntity;
|
||||||
|
|
||||||
@@ -26,10 +27,12 @@ public class BizMeeting extends BaseEntity {
|
|||||||
/** start_time */
|
/** start_time */
|
||||||
@Excel(name = "start_time")
|
@Excel(name = "start_time")
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||||
|
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||||
private Date startTime;
|
private Date startTime;
|
||||||
/** end_time */
|
/** end_time */
|
||||||
@Excel(name = "end_time")
|
@Excel(name = "end_time")
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||||
|
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||||
private Date endTime;
|
private Date endTime;
|
||||||
/** total_periods */
|
/** total_periods */
|
||||||
@Excel(name = "total_periods")
|
@Excel(name = "total_periods")
|
||||||
|
|||||||
@@ -37,6 +37,14 @@
|
|||||||
<select id="selectList" resultMap="BizMeetingResult" parameterType="BizMeeting">
|
<select id="selectList" resultMap="BizMeetingResult" parameterType="BizMeeting">
|
||||||
<include refid="selectFields"/>
|
<include refid="selectFields"/>
|
||||||
<where>
|
<where>
|
||||||
|
<if test="projectNo != null and projectNo != ''">and project_no like concat('%', #{projectNo}, '%')</if>
|
||||||
|
<if test="meetingId != null">and meeting_id = #{meetingId}</if>
|
||||||
|
<if test="meetingName != null and meetingName != ''">and meeting_name like concat('%', #{meetingName}, '%')</if>
|
||||||
|
<if test="periodNo != null">and period_no = #{periodNo}</if>
|
||||||
|
<if test="projectForm != null and projectForm != ''">and project_form = #{projectForm}</if>
|
||||||
|
<if test="currentStage != null and currentStage != ''">and current_stage = #{currentStage}</if>
|
||||||
|
<if test="startTime != null">and start_time >= #{startTime}</if>
|
||||||
|
<if test="endTime != null">and end_time <= #{endTime}</if>
|
||||||
</where>
|
</where>
|
||||||
order by meeting_id desc
|
order by meeting_id desc
|
||||||
</select>
|
</select>
|
||||||
|
|||||||
Reference in New Issue
Block a user