From 916d0470ce189a31325348759b9435103fe242ed Mon Sep 17 00:00:00 2001
From: litao <litao@lymsh.com>
Date: Sat, 27 May 2017 11:04:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=88=B8=E6=8A=A5=E8=A1=A8?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../permission/dao/master/CouponMapper.java        |  2 ++
 .../main/resources/mainOrm/master/CouponMapper.xml | 30 ++++++++++++++++++++++
 .../web/service/impl/ReportServiceImpl.java        |  6 ++++-
 3 files changed, 37 insertions(+), 1 deletion(-)

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<Map<String,Object>> findCouponInfo(Map<String, Object> param);
+
+    int findCouponInfoCount(Map<String, Object> 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 @@
         </if>
         limit #{currentPage},#{pageSize}
     </select>
+
+    <select id="findCouponInfoCount" parameterType="map" resultType="integer">
+        select count(1) from (
+            select c.type, a.sequence_id, d.name
+            from coupon_info a, coupon_template b, coupon_type c, users d, organization e, hospital_coupon_template_group f
+            where a.coupon_template_id = b.id and b.type_id = c.id and a.user_id = d.id and a.status=2 and a.create_hospital_id = e.id
+            and a.used_hospital_id = #{hospitalId} and f.hospital_id = a.used_hospital_id and c.type in
+            <foreach collection="couponType" open="(" close=")" separator="," item="type">
+                #{type}
+            </foreach>
+            <if test="startDate != null">
+                and a.create_date >= #{startDate}
+            </if>
+            <if test="endDate != null">
+                and a.create_date <![CDATA[ <= ]]> #{endDate}
+            </if>
+            <if test="provinceId != null and provinceId != ''">
+                and e.province_id = #{provinceId}
+            </if>
+            <if test="cityId != null and cityId != '' ">
+                and e.city_id = #{cityId}
+            </if>
+            <if test="areaId != null and areaId != ''">
+                and e.area_id = #{areaId}
+            </if>
+            <if test="tempId != null and tempId != ''">
+                and f.coupon_template_group_id = #{tempId}
+            </if>
+        ) a
+    </select>
 </mapper>
\ 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<String, Object> param) {
         PageUtil.setPageInfo(param);
+
         Map<String, Object> hospitalName = couponMapper.findHospitalName(param);
         List<Map<String, Object>> couponInfos = couponMapper.findCouponInfo(param);
         for (Map<String, Object> 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<String, Object> map) {
-- 
1.8.3.1