From 96c734490c1753000b2106819367f975f96263eb Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Fri, 12 Nov 2021 15:43:46 +0800
Subject: [PATCH 1/2] shijian

---
 .../impl/ScreenProjectCategoryGridAndOrgDailyServiceImpl.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectCategoryGridAndOrgDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectCategoryGridAndOrgDailyServiceImpl.java
index 93343327bd..5e82efba75 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectCategoryGridAndOrgDailyServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectCategoryGridAndOrgDailyServiceImpl.java
@@ -97,7 +97,7 @@ public class ScreenProjectCategoryGridAndOrgDailyServiceImpl implements ScreenPr
         log.info("网格-所有项目分类即将插入的集合{}",allList);
         gridInsert(allList);
         long end = System.currentTimeMillis();
-        log.info("网格项目分类统计结束，耗时:"+ (end-start/1000) + "s");
+        log.info("网格项目分类统计结束，耗时:"+ (end-start)/1000 + "s");
     }
 
     /**
@@ -205,7 +205,7 @@ public class ScreenProjectCategoryGridAndOrgDailyServiceImpl implements ScreenPr
         log.info("组织-即将插入的项目分类{}",result);
         orgInsert(result);
         long end = System.currentTimeMillis();
-        log.info("组织项目分类统计结束，耗时:"+ (end-start/1000) + "s");
+        log.info("组织项目分类统计结束，耗时:"+ (end-start)/1000 + "s");
     }
 
     /**

From d8f0da1bc9ce78c1b1066cb924e9ec70d1601c20 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Fri, 12 Nov 2021 16:17:11 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/screen/ScreenProjectDataDao.xml    | 47 ++++++++++---------
 1 file changed, 24 insertions(+), 23 deletions(-)

diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectDataDao.xml
index 8ca09bf5cb..370f73fdf8 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectDataDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectDataDao.xml
@@ -162,28 +162,29 @@
     <!-- 查询分类下的项目列表 -->
     <select id="selectCategoryProjectList" resultType="com.epmet.project.dto.result.CategoryProjectListResultDTO">
         SELECT
-            ALL_CATEGORY_NAME AS category,
-            CASE WHEN PROJECT_STATUS_CODE = 'closed_case' THEN 'closed' ELSE PROJECT_STATUS_CODE END  AS projectStatus,
-            IFNULL(PROJECT_TITLE,'') AS projectTitle,
-            DATE_FORMAT(PROJECT_CREATE_TIME,'%Y-%m-%d %h:%i:%s') AS createTime,
-            ORG_ID,
-            ORG_TYPE,
-            PROJECT_ID,
-            LINK_NAME,
-            LINK_MOBILE,
-            PROJECT_ADDRESS
-        FROM screen_project_data
-        WHERE DEL_FLAG = '0'
-          <if test=' status == "closed" '>
-              AND PROJECT_STATUS_CODE IN ('closed_case','closed')
-          </if>
-          AND CONCAT(ALL_PARENT_IDS,':',ORG_ID) LIKE CONCAT('%',#{orgId},'%')
-          AND CATEGORY_CODE LIKE CONCAT('%',#{categoryCode},'%')
-          AND CUSTOMER_ID = #{customerId}
-          AND DATE_FORMAT(PROJECT_CREATE_TIME,'%Y%m%d') <![CDATA[ <= ]]> #{endTime}
-          <if test="null != startTime and startTime != '' ">
-              AND DATE_FORMAT(PROJECT_CREATE_TIME,'%Y%m%d') >= #{startTime}
-          </if>
-        ORDER BY PROJECT_CREATE_TIME DESC
+            DISTINCT pd.PROJECT_ID AS projectId,
+            pd.ALL_CATEGORY_NAME AS category,
+            CASE WHEN pd.PROJECT_STATUS_CODE = 'closed_case' THEN 'closed' ELSE pd.PROJECT_STATUS_CODE END  AS projectStatus,
+            IFNULL(pd.PROJECT_TITLE,'') AS projectTitle,
+            DATE_FORMAT(pd.PROJECT_CREATE_TIME,'%Y-%m-%d %h:%i:%s') AS createTime,
+            pd.ORG_ID,
+            pd.ORG_TYPE,
+            pd.LINK_NAME,
+            pd.LINK_MOBILE,
+            pd.PROJECT_ADDRESS
+        FROM screen_project_data pd
+        INNER JOIN screen_project_category pc ON (pc.PROJECT_ID = pd.PROJECT_ID AND pc.DEL_FLAG = '0' AND pc.CATEGORY_CODE IS NOT NULL)
+        WHERE pd.DEL_FLAG = '0'
+            <if test=' status == "closed" '>
+                AND pd.PROJECT_STATUS_CODE IN ('closed_case','closed')
+            </if>
+            AND CONCAT(pd.ALL_PARENT_IDS,':',pd.ORG_ID) LIKE CONCAT('%',#{orgId},'%')
+            AND pc.CATEGORY_CODE LIKE CONCAT(#{categoryCode},'%')
+            AND pd.CUSTOMER_ID = #{customerId}
+            AND DATE_FORMAT(pd.PROJECT_CREATE_TIME,'%Y%m%d') <![CDATA[ <= ]]> #{endTime}
+            <if test="null != startTime and startTime != '' ">
+                AND DATE_FORMAT(pd.PROJECT_CREATE_TIME,'%Y%m%d') >= #{startTime}
+            </if>
+        ORDER BY pd.PROJECT_CREATE_TIME DESC
     </select>
 </mapper>