From 1534b1ca38d5f3a7f4178c7f6883b4fa90a10219 Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Thu, 2 Apr 2020 15:09:24 +0800
Subject: [PATCH] update

---
 .../lyms/platform/pojo/ResidentsArchiveModel.java  | 12 +++++++++
 .../lyms/platform/query/ResidentsArchiveQuery.java | 30 +++++++++++++++++++++-
 .../web/service/impl/PreEugebicsServiceImpl.java   |  4 +--
 3 files changed, 43 insertions(+), 3 deletions(-)

diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/ResidentsArchiveModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/ResidentsArchiveModel.java
index 3c39772..f24ef0c 100644
--- a/platform-dal/src/main/java/com/lyms/platform/pojo/ResidentsArchiveModel.java
+++ b/platform-dal/src/main/java/com/lyms/platform/pojo/ResidentsArchiveModel.java
@@ -196,6 +196,18 @@ public class ResidentsArchiveModel extends BaseModel {
     //0 或者空不是  1是
     private Integer hasHj;
 
+    //婚检时间
+    private Date checkupTime;
+
+    public Date getCheckupTime() {
+        return checkupTime;
+    }
+
+    public ResidentsArchiveModel setCheckupTime(Date checkupTime) {
+        this.checkupTime = checkupTime;
+        return this;
+    }
+
     public Integer getHasHj() {
         return hasHj;
     }
diff --git a/platform-dal/src/main/java/com/lyms/platform/query/ResidentsArchiveQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/ResidentsArchiveQuery.java
index ef9bc1c..b6f1a5c 100644
--- a/platform-dal/src/main/java/com/lyms/platform/query/ResidentsArchiveQuery.java
+++ b/platform-dal/src/main/java/com/lyms/platform/query/ResidentsArchiveQuery.java
@@ -138,7 +138,9 @@ public class ResidentsArchiveQuery extends BaseQuery implements IConvertToNative
 
     //配偶证件号
     private String spouseCardNo;
-
+    //婚检时间
+    private Date checkupTimeStart;
+    private Date checkupTimeEnd;
 
 
     @Override
@@ -265,6 +267,14 @@ public class ResidentsArchiveQuery extends BaseQuery implements IConvertToNative
             }
         }
 
+        if (null != checkupTimeStart && null != checkupTimeEnd) {
+            if (null != c1) {
+                c1 = c1.where("checkupTime").gte(checkupTimeStart).lte(checkupTimeEnd);
+            } else {
+                c1 = Criteria.where("checkupTime").gte(checkupTimeStart).lte(checkupTimeEnd);
+            }
+        }
+
 
         if (null != createdStart && null != createdEnd) {
             if (null != c1) {
@@ -337,6 +347,24 @@ public class ResidentsArchiveQuery extends BaseQuery implements IConvertToNative
     //0 或者空不是  1是
     private Integer hasHj;
 
+    public Date getCheckupTimeStart() {
+        return checkupTimeStart;
+    }
+
+    public ResidentsArchiveQuery setCheckupTimeStart(Date checkupTimeStart) {
+        this.checkupTimeStart = checkupTimeStart;
+        return this;
+    }
+
+    public Date getCheckupTimeEnd() {
+        return checkupTimeEnd;
+    }
+
+    public ResidentsArchiveQuery setCheckupTimeEnd(Date checkupTimeEnd) {
+        this.checkupTimeEnd = checkupTimeEnd;
+        return this;
+    }
+
     public Integer getHasHj() {
         return hasHj;
     }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PreEugebicsServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PreEugebicsServiceImpl.java
index 545ae4e..338cf73 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PreEugebicsServiceImpl.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PreEugebicsServiceImpl.java
@@ -610,8 +610,8 @@ public class PreEugebicsServiceImpl extends BaseServiceImpl implements IPreEugen
                 }
                 if (StringUtils.isNotEmpty(time)) {
                     try {
-                        query.setBuildDateStart(DateUtil.getSNDate(time)[0]);
-                        query.setBuildDateEnd(DateUtil.getSNDate(time)[1]);
+                        query.setCheckupTimeStart(DateUtil.getSNDate(time)[0]);
+                        query.setCheckupTimeEnd(DateUtil.getSNDate(time)[1]);
                     } catch (Exception e) {
                         e.printStackTrace();
                     }
-- 
1.8.3.1