Compare commits

..

No commits in common. "f0255ceb1b7adb5df5ad7878b2e2a9e990652f53" and "661534ea934d51ccb720d6fa5dbc309bc321bba4" have entirely different histories.

2 changed files with 1 additions and 10 deletions

View File

@ -72,12 +72,6 @@ public class AllocCanteenSuggestion extends BaseEntity {
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
private Long replyState; private Long replyState;
@ApiModelProperty("开始时间")
private String startTime;
@ApiModelProperty("结束时间")
private String endTime;
public String getComplaintPicture() { public String getComplaintPicture() {
return FileUrlUtil.getFileUrl(this.complaintPicture); return FileUrlUtil.getFileUrl(this.complaintPicture);
} }

View File

@ -34,7 +34,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<where> <where>
<if test="complaintId != null "> and acs.complaint_id = #{complaintId}</if> <if test="complaintId != null "> and acs.complaint_id = #{complaintId}</if>
<if test="userId != null "> and acs.user_id = #{userId}</if> <if test="userId != null "> and acs.user_id = #{userId}</if>
<if test="content != null and content != ''"> and acs.content like concat('%', #{content}, '%')</if> <if test="content != null and content != ''"> and acs.content = #{content}</if>
<if test="canteenId != null "> and acs.canteen_id = #{canteenId}</if> <if test="canteenId != null "> and acs.canteen_id = #{canteenId}</if>
<if test="complaintPicture != null and complaintPicture != ''"> and acs.complaint_picture = #{complaintPicture}</if> <if test="complaintPicture != null and complaintPicture != ''"> and acs.complaint_picture = #{complaintPicture}</if>
<if test="sourceType != null "> and acs.source_type = #{sourceType}</if> <if test="sourceType != null "> and acs.source_type = #{sourceType}</if>
@ -42,9 +42,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="replyContent != null and replyContent != ''"> and acs.reply_content = #{replyContent}</if> <if test="replyContent != null and replyContent != ''"> and acs.reply_content = #{replyContent}</if>
<if test="revision != null "> and acs.revision = #{revision}</if> <if test="revision != null "> and acs.revision = #{revision}</if>
<if test="replyState != null "> and acs.reply_state = #{replyState}</if> <if test="replyState != null "> and acs.reply_state = #{replyState}</if>
<if test="startTime!=null and startTime!='' and endTime!=null and endTime!=''">
and acs.create_time BETWEEN CONCAT(#{startTime}, ' 00:00:00') AND CONCAT(#{endTime},' 23:59:59')
</if>
</where> </where>
</select> </select>