zy hace 7 meses
padre
commit
6fbc4da810

+ 12 - 0
bus-biz/src/main/resources/mapper/WFallbackInfoMapper.xml

@@ -15,6 +15,18 @@
    is_delete
    from
    w_fallback_info
+   <where>
+       is_delete = 0
+       <if test="creatorName != null and creatorName != ''">
+           and creator_name like concat('%', #{creatorName}, '%')
+       </if>
+       <if test="startTime != null ">
+           and create_time &gt;= #{startTime}
+       </if>
+       <if test="endTime != null ">
+           and create_time &lt;= #{endTime}
+       </if>
+   </where>
  </select>
 
 </mapper>

+ 8 - 16
bus-common/src/main/java/bus/model/dto/WFallbackInfoPageDto.java

@@ -3,6 +3,8 @@ package bus.model.dto;
 import bus.model.BaseEntity;
 import lombok.Data;
 import io.swagger.annotations.ApiModelProperty;
+import org.springframework.format.annotation.DateTimeFormat;
+
 import java.util.Date;
 import java.util.Date;
 /**
@@ -13,22 +15,12 @@ import java.util.Date;
 **/
 @Data
 public class WFallbackInfoPageDto extends BaseEntity{
-    @ApiModelProperty("id")
-    private String id;
-    @ApiModelProperty("反馈内容")
-    private String content;
-    @ApiModelProperty("记录创建时间")
-    private Date createTime;
-    @ApiModelProperty("记录更新时间")
-    private Date updateTime;
-    @ApiModelProperty("创建人id")
-    private String creatorId;
-    @ApiModelProperty("修改人id")
-    private String updaterId;
+
     @ApiModelProperty("创建人姓名")
     private String creatorName;
-    @ApiModelProperty("修改人姓名")
-    private String updaterName;
-    @ApiModelProperty("是否删除")
-    private Integer isDelete;
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date startTime;
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date endTime;
+
 }