Merge branch 'dev_screen_data_2.0' into dev_temp

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

@@ -204,4 +204,35 @@ public interface FactOriginProjectLogDailyDao extends BaseDao<FactOriginProjectL
 	 */
 	List<OrgStatisticsResultDTO> selectOrgSatisfaction(@Param("customerId") String customerId, @Param("monthId") String monthId,
 													@Param("level")String level);
+
+	/**
+	 * 获取部门办结项目数
+	 * @author zhaoqifeng
+	 * @date 2020/10/16 17:09
+	 * @param customerId
+	 * @param monthId
+	 * @return java.util.List<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
+	 */
+	List<OrgStatisticsResultDTO> selectDeptClosedProject(@Param("customerId") String customerId, @Param("monthId") String monthId);
+
+
+	/**
+	 * 部门办结项目满意度
+	 * @author zhaoqifeng
+	 * @date 2020/9/20 16:44
+	 * @param customerId
+	 * @param monthId
+	 * @return java.util.List<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
+	 */
+	List<OrgStatisticsResultDTO> selectDeptSatisfaction(@Param("customerId") String customerId, @Param("monthId") String monthId);
+
+	/**
+	 * 网格结案率统计
+	 * @author zhaoqifeng
+	 * @date 2020/9/20 16:44
+	 * @param customerId
+	 * @param monthId
+	 * @return java.util.List<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
+	 */
+	List<OrgStatisticsResultDTO> selectGridClosed(@Param("customerId") String customerId, @Param("monthId") String monthId);
 }

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

@@ -96,4 +96,14 @@ public interface FactOriginProjectOrgPeriodDailyDao extends BaseDao<FactOriginPr
      * @date 2020.09.21 02:13
      **/
     List<OrgResponseTimeResultDTO> selectAgencyResponseCoefficient(@Param("customerId") String customerId,@Param("dimId") String dimId, @Param("dateType") String dateType);
+
+    /**
+     * 部门处理效率统计
+     * @author zhaoqifeng
+     * @date 2020/10/19 9:31
+     * @param customerId
+     * @param monthId
+     * @return java.util.List<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
+     */
+    List<OrgStatisticsResultDTO> selectDeptHandle(@Param("customerId") String customerId, @Param("monthId") String monthId);
 }

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

@@ -9,13 +9,11 @@ import com.epmet.dto.stats.DimDepartmentDTO;
 import com.epmet.entity.evaluationindex.indexcoll.FactIndexGovrnAblityDeptMonthlyEntity;
 import com.epmet.service.evaluationindex.extract.dataToIndex.IndexCollDistrictDepartmentService;
 import com.epmet.service.evaluationindex.extract.todata.FactOriginProjectLogDailyService;
-import com.epmet.service.evaluationindex.extract.todata.FactOriginProjectMainDailyService;
 import com.epmet.service.evaluationindex.indexcoll.FactIndexGovrnAblityDeptMonthlyService;
-import com.epmet.service.evaluationindex.indexcoll.FactIndexPartyAblityOrgMonthlyService;
 import com.epmet.service.stats.DimDepartmentService;
-import com.epmet.service.stats.FactArticlePublishedDepartmentDailyService;
 import com.epmet.util.DimIdGenerator;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -41,12 +39,6 @@ public class IndexCollDistrictDepartmentServiceImpl implements IndexCollDistrict
 	private FactOriginProjectLogDailyService factOriginProjectLogDailyService;
 	@Autowired
 	private FactOriginProjectOrgPeriodDailyDao factOriginProjectOrgPeriodDailyDao;
-	@Autowired
-	private FactOriginProjectMainDailyService factOriginProjectMainDailyService;
-	@Autowired
-	private FactArticlePublishedDepartmentDailyService factArticlePublishedDepartmentDailyService;
-	@Autowired
-	private FactIndexPartyAblityOrgMonthlyService factIndexPartyAblityOrgMonthlyService;
 
 	@Override
 	public void saveDepartmentAbility(String customerId, String dateId) {
@@ -97,7 +89,43 @@ public class IndexCollDistrictDepartmentServiceImpl implements IndexCollDistrict
 				}));
 			}
 
-			//TODO 区直部门办结项目满意度 暂时无法统计
+			//办结项目数 办结率
+			List<OrgStatisticsResultDTO > closedList = factOriginProjectLogDailyService.getDeptClosedProject(customerId, dimId.getMonthId());
+			if (CollectionUtils.isNotEmpty(closedList)) {
+				list.forEach(entity -> closedList.stream().filter(dto -> dto.getOrgId().equals(entity.getDeptId())).forEach(item -> {
+					entity.setClosedProjectCount(item.getCount());
+					if (item.getSum() != NumConstant.ZERO) {
+						BigDecimal count = new BigDecimal(item.getCount());
+						BigDecimal sum = new BigDecimal(item.getSum());
+						entity.setClosedProjectRatio(count.divide(sum, NumConstant.SIX, RoundingMode.HALF_UP));
+					}
+				}));
+			}
+
+			//部门办结项目满意度
+			List<OrgStatisticsResultDTO > satisfactions = factOriginProjectLogDailyService.getDeptSatisfaction(customerId, dimId.getMonthId());
+			if (CollectionUtils.isNotEmpty(satisfactions)) {
+				list.forEach(entity -> satisfactions.stream().filter(dto -> dto.getOrgId().equals(entity.getDeptId())).forEach(item -> {
+					if (item.getCount() != NumConstant.ZERO) {
+						BigDecimal count = new BigDecimal(item.getCount());
+						entity.setClosedProjectRatio(item.getRatio().divide(count, NumConstant.SIX, RoundingMode.HALF_UP));
+					}
+				}));
+			}
+
+			//部门办结项目的处理效率
+			List<OrgStatisticsResultDTO > handle = factOriginProjectOrgPeriodDailyDao.selectDeptHandle(customerId, dimId.getMonthId());
+			if (CollectionUtils.isNotEmpty(handle)) {
+				list.forEach(entity -> handle.stream().filter(dto -> dto.getOrgId().equals(entity.getDeptId())).forEach(item -> {
+					if (item.getCount() != NumConstant.ZERO) {
+						BigDecimal count = new BigDecimal(item.getCount());
+						BigDecimal sum = new BigDecimal(item.getSum());
+						BigDecimal one = new BigDecimal(NumConstant.ONE);
+						entity.setClosedProjectRatio(one.divide(sum.divide(count), NumConstant.SIX, RoundingMode.HALF_UP));
+					}
+				}));
+			}
+
 
 			factIndexGovrnAblityDeptMonthlyService.deleteByCustomer(customerId, dimId.getMonthId());
 			factIndexGovrnAblityDeptMonthlyService.insertBatch(list);

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

@@ -239,4 +239,33 @@ public interface FactOriginProjectLogDailyService extends BaseService<FactOrigin
      */
     List<OrgStatisticsResultDTO> getOrgSatisfaction(String customerId, String monthId, String level);
 
+    /**
+     * 获取部门办结项目数
+     * @author zhaoqifeng
+     * @date 2020/10/16 17:08
+     * @param customerId
+     * @param monthId
+     * @return java.util.List<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
+     */
+    List<OrgStatisticsResultDTO> getDeptClosedProject(String customerId, String monthId);
+
+    /**
+     * 部门办结项目满意度
+     * @author zhaoqifeng
+     * @date 2020/10/16 17:50
+     * @param customerId
+     * @param monthId
+     * @return java.util.List<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
+     */
+    List<OrgStatisticsResultDTO>  getDeptSatisfaction(String customerId, String monthId);
+
+    /**
+     * 网格结案率统计
+     * @author zhaoqifeng
+     * @date 2020/10/19 11:58
+     * @param customerId
+     * @param monthId
+     * @return java.util.List<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
+     */
+    List<OrgStatisticsResultDTO>  getGridClosed(String customerId, String monthId);
 }

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

@@ -23,4 +23,14 @@ public interface FactOriginProjectOrgPeriodDailyService extends BaseService<Fact
 	 * @return java.util.List<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
 	 */
 	List<OrgStatisticsResultDTO> getResponsiveness(String customerId, String monthId, String level, String orgType);
+
+	/**
+	 * 部门处理效率统计
+	 * @author zhaoqifeng
+	 * @date 2020/10/19 9:38
+	 * @param customerId
+	 * @param monthId
+	 * @return java.util.List<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
+	 */
+	List<OrgStatisticsResultDTO> getDeptHandle(String customerId, String monthId);
 }

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

@@ -295,5 +295,47 @@ public class FactOriginProjectLogDailyServiceImpl extends BaseServiceImpl<FactOr
         return baseDao.selectOrgSatisfaction(customerId, monthId, level);
     }
 
+    /**
+     * 获取部门办结项目数
+     *
+     * @param customerId
+     * @param monthId
+     * @return java.util.List<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
+     * @author zhaoqifeng
+     * @date 2020/10/16 17:08
+     */
+    @Override
+    public List<OrgStatisticsResultDTO> getDeptClosedProject(String customerId, String monthId) {
+        return baseDao.selectDeptClosedProject(customerId, monthId);
+    }
+
+    /**
+     * 部门办结项目满意度
+     *
+     * @param customerId
+     * @param monthId
+     * @return java.util.List<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
+     * @author zhaoqifeng
+     * @date 2020/10/16 17:50
+     */
+    @Override
+    public List<OrgStatisticsResultDTO> getDeptSatisfaction(String customerId, String monthId) {
+        return baseDao.selectDeptSatisfaction(customerId, monthId);
+    }
+
+    /**
+     * 网格结案率统计
+     *
+     * @param customerId
+     * @param monthId
+     * @return java.util.List<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
+     * @author zhaoqifeng
+     * @date 2020/10/19 11:58
+     */
+    @Override
+    public List<OrgStatisticsResultDTO> getGridClosed(String customerId, String monthId) {
+        return baseDao.selectGridClosed(customerId, monthId);
+    }
+
 
 }

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

@@ -23,4 +23,18 @@ public class FactOriginProjectOrgPeriodDailyServiceImpl extends BaseServiceImpl<
 	public List<OrgStatisticsResultDTO> getResponsiveness(String customerId, String monthId, String level, String orgType) {
 		return baseDao.selectResponsiveness(customerId, monthId, level, orgType);
 	}
+
+	/**
+	 * 部门处理效率统计
+	 *
+	 * @param customerId
+	 * @param monthId
+	 * @return java.util.List<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
+	 * @author zhaoqifeng
+	 * @date 2020/10/19 9:38
+	 */
+	@Override
+	public List<OrgStatisticsResultDTO> getDeptHandle(String customerId, String monthId) {
+		return baseDao.selectDeptHandle(customerId, monthId);
+	}
 }

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

@@ -101,15 +101,25 @@ public class OrgRankExtractServiceImpl implements OrgRankExtractService {
 			));
 		}
 		//结案率 结案数/项目数
-		List<FactIndexGovrnAblityGridMonthlyEntity> abilityList = factIndexGovrnAblityGridMonthlyService.getGridByCustomer(customerId, monthId);
+//		List<FactIndexGovrnAblityGridMonthlyEntity> abilityList = factIndexGovrnAblityGridMonthlyService.getGridByCustomer(customerId, monthId);
-		if (CollectionUtils.isNotEmpty(abilityList)) {
+//		if (CollectionUtils.isNotEmpty(abilityList)) {
-			list.forEach(entity -> abilityList.stream().filter(item -> item.getGridId().equals(entity.getOrgId())).forEach(dto -> {
+//			list.forEach(entity -> abilityList.stream().filter(item -> item.getGridId().equals(entity.getOrgId())).forEach(dto -> {
-				if (dto.getProjectTotal() != NumConstant.ZERO) {
+//				if (dto.getProjectTotal() != NumConstant.ZERO) {
-					BigDecimal total = new BigDecimal(dto.getProjectTotal());
+//					BigDecimal total = new BigDecimal(dto.getProjectTotal());
-					BigDecimal closed = new BigDecimal(dto.getResolveProjectCount());
+//					BigDecimal closed = new BigDecimal(dto.getResolveProjectCount());
-					entity.setCloseProjectRatio(closed.multiply(hundred).divide(total, NumConstant.SIX, RoundingMode.HALF_UP));
+//					entity.setCloseProjectRatio(closed.multiply(hundred).divide(total, NumConstant.SIX, RoundingMode.HALF_UP));
+//				}
+//
+//			}));
+//		}
+		List<OrgStatisticsResultDTO> closed =  factOriginProjectLogDailyService.getGridClosed(customerId, monthId);
+		if (CollectionUtils.isNotEmpty(closed)) {
+			list.forEach(entity -> closed.stream().filter(item -> item.getOrgId().equals(entity.getOrgId())).forEach(dto -> {
+				if (dto.getSum() != NumConstant.ZERO) {
+					BigDecimal sum = new BigDecimal(dto.getSum());
+					BigDecimal count = new BigDecimal(dto.getCount());
+					entity.setCloseProjectRatio(count.multiply(hundred).divide(sum, NumConstant.SIX, RoundingMode.HALF_UP));
 				}
-
 			}));
 		}
 		//满意率 满意和非常满意占比

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

@@ -125,7 +125,6 @@
         FROM
             fact_origin_project_log_daily fopld
                 INNER JOIN dim_agency da ON fopld.AGENCY_ID = da.ID
-                AND da.`LEVEL` = #{level}
         WHERE
             fopld.IS_ACTIVE = 0
           AND fopld.ACTION_CODE = 'transfer'
@@ -425,4 +424,93 @@
         GROUP BY
             AGENCY_ID
     </select>
+    <select id="selectDeptClosedProject" resultType="com.epmet.dto.extract.result.OrgStatisticsResultDTO">
+        SELECT
+            a.ORG_ID,
+            a.count AS "sum",
+            IFNULL(b.count,0) AS "count"
+        FROM
+            (SELECT
+                 ORG_ID,
+                 COUNT( ID ) AS "count"
+             FROM
+                 fact_origin_project_log_daily
+             WHERE
+                 ORG_TYPE = 'department'
+               AND IS_ACTIVE = '0'
+               AND CUSTOMER_ID = #{customerId}
+               AND MONTH_ID = #{monthId}
+             GROUP BY
+                 ORG_ID) a
+                LEFT JOIN
+            (SELECT
+                 ORG_ID,
+                 COUNT( ID ) AS "count"
+             FROM
+                 fact_origin_project_log_daily
+             WHERE
+                 ORG_TYPE = 'department'
+               AND ACTION_CODE = 'close'
+               AND CUSTOMER_ID = #{customerId}
+               AND MONTH_ID = #{monthId}
+             GROUP BY
+                 ORG_ID) b ON a.ORG_ID = b.ORG_ID
+    </select>
+    <select id="selectDeptSatisfaction" resultType="com.epmet.dto.extract.result.OrgStatisticsResultDTO">
+        SELECT
+            ORG_ID,
+            COUNT( a.PROJECT_ID ) AS "count",
+            SUM( IFNULL( b.score, 80 ) ) AS "ratio"
+        FROM
+            (SELECT
+                 ORG_ID,
+                 PROJECT_ID
+             FROM
+                 fact_origin_project_log_daily
+             WHERE
+                 ORG_TYPE = 'department'
+               AND ACTION_CODE = 'close'
+               AND CUSTOMER_ID = #{customerId}
+               AND MONTH_ID = #{monthId}) a
+                LEFT JOIN
+            (SELECT
+                 PROJECT_ID,
+                 AVG( CASE ACTION_CODE WHEN 'bad' THEN 60 WHEN 'perfect' THEN 100 ELSE 80 END ) AS score
+             FROM
+                 fact_origin_project_log_daily
+             WHERE
+                 ( ACTION_CODE = 'bad' OR ACTION_CODE = 'good' OR ACTION_CODE = 'perfect' )
+               AND CUSTOMER_ID = #{customerId}
+               AND MONTH_ID = #{monthId}
+             GROUP BY
+                 PROJECT_ID) b ON a.PROJECT_ID = b.PROJECT_ID
+        GROUP BY ORG_ID
+    </select>
+    <select id="selectGridClosed" resultType="com.epmet.dto.extract.result.OrgStatisticsResultDTO">
+        SELECT
+            a.ORG_ID,
+            a.count AS "sum",
+            IFNULL(b.count,0)AS "count"
+        FROM
+            (SELECT ORG_ID,
+                    COUNT(ID) AS "count"
+             FROM fact_origin_project_log_daily
+             WHERE( ACTION_CODE = 'created' OR ACTION_CODE = 'transfer')
+               AND IS_ACTIVE = 0
+               AND ORG_TYPE = 'grid'
+               AND CUSTOMER_ID = #{customerId}
+               AND MONTH_ID = #{monthId}
+             GROUP BY ORG_ID) a
+                LEFT JOIN
+            (SELECT fl.ORG_ID,
+                    COUNT(fl.ID) AS "count"
+             FROM fact_origin_project_log_daily fl
+                      INNER JOIN fact_origin_project_main_daily fm ON fl.PROJECT_ID = fm.ID AND fm.PROJECT_STATUS = 'closed'
+             WHERE( fl.ACTION_CODE = 'created' OR fl.ACTION_CODE = 'transfer')
+               AND fl.IS_ACTIVE = 0
+               AND fl.ORG_TYPE = 'grid'
+               AND fl.CUSTOMER_ID = #{customerId}
+               AND fl.MONTH_ID = #{monthId}
+             GROUP BY fl.ORG_ID) b ON a.ORG_ID = b.ORG_ID
+    </select>
 </mapper>

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

@@ -54,7 +54,6 @@
         FROM
             fact_origin_project_org_period_daily f
                 INNER JOIN dim_agency da ON f.ORG_ID = da.ID
-                AND da.`LEVEL` = #{level}
         WHERE
             f.ORG_TYPE = #{orgType}
             AND DATE_FORMAT(INFORMED_DATE, '%Y%m') = #{monthId}
@@ -180,4 +179,21 @@
 				GROUP BY ORG_ID
 
     </select>
+    <select id="selectDeptHandle" resultType="com.epmet.dto.extract.result.OrgStatisticsResultDTO">
+        SELECT
+            fp.ORG_ID,
+            SUM( TIMESTAMPDIFF( MINUTE, ( DATE_FORMAT( fp.INFORMED_DATE, '%Y-%m-%d %H:%i' )),
+                                ( DATE_FORMAT( fp.PERIOD_TILL_REPLY_FIRSTLY, '%Y-%m-%d %H:%i' )) ) ) AS "sum",
+            COUNT( fp.ID ) AS "count"
+        FROM
+            fact_origin_project_org_period_daily fp
+        INNER JOIN fact_origin_project_main_daily fm ON fp.PROJECT_ID = fm.ID
+        AND fm.PROJECT_STATUS = 'closed'
+        WHERE
+            fp.ORG_TYPE = 'dept'
+            AND fp.CUSTOMER_ID = #{customerId}
+            AND fm.MONTH_ID = #{monthId}
+        GROUP BY
+            fp.ORG_ID
+    </select>
 </mapper>

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/DimDepartmentDao.xml

@@ -60,7 +60,6 @@
         FROM
             dim_department dd
                 INNER JOIN dim_agency da ON dd.AGENCY_ID = da.ID
-                AND da.`LEVEL` = 'district'
         WHERE
             dd.CUSTOMER_ID = #{customerId}
     </select>