diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/LymsEncodeUtil.java b/platform-common/src/main/java/com/lyms/platform/common/utils/LymsEncodeUtil.java index a947098..8c4b1bd 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/utils/LymsEncodeUtil.java +++ b/platform-common/src/main/java/com/lyms/platform/common/utils/LymsEncodeUtil.java @@ -31,7 +31,7 @@ public class LymsEncodeUtil { String key1 = "Lymsh@2020"; - String d = aesEncrypt("2020-04-03",key1); + String d = aesEncrypt("2020-04-30",key1); System.out.println("加密:" + d); } diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/PreEugenicsBaseModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/PreEugenicsBaseModel.java index 238bfdd..9440b39 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/PreEugenicsBaseModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/PreEugenicsBaseModel.java @@ -369,6 +369,18 @@ public class PreEugenicsBaseModel extends BaseModel { //0 或者空 未上传国家网 1上传国家网 private Integer sendCountry; + //0 或者空孕检 1婚孕检 + private Integer hyj; + + + public Integer getHyj() { + return hyj; + } + + public void setHyj(Integer hyj) { + this.hyj = hyj; + } + public Integer getSendCountry() { return sendCountry; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PreEugenicsBaseListRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PreEugenicsBaseListRequest.java index 482a02f..ca4d056 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PreEugenicsBaseListRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PreEugenicsBaseListRequest.java @@ -62,6 +62,19 @@ public class PreEugenicsBaseListRequest extends BaseQuery { //是否有B超 private Boolean hasBc; + //0 或者空孕检 1婚孕检 + private Integer hyj; + + + public Integer getHyj() { + return hyj; + } + + public void setHyj(Integer hyj) { + this.hyj = hyj; + } + + public Boolean getHasBc() { return hasBc; } 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 2ec2697..5276350 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 @@ -291,6 +291,11 @@ public class PreEugebicsServiceImpl extends BaseServiceImpl implements IPreEugen query.addCriteria(Criteria.where("wifeBCheck").exists(hasBc)); } + Integer hyj = param.getHyj(); + if (hyj != null) { + query.addCriteria(Criteria.where("hyj").is(hyj)); + } + String createTime = param.getCreateTime(); if (StringUtils.isNotEmpty(createTime)) { String[] arrs = createTime.split(" - ");