From e48ba66433e92d23c4d76a1307097057d0d427fe Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Tue, 11 May 2021 14:13:39 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=99=E4=B8=AA=E6=8E=A5=E5=8F=A3=E6=B2=A1?=
 =?UTF-8?q?=E6=B3=95=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../screen/CategoryAnalysisResultDTO.java     | 10 ++++++
 .../ScreenProjectCategoryOrgDailyDao.xml      | 35 ++++++++++---------
 2 files changed, 29 insertions(+), 16 deletions(-)

diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/result/screen/CategoryAnalysisResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/result/screen/CategoryAnalysisResultDTO.java
index da023e6c0b..f91ef35e09 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/result/screen/CategoryAnalysisResultDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/result/screen/CategoryAnalysisResultDTO.java
@@ -23,4 +23,14 @@ public class CategoryAnalysisResultDTO implements Serializable {
 	 * 项目总数
 	 */
 	private Integer projectTotal;
+
+	/**
+	 * 数据更新至
+	 */
+	private String dateId;
+
+	/**
+	 * 分类编码
+	 */
+	private String categoryCode;
 }
diff --git 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
index 2e207479c1..4d95ae22e5 100644
--- 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
@@ -6,28 +6,31 @@
 
     <select id="selectCategoryAnalysis" resultType="com.epmet.dto.result.screen.CategoryAnalysisResultDTO">
         SELECT D.CATEGORY_NAME AS categoryName,
-			 M.PROJECT_TOTAL  AS projectTotal
+			 M.PROJECT_TOTAL  AS projectTotal,
+			 m.DATE_ID as dateId,
+             m.CATEGORY_CODE as categoryCode
         FROM screen_project_category_org_daily m
         left join customer_project_category_dict d
          on(m.CATEGORY_CODE=D.CATEGORY_CODE
                 AND D.DEL_FLAG='0'
                 and d.CUSTOMER_ID=#{customerId})
         WHERE M.DEL_FLAG = '0'
-                    AND M.ORG_ID = #{agencyId}
-                    AND M.DATE_ID = (
-                                    select
-                                            date_id
-                                    from
-                                            screen_project_category_org_daily
-                                    where
-                                            del_flag = '0'
-                                    and ORG_ID = #{agencyId}
-                                    and CUSTOMER_ID=#{customerId}
-                                    order by
-                                            date_id desc,
-                                            created_time desc
-                                    limit 1
-                    )
+        AND M.ORG_ID = #{agencyId}
+        and M.CUSTOMER_ID=#{customerId}
+        AND M.DATE_ID = (
+                        select
+                                date_id
+                        from
+                                screen_project_category_org_daily
+                        where
+                                del_flag = '0'
+                        and ORG_ID = #{agencyId}
+                        and CUSTOMER_ID=#{customerId}
+                        order by
+                                date_id desc,
+                                created_time desc
+                        limit 1
+        )
         ORDER BY M.PROJECT_TOTAL desc,D.CATEGORY_NAME asc
         limit 20
     </select>