From 5ad10b9e8c2ffc8e1d95329a1e75a3f6d87b923b Mon Sep 17 00:00:00 2001
From: litao <litao@lymsh.com>
Date: Mon, 26 Jun 2017 11:55:33 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=94=E5=9B=9E=E4=BD=BF=E7=94=A8/=E5=8F=91?=
 =?UTF-8?q?=E6=94=BE=E4=BA=BA=E6=95=B0id?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../permission/dao/master/CouponMapper.java        |  4 +++
 .../main/resources/mainOrm/master/CouponMapper.xml | 34 ++++++++++++++++++++++
 .../web/service/impl/ReportServiceImpl.java        |  7 +++++
 .../lyms/platform/operate/web/utils/MongoUtil.java |  1 +
 4 files changed, 46 insertions(+)

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 02db61a..ac6b3f4 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
@@ -82,4 +82,8 @@ public interface CouponMapper {
     List<Map<String,Object>> findUserSendInfo(Map<String, Object> param);
 
     Integer findUserSendInfoCount(Map<String, Object> param);
+
+    List<String> findSendUserIds(Map<String, Object> param);
+
+    List<String> findUsedUserIds(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 e374f57..43cfbd7 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml
@@ -239,6 +239,23 @@
         group by b.coupon_order, b.type, a.used_hospital_id
     </select>
 
+    <select id="findUsedUserIds" parameterType="map" resultType="lists">
+        select distinct(b.user_id)
+        from organization a, coupon_info b, coupon_template c, coupon_type d
+        where a.id = b.used_hospital_id and b.coupon_template_id = c.id and c.type_id = d.id
+        and a.id = #{hid}
+        and d.type in
+        <foreach collection="couponType" open="(" close=")" separator="," item="type">
+            #{type}
+        </foreach>
+        <if test="startDate != null">
+            and b.use_date >= #{startDate}
+        </if>
+        <if test="endDate != null">
+            and b.use_date <![CDATA[ < ]]> #{endDate}
+        </if>
+    </select>
+
     <select id="findHospitalUsedInfo" parameterType="map" resultType="map">
         select a.id, count(distinct(b.user_id)) as user_used_count, count(1) as coupon_used_count, a.area_id, a.city_id, a.province_id
         from organization a, coupon_info b, coupon_template c, coupon_type d
@@ -256,6 +273,23 @@
         </if>
     </select>
 
+    <select id="findSendUserIds" parameterType="map" resultType="list">
+        select distinct(b.user_id)
+        from organization a, coupon_info b, coupon_template c, coupon_type d
+        where a.id = b.create_hospital_id and b.coupon_template_id = c.id and c.type_id = d.id
+        and a.id = #{hid}
+        and d.type in
+        <foreach collection="couponType" open="(" close=")" separator="," item="type">
+            #{type}
+        </foreach>
+        <if test="startDate != null">
+            and b.create_date >= #{startDate}
+        </if>
+        <if test="endDate != null">
+            and b.create_date <![CDATA[ < ]]> #{endDate}
+        </if>
+    </select>
+
     <select id="findHospitalSendInfo" parameterType="map" resultType="map">
         select a.id, count(distinct(b.user_id)) as people_send_count, count(1) as coupon_send_count, a.area_id, a.city_id, a.province_id
         from organization a, coupon_info b, coupon_template c, coupon_type d
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 b7712d9..36d0e1c 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
@@ -468,6 +468,13 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService
                     Map<String, Object> sendInfo = couponMapper.findHospitalSendInfo(param);
 
                     Map<String, Object> tempMap = packCouponMap(sendInfo, usedInfo, hNameMap, hid, xAxis, param);
+                    /** 方法/使用人数id */
+                    List<String> sendUserIds = couponMapper.findSendUserIds(param);
+                    List<String> usedUserIds = couponMapper.findUsedUserIds(param);
+                    tempMap.put("sendUserIds", sendUserIds);
+                    tempMap.put("usedUserIds", usedUserIds);
+
+
                     if(MapUtils.isNotEmpty(tempMap)) {
                         couponReport.add(tempMap);
                     }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MongoUtil.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MongoUtil.java
index 8fe4abe..5af1e37 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MongoUtil.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MongoUtil.java
@@ -51,6 +51,7 @@ public class MongoUtil {
      * @return
      */
     public List<Map<String, Object>> getListByGroup(List<Patients> patients) {
+
         Map<String, Integer> codeMap = new HashMap<>(); /** key为 provinceId_cityId_areaId_month */
         Map<Integer, Integer> otherMap = new HashMap<>(); /** key为 month */
 
-- 
1.8.3.1