From 60d8312d4052188d4b77c2af97963dd0fced50cb Mon Sep 17 00:00:00 2001
From: litao <litao@lymsh.com>
Date: Thu, 8 Jun 2017 17:04:41 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mainOrm/master/CouponMapper.xml                 | 3 ++-
 .../com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java  | 1 -
 2 files changed, 2 insertions(+), 2 deletions(-)

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 d15a349..5e9b8b1 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml
@@ -425,7 +425,7 @@
     </select>
 
     <select id="findUserSendInfo" parameterType="map" resultType="map">
-        select a.create_hospital_id, a.user_id, a.create_date ,d.name as send_hospital, e.name as doctoer_name
+        select a.create_hospital_id, a.user_id, DATE_FORMAT(a.create_date, '%Y-%m-%d') as create_date, d.name as send_hospital, e.name as doctoer_name
         from
         coupon_info a, coupon_template b, coupon_type c, organization d, users e
         where a.coupon_template_id = b.id and b.type_id = c.id and a.create_hospital_id = d.id and a.create_user_id = e.id
@@ -443,6 +443,7 @@
         <if test="endDate != null">
             and a.create_date <![CDATA[ < ]]> #{endDate}
         </if>
+        group by a.user_id, a.create_date
         limit #{currentPage},#{pageSize}
     </select>
 
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 e5e3b53..63605ff 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
@@ -733,7 +733,6 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService
                 if(StringUtils.isNotEmpty(userId)) {
                     setUserSendInfo(userId, map); /** 设置姓名、居住地、户籍地、电话 */
                 }
-                map.put("create_date", DateUtil.getyyyy_MM_dd((Date) map.get("create_date")));
             }
             PageResult pageResult = new PageResult(count, (Integer) param.get("currentPage") ,(Integer) param.get("pageSize"), CollectionUtils.createMap("userSendInfos", userSendInfo));
             return RespBuilder.buildSuccess(pageResult);
-- 
1.8.3.1