From bce70197a497072f6d437c5bc0703a3f1e5bfd4d Mon Sep 17 00:00:00 2001 From: landong2015 Date: Tue, 20 Dec 2016 11:00:10 +0800 Subject: [PATCH] =?UTF-8?q?update=20birthday=20and=20buildDay=20=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lyms/platform/pojo/ResidentsArchiveModel.java | 12 ++++---- .../lyms/platform/query/ResidentsArchiveQuery.java | 34 ++++++++++++++++++---- .../operate/web/facade/FolicAcidFacade.java | 8 ++--- .../web/facade/PremaritalCheckupFacade.java | 10 +++---- .../operate/web/facade/ResidentsArchiveFacade.java | 12 ++++---- .../web/request/ResidentsArchiveAddRequest.java | 5 ++-- 6 files changed, 53 insertions(+), 28 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 f17946b..33b7dfc 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 @@ -24,7 +24,7 @@ public class ResidentsArchiveModel extends BaseModel{ //性别 private String sex; //出生日期 - private String birthday; + private Date birthday; //国籍 private String countryId; //民族Id @@ -87,7 +87,7 @@ public class ResidentsArchiveModel extends BaseModel{ //建档人 private String buildDoctor; //建档日期 - private String buildDay; + private Date buildDay; /* table info */ @@ -132,11 +132,11 @@ public class ResidentsArchiveModel extends BaseModel{ this.sex = sex; } - public String getBirthday() { + public Date getBirthday() { return birthday; } - public void setBirthday(String birthday) { + public void setBirthday(Date birthday) { this.birthday = birthday; } @@ -372,11 +372,11 @@ public class ResidentsArchiveModel extends BaseModel{ this.buildDoctor = buildDoctor; } - public String getBuildDay() { + public Date getBuildDay() { return buildDay; } - public void setBuildDay(String buildDay) { + public void setBuildDay(Date buildDay) { this.buildDay = buildDay; } 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 439b947..27a59f1 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 @@ -6,6 +6,7 @@ import com.lyms.platform.common.dao.operator.MongoCondition; import com.lyms.platform.common.dao.operator.MongoOper; import com.lyms.platform.common.dao.operator.MongoQuery; import org.apache.commons.lang.StringUtils; +import org.springframework.data.mongodb.core.query.Criteria; import java.util.Date; @@ -21,7 +22,8 @@ public class ResidentsArchiveQuery extends BaseQuery implements IConvertToNative //性别 private String sex; //出生日期 - private Date birthday; + private Date birthdayStart; + private Date birthdayEnd; //国籍 private String countryId; //民族Id @@ -142,6 +144,20 @@ public class ResidentsArchiveQuery extends BaseQuery implements IConvertToNative if (StringUtils.isNotBlank(hospitalId)) { condition = condition.and("hospitalId", hospitalId, MongoOper.IS); } + Criteria c1 = null; + if(null!=birthdayStart){ + c1 = Criteria.where("birthday").gte(birthdayStart); + } + if(null!=birthdayEnd){ + if (null==c1) { + c1 = Criteria.where("birthday").lte(birthdayEnd); + } else { + c1 = c1.lte(birthdayEnd); + } + } + if (c1!=null) { + condition = condition.andCondition(new MongoCondition(c1)); + } return condition.toMongoQuery(); } @@ -177,12 +193,20 @@ public class ResidentsArchiveQuery extends BaseQuery implements IConvertToNative this.sex = sex; } - public Date getBirthday() { - return birthday; + public Date getBirthdayStart() { + return birthdayStart; + } + + public void setBirthdayStart(Date birthdayStart) { + this.birthdayStart = birthdayStart; + } + + public Date getBirthdayEnd() { + return birthdayEnd; } - public void setBirthday(Date birthday) { - this.birthday = birthday; + public void setBirthdayEnd(Date birthdayEnd) { + this.birthdayEnd = birthdayEnd; } public String getCountryId() { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/FolicAcidFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/FolicAcidFacade.java index b8a3a70..881080b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/FolicAcidFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/FolicAcidFacade.java @@ -112,13 +112,13 @@ public class FolicAcidFacade { model.setUsername(addRequest.getUsername()); model.setCertificateNum(addRequest.getCardNo()); model.setCertificateTypeId(addRequest.getCertificateTypeId()); - model.setBirthday(addRequest.getBirthday()); + model.setBirthday(addRequest.getBirthday()!=null ? DateUtil.parseYMD(addRequest.getBirthday()) : null); model.setAge(addRequest.getAge()); model.setPhone(addRequest.getPhone()); model.setSex(SystemConfig.WOMAN_ID); //建档日期 - model.setBuildDay(DateUtil.getyyyy_MM_dd(new Date())); + model.setBuildDay(new Date()); model.setVcCardNo(addRequest.getVcCardNo()); @@ -204,8 +204,8 @@ public class FolicAcidFacade { archiveMap.put("certificateNum", archiveModel.getCertificateNum()); archiveMap.put("certificateTypeId", archiveModel.getCertificateTypeId()); archiveMap.put("username", archiveModel.getUsername()); - archiveMap.put("birthday",archiveModel.getBirthday()); - archiveMap.put("age", StringUtils.isEmpty(archiveModel.getBirthday()) ? "" : DateUtil.getAge(DateUtil.parseYMD(archiveModel.getBirthday()))); + archiveMap.put("birthday",archiveModel.getBirthday() != null ? DateUtil.getyyyy_MM_dd(archiveModel.getBirthday()) : null); + archiveMap.put("age", archiveModel.getBirthday() != null ? "" : DateUtil.getAge(archiveModel.getBirthday())); archiveMap.put("phone", archiveModel.getPhone()); archiveMap.put("id", archiveModel.getId()); if (StringUtils.isEmpty(archiveModel.getSex()) || archiveModel.getSex().equals(SystemConfig.WOMAN_ID )){ diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java index 08c42df..c72515a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java @@ -144,7 +144,7 @@ public class PremaritalCheckupFacade { archiveMap.put("sex", "男"); } } - archiveMap.put("birthday", getBirthday(archiveModel.getBirthday())); + archiveMap.put("birthday", getBirthday(archiveModel.getBirthday()!=null ? DateUtil.getyyyy_MM_dd(archiveModel.getBirthday()) : null )); archiveMap.put("phone", archiveModel.getPhone()); archiveMap.put("residence", CommonsHelper.getResidence(archiveModel.getProvinceRegisterId(), archiveModel.getCityRegisterId(), archiveModel.getAreaRegisterId(), archiveModel.getStreetRegisterId(), archiveModel.getAddressRegister(), basicConfigService)); @@ -779,8 +779,8 @@ public class PremaritalCheckupFacade { if (archiveModel!=null && archiveModel.getYn()==YnEnums.YES.getId()){ username = archiveModel.getUsername(); phone = archiveModel.getPhone(); - if (StringUtils.isNotEmpty(archiveModel.getBirthday())){ - age = DateUtil.getAge(DateUtil.parseYMD(archiveModel.getBirthday())); + if (archiveModel.getBirthday()!=null){ + age = DateUtil.getAge(archiveModel.getBirthday()); } } } @@ -1142,8 +1142,8 @@ public class PremaritalCheckupFacade { if (archiveModel!=null && archiveModel.getYn()==YnEnums.YES.getId()){ username = archiveModel.getUsername(); phone = archiveModel.getPhone(); - if (StringUtils.isNotEmpty(archiveModel.getBirthday())){ - age = DateUtil.getAge(DateUtil.parseYMD(archiveModel.getBirthday())); + if (archiveModel.getBirthday()!=null){ + age = DateUtil.getAge(archiveModel.getBirthday()); } } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java index cf8f20f..ceae121 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java @@ -162,7 +162,7 @@ public class ResidentsArchiveFacade{ result.setHospitalId(String.valueOf(org.getId())); } } - result.setBookBuildDate(data.getBuildDay()); + result.setBookBuildDate(DateUtil.getyyyy_MM_dd(data.getBuildDay())); result.setId(data.getId()); resultList.add(result); } @@ -428,7 +428,7 @@ public class ResidentsArchiveFacade{ temp.setHospitalId(String.valueOf(org.getId())); } } - temp.setBookBuildDate(archiveModel.getBuildDay()); + temp.setBookBuildDate(DateUtil.getyyyy_MM_dd(archiveModel.getBuildDay())); temp.setId(archiveModel.getId()); historyResults.add(temp); } @@ -449,7 +449,7 @@ public class ResidentsArchiveFacade{ result.setId(model.getId()); result.setUsername(model.getUsername()); result.setSex(model.getSex()); - result.setBirthday(model.getBirthday()); + result.setBirthday(DateUtil.getyyyy_MM_dd(model.getBirthday())); result.setCountryId(model.getCountryId()); result.setNationId(model.getNationId()); result.setMarriageId(model.getMarriageId()); @@ -483,7 +483,7 @@ public class ResidentsArchiveFacade{ result.setVcCardNo(model.getVcCardNo()); result.setBuildDoctor(model.getBuildDoctor()); - result.setBuildDay(model.getBuildDay()); + result.setBuildDay(DateUtil.getyyyy_MM_dd(model.getBuildDay())); result.setCreated(model.getCreated()); result.setModified(model.getModified()); @@ -537,7 +537,7 @@ public class ResidentsArchiveFacade{ map.put("id",model.getId()); map.put("username",model.getUsername()); map.put("certificateNum",model.getCertificateNum()); - map.put("age",DateUtil.getAge(DateUtil.parseYMD(model.getBirthday()))); + map.put("age",DateUtil.getAge(model.getBirthday())); map.put("residence", CommonsHelper.getResidence(model.getProvinceId(), model.getCityId(), model.getAreaId(), model.getStreetId(), model.getAddress(), basicConfigService)); map.put("isCheckup",queryPremaritalCheckup(model.getId(), model.getHospitalId())); map.put("phone", FunvCommonUtil.getXingPhone(model.getPhone())); @@ -609,7 +609,7 @@ public class ResidentsArchiveFacade{ Map map = new HashMap<>(); map.put("username",data.getUsername()); map.put("sex","女"); - map.put("birthday",getBirthday(data.getBirthday())); + map.put("birthday",getBirthday(DateUtil.getyyyy_MM_dd(data.getBirthday()))); map.put("countryId",getBaseicConfigByid(data.getCountryId())); map.put("nationId",getBaseicConfigByid(data.getNationId())); map.put("marriageId",getBaseicConfigByid(data.getMarriageId())); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ResidentsArchiveAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ResidentsArchiveAddRequest.java index 3ad2d2e..f5ed1bf 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ResidentsArchiveAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ResidentsArchiveAddRequest.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.Form; import com.lyms.platform.common.core.annotation.form.FormParam; +import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.common.utils.JsonUtil; import com.lyms.platform.pojo.ResidentsArchiveModel; import org.hibernate.validator.constraints.NotEmpty; @@ -99,7 +100,7 @@ public class ResidentsArchiveAddRequest implements IBasicRequestConvert