Merge remote-tracking branch 'remotes/origin/dev_third_data' into dev_temp

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/index/impl/IndexExplainServiceImpl.java

@@ -214,7 +214,7 @@ public class IndexExplainServiceImpl implements IndexExplainService {
                 if (StringUtils.isNotBlank(score.getQuantity())) {
                     tb.setQuantity(score.getQuantity());
                 }
-                tb.setWeight(score.getWeight().multiply(new BigDecimal(NumConstant.ONE_HUNDRED)).setScale(NumConstant.TWO, BigDecimal.ROUND_HALF_UP) + "%");
+                tb.setWeight(score.getWeight().multiply(new BigDecimal(NumConstant.ONE_HUNDRED)) + "%");
             }
         }
     }

epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexAgencySubScoreDao.xml

@@ -45,7 +45,7 @@
      SELECT
             fact.index_code,
             IF(fact.origin_value='',0,IFNULL(fact.origin_value,0)) AS origin_value,
-            round(fact.score,2) AS score,
+            round(fact.score,1) AS score,
             round(fact.WEIGHT,2) AS weight
         FROM
             fact_index_agency_sub_score fact

epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexCommunitySubScoreDao.xml

@@ -46,7 +46,7 @@
             fact.index_code,
             IF(fact.origin_value='',0,IFNULL(fact.origin_value,0)) AS origin_value,
             IF(fact.SAMPLE_COUNT='',0,IFNULL(fact.SAMPLE_COUNT,0)) AS quantity,
-            round(fact.score,2) AS score,
+            round(fact.score,1) AS score,
             round(fact.WEIGHT,2) AS weight
         FROM
             fact_index_community_sub_score fact

epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexCpcSubScoreDao.xml

@@ -30,8 +30,9 @@
             SELECT
                 id, customer_id, agency_id, grid_id, year_id, month_id, user_id,
                 COUNT(*) quantity,
-                ROUND(AVG(score),2) score,
+                ROUND(AVG(score),1) score,
-                index_code, all_parent_index_code, weight
+                index_code, all_parent_index_code,
+                ROUND(weight,2) weight
             FROM  fact_index_cpc_sub_score
             WHERE ALL_PARENT_INDEX_CODE = #{allParentIndexCode}
             AND CUSTOMER_ID = #{customerId}

epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexDeptSubScoreDao.xml

@@ -11,7 +11,8 @@
                 origin_value,
                 index_code, all_parent_index_code, weight,
                 COUNT(*) quantity,
-                ROUND(AVG(score),2) score
+                ROUND(AVG(score),1) score,
+                round(weight,2) AS weight
             FROM  fact_index_dept_sub_score
             WHERE
                 ALL_PARENT_INDEX_CODE = #{allParentIndexCode}

epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexGridSubScoreDao.xml

@@ -45,7 +45,7 @@
          SELECT
             fact.index_code,
             IF(fact.origin_value='',0,IFNULL(fact.origin_value,0)) AS origin_value,
-            round(fact.score,2) AS score,
+            round(fact.score,1) AS score,
             round(fact.WEIGHT,2) AS weight
         FROM
             fact_index_grid_sub_score fact

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/result/OrgStatisticsResultDTO.java

@@ -15,6 +15,7 @@ public class OrgStatisticsResultDTO implements Serializable {
 	private static final long serialVersionUID = 9221060553279124719L;
 	private String customerId;
 	private String agencyId;
+	private String level;
 	private String orgId;
 	private Integer count;
 	private Integer sum;

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginIssueMainDailyDao.java

@@ -227,6 +227,17 @@ public interface FactOriginIssueMainDailyDao extends BaseDao<FactOriginIssueMain
      */
     List<OrgStatisticsResultDTO> selectPartyMemberIssueStaticByGrid(@Param("customerId") String customerId, @Param("dateId") String dateId);
 
+    /**
+     * 获取组织关闭议题数
+     * @author zhaoqifeng
+     * @date 2021/5/25 17:18
+     * @param customerId
+     * @param dateId
+	 * @param closedStatus
+     * @return java.util.List<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
+     */
+    List<OrgStatisticsResultDTO> selectAgencyClosedIssueCount(@Param("customerId") String customerId, @Param("dateId") String dateId, @Param("closedStatus") String closedStatus);
+
     /**
      * 3、当前网格内，议题关闭已解决数
      * 4、当前网格内，议题关闭无需解决数

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectMainDailyDao.java

@@ -465,4 +465,16 @@ public interface FactOriginProjectMainDailyDao extends BaseDao<FactOriginProject
 													 @Param("projectStatus")String projectStatus,
 													 @Param("origin")String origin,
 													 @Param("isResolved")String isResolved);
+
+	/**
+	 * 获取组织已结案项目
+	 * @author zhaoqifeng
+	 * @date 2021/5/26 15:11
+	 * @param customerId
+	 * @param dateId
+	 * @param closedStatus
+	 * @return java.util.List<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
+	 */
+	List<OrgStatisticsResultDTO> selectAgencyClosedProjectCount(@Param("customerId") String customerId, @Param("dateId") String dateId, @Param(
+			"closedStatus") String closedStatus, @Param("origin") String origin);
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginTopicMainDailyDao.java

@@ -185,4 +185,18 @@ public interface FactOriginTopicMainDailyDao extends BaseDao<FactOriginTopicMain
                                                             @Param("topicStatus")String topicStatus,
                                                             @Param("closedStatus")String closedStatus,
                                                             @Param("shiftIssue")String shiftIssue);
+
+    /**
+     * 获取组织已关闭话题数
+     * @author zhaoqifeng
+     * @date 2021/5/25 15:45
+     * @param customerId
+     * @param dateId
+     * @param closedStatus
+     * @param shiftIssue
+     * @return java.util.List<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
+     */
+    List<OrgStatisticsResultDTO> selectAgencyClosedTopicCount(@Param("customerId") String customerId, @Param("dateId") String dateId,
+                                                              @Param("closedStatus") String closedStatus, @Param("shiftIssue") Integer shiftIssue);
+
 }

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

@@ -27,20 +27,15 @@ import com.epmet.entity.evaluationindex.extract.FactAgencyGovernDailyEntity;
  * @since v1.0.0 2021-05-24
  */
 public interface FactAgencyGovernDailyService extends BaseService<FactAgencyGovernDailyEntity> {
-    // 问题解决总数：当前组织下，话题关闭（已解决+无需解决）总数、议题关闭（已解决+无需解决）总数和项目结案（议题转为项目的结案数+项目立项结案数）总数之和
+
-    // 党群自治占比：当前组织下，所有小组内关闭（已解决+无需解决）的话题数与问题解决总数之比（未出小组：未转议题的）
+	/**
-    // 网格自治占比：当前组织下，所有网格内结案项目数与问题解决总数之比（未出网格）
+	 * 治理指数-组织相关
-    // 参考：fact_index_govrn_ablity_grid_monthly的SELF_SOLVE_PROJECT_COUNT计算
+	 * @author zhaoqifeng
-    // 社区解决占比：当前组织下，由社区结案的项目数与问题解决总数之比
+	 * @date 2021/5/25 14:10
-    // 区直部门解决占比：当前组织下，由区级部门结案的项目数与问题解决总数之比
+	 * @param customerId
-    // 街道解决占比：当前组织下，由街道结案的项目数与问题解决总数之比
+	 * @param dateId
-    // 自下而上的项目解决：结案时操作人所代表的的处理部门（可以是网格、街道、组织）
+	 * @return void
-    // 自上而下的项目解决：向下吹哨，谁立项谁解决（后期在讨论哪样更合理）
+	 */
-    //
+	void extractFactAgencyGovernDaily(String customerId, String dateId);
-    // 究竟是谁解决！！：
-    // A社区→A街道→B社区（结案）——A街道解决（自下而上吹（饱含立项往上吹/从话题来的项目），看往上吹的最高层级）
-    // A社区→B社区→C社区（结案）——C社区解决（平级协助解决，看最后结案）
-    // A街道→A社区→B社区（结案）——A街道解决（自上而下吹，谁立项谁解决）
-    // 注：A社区→A街道→（退回）A社区→B社区（结案），A街道不算处理项目，仍是平级协助解决，看最后谁结案
 
 }

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

@@ -136,4 +136,15 @@ public interface FactOriginIssueMainDailyService extends BaseService<FactOriginI
      * @return
      */
     List<GovernGridTotalCommonDTO> queryGridIssueValue(String customerId, List<String> gridIds, String issueStatus, String resolveType);
+
+    /**
+     * 获取组织关闭议题数
+     * @author zhaoqifeng
+     * @date 2021/5/25 17:09
+     * @param customerId
+     * @param dateId
+     * @param closedStatus
+     * @return java.util.Map<java.lang.String,com.epmet.dto.extract.result.OrgStatisticsResultDTO>
+     */
+    Map<String, OrgStatisticsResultDTO> getAgencyClosedIssueCount(String customerId, String dateId, String closedStatus);
 }

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

@@ -436,4 +436,16 @@ public interface FactOriginProjectMainDailyService extends BaseService<FactOrigi
      * @return
      */
     List<GovernGridTotalCommonDTO> queryGridProjectValue(String customerId, List<String> gridIds, String projectStatus, String origin, String isResolved);
+
+    /**
+     * 获取组织关闭项目数
+     * @author zhaoqifeng
+     * @date 2021/5/26 15:09
+     * @param customerId
+     * @param dateId
+     * @param closedStatus
+     * @param origin
+     * @return java.util.Map<java.lang.String,com.epmet.dto.extract.result.OrgStatisticsResultDTO>
+     */
+    Map<String, OrgStatisticsResultDTO> getAgencyClosedProjectCount(String customerId, String dateId, String closedStatus, String origin);
 }

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

@@ -138,4 +138,18 @@ public interface FactOriginTopicMainDailyService extends BaseService<FactOriginT
      * @return
      */
     List<GovernGridTotalCommonDTO> queryGridTopicValue(String customerId, List<String> gridIds, String topicStatus, String closedStatus, String shiftIssue);
+
+
+    /**
+     * 获取组织已关闭话题数
+     * @author zhaoqifeng
+     * @date 2021/5/25 15:02
+     * @param customerId
+     * @param dateId
+     * @param closedStatus
+     * @param shiftIssue
+     * @return java.util.List<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
+     */
+    Map<String, OrgStatisticsResultDTO> getAgencyClosedTopicCount(String customerId, String dateId, String closedStatus, Integer shiftIssue);
+
 }

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

@@ -33,5 +33,32 @@ import org.springframework.stereotype.Service;
 public class FactAgencyGovernDailyServiceImpl extends BaseServiceImpl<FactAgencyGovernDailyDao, FactAgencyGovernDailyEntity> implements FactAgencyGovernDailyService {
 
 
+	/**
+	 * 治理指数-组织相关
+	 *
+	 * @param customerId
+	 * @param dateId
+	 * @return void
+	 * @author zhaoqifeng
+	 * @date 2021/5/25 14:10
+	 */
+	@Override
+	public void extractFactAgencyGovernDaily(String customerId, String dateId) {
+		// 问题解决总数：当前组织下，话题关闭（已解决+无需解决）总数、议题关闭（已解决+无需解决）总数和项目结案（议题转为项目的结案数+项目立项结案数）总数之和
 
+		// 党群自治占比：当前组织下，所有小组内关闭（已解决+无需解决）的话题数与问题解决总数之比（未出小组：未转议题的）
+		// 网格自治占比：当前组织下，所有网格内结案项目数与问题解决总数之比（未出网格）
+		// 参考：fact_index_govrn_ablity_grid_monthly的SELF_SOLVE_PROJECT_COUNT计算
+		// 社区解决占比：当前组织下，由社区结案的项目数与问题解决总数之比
+		// 区直部门解决占比：当前组织下，由区级部门结案的项目数与问题解决总数之比
+		// 街道解决占比：当前组织下，由街道结案的项目数与问题解决总数之比
+		// 自下而上的项目解决：结案时操作人所代表的的处理部门（可以是网格、街道、组织）
+		// 自上而下的项目解决：向下吹哨，谁立项谁解决（后期在讨论哪样更合理）
+		//
+		// 究竟是谁解决！！：
+		// A社区→A街道→B社区（结案）——A街道解决（自下而上吹（饱含立项往上吹/从话题来的项目），看往上吹的最高层级）
+		// A社区→B社区→C社区（结案）——C社区解决（平级协助解决，看最后结案）
+		// A街道→A社区→B社区（结案）——A街道解决（自上而下吹，谁立项谁解决）
+		// 注：A社区→A街道→（退回）A社区→B社区（结案），A街道不算处理项目，仍是平级协助解决，看最后谁结案
+	}
 }

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

@@ -186,4 +186,23 @@ public class FactOriginIssueMainDailyServiceImpl extends BaseServiceImpl<FactOri
     public List<GovernGridTotalCommonDTO> queryGridIssueValue(String customerId, List<String> gridIds, String issueStatus, String resolveType) {
         return baseDao.selectGroupByGridId(customerId,gridIds,issueStatus,resolveType);
     }
+
+    /**
+     * 获取组织关闭议题数
+     *
+     * @param customerId
+     * @param dateId
+     * @param closedStatus
+     * @return java.util.Map<java.lang.String, com.epmet.dto.extract.result.OrgStatisticsResultDTO>
+     * @author zhaoqifeng
+     * @date 2021/5/25 17:09
+     */
+    @Override
+    public Map<String, OrgStatisticsResultDTO> getAgencyClosedIssueCount(String customerId, String dateId, String closedStatus) {
+        List<OrgStatisticsResultDTO> list = baseDao.selectAgencyClosedIssueCount(customerId, dateId, closedStatus);
+        if (CollectionUtils.isEmpty(list)) {
+            return Collections.emptyMap();
+        }
+        return list.stream().collect(Collectors.toMap(OrgStatisticsResultDTO::getAgencyId, Function.identity()));
+    }
 }

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

@@ -658,5 +658,25 @@ public class FactOriginProjectMainDailyServiceImpl extends BaseServiceImpl<FactO
         return baseDao.selectGroupByGrid(customerId,gridIds,projectStatus,origin,isResolved);
     }
 
+    /**
+     * 获取组织关闭项目数
+     *
+     * @param customerId
+     * @param dateId
+     * @param closedStatus
+     * @param origin
+     * @return java.util.Map<java.lang.String, com.epmet.dto.extract.result.OrgStatisticsResultDTO>
+     * @author zhaoqifeng
+     * @date 2021/5/26 15:09
+     */
+    @Override
+    public Map<String, OrgStatisticsResultDTO> getAgencyClosedProjectCount(String customerId, String dateId, String closedStatus, String origin) {
+        List<OrgStatisticsResultDTO> list = baseDao.selectAgencyClosedProjectCount(customerId, dateId, closedStatus, origin);
+        if (CollectionUtils.isEmpty(list)) {
+            return Collections.emptyMap();
+        }
+        return list.stream().collect(Collectors.toMap(OrgStatisticsResultDTO::getAgencyId, Function.identity()));
+    }
+
 
 }

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

@@ -398,4 +398,25 @@ public class FactOriginTopicMainDailyServiceImpl extends BaseServiceImpl<FactOri
     public List<GovernGridTotalCommonDTO> queryGridTopicValue(String customerId, List<String> gridIds, String topicStatus, String closedStatus, String shiftIssue) {
         return baseDao.selectTopicGroupByGridId(customerId,gridIds,topicStatus,closedStatus,shiftIssue);
     }
+    /**
+     * 获取组织已关闭话题数
+     *
+     * @param customerId
+     * @param dateId
+     * @param closedStatus
+     * @param shiftIssue
+     * @return java.util.List<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
+     * @author zhaoqifeng
+     * @date 2021/5/25 15:02
+     */
+    @Override
+    public Map<String, OrgStatisticsResultDTO> getAgencyClosedTopicCount(String customerId, String dateId, String closedStatus, Integer shiftIssue) {
+        List<OrgStatisticsResultDTO> list = baseDao.selectAgencyClosedTopicCount(customerId, dateId, closedStatus,shiftIssue);
+        if (CollectionUtils.isEmpty(list)) {
+            return Collections.emptyMap();
+        }
+        return list.stream().collect(Collectors.toMap(OrgStatisticsResultDTO::getAgencyId, Function.identity()));
+    }
+
+
 }

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginIssueMainDailyDao.xml

@@ -343,4 +343,19 @@
             m.CUSTOMER_ID,
             m.GRID_ID
     </select>
+    <select id="selectAgencyClosedIssueCount" resultType="com.epmet.dto.extract.result.OrgStatisticsResultDTO">
+        SELECT
+            AGENCY_ID,
+            COUNT(ID) AS "sum"
+        FROM fact_origin_issue_main_daily
+        WHERE CUSTOMER_ID = #{customerId}
+          AND DATE_ID &lt;= #{dateId}
+        <if test='null != closedStatus and "" != closedStatus'>
+            AND ISSUE_STATUS = #{closedStatus}
+        </if>
+        <if test='null == closedStatus or "" == closedStatus'>
+            AND (ISSUE_STATUS = 'closed_resolved' OR ISSUE_STATUS = 'closed_unresolved')
+        </if>
+        GROUP BY AGENCY_ID
+    </select>
 </mapper>

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectMainDailyDao.xml

@@ -947,4 +947,20 @@
             m.CUSTOMER_ID,
             m.GRID_ID
     </select>
+    <select id="selectAgencyClosedProjectCount" resultType="com.epmet.dto.extract.result.OrgStatisticsResultDTO">
+        SELECT
+            AGENCY_ID,
+            COUNT(ID) AS "sum"
+        FROM fact_origin_project_main_daily
+        WHERE CUSTOMER_ID = #{customerId}
+          AND DATE_ID &lt;= #{dateId}
+          AND PROJECT_STATUS = 'closed'
+        <if test='null != origin and "" != origin'>
+            AND ORIGIN = #{origin}
+        </if>
+        <if test='null != closedStatus and "" != closedStatus'>
+            AND IS_RESOLVED = #{closedStatus}
+        </if>
+        GROUP BY AGENCY_ID
+    </select>
 </mapper>

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginTopicMainDailyDao.xml

@@ -241,4 +241,20 @@
         GROUP BY
         m.CUSTOMER_ID,m.GRID_ID
     </select>
+    <select id="selectAgencyClosedTopicCount" resultType="com.epmet.dto.extract.result.OrgStatisticsResultDTO">
+        SELECT
+            AGENCY_ID,
+            COUNT(ID) as "sum"
+        FROM fact_origin_topic_main_daily
+        WHERE CUSTOMER_ID = #{customerId}
+          AND DATE_ID &lt;= #{dateId}
+          AND TOPIC_STATUS = 'closed'
+        <if test='null != closedStatus and "" != closedStatus'>
+            AND CLOSED_STATUS = #{closedStatus}
+        </if>
+        <if test='null != shiftIssue'>
+            AND SHIFT_ISSUE = #{shiftIssue}
+        </if>
+        GROUP BY AGENCY_ID
+    </select>
 </mapper>

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

@@ -238,22 +238,17 @@
         FROM
             (
                 SELECT
-                    ps.PROJECT_ID,
+                    PROJECT_ID,
-                    ps.ORG_ID_PATH,
+                    ORG_ID_PATH,
-                    ps.GRID_ID,
+                    GRID_ID,
-                    ps.DEPARTMENT_ID
+                    DEPARTMENT_ID
                  FROM
-                    project_process pp
+                    project_process
-                        INNER JOIN project_staff ps ON pp.STAFF_ID = ps.STAFF_ID
-                        AND pp.DEPARTMENT_NAME = ps.DEPARTMENT_NAME
-                        AND pp.PROJECT_ID = ps.PROJECT_ID
-                        AND ps.IS_HANDLE = 'handle'
-                        AND pp.CREATED_TIME = ps.UPDATED_TIME
-                        AND ps.CUSTOMER_ID = #{customerId}
                 WHERE
-                    pp.OPERATION = 'close'
+                OPERATION = 'close'
+                AND CUSTOMER_ID = #{customerId}
                 <if test="date != null and date.trim() != ''">
-                        AND DATE_FORMAT(pp.CREATED_TIME , '%Y%m%d') = #{date}
+                    AND DATE_FORMAT(CREATED_TIME , '%Y%m%d') = #{date}
                 </if>
 
             ) a