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 7af10e4..9b3139f 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 @@ -140,6 +140,15 @@ public class ResidentsArchiveQuery extends BaseQuery implements IConvertToNative if (StringUtils.isNotBlank(areaId)) { condition = condition.and("areaId", areaId, MongoOper.IS); } + if (StringUtils.isNotBlank(provinceRegisterId)) { + condition = condition.and("provinceRegisterId", provinceRegisterId, MongoOper.IS); + } + if (StringUtils.isNotBlank(cityRegisterId)) { + condition = condition.and("cityRegisterId", cityRegisterId, MongoOper.IS); + } + if (StringUtils.isNotBlank(areaRegisterId)) { + condition = condition.and("areaRegisterId", areaRegisterId, MongoOper.IS); + } if (StringUtils.isNotBlank(vcCardNo)) { condition = condition.and("vcCardNo", vcCardNo, MongoOper.IS); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsFacade.java index 4a70c89..cc177d0 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsFacade.java @@ -191,7 +191,7 @@ public class ResidentsFacade { list.add(map); } } - return new BaseListResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(list); + return new BaseListResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(list).setPageInfo(query.getPageInfo()); } //查询孕次 diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ResidentsArchiveQueryRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ResidentsArchiveQueryRequest.java index ac95a4c..902c2a9 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ResidentsArchiveQueryRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ResidentsArchiveQueryRequest.java @@ -40,9 +40,9 @@ public class ResidentsArchiveQueryRequest extends BasePageQueryRequest{ private String cityRegisterId; private String areaRegisterId; - //年龄(如: 24-26) + //年龄(如: 24 - 26) private String age; - //出生日期(范围值 - ) + //出生日期(范围值 1991-01-01 - 1994-02-02 ) private String birthday; public String getBuildProvinceId() {