From 63db743735d7f376d046500cbcfbbfe3acde6ca1 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Mon, 1 Nov 2021 13:39:46 +0800
Subject: [PATCH 1/5] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/epmetuser/StaffPatrolRecordDao.xml    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/StaffPatrolRecordDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/StaffPatrolRecordDao.xml
index 9dc97b4c5a..a23656d221 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/StaffPatrolRecordDao.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/StaffPatrolRecordDao.xml
@@ -124,7 +124,7 @@
     <select id="gridMemberPatrol" resultType="com.epmet.dataaggre.dto.epmetuser.result.StaffListResultDTO">
         SELECT
             staff_id staffId,
-            IFNULL(SUM(patrol_total), 0) reportProjectCount,
+            IFNULL(SUM(report_project_count), 0) reportProjectCount,
             IFNULL(SUM(total_time), 0) timeNum
         FROM
             stats_staff_patrol_record_daily

From e16e266407fdf1a7e2dba611aa8e3ef2b838a2f8 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Tue, 2 Nov 2021 15:25:48 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E5=AF=B9=E5=A4=96=E7=BD=91=E6=A0=BC?=
 =?UTF-8?q?=E5=91=98=E5=B7=A1=E6=9F=A5=E6=95=B0=E6=8D=AE=E7=A8=8B=E5=BA=8F?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/datastats/DatsStatsDao.xml         | 43 +++++++++++--------
 1 file changed, 25 insertions(+), 18 deletions(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml
index 90029209ad..228e1c3fc6 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml
@@ -769,32 +769,39 @@
 
     <select id="selectGirdMemberPatrol" resultType="com.epmet.dataaggre.dto.epmetuser.result.GridMemberPatrolListResultDTO">
         SELECT
-            staff_id staffId,
-            staff_name staffName,
-            date_id dateId,
+            a.staff_id staffId,
+            a.staff_name staffName,
+            a.date_id dateId,
             IFNULL(
                 SUM(
-                    issue_to_project_count + closed_issue_count + project_response_count + project_transfer_count + project_closed_count
-                )
-            , 0)eventCount
-        FROM
-            fact_grid_member_statistics_daily
-        WHERE
-            del_flag = '0'
-        AND pids LIKE concat('%', #{agencyId}, '%')
-        AND date_id = (
-            SELECT MAX(date_id)
-            FROM fact_grid_member_statistics_daily
-            WHERE
-                del_flag = '0'
+                    a.issue_to_project_count + a.closed_issue_count + a.project_response_count + a.project_transfer_count + a.project_closed_count
+                ),
+                0
+            ) eventCount
+        FROM
+            fact_grid_member_statistics_daily a
+        INNER JOIN (
+            SELECT
+                staff_id,
+                MAX(date_id) date_id
+            FROM
+                fact_grid_member_statistics_daily
+            WHERE del_flag = '0'
+            AND pids LIKE concat('%', #{agencyId}, '%')
             <if test="dimType!= null and dimType == 'month' ">
                 AND month_id = #{dimId}
             </if>
             <if test="dimType!= null and dimType == 'year' ">
                 AND year_id = #{dimId}
             </if>
-        )
-        GROUP BY staff_id
+            GROUP BY STAFF_ID
+        ) b ON a.STAFF_ID = b.STAFF_ID AND a.date_id = b.date_id
+
+        WHERE
+            a.del_flag = '0'
+        AND a.pids LIKE concat('%', #{agencyId}, '%')
+        GROUP BY a.staff_id
+        ORDER BY a.date_id DESC
     </select>
 
     <select id="regUserList" resultType="com.epmet.dataaggre.dto.datastats.result.CustomerDataManageResultDTO$CustomerDataManage">

From 2c4a4a5897f27e35f25b108b6555f4b381cecb4a Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Wed, 3 Nov 2021 16:31:00 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E7=BB=93=E6=A1=88=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ScreenProjectCategoryGridDailyDTO.java    |  2 ++
 .../FactOriginProjectCategoryDailyDao.java    |  2 +-
 .../ScreenProjectCategoryGridDailyEntity.java |  5 +++++
 ...OriginProjectCategoryDailyServiceImpl.java |  6 +++++-
 .../V0.0.25__add_closedProjectTotal.sql       |  2 ++
 .../FactOriginProjectCategoryDailyDao.xml     | 20 +++++++++++++++++--
 6 files changed, 33 insertions(+), 4 deletions(-)
 create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.25__add_closedProjectTotal.sql

diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/ScreenProjectCategoryGridDailyDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/ScreenProjectCategoryGridDailyDTO.java
index cd31f554bb..e47c97f841 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/ScreenProjectCategoryGridDailyDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/ScreenProjectCategoryGridDailyDTO.java
@@ -120,4 +120,6 @@ public class ScreenProjectCategoryGridDailyDTO implements Serializable {
      */
 	private Boolean status = false;
 
+	private Integer closedProjectTotal = 0;
+
 }
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectCategoryDailyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectCategoryDailyDao.java
index 58ba1f5bc9..298860ce34 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectCategoryDailyDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectCategoryDailyDao.java
@@ -42,7 +42,7 @@ public interface FactOriginProjectCategoryDailyDao extends BaseDao<FactOriginPro
      * @description 计算当前客户下，各个网格内，各项目分类下项目数量
      * @Date 2021/3/23 9:58
      **/
-    List<ScreenProjectCategoryGridDailyDTO> selectListProjectCategoryGridDailyDTO(@Param("customerId") String customerId,@Param("subCount")Integer subCount);
+    List<ScreenProjectCategoryGridDailyDTO> selectListProjectCategoryGridDailyDTO(@Param("customerId") String customerId,@Param("subCount")Integer subCount,@Param("projectType")String projectType);
 
     /**
      * @Description  查询客户下，组织直接立项的，各项目分类下的项目数量【筛选组织创建的项目，fact_origin_project_main_daily表gridId为空】
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenProjectCategoryGridDailyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenProjectCategoryGridDailyEntity.java
index 82b03555ac..2a5881cbf4 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenProjectCategoryGridDailyEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenProjectCategoryGridDailyEntity.java
@@ -74,4 +74,9 @@ public class ScreenProjectCategoryGridDailyEntity extends BaseEpmetEntity {
 	 * 分类等级1、2....
 	 */
 	private Integer level;
+
+	/**
+	 * 分类下所有结案的项目
+	 */
+	private Integer closedProjectTotal;
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginProjectCategoryDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginProjectCategoryDailyServiceImpl.java
index 083fe26a85..e1131e02c6 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginProjectCategoryDailyServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginProjectCategoryDailyServiceImpl.java
@@ -138,7 +138,11 @@ public class FactOriginProjectCategoryDailyServiceImpl extends BaseServiceImpl<F
      **/
     @Override
     public List<ScreenProjectCategoryGridDailyDTO> selectListProjectCategoryGridDailyDTO(String customerId) {
-        List<ScreenProjectCategoryGridDailyDTO> list=baseDao.selectListProjectCategoryGridDailyDTO(customerId,getSubCount(customerId));
+        List<ScreenProjectCategoryGridDailyDTO> list=baseDao.selectListProjectCategoryGridDailyDTO(customerId,getSubCount(customerId),"all");
+        List<ScreenProjectCategoryGridDailyDTO> closedList = baseDao.selectListProjectCategoryGridDailyDTO(customerId,getSubCount(customerId),"closed");
+        if (!CollectionUtils.isEmpty(closedList)){
+            list.forEach(l -> closedList.stream().filter(c -> l.getGridId().equals(c.getGridId()) && l.getCategoryCode().equals(c.getCategoryCode())).forEach(c -> l.setClosedProjectTotal(c.getClosedProjectTotal())));
+        }
         return list;
     }
 
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.25__add_closedProjectTotal.sql b/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.25__add_closedProjectTotal.sql
new file mode 100644
index 0000000000..70f26d026d
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.25__add_closedProjectTotal.sql
@@ -0,0 +1,2 @@
+alter table screen_project_category_grid_daily add COLUMN CLOSED_PROJECT_TOTAL int(11) NOT NULL DEFAULT 0 comment '该分类下所有结案的项目数' AFTER PROJECT_TOTAL;
+alter table screen_project_category_org_daily add COLUMN CLOSED_PROJECT_TOTAL int(11) NOT NULL DEFAULT 0 comment '该分类下所有结案的项目数' AFTER PROJECT_TOTAL;
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectCategoryDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectCategoryDailyDao.xml
index cd1ced9860..9cfc1717b5 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectCategoryDailyDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectCategoryDailyDao.xml
@@ -36,13 +36,21 @@
                 p.GRID_ID,
                 p.AGENCY_ID AS PID,
                 P.PIDS,
-                count(1)as projectTotal
+                <if test='projectType == "closed" '>
+                    count(1) AS closedProjectTotal
+                </if>
+                <if test='projectType == "all" '>
+                    count(1)as projectTotal
+                </if>
             FROM
                 fact_origin_project_category_daily c
                 LEFT JOIN fact_origin_project_main_daily p ON ( c.PROJECT_Id = p.id and p.del_flag='0' AND p.GRID_ID != '')
             WHERE
                 c.DEL_FLAG = '0'
                 AND c.CUSTOMER_ID = #{customerId}
+                <if test='projectType == "closed" '>
+                    AND p.PROJECT_STATUS = 'closed'
+                </if>
                 AND c.`LEVEL` = '2'
                 AND p.GRID_ID != ''
             GROUP BY
@@ -60,13 +68,21 @@
                 p.GRID_ID,
                 p.AGENCY_ID AS PID,
                 P.PIDS,
-                count(distinct c.project_id)as projectTotal
+                <if test='projectType == "closed" '>
+                    count(distinct c.project_id) AS closedProjectTotal
+                </if>
+                <if test='projectType == "all" '>
+                    count(distinct c.project_id)as projectTotal
+                </if>
             FROM
                 fact_origin_project_category_daily c
                 LEFT JOIN fact_origin_project_main_daily p ON ( c.PROJECT_Id = p.id and p.del_flag='0' AND p.GRID_ID != '')
             WHERE
                 c.DEL_FLAG = '0'
                 AND p.GRID_ID != ''
+                <if test='projectType == "closed" '>
+                    AND p.PROJECT_STATUS = 'closed'
+                </if>
                 AND c.CUSTOMER_ID = #{customerId}
             GROUP BY
                 c.CUSTOMER_ID,

From 72d9f19283def0bbc839ef9dd4fc97d468fe56cb Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Thu, 4 Nov 2021 10:05:37 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=88=86=E7=B1=BB?=
 =?UTF-8?q?=E5=B7=B2=E7=BB=93=E6=A1=88=E7=9A=84=E9=A1=B9=E7=9B=AE=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../result/ClosedProjectTotalResultDTO.java   | 31 +++++++++++++++++
 .../result/CategoryProjectResultDTO.java      |  5 +++
 .../FactOriginProjectCategoryDailyDao.java    |  3 +-
 .../ScreenProjectCategoryOrgDailyDao.java     | 12 +++++++
 .../ScreenProjectCategoryOrgDailyEntity.java  |  5 +++
 ...FactOriginProjectCategoryDailyService.java |  2 +-
 ...OriginProjectCategoryDailyServiceImpl.java |  4 +--
 ...eenProjectCategoryOrgDailyServiceImpl.java | 29 ++++++++++++++--
 .../FactOriginProjectCategoryDailyDao.xml     | 20 +++++++++--
 .../ScreenProjectCategoryGridDailyDao.xml     |  1 +
 .../ScreenProjectCategoryOrgDailyDao.xml      | 33 +++++++++++++++++++
 11 files changed, 137 insertions(+), 8 deletions(-)
 create mode 100644 epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/project/result/ClosedProjectTotalResultDTO.java

diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/project/result/ClosedProjectTotalResultDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/project/result/ClosedProjectTotalResultDTO.java
new file mode 100644
index 0000000000..bd2aea194f
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/project/result/ClosedProjectTotalResultDTO.java
@@ -0,0 +1,31 @@
+package com.epmet.dto.project.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/11/4 9:12 上午
+ * @DESC
+ */
+@Data
+public class ClosedProjectTotalResultDTO implements Serializable {
+
+    private static final long serialVersionUID = -3683494871244065806L;
+
+    /**
+     * 组织ID
+     */
+    private String orgId;
+
+    /**
+     * 分类code
+     */
+    private String categoryCode;
+
+    /**
+     * 结案的项目数
+     */
+    private Integer closedProjectTotal = 0;
+}
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/result/CategoryProjectResultDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/result/CategoryProjectResultDTO.java
index 48af51b5ef..29cc0ea5db 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/result/CategoryProjectResultDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/result/CategoryProjectResultDTO.java
@@ -42,6 +42,11 @@ public class CategoryProjectResultDTO implements Serializable {
      */
     private Integer projectTotal;
 
+    /**
+     * 结案数
+     */
+    private Integer closedProjectTotal;
+
     /**
      * 分类级别
      */
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectCategoryDailyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectCategoryDailyDao.java
index 298860ce34..e520998bda 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectCategoryDailyDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectCategoryDailyDao.java
@@ -50,7 +50,8 @@ public interface FactOriginProjectCategoryDailyDao extends BaseDao<FactOriginPro
      * @author zxc
      * @date 2021/4/13 下午4:36
      */
-    List<ScreenProjectCategoryGridDailyDTO> selectListProjectCategoryByOrg(@Param("orgIds")List<String> orgIds,@Param("customerId") String customerId,@Param("subCount") Integer subCount);
+    List<ScreenProjectCategoryGridDailyDTO> selectListProjectCategoryByOrg(@Param("orgIds")List<String> orgIds,@Param("customerId") String customerId,
+                                                                           @Param("subCount") Integer subCount,@Param("projectType")String projectType);
 
     int deleteByProjectIds(@Param("list") List<String> list);
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenProjectCategoryOrgDailyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenProjectCategoryOrgDailyDao.java
index 70ef71817f..51cb145080 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenProjectCategoryOrgDailyDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenProjectCategoryOrgDailyDao.java
@@ -18,6 +18,7 @@
 package com.epmet.dao.evaluationindex.screen;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.project.result.ClosedProjectTotalResultDTO;
 import com.epmet.dto.screen.result.CategoryProjectResultDTO;
 import com.epmet.entity.evaluationindex.screen.ScreenProjectCategoryOrgDailyEntity;
 import com.sun.org.apache.xpath.internal.operations.Bool;
@@ -106,4 +107,15 @@ public interface ScreenProjectCategoryOrgDailyDao extends BaseDao<ScreenProjectC
 	 * @date 2021/8/16 10:36 上午
 	 */
 	List<CategoryProjectResultDTO> selectSelfAgencyCategory(@Param("dateId") String dateId,@Param("orgIds")List<String> orgIds);
+
+	/**
+	 * @Description  查询父客户 存在 分类的结案项目数
+	 * @param customerIds
+	 * @param dateId
+	 * @author zxc
+	 * @date 2021/11/4 9:26 上午
+	 */
+	List<ClosedProjectTotalResultDTO> selectClosedProjectTotal(@Param("customerIds")List<String> customerIds, @Param("dateId") String dateId,
+															   @Param("status")Boolean status);
+
 }
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenProjectCategoryOrgDailyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenProjectCategoryOrgDailyEntity.java
index bdfba9bbc6..2d4dd0dde2 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenProjectCategoryOrgDailyEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenProjectCategoryOrgDailyEntity.java
@@ -82,6 +82,11 @@ public class ScreenProjectCategoryOrgDailyEntity extends BaseEpmetEntity {
      */
 	private Integer projectTotal;
 
+	/**
+	 * 分类下所有结案项目数
+	 */
+	private Integer closedProjectTotal;
+
 	/**
 	 * 分类等级1、2....
 	 */
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginProjectCategoryDailyService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginProjectCategoryDailyService.java
index 1252a4739c..3bd2029431 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginProjectCategoryDailyService.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginProjectCategoryDailyService.java
@@ -54,5 +54,5 @@ public interface FactOriginProjectCategoryDailyService extends BaseService<FactO
      * @author zxc
      * @date 2021/4/13 下午4:36
      */
-    List<ScreenProjectCategoryGridDailyDTO> selectListProjectCategoryByOrg(List<String> orgIds,String customerId,Integer subCount);
+    List<ScreenProjectCategoryGridDailyDTO> selectListProjectCategoryByOrg(List<String> orgIds,String customerId,Integer subCount,String projectType);
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginProjectCategoryDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginProjectCategoryDailyServiceImpl.java
index e1131e02c6..28a57a5b3c 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginProjectCategoryDailyServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginProjectCategoryDailyServiceImpl.java
@@ -161,10 +161,10 @@ public class FactOriginProjectCategoryDailyServiceImpl extends BaseServiceImpl<F
      * @date 2021/4/13 下午4:36
      */
     @Override
-    public List<ScreenProjectCategoryGridDailyDTO> selectListProjectCategoryByOrg(List<String> orgIds,String customerId,Integer subCount) {
+    public List<ScreenProjectCategoryGridDailyDTO> selectListProjectCategoryByOrg(List<String> orgIds,String customerId,Integer subCount,String projectType) {
         if (!CollectionUtils.isEmpty(orgIds)){
             return new ArrayList<>();
         }
-        return baseDao.selectListProjectCategoryByOrg(orgIds,customerId,subCount);
+        return baseDao.selectListProjectCategoryByOrg(orgIds,customerId,subCount,projectType);
     }
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectCategoryOrgDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectCategoryOrgDailyServiceImpl.java
index d7edb6dd9a..1cd79eabd8 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectCategoryOrgDailyServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectCategoryOrgDailyServiceImpl.java
@@ -32,6 +32,7 @@ import com.epmet.constant.ScreenConstant;
 import com.epmet.dao.evaluationindex.screen.ScreenProjectCategoryGridDailyDao;
 import com.epmet.dao.evaluationindex.screen.ScreenProjectCategoryOrgDailyDao;
 import com.epmet.dto.extract.result.CustomerAgencyInfoResultDTO;
+import com.epmet.dto.project.result.ClosedProjectTotalResultDTO;
 import com.epmet.dto.screen.ScreenCustomerGridDTO;
 import com.epmet.dto.screen.ScreenProjectCategoryGridDailyDTO;
 import com.epmet.dto.screen.ScreenProjectCategoryOrgDailyDTO;
@@ -264,6 +265,7 @@ public class ScreenProjectCategoryOrgDailyServiceImpl extends BaseServiceImpl<Sc
                         categoryProjectGrid.forEach(grid -> {
                             if (agency.getOrgId().equals(grid.getOrgId()) && agency.getCategoryCode().equals(grid.getCategoryCode())){
                                 agency.setProjectTotal(agency.getProjectTotal() + grid.getProjectTotal());
+                                agency.setClosedProjectTotal(agency.getClosedProjectTotal() + grid.getClosedProjectTotal());
                                 grid.setStatus(true);
                             }
                         });
@@ -280,7 +282,11 @@ public class ScreenProjectCategoryOrgDailyServiceImpl extends BaseServiceImpl<Sc
         // 组织项目分类 项目数
         List<CustomerAgencyInfoResultDTO> levelAgencyInfo = groupByLevel.get(level);
         if (!CollectionUtils.isEmpty(levelAgencyInfo)){
-            List<ScreenProjectCategoryGridDailyDTO> screenProjectCategory = factOriginProjectCategoryDailyService.selectListProjectCategoryByOrg(orgIds,customerId,NumConstant.FOUR);
+            List<ScreenProjectCategoryGridDailyDTO> screenProjectCategory = factOriginProjectCategoryDailyService.selectListProjectCategoryByOrg(orgIds,customerId,NumConstant.FOUR,"all");
+            List<ScreenProjectCategoryGridDailyDTO> closedScreenProjectCategory = factOriginProjectCategoryDailyService.selectListProjectCategoryByOrg(orgIds,customerId,NumConstant.FOUR,"closed");
+            if (!CollectionUtils.isEmpty(closedScreenProjectCategory)){
+                screenProjectCategory.forEach(l -> closedScreenProjectCategory.stream().filter(c -> l.getGridId().equals(c.getGridId()) && l.getCategoryCode().equals(c.getCategoryCode())).forEach(c -> l.setClosedProjectTotal(c.getClosedProjectTotal())));
+            }
             if (!CollectionUtils.isEmpty(result)){
                 if (!CollectionUtils.isEmpty(screenProjectCategory)){
                     result.forEach(r -> {
@@ -288,6 +294,7 @@ public class ScreenProjectCategoryOrgDailyServiceImpl extends BaseServiceImpl<Sc
                             if (r.getOrgId().equals(pc.getOrgId()) && r.getCategoryCode().equals(pc.getCategoryCode())){
                                 pc.setStatus(true);
                                 r.setProjectTotal(r.getProjectTotal() + pc.getProjectTotal());
+                                r.setClosedProjectTotal(r.getClosedProjectTotal() + pc.getClosedProjectTotal());
                             }
                         });
                     });
@@ -390,6 +397,7 @@ public class ScreenProjectCategoryOrgDailyServiceImpl extends BaseServiceImpl<Sc
                             // 组织ID 和 分类标签code一样时，项目数累加
                             if (agency.getOrgId().equals(grid.getOrgId()) && agency.getCategoryCode().equals(grid.getCategoryCode())){
                                 agency.setProjectTotal(agency.getProjectTotal() + grid.getProjectTotal());
+                                agency.setClosedProjectTotal(agency.getClosedProjectTotal() + grid.getClosedProjectTotal());
                                 grid.setStatus(true);
                             }
                         });
@@ -417,13 +425,23 @@ public class ScreenProjectCategoryOrgDailyServiceImpl extends BaseServiceImpl<Sc
                 // 父客户存在的分类
                 List<CategoryProjectResultDTO> categoryProjectExists = baseDao.selectOrgCategoryMoreCustomerInfo(customerIds, dateId, level, customerId);
                 log.info("父客户存在的分类{}"+ JSON.toJSONString(categoryProjectExists));
+                // 父客户存在的分类 已结案的项目数
+                List<ClosedProjectTotalResultDTO> closedProjectTotalExist = baseDao.selectClosedProjectTotal(customerIds, dateId, true);
                 // 父客户不存在的分类
                 List<CategoryProjectResultDTO> categoryProjectNotExists = baseDao.selectOrgCategoryMoreCustomerInfoNotExists(customerIds, dateId, level, customerId);
                 log.info("父客户不存在的分类{}"+ JSON.toJSONString(categoryProjectNotExists));
+                // 父客户 不存在 的分类 已结案的项目数
+                List<ClosedProjectTotalResultDTO> closedProjectTotalNotExist = baseDao.selectClosedProjectTotal(customerIds, dateId, false);
                 if (!CollectionUtils.isEmpty(categoryProjectExists)){
+                    if (!CollectionUtils.isEmpty(closedProjectTotalExist)){
+                        categoryProjectExists.forEach(l -> closedProjectTotalExist.stream().filter(c -> l.getOrgId().equals(c.getOrgId()) && l.getCategoryCode().equals(c.getCategoryCode())).forEach(c -> l.setClosedProjectTotal(c.getClosedProjectTotal())));
+                    }
                     sonCustomerList.addAll(categoryProjectExists);
                 }
                 if (!CollectionUtils.isEmpty(categoryProjectNotExists)){
+                    if (!CollectionUtils.isEmpty(closedProjectTotalNotExist)){
+                        categoryProjectNotExists.forEach(l -> closedProjectTotalNotExist.stream().filter(c -> l.getOrgId().equals(c.getOrgId()) && l.getCategoryCode().equals(c.getCategoryCode())).forEach(c -> l.setClosedProjectTotal(c.getClosedProjectTotal())));
+                    }
                     sonCustomerList.addAll(categoryProjectNotExists);
                 }
                 if (!CollectionUtils.isEmpty(sonCustomerList)){
@@ -443,6 +461,7 @@ public class ScreenProjectCategoryOrgDailyServiceImpl extends BaseServiceImpl<Sc
                         categoryProjectExists.forEach(c -> {
                             if (f.getCategoryCode().equals(c.getCategoryCode())){
                                 f.setProjectTotal(f.getProjectTotal() + c.getProjectTotal());
+                                f.setClosedProjectTotal(f.getClosedProjectTotal() + c.getClosedProjectTotal());
                                 c.setStatus(true);
                             }
                         });
@@ -481,6 +500,7 @@ public class ScreenProjectCategoryOrgDailyServiceImpl extends BaseServiceImpl<Sc
                             e.setCategoryCode(code);
                             e.setOrgId(entity.getAgencyId());
                             e.setProjectTotal(CollectionUtils.isEmpty(list2) ? NumConstant.ZERO : list2.stream().collect(Collectors.summingInt(CategoryProjectResultDTO::getProjectTotal)));
+                            e.setClosedProjectTotal(CollectionUtils.isEmpty(list2) ? NumConstant.ZERO : list2.stream().collect(Collectors.summingInt(CategoryProjectResultDTO::getClosedProjectTotal)));
                             e.setPid(entity.getPid());
                             e.setPids(StringUtils.isEmpty(entity.getPids()) ? NumConstant.ZERO_STR : entity.getPids());
                             // 因为根据categoryCode分组，所以level都一样，取第一条的
@@ -496,7 +516,11 @@ public class ScreenProjectCategoryOrgDailyServiceImpl extends BaseServiceImpl<Sc
         List<CustomerAgencyInfoResultDTO> levelAgencyInfo = groupByLevel.get(level);
         if (!CollectionUtils.isEmpty(levelAgencyInfo)) {
             // 查询客户下，组织直接立项的，各项目分类下的项目数量【筛选组织创建的项目，fact_origin_project_main_daily表gridId为空】
-            List<ScreenProjectCategoryGridDailyDTO> screenProjectCategory = factOriginProjectCategoryDailyService.selectListProjectCategoryByOrg(orgIds, customerId,NumConstant.TWO);
+            List<ScreenProjectCategoryGridDailyDTO> screenProjectCategory = factOriginProjectCategoryDailyService.selectListProjectCategoryByOrg(orgIds, customerId,NumConstant.TWO,"all");
+            List<ScreenProjectCategoryGridDailyDTO> closedScreenProjectCategory = factOriginProjectCategoryDailyService.selectListProjectCategoryByOrg(orgIds, customerId,NumConstant.TWO,"closed");
+            if (!CollectionUtils.isEmpty(closedScreenProjectCategory)){
+                screenProjectCategory.forEach(l -> closedScreenProjectCategory.stream().filter(c -> l.getGridId().equals(c.getGridId()) && l.getCategoryCode().equals(c.getCategoryCode())).forEach(c -> l.setClosedProjectTotal(c.getClosedProjectTotal())));
+            }
             log.info("直接立项的统计:"+screenProjectCategory);
             if (!CollectionUtils.isEmpty(result)) {
                 if (!CollectionUtils.isEmpty(screenProjectCategory)) {
@@ -505,6 +529,7 @@ public class ScreenProjectCategoryOrgDailyServiceImpl extends BaseServiceImpl<Sc
                             if (r.getOrgId().equals(pc.getOrgId()) && r.getCategoryCode().equals(pc.getCategoryCode())) {
                                 pc.setStatus(true);
                                 r.setProjectTotal(r.getProjectTotal() + pc.getProjectTotal());
+                                r.setClosedProjectTotal(r.getClosedProjectTotal() + pc.getClosedProjectTotal());
                             }
                         });
                     });
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectCategoryDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectCategoryDailyDao.xml
index 9cfc1717b5..e0cfcc7fe7 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectCategoryDailyDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectCategoryDailyDao.xml
@@ -103,7 +103,12 @@
             p.AGENCY_ID AS orgId,
             p.PID AS PID,
             P.PIDS,
-            COUNT(DISTINCT p.ID) AS projectTotal
+            <if test='projectType == "all" '>
+                COUNT(DISTINCT p.ID) AS projectTotal
+            </if>
+            <if test='projectType == "closed" '>
+                COUNT(DISTINCT p.ID) AS closedProjectTotal
+            </if>
         FROM fact_origin_project_main_daily p
         LEFT JOIN fact_origin_project_category_daily c ON ( c.PROJECT_Id = p.id AND p.del_flag='0' AND p.GRID_ID = '')
         WHERE c.DEL_FLAG = '0'
@@ -115,6 +120,9 @@
             )
           AND c.`LEVEL` = '2'
           AND p.GRID_ID = ''
+          <if test='projectType == "closed" '>
+              AND p.PROJECT_STATUS = 'closed'
+          </if>
         GROUP BY c.CUSTOMER_ID, c.CATEGORY_CODE, c.`LEVEL`, p.AGENCY_ID, p.PID, P.PIDS
         UNION ALL
         SELECT
@@ -125,7 +133,12 @@
             p.AGENCY_ID AS orgId,
             p.PID AS PID,
             P.PIDS,
-            COUNT(distinct p.ID) AS projectTotal
+            <if test='projectType == "all" '>
+                COUNT(DISTINCT p.ID) AS projectTotal
+            </if>
+            <if test='projectType == "closed" '>
+                COUNT(DISTINCT p.ID) AS closedProjectTotal
+            </if>
         FROM fact_origin_project_main_daily p
         LEFT JOIN fact_origin_project_category_daily c ON ( c.PROJECT_Id = p.id AND p.del_flag='0' AND p.GRID_ID = '')
         WHERE c.DEL_FLAG = '0'
@@ -136,6 +149,9 @@
               </foreach>
           )
          AND p.GRID_ID = ''
+         <if test='projectType == "closed" '>
+            AND p.PROJECT_STATUS = 'closed'
+         </if>
         GROUP BY c.CUSTOMER_ID, left(c.CATEGORY_CODE, #{subCount}), c.`LEVEL`, p.PID, p.AGENCY_ID, P.PIDS
     </select>
 </mapper>
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectCategoryGridDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectCategoryGridDailyDao.xml
index 8ec1fcc4bd..763d1c0d49 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectCategoryGridDailyDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectCategoryGridDailyDao.xml
@@ -20,6 +20,7 @@
             sg.CUSTOMER_ID AS categoryOriginCustomerId,
             sg.CATEGORY_CODE,
             SUM(sg.PROJECT_TOTAL) AS projectTotal,
+            SUM(sg.CLOSED_PROJECT_TOTAL) AS closedProjectTotal,
             sg.level,
             sg.DATE_ID,
             sca.`LEVEL` AS orgType
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectCategoryOrgDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectCategoryOrgDailyDao.xml
index 38aa359065..f1efea5b81 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectCategoryOrgDailyDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectCategoryOrgDailyDao.xml
@@ -32,6 +32,7 @@
             sa.CATEGORY_ORIGIN_CUSTOMER_ID,
             sa.CATEGORY_CODE,
             SUM(sa.PROJECT_TOTAL) AS projectTotal,
+            SUM(sa.CLOSED_PROJECT_TOTAL) AS closedProjectTotal,
             sa.level,
             sa.DATE_ID,
             sca.`LEVEL` AS orgType
@@ -182,4 +183,36 @@
         GROUP BY categoryCode,od.ORG_ID
     </select>
 
+    <!-- 查询分类的结案项目数 -->
+    <select id="selectClosedProjectTotal" resultType="com.epmet.dto.project.result.ClosedProjectTotalResultDTO">
+        <foreach collection="customerIds" item="customerId" separator=" UNION ALL ">
+            SELECT
+            (SELECT AGENCY_ID FROM screen_customer_agency WHERE DEL_FLAG = 0 AND CUSTOMER_ID = #{customerId} AND PID = '0') AS orgId,
+            <if test="status == true">
+                cd.EPMET_CATEGORY_CODE AS categoryCode,
+            </if>
+            <if test="status == false">
+                pd.CATEGORY_CODE AS categoryCode
+            </if>
+            count(pd.project_id) AS closedProjectTotal
+            FROM screen_project_data pd
+            LEFT JOIN customer_project_category_dict cd ON (cd.CATEGORY_CODE = pd.CATEGORY_CODE AND cd.CUSTOMER_ID = #{customerId})
+            LEFT JOIN screen_customer_grid scg ON scg.GRID_ID = pd.ORG_ID
+            WHERE 1=1
+            AND pd.DEL_FLAG = '0'
+            AND pd.CUSTOMER_ID = #{customerId}
+            <if test="status == true">
+                AND cd.EPMET_CATEGORY_CODE IS NOT NULL
+            </if>
+            <if test="status == false">
+                AND (cd.EPMET_CATEGORY_CODE IS NULL OR cd.EPMET_CATEGORY_CODE = '')
+            </if>
+            AND cd.EPMET_CATEGORY_CODE != ''
+            AND pd.PROJECT_STATUS_CODE = 'closed'
+            AND pd.ALL_PARENT_IDS LIKE CONCAT('%',(SELECT AGENCY_ID FROM screen_customer_agency WHERE DEL_FLAG = 0 AND CUSTOMER_ID = #{customerId} AND PID = '0'),'%')
+            AND DATE_FORMAT(pd.project_create_time,'%Y%m%d') <![CDATA[ <= ]]> #{dateId}
+            GROUP BY categoryCode
+        </foreach>
+    </select>
+
 </mapper>
\ No newline at end of file

From dd3f09bfe71093c8c88db382b32b2d74b74615d9 Mon Sep 17 00:00:00 2001
From: wangxianzhang <ZHANGYUGE6666>
Date: Thu, 4 Nov 2021 10:31:27 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=20=E6=89=BE?=
 =?UTF-8?q?=E5=9B=9E=E5=90=88=E5=B9=B6=E4=B8=A2=E5=A4=B1=E7=9A=84girdEntit?=
 =?UTF-8?q?y=E7=9A=84code=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../evaluationindex/screen/ScreenCustomerGridEntity.java     | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenCustomerGridEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenCustomerGridEntity.java
index 4a0d8e53c8..cf6c373dca 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenCustomerGridEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenCustomerGridEntity.java
@@ -92,4 +92,9 @@ public class ScreenCustomerGridEntity extends BaseEpmetEntity {
 	 * desc: 是否参与上级计算yes:参与;no:不参与 add 01.14
 	 */
 	private String upToCal;
+
+	/**
+	 * 地区码
+	 */
+	private String code;
 }