diff --git a/src/main/java/com/example/demo/domain/entity/Detail.java b/src/main/java/com/example/demo/domain/entity/Detail.java index fa98085..91762a7 100644 --- a/src/main/java/com/example/demo/domain/entity/Detail.java +++ b/src/main/java/com/example/demo/domain/entity/Detail.java @@ -38,7 +38,7 @@ public class Detail implements Serializable { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @DateTimeFormat(pattern = "yyyy-MM-dd") private Date createTime; - + private String username; private Date endDate; private Date startDate; private String uname; diff --git a/src/main/java/com/example/demo/mapper/DetailYMapper.java b/src/main/java/com/example/demo/mapper/DetailYMapper.java index 36d16b4..8e1f642 100644 --- a/src/main/java/com/example/demo/mapper/DetailYMapper.java +++ b/src/main/java/com/example/demo/mapper/DetailYMapper.java @@ -84,8 +84,9 @@ public interface DetailYMapper { "`detail_y`", "", "AND jwcode=#{jwcode}", - "AND update_type=#{updateType}", - "AND create_time BETWEEN #{startDate} AND #{endDate}", +// "AND update_type=#{updateType}", +// "AND create_time BETWEEN #{startDate} AND #{endDate}", + "AND area=#{area}", "", "" })