diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/PostReviewModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/PostReviewModel.java index 434a0e6..31b6270 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/PostReviewModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/PostReviewModel.java @@ -82,7 +82,7 @@ public class PostReviewModel extends BaseModel { //产检 医生 private String prodDoctor; //产检日期 - private String checkTime; + private Date checkTime; //下次产检时间 private String nextCheckTime; @@ -123,11 +123,11 @@ public class PostReviewModel extends BaseModel { this.boneDensity = boneDensity; } - public String getCheckTime() { + public Date getCheckTime() { return checkTime; } - public void setCheckTime(String checkTime) { + public void setCheckTime(Date checkTime) { this.checkTime = checkTime; } diff --git a/platform-dal/src/main/java/com/lyms/platform/query/PostReviewQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/PostReviewQuery.java index 9ae81ab..f3984e3 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/PostReviewQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/PostReviewQuery.java @@ -101,7 +101,7 @@ public class PostReviewQuery extends BaseQuery implements IConvertToNativeQuery boolean isAddStart = Boolean.FALSE; Criteria c = null; if (null != start) { - c = Criteria.where("created").gte(start); + c = Criteria.where("checkTime").gte(start); isAddStart = Boolean.TRUE; } @@ -109,7 +109,7 @@ public class PostReviewQuery extends BaseQuery implements IConvertToNativeQuery if (isAddStart) { c=c.lte(end); } else { - c = Criteria.where("created").lte(end); + c = Criteria.where("checkTime").lte(end); } isAddStart = Boolean.TRUE; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PostReviewRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PostReviewRequest.java index 757692c..23b12e2 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PostReviewRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PostReviewRequest.java @@ -3,6 +3,7 @@ package com.lyms.platform.operate.web.request; import com.lyms.platform.common.base.IBasicRequestConvert; import com.lyms.platform.common.core.annotation.form.FormParam; import com.lyms.platform.common.core.annotation.form.Form; +import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.common.utils.JsonUtil; import com.lyms.platform.pojo.PostReviewModel; import org.hibernate.validator.constraints.NotEmpty; @@ -339,7 +340,7 @@ public class PostReviewRequest implements IBasicRequestConvert