Merge branch 'dev_guidance' into develop

4 years ago · 3a13b5bb23
1 changed files with 2 additions and 5 deletions
--- a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointStatisticalDailyDao.xml
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointStatisticalDailyDao.xml
@ -250,9 +250,7 @@
            <if test="null != gridId and gridId != ''">
                AND a.GRID_ID = #{gridId}
            </if>
-            GROUP BY a.CUSTOMER_ID,
-            a.AGENCY_ID,
-            a.GRID_ID,
+            GROUP BY
            a.USER_ID
    </select>
    <select id="selectGridPointByMonth" resultType="com.epmet.dto.BizPointUserTotalDetailDTO">
@ -273,8 +271,7 @@
            <if test="null != agencyId and agencyId != ''">
                AND a.AGENCY_ID = #{agencyId}
            </if>
-            GROUP BY a.CUSTOMER_ID,
-            a.AGENCY_ID,
+            GROUP BY
            a.GRID_ID
    </select>
 </mapper>