From 6702899ec7e270317fb54df4c00d9d42192e9da8 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Mon, 22 Mar 2021 13:28:14 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E5=86=85=E3=80=81=E7=BB=84?=
 =?UTF-8?q?=E7=BB=87=E5=86=85=E9=A1=B9=E7=9B=AE=E5=88=86=E7=B1=BB=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E9=A1=B9=E7=9B=AE=E6=95=B0=E9=87=8F=E9=87=87=E9=9B=86?=
 =?UTF-8?q?API=E8=B0=83=E6=95=B4=EF=BC=8C=20=E5=A4=A7=E5=B1=8F=E4=BA=8B?=
 =?UTF-8?q?=E4=BB=B6=E7=B1=BB=E5=9E=8B=E5=88=86=E6=9E=90=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ScreenProjectCategoryGridDailyDTO.java    | 42 ++---------------
 .../dto/ScreenProjectCategoryOrgDailyDTO.java | 42 ++---------------
 .../ScreenProjectCategoryOrgDailyDao.xml      | 40 +++++++++--------
 .../ScreenProjectCategoryGridDailyDTO.java    | 44 ++----------------
 .../ScreenProjectCategoryOrgDailyDTO.java     | 44 ++----------------
 .../ScreenProjectCategoryGridDailyEntity.java | 45 +------------------
 .../ScreenProjectCategoryOrgDailyEntity.java  | 43 +-----------------
 .../ScreenProjectCategoryGridDailyDao.xml     | 23 ----------
 .../ScreenProjectCategoryOrgDailyDao.xml      | 25 -----------
 9 files changed, 36 insertions(+), 312 deletions(-)

diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/ScreenProjectCategoryGridDailyDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/ScreenProjectCategoryGridDailyDTO.java
index b9cd6657b6..166be073a1 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/ScreenProjectCategoryGridDailyDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/ScreenProjectCategoryGridDailyDTO.java
@@ -17,11 +17,10 @@
 
 package com.epmet.dto;
 
-import java.io.Serializable;
-import java.util.Date;
 import lombok.Data;
 
-import java.math.BigDecimal;
+import java.io.Serializable;
+import java.util.Date;
 
 /**
  * 项目(事件)分类按网格_按天统计
@@ -67,48 +66,13 @@ public class ScreenProjectCategoryGridDailyDTO implements Serializable {
     /**
      * e世通中的项目类别编码
      */
-	private String epmetCategoryCode;
+	private String categoryCode;
 
     /**
      * 该分类下所有项目总数
      */
 	private Integer projectTotal;
 
-    /**
-     * 该分类下，正在处理中的项目总数
-     */
-	private Integer pendingTotal;
-
-    /**
-     * 该分类下已结案的项目总数
-     */
-	private Integer closedTotal;
-
-    /**
-     * 该分类下已结案无需解决的项目总数
-     */
-	private Integer unResolvedTotal;
-
-    /**
-     * 该分类下已结案已解决的项目总数
-     */
-	private Integer resolvedTotal;
-
-    /**
-     * 该分类下项目结案率
-     */
-	private BigDecimal closedRatio;
-
-    /**
-     * 该分类下已结案项目解决率
-     */
-	private BigDecimal resolvedRatio;
-
-    /**
-     * 该分类下已结案项目未解决率
-     */
-	private BigDecimal unResolvedRatio;
-
     /**
      * 删除标识
      */
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/ScreenProjectCategoryOrgDailyDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/ScreenProjectCategoryOrgDailyDTO.java
index 1507a1f88a..0404581cf7 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/ScreenProjectCategoryOrgDailyDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/ScreenProjectCategoryOrgDailyDTO.java
@@ -17,11 +17,10 @@
 
 package com.epmet.dto;
 
-import java.io.Serializable;
-import java.util.Date;
 import lombok.Data;
 
-import java.math.BigDecimal;
+import java.io.Serializable;
+import java.util.Date;
 
 /**
  * 项目(事件)分类按组织_按天统计
@@ -72,48 +71,13 @@ public class ScreenProjectCategoryOrgDailyDTO implements Serializable {
     /**
      * e世通中的项目类别编码
      */
-	private String epmetCategoryCode;
+	private String categoryCode;
 
     /**
      * 该分类下所有项目总数
      */
 	private Integer projectTotal;
 
-    /**
-     * 该分类下，正在处理中的项目总数
-     */
-	private Integer pendingTotal;
-
-    /**
-     * 该分类下已结案的项目总数
-     */
-	private Integer closedTotal;
-
-    /**
-     * 该分类下已结案无需解决的项目总数
-     */
-	private Integer unResolvedTotal;
-
-    /**
-     * 该分类下已结案已解决的项目总数
-     */
-	private Integer resolvedTotal;
-
-    /**
-     * 该分类下项目结案率
-     */
-	private BigDecimal closedRatio;
-
-    /**
-     * 该分类下已结案项目解决率
-     */
-	private BigDecimal resolvedRatio;
-
-    /**
-     * 该分类下已结案项目未解决率
-     */
-	private BigDecimal unResolvedRatio;
-
     /**
      * 删除标识
      */
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 5816def044..d2ac38a7f7 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
@@ -5,24 +5,26 @@
 
 
     <select id="selectCategoryAnalysis" resultType="com.epmet.dto.result.screen.CategoryAnalysisResultDTO">
-        SELECT EPMET_CATEGORY_NAME AS categoryName,
-			 PROJECT_TOTAL  AS projectTotal
-        FROM screen_project_category_org_daily
-        WHERE DEL_FLAG = '0'
-            AND ORG_ID = #{agencyId}
-            AND DATE_ID = (
-                select
-                        date_id
-                from
-                        screen_project_category_org_daily
-                where
-                        del_flag = '0'
-                and ORG_ID = #{agencyId}
-                order by
-                        date_id desc,
-                        created_time desc
-                limit 1
-            )
-        ORDER BY EPMET_CATEGORY_CODE
+        SELECT D.CATEGORY_NAME AS categoryName,
+			 M.PROJECT_TOTAL  AS projectTotal
+        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')
+        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}
+                        order by
+                            date_id desc,
+                            created_time desc
+                        limit 1
+                )
+        ORDER BY M.CATEGORY_CODE ASC
     </select>
 </mapper>
\ No newline at end of file
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 50afc350ef..582fc6d842 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
@@ -17,11 +17,10 @@
 
 package com.epmet.dto.screen;
 
-import java.io.Serializable;
-import java.util.Date;
 import lombok.Data;
 
-import java.math.BigDecimal;
+import java.io.Serializable;
+import java.util.Date;
 
 /**
  * 项目(事件)分类按网格_按天统计
@@ -67,50 +66,13 @@ public class ScreenProjectCategoryGridDailyDTO implements Serializable {
     /**
      * e世通中的项目类别编码
      */
-	private String epmetCategoryCode;
-
-	private String epmetCategoryName;
+	private String categoryCode;
 
     /**
      * 该分类下所有项目总数
      */
 	private Integer projectTotal;
 
-    /**
-     * 该分类下，正在处理中的项目总数
-     */
-	private Integer pendingTotal;
-
-    /**
-     * 该分类下已结案的项目总数
-     */
-	private Integer closedTotal;
-
-    /**
-     * 该分类下已结案无需解决的项目总数
-     */
-	private Integer unResolvedTotal;
-
-    /**
-     * 该分类下已结案已解决的项目总数
-     */
-	private Integer resolvedTotal;
-
-    /**
-     * 该分类下项目结案率
-     */
-	private BigDecimal closedRatio;
-
-    /**
-     * 该分类下已结案项目解决率
-     */
-	private BigDecimal resolvedRatio;
-
-    /**
-     * 该分类下已结案项目未解决率
-     */
-	private BigDecimal unResolvedRatio;
-
     /**
      * 删除标识
      */
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/ScreenProjectCategoryOrgDailyDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/ScreenProjectCategoryOrgDailyDTO.java
index 49c85be67e..ed598e903f 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/ScreenProjectCategoryOrgDailyDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/ScreenProjectCategoryOrgDailyDTO.java
@@ -17,11 +17,10 @@
 
 package com.epmet.dto.screen;
 
-import java.io.Serializable;
-import java.util.Date;
 import lombok.Data;
 
-import java.math.BigDecimal;
+import java.io.Serializable;
+import java.util.Date;
 
 /**
  * 项目(事件)分类按组织_按天统计
@@ -72,50 +71,13 @@ public class ScreenProjectCategoryOrgDailyDTO implements Serializable {
     /**
      * e世通中的项目类别编码
      */
-	private String epmetCategoryCode;
-
-	private String epmetCategoryName;
+	private String categoryCode;
 
     /**
      * 该分类下所有项目总数
      */
 	private Integer projectTotal;
 
-    /**
-     * 该分类下，正在处理中的项目总数
-     */
-	private Integer pendingTotal;
-
-    /**
-     * 该分类下已结案的项目总数
-     */
-	private Integer closedTotal;
-
-    /**
-     * 该分类下已结案无需解决的项目总数
-     */
-	private Integer unResolvedTotal;
-
-    /**
-     * 该分类下已结案已解决的项目总数
-     */
-	private Integer resolvedTotal;
-
-    /**
-     * 该分类下项目结案率
-     */
-	private BigDecimal closedRatio;
-
-    /**
-     * 该分类下已结案项目解决率
-     */
-	private BigDecimal resolvedRatio;
-
-    /**
-     * 该分类下已结案项目未解决率
-     */
-	private BigDecimal unResolvedRatio;
-
     /**
      * 删除标识
      */
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 ef91f696c2..5d40a12628 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
@@ -18,14 +18,10 @@
 package com.epmet.entity.evaluationindex.screen;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.math.BigDecimal;
-import java.util.Date;
-
 /**
  * 项目(事件)分类按网格_按天统计
  *
@@ -65,50 +61,13 @@ public class ScreenProjectCategoryGridDailyEntity extends BaseEpmetEntity {
 	private String pids;
 
     /**
-     * e世通中的项目类别编码
+     * 项目类别编码
      */
-	private String epmetCategoryCode;
-
-	private String epmetCategoryName;
+	private String categoryCode;
 
     /**
      * 该分类下所有项目总数
      */
 	private Integer projectTotal;
 
-    /**
-     * 该分类下，正在处理中的项目总数
-     */
-	private Integer pendingTotal;
-
-    /**
-     * 该分类下已结案的项目总数
-     */
-	private Integer closedTotal;
-
-    /**
-     * 该分类下已结案无需解决的项目总数
-     */
-	private Integer unResolvedTotal;
-
-    /**
-     * 该分类下已结案已解决的项目总数
-     */
-	private Integer resolvedTotal;
-
-    /**
-     * 该分类下项目结案率
-     */
-	private BigDecimal closedRatio;
-
-    /**
-     * 该分类下已结案项目解决率
-     */
-	private BigDecimal resolvedRatio;
-
-    /**
-     * 该分类下已结案项目未解决率
-     */
-	private BigDecimal unResolvedRatio;
-
 }
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 1ac6c76145..7c61d7069d 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
@@ -18,14 +18,10 @@
 package com.epmet.entity.evaluationindex.screen;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.math.BigDecimal;
-import java.util.Date;
-
 /**
  * 项目(事件)分类按组织_按天统计
  *
@@ -72,48 +68,11 @@ public class ScreenProjectCategoryOrgDailyEntity extends BaseEpmetEntity {
     /**
      * e世通中的项目类别编码
      */
-	private String epmetCategoryCode;
-
-	private String epmetCategoryName;
+	private String categoryCode;
 
     /**
      * 该分类下所有项目总数
      */
 	private Integer projectTotal;
 
-    /**
-     * 该分类下，正在处理中的项目总数
-     */
-	private Integer pendingTotal;
-
-    /**
-     * 该分类下已结案的项目总数
-     */
-	private Integer closedTotal;
-
-    /**
-     * 该分类下已结案无需解决的项目总数
-     */
-	private Integer unResolvedTotal;
-
-    /**
-     * 该分类下已结案已解决的项目总数
-     */
-	private Integer resolvedTotal;
-
-    /**
-     * 该分类下项目结案率
-     */
-	private BigDecimal closedRatio;
-
-    /**
-     * 该分类下已结案项目解决率
-     */
-	private BigDecimal resolvedRatio;
-
-    /**
-     * 该分类下已结案项目未解决率
-     */
-	private BigDecimal unResolvedRatio;
-
 }
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 bc84c6b2df..e79da541d9 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
@@ -3,29 +3,6 @@
 
 <mapper namespace="com.epmet.dao.evaluationindex.screen.ScreenProjectCategoryGridDailyDao">
 
-    <resultMap type="com.epmet.entity.evaluationindex.screen.ScreenProjectCategoryGridDailyEntity" id="screenProjectCategoryGridDailyMap">
-        <result property="id" column="ID"/>
-        <result property="customerId" column="CUSTOMER_ID"/>
-        <result property="dateId" column="DATE_ID"/>
-        <result property="gridId" column="GRID_ID"/>
-        <result property="pid" column="PID"/>
-        <result property="pids" column="PIDS"/>
-        <result property="epmetCategoryCode" column="EPMET_CATEGORY_CODE"/>
-        <result property="projectTotal" column="PROJECT_TOTAL"/>
-        <result property="pendingTotal" column="PENDING_TOTAL"/>
-        <result property="closedTotal" column="CLOSED_TOTAL"/>
-        <result property="unResolvedTotal" column="UN_RESOLVED_TOTAL"/>
-        <result property="resolvedTotal" column="RESOLVED_TOTAL"/>
-        <result property="closedRatio" column="CLOSED_RATIO"/>
-        <result property="resolvedRatio" column="RESOLVED_RATIO"/>
-        <result property="unResolvedRatio" column="UN_RESOLVED_RATIO"/>
-        <result property="delFlag" column="DEL_FLAG"/>
-        <result property="revision" column="REVISION"/>
-        <result property="createdBy" column="CREATED_BY"/>
-        <result property="createdTime" column="CREATED_TIME"/>
-        <result property="updatedBy" column="UPDATED_BY"/>
-        <result property="updatedTime" column="UPDATED_TIME"/>
-    </resultMap>
     <delete id="deleteByDateIdAndCustomerId">
         delete from screen_project_category_grid_daily
         where customer_id = #{customerId}
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 5d8cd9a73a..20c4452e69 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
@@ -2,31 +2,6 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <mapper namespace="com.epmet.dao.evaluationindex.screen.ScreenProjectCategoryOrgDailyDao">
-
-    <resultMap type="com.epmet.entity.evaluationindex.screen.ScreenProjectCategoryOrgDailyEntity" id="screenProjectCategoryOrgDailyMap">
-        <result property="id" column="ID"/>
-        <result property="customerId" column="CUSTOMER_ID"/>
-        <result property="dateId" column="DATE_ID"/>
-        <result property="orgId" column="ORG_ID"/>
-        <result property="orgType" column="ORG_TYPE"/>
-        <result property="pid" column="PID"/>
-        <result property="pids" column="PIDS"/>
-        <result property="epmetCategoryCode" column="EPMET_CATEGORY_CODE"/>
-        <result property="projectTotal" column="PROJECT_TOTAL"/>
-        <result property="pendingTotal" column="PENDING_TOTAL"/>
-        <result property="closedTotal" column="CLOSED_TOTAL"/>
-        <result property="unResolvedTotal" column="UN_RESOLVED_TOTAL"/>
-        <result property="resolvedTotal" column="RESOLVED_TOTAL"/>
-        <result property="closedRatio" column="CLOSED_RATIO"/>
-        <result property="resolvedRatio" column="RESOLVED_RATIO"/>
-        <result property="unResolvedRatio" column="UN_RESOLVED_RATIO"/>
-        <result property="delFlag" column="DEL_FLAG"/>
-        <result property="revision" column="REVISION"/>
-        <result property="createdBy" column="CREATED_BY"/>
-        <result property="createdTime" column="CREATED_TIME"/>
-        <result property="updatedBy" column="UPDATED_BY"/>
-        <result property="updatedTime" column="UPDATED_TIME"/>
-    </resultMap>
     <delete id="deleteByDateIdAndCustomerId">
         delete from screen_project_category_org_daily
         where customer_id = #{customerId}