Commit 15c293974363b498bb90770cb0bcd968c6c09e5d
1 parent
bd3af687f4
Exists in
master
and in
6 other branches
update
Showing 2 changed files with 2 additions and 3 deletions
platform-biz-service/src/main/resources/mainOrm/master/FolviteReceiveMapper.xml
View file @
15c2939
| ... | ... | @@ -95,8 +95,7 @@ |
| 95 | 95 | <include refid="orderAndLimit"/> |
| 96 | 96 | </select> |
| 97 | 97 | |
| 98 | - <select id="listCount" parameterType="com.lyms.platform.permission.model.FolviteRecordQuery" | |
| 99 | - resultType="java.lang.Integer"> | |
| 98 | + <select id="listCount" parameterType="com.lyms.platform.permission.model.FolviteRecordQuery" resultType="java.lang.Integer"> | |
| 100 | 99 | SELECT |
| 101 | 100 | count(1) |
| 102 | 101 | FROM |
| ... | ... | @@ -127,7 +126,6 @@ |
| 127 | 126 | AND <![CDATA[ f.drawTime < date_format(#{endDrawTime},'%Y-%m-%d') ]]> |
| 128 | 127 | </if> |
| 129 | 128 | </where> |
| 130 | - GROUP BY p.folvite_id | |
| 131 | 129 | </select> |
| 132 | 130 | |
| 133 | 131 | <select id="queyFolviteReceiveCount" parameterType="com.lyms.platform.permission.model.FolviteRecordQuery" |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/FolviteServiceImpl.java
View file @
15c2939
| ... | ... | @@ -97,6 +97,7 @@ |
| 97 | 97 | } |
| 98 | 98 | FolviteRecordQuery recordQuery = new FolviteRecordQuery(); |
| 99 | 99 | recordQuery.setFolviteId(queryOne.getId()); |
| 100 | + recordQuery.setSort("receive_date asc"); | |
| 100 | 101 | List<FolviteReceiveRecordModel> folviteRecordModels = queryFolviteReceiveList(recordQuery); |
| 101 | 102 | if (CollectionUtils.isNotEmpty(folviteRecordModels)) { |
| 102 | 103 | for (FolviteReceiveRecordModel folviteRecordModel : folviteRecordModels) { |