From 15c293974363b498bb90770cb0bcd968c6c09e5d Mon Sep 17 00:00:00 2001
From: Administrator <184677810@qq.com>
Date: Fri, 1 Nov 2019 14:49:41 +0800
Subject: [PATCH] update

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

diff --git a/platform-biz-service/src/main/resources/mainOrm/master/FolviteReceiveMapper.xml b/platform-biz-service/src/main/resources/mainOrm/master/FolviteReceiveMapper.xml
index 77a1d36..01e19d9 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/FolviteReceiveMapper.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/FolviteReceiveMapper.xml
@@ -95,8 +95,7 @@ yn
         <include refid="orderAndLimit"/>
     </select>
 
-    <select id="listCount" parameterType="com.lyms.platform.permission.model.FolviteRecordQuery"
-            resultType="java.lang.Integer">
+    <select id="listCount" parameterType="com.lyms.platform.permission.model.FolviteRecordQuery"  resultType="java.lang.Integer">
         SELECT
         count(1)
         FROM
@@ -127,7 +126,6 @@ yn
                 AND  <![CDATA[ f.drawTime < date_format(#{endDrawTime},'%Y-%m-%d')  ]]>
             </if>
         </where>
-        GROUP BY p.folvite_id
     </select>
 
     <select id="queyFolviteReceiveCount" parameterType="com.lyms.platform.permission.model.FolviteRecordQuery"
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/FolviteServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/FolviteServiceImpl.java
index 294e407..059b655 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/FolviteServiceImpl.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/FolviteServiceImpl.java
@@ -97,6 +97,7 @@ public class FolviteServiceImpl implements FolviteService {
             }
             FolviteRecordQuery recordQuery = new FolviteRecordQuery();
             recordQuery.setFolviteId(queryOne.getId());
+            recordQuery.setSort("receive_date asc");
             List<FolviteReceiveRecordModel> folviteRecordModels = queryFolviteReceiveList(recordQuery);
             if (CollectionUtils.isNotEmpty(folviteRecordModels)) {
                 for (FolviteReceiveRecordModel folviteRecordModel : folviteRecordModels) {
-- 
1.8.3.1