From d825f75e73eefea5b11d817d2a05bfcd19a5d5eb Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Mon, 12 Oct 2020 17:33:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E5=85=88=E9=94=8B=E6=A8=A1?=
 =?UTF-8?q?=E8=8C=83=EF=BC=8C=E5=B7=B2=E8=A7=A3=E5=86=B3=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=EF=BC=8C=E5=8D=A0=E5=B7=B2=E7=BB=93=E6=A1=88=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E5=8D=A0=E6=AF=94=20=20sql=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../extract/FactOriginProjectMainDailyDao.java     | 12 ++++++++----
 .../todata/FactOriginProjectMainDailyService.java  | 11 ++++++-----
 .../FactOriginProjectMainDailyServiceImpl.java     | 14 ++++++++------
 .../impl/PioneerDataExtractServiceImpl.java        |  5 +++--
 .../extract/FactOriginProjectMainDailyDao.xml      | 10 ++++++++--
 5 files changed, 33 insertions(+), 19 deletions(-)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectMainDailyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectMainDailyDao.java
index 4ed5d1303c..bdadee2f52 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectMainDailyDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectMainDailyDao.java
@@ -113,7 +113,8 @@ public interface FactOriginProjectMainDailyDao extends BaseDao<FactOriginProject
 	 * @param customerId
 	 * @param gridId
 	 * @param communityId
-	 * @param closedStatus
+	 * @param closedStatus :resolved   unresolved
+	 * @param projectStatus :pending closed
 	 * @author yinzuomei
 	 * @description 具体某个网格或者社区内的项目
 	 * @Date 2020/9/23 18:18
@@ -121,20 +122,23 @@ public interface FactOriginProjectMainDailyDao extends BaseDao<FactOriginProject
     Integer getGridOrCommunityClosedProjectTotal(@Param("customerId")String customerId,
 									  @Param("gridId") String gridId,
 									  @Param("communityId") String communityId,
-									  @Param("closedStatus") String closedStatus);
+									  @Param("closedStatus") String closedStatus,
+									  @Param("projectStatus") String projectStatus);
 
     /**
      * @return int
      * @param customerId
      * @param agencyPath
-     * @param closedStatus
+	 * @param closedStatus :resolved   unresolved
+	 * @param projectStatus :pending closed
      * @author yinzuomei
      * @description 组织下：已解决项目  or  已结案项目总数
      * @Date 2020/9/24 17:38
      **/
 	int getAgencyClosedProjectTotal(@Param("customerId") String customerId,
 									@Param("agencyPath")String agencyPath,
-									@Param("closedStatus")String closedStatus);
+									@Param("closedStatus")String closedStatus,
+									@Param("projectStatus") String projectStatus);
 
 	/**
 	 * 组织自治项目数
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginProjectMainDailyService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginProjectMainDailyService.java
index ef295cf1bc..825d0d716d 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginProjectMainDailyService.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginProjectMainDailyService.java
@@ -25,7 +25,6 @@ import com.epmet.dto.extract.result.OrgStatisticsResultDTO;
 import com.epmet.dto.screen.form.ProjectSourceMapFormDTO;
 import com.epmet.entity.evaluationindex.extract.FactOriginProjectMainDailyEntity;
 import com.epmet.entity.evaluationindex.screen.ScreenDifficultyDataEntity;
-import com.mysql.cj.x.protobuf.MysqlxDatatypes;
 
 import java.util.List;
 import java.util.Map;
@@ -171,23 +170,25 @@ public interface FactOriginProjectMainDailyService extends BaseService<FactOrigi
      * @return java.lang.Integer
      * @param customerId
      * @param gridId
-     * @param closedStatus
+     * @param closedStatus :resolved   unresolved
+     * @param projectStatus :pending closed
      * @author yinzuomei
      * @description 具体某个网格内的项目
      * @Date 2020/9/23 18:17
      **/
-    Integer getGridOrCommunityClosedProjectTotal(String customerId, String gridId, String communityId,String closedStatus);
+    Integer getGridOrCommunityClosedProjectTotal(String customerId, String gridId, String communityId,String closedStatus,String projectStatus);
 
     /**
      * @return int
      * @param customerId
      * @param agencyPath
-     * @param closedStatus
+     * @param closedStatus :resolved   unresolved
+     * @param projectStatus :pending closed
      * @author yinzuomei
      * @description 组织下：已解决项目  or  已结案项目总数
      * @Date 2020/9/24 17:37
      **/
-    int getAgencyClosedProjectTotal(String customerId, String agencyPath, String closedStatus);
+    int getAgencyClosedProjectTotal(String customerId, String agencyPath, String closedStatus,String projectStatus);
 
     /**
      * 自治项目数
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginProjectMainDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginProjectMainDailyServiceImpl.java
index c4fe8c7fab..a98ed26225 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginProjectMainDailyServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginProjectMainDailyServiceImpl.java
@@ -176,29 +176,31 @@ public class FactOriginProjectMainDailyServiceImpl extends BaseServiceImpl<FactO
     /**
      * @param customerId
      * @param gridId
-     * @param closedStatus
+     * @param closedStatus :resolved   unresolved
+     * @param projectStatus :pending closed
      * @return java.lang.Integer
      * @author yinzuomei
      * @description 具体某个网格内的项目
      * @Date 2020/9/23 18:17
      **/
     @Override
-    public Integer getGridOrCommunityClosedProjectTotal(String customerId, String gridId,String communityId, String closedStatus) {
-        return baseDao.getGridOrCommunityClosedProjectTotal(customerId,gridId,communityId,closedStatus);
+    public Integer getGridOrCommunityClosedProjectTotal(String customerId, String gridId,String communityId, String closedStatus,String projectStatus) {
+        return baseDao.getGridOrCommunityClosedProjectTotal(customerId,gridId,communityId,closedStatus,projectStatus);
     }
 
     /**
      * @param customerId
      * @param agencyPath
-     * @param closedStatus
+     * @param closedStatus :resolved   unresolved
+     * @param projectStatus :pending closed
      * @return int
      * @author yinzuomei
      * @description 组织下：已解决项目  or  已结案项目总数
      * @Date 2020/9/24 17:37
      **/
     @Override
-    public int getAgencyClosedProjectTotal(String customerId, String agencyPath, String closedStatus) {
-        return baseDao.getAgencyClosedProjectTotal(customerId,agencyPath,closedStatus);
+    public int getAgencyClosedProjectTotal(String customerId, String agencyPath, String closedStatus,String projectStatus) {
+        return baseDao.getAgencyClosedProjectTotal(customerId,agencyPath,closedStatus,projectStatus);
     }
 
     @Override
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/PioneerDataExtractServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/PioneerDataExtractServiceImpl.java
index e71227623c..2cb4feff51 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/PioneerDataExtractServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/PioneerDataExtractServiceImpl.java
@@ -5,6 +5,7 @@ import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.constant.DimObjectStatusConstant;
 import com.epmet.constant.IndexCalConstant;
 import com.epmet.constant.OrgTypeConstant;
+import com.epmet.constant.ProjectConstant;
 import com.epmet.entity.evaluationindex.screen.ScreenPioneerDataEntity;
 import com.epmet.service.evaluationindex.extract.todata.FactOriginIssueLogDailyService;
 import com.epmet.service.evaluationindex.extract.todata.FactOriginIssueMainDailyService;
@@ -284,7 +285,7 @@ public class PioneerDataExtractServiceImpl implements PioneerDataExtractService
 
     //组织下：已解决项目  or  已结案项目总数
     private int getAgencyClosedProjectTotal(String customerId, String agencyPath, String closedStatus) {
-        return factOriginProjectMainDailyService.getAgencyClosedProjectTotal(customerId,agencyPath,closedStatus);
+        return factOriginProjectMainDailyService.getAgencyClosedProjectTotal(customerId,agencyPath,closedStatus, ProjectConstant.CLOSED);
     }
 
     //组织下：议题转项目数
@@ -317,7 +318,7 @@ public class PioneerDataExtractServiceImpl implements PioneerDataExtractService
      * @description 网格或者社区下:  已解决项目
      **/
     private Integer getGridOrCommunityClosedProjectTotal(String customerId, String gridId, String communityId, String closedStatus) {
-        return factOriginProjectMainDailyService.getGridOrCommunityClosedProjectTotal(customerId, gridId, communityId, closedStatus);
+        return factOriginProjectMainDailyService.getGridOrCommunityClosedProjectTotal(customerId, gridId, communityId, closedStatus,ProjectConstant.CLOSED);
     }
 
     /**
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectMainDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectMainDailyDao.xml
index f8c2d6db81..afbaa54d93 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectMainDailyDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectMainDailyDao.xml
@@ -160,7 +160,10 @@
                 and t1.AGENCY_ID=#{communityId}
             </if>
             <if test='null != closedStatus and "" != closedStatus'>
-                and t1.CLOSED_STATUS=#{closedStatus}
+                and t1.IS_RESOLVED=#{closedStatus}
+            </if>
+            <if test='null != projectStatus and "" != projectStatus'>
+                and t1.PROJECT_STATUS=#{projectStatus}
             </if>
     </select>
 
@@ -175,7 +178,10 @@
             AND T1.CUSTOMER_ID = #{customerId}
             and t1.PIDS LIKE CONCAT(#{agencyPath},'%')
             <if test='null != closedStatus and "" != closedStatus'>
-                and t1.CLOSED_STATUS=#{closedStatus}
+                and t1.IS_RESOLVED=#{closedStatus}
+            </if>
+            <if test='null != projectStatus and "" != projectStatus'>
+                and t1.PROJECT_STATUS=#{projectStatus}
             </if>
     </select>
     <select id="getSelfProject" resultType="com.epmet.dto.extract.result.OrgStatisticsResultDTO">