diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/CouponMapper.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/CouponMapper.java index 005ffbc..96b0c41 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/CouponMapper.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/CouponMapper.java @@ -62,4 +62,6 @@ public interface CouponMapper { String findPhone(String s); List> findCouponInfo(Map param); + + int findCouponInfoCount(Map param); } diff --git a/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml b/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml index 6b8c6a9..d109b34 100644 --- a/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml +++ b/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml @@ -250,4 +250,34 @@ limit #{currentPage},#{pageSize} + + \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java index 703d9d7..214fa1b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java @@ -486,12 +486,16 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService @Override public BaseObjectResponse couponInfo(Map param) { PageUtil.setPageInfo(param); + Map hospitalName = couponMapper.findHospitalName(param); List> couponInfos = couponMapper.findCouponInfo(param); for (Map couponInfo : couponInfos) { setAntexInfo(couponInfo); } - return RespBuilder.buildSuccess("hospitalInfo", hospitalName, "couponInfo", couponInfos); + hospitalName.put("couponInfos", couponInfos); + int count = couponMapper.findCouponInfoCount(param); + PageResult pageResult = new PageResult(count, (Integer) param.get("currentPage") ,(Integer) param.get("pageSize"), hospitalName); + return RespBuilder.buildSuccess(pageResult); } private void setAntexInfo(Map map) {