diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/MeasureInfoMapper.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/MeasureInfoMapper.java index 81c7c99..cfd7976 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/MeasureInfoMapper.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/MeasureInfoMapper.java @@ -14,4 +14,6 @@ public interface MeasureInfoMapper { List queryMeasureInfoList(MeasureInfoQuery query); int updateMeasureInfo(MeasureInfoModel model); + + int queryMeasureInfoListCount(MeasureInfoQuery query); } diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/MeasureInfoServiceImpl.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/MeasureInfoServiceImpl.java index cd88389..96d32cb 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/MeasureInfoServiceImpl.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/MeasureInfoServiceImpl.java @@ -25,6 +25,9 @@ public class MeasureInfoServiceImpl implements MeasureInfoService { @Override public List queryMeasureInfoList(MeasureInfoQuery query) { + if (query.getNeed() != null) { + query.mysqlBuild(measureInfoMapper.queryMeasureInfoListCount(query)); + } return measureInfoMapper.queryMeasureInfoList(query); } diff --git a/platform-biz-service/src/main/resources/mainOrm/master/MeasureInfoMapper.xml b/platform-biz-service/src/main/resources/mainOrm/master/MeasureInfoMapper.xml index 9d2a2b4..58aa0c3 100644 --- a/platform-biz-service/src/main/resources/mainOrm/master/MeasureInfoMapper.xml +++ b/platform-biz-service/src/main/resources/mainOrm/master/MeasureInfoMapper.xml @@ -48,6 +48,12 @@ + + + UPDATE measure_info diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java index 81e97a9..98e457d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java @@ -40,6 +40,7 @@ public class MeasureInfoFacade { query.setAge(age); query.setVcCardNo(vcCardNo); query.setSort(" created desc "); + query.setNeed("true"); if (StringUtils.isNotEmpty(recordTime)) { String[] dates = recordTime.split(" - "); query.setRecordTimeStart(DateUtil.parseYMD(dates[0]));