Merge remote-tracking branch 'origin/dev_screen_data_2.0' into dev_temp

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);
 
 	/**
 	 * 组织自治项目数

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/FactOriginProjectMainDailyEntity.java

@@ -133,6 +133,4 @@ public class FactOriginProjectMainDailyEntity extends BaseEpmetEntity {
      */
 	private String finishOrgIds;
 
-	private String closedStatus;
-
 }

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);
 
     /**
      * 自治项目数

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

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/ProjectExtractServiceImpl.java

@@ -87,12 +87,11 @@ public class ProjectExtractServiceImpl implements ProjectExtractService {
             List<FactOriginProjectMainDailyEntity> closeProjects =
                     pendingList.stream().flatMap(pending -> closedList.stream().filter(closed -> pending.getId().equals(closed.getProjectId())).map(process -> {
                         FactOriginProjectMainDailyEntity entity = new FactOriginProjectMainDailyEntity();
-                        entity.setId(process.getId());
+                        entity.setId(process.getProjectId());
 						entity.setProjectStatus("close");
 						entity.setCreatedTime(DateUtils.stringToDate(pending.getDateId(), DateUtils.DATE_PATTERN_YYYYMMDD));
 						entity.setUpdatedTime(process.getUpdatedTime());
 						entity.setIsResolved(process.getIsResolved());
-						entity.setClosedStatus(entity.getIsResolved());
 						return entity;
 					})).collect(Collectors.toList());
 
@@ -140,7 +139,6 @@ public class ProjectExtractServiceImpl implements ProjectExtractService {
 				entity.setIssueId(project.getOriginId());
 				entity.setProjectStatus(project.getStatus());
 				entity.setIsResolved(project.getClosedStatus());
-                entity.setClosedStatus(entity.getIsResolved());
 				entity.setCreatedTime(project.getCreatedTime());
 				entity.setUpdatedTime(project.getUpdatedTime());
 				entity.setPids(project.getOrgIdPath());

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);
     }
 
     /**

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">

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectProcessDao.xml

@@ -77,7 +77,7 @@
     </select>
     <select id="selectClosedProjectList" resultType="com.epmet.entity.project.ProjectProcessEntity">
         SELECT
-            pp.PROJECT_ID,
+            pp.PROJECT_ID ,
             pp.CREATED_TIME,
             p.CLOSED_STATUS AS isResolved
         FROM project_process pp
@@ -215,7 +215,7 @@
             pp.PROJECT_ID,
             pp.OPERATION,
             pp.STAFF_ID,
-            pp.CREATED_TIME,
+            pp.CREATED_TIME
         FROM
             project_process pp
         INNER JOIN project p ON pp.PROJECT_ID = p.ID