Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev

4 years ago · 51dbf84f37
1 changed files with 2 additions and 1 deletions
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectCategoryOrgDailyDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectCategoryOrgDailyDao.xml
@ -29,6 +29,7 @@
                                created_time desc
                        limit 1
        )
+        GROUP BY m.DATE_ID,m.CATEGORY_CODE,m.PROJECT_TOTAL
        ORDER BY M.PROJECT_TOTAL desc
    </select>

@ -117,4 +118,4 @@
          AND p2.CUSTOMER_ID = #{customerId}
          AND p1.CATEGORY_CODE = p2.PARENT_CATEGORY_CODE
    </select>
-</mapper>
+</mapper>