先进排行组织项目结案率统计修改

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java

@@ -62,7 +62,6 @@ import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Date;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
@@ -760,6 +759,7 @@ public class DemoController {
         orgRankExtractService.extractGridData(formDTO.getCustomerId(), formDTO.getDateId());
         orgRankExtractService.extractCommunityData(formDTO.getCustomerId(), formDTO.getDateId());
         orgRankExtractService.extractStreetData(formDTO.getCustomerId(), formDTO.getDateId());
+        orgRankExtractService.extractDistrictData(formDTO.getCustomerId(), formDTO.getDateId());
         return new Result();
     }
 

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

@@ -288,6 +288,7 @@ public interface FactOriginProjectLogDailyDao extends BaseDao<FactOriginProjectL
 	 * @return java.util.List<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
 	 */
 	List<OrgStatisticsResultDTO> selectGridClosed(@Param("customerId") String customerId, @Param("monthId") String monthId);
+	List<OrgStatisticsResultDTO> selectAgencyClosed(@Param("customerId") String customerId, @Param("monthId") String monthId);
 
 	/**
 	 * 网格自治率统计--按天

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

@@ -21,7 +21,6 @@ import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.extract.FactOriginProjectLogDailyDTO;
 import com.epmet.dto.extract.result.*;
-import com.epmet.dto.screen.ScreenProjectDataDTO;
 import com.epmet.entity.evaluationindex.extract.FactOriginProjectLogDailyEntity;
 
 import java.math.BigDecimal;
@@ -310,7 +309,7 @@ public interface FactOriginProjectLogDailyService extends BaseService<FactOrigin
      * @return java.util.List<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
      */
     List<OrgStatisticsResultDTO>  getGridClosed(String customerId, String monthId);
-
+    List<OrgStatisticsResultDTO>  getAgencyClosed(String customerId, String monthId);
     /**
      * 网格自制率统计-按天
      * @author zhaoqifeng

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

@@ -401,6 +401,11 @@ public class FactOriginProjectLogDailyServiceImpl extends BaseServiceImpl<FactOr
         return baseDao.selectGridClosed(customerId, monthId);
     }
 
+    @Override
+    public List<OrgStatisticsResultDTO> getAgencyClosed(String customerId, String monthId) {
+        return baseDao.selectAgencyClosed(customerId, monthId);
+    }
+
     /**
      * 网格自制率统计-按天
      *

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

@@ -6,8 +6,6 @@ import com.epmet.constant.OrgTypeConstant;
 import com.epmet.dto.extract.result.OrgStatisticsResultDTO;
 import com.epmet.dto.stats.user.FactRegUserAgencyMonthlyDTO;
 import com.epmet.dto.stats.user.FactRegUserGridMonthlyDTO;
-import com.epmet.entity.evaluationindex.indexcoll.FactIndexGovrnAblityGridMonthlyEntity;
-import com.epmet.entity.evaluationindex.indexcoll.FactIndexGovrnAblityOrgMonthlyEntity;
 import com.epmet.entity.evaluationindex.screen.ScreenOrgRankDataEntity;
 import com.epmet.service.evaluationindex.extract.todata.*;
 import com.epmet.service.evaluationindex.extract.toscreen.OrgRankExtractService;
@@ -17,9 +15,9 @@ import com.epmet.service.evaluationindex.screen.ScreenOrgRankDataService;
 import com.epmet.service.stats.user.FactRegUserAgencyMonthlyService;
 import com.epmet.service.stats.user.FactRegUserGridMonthlyService;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.apache.commons.collections4.CollectionUtils;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
@@ -184,11 +182,15 @@ public class OrgRankExtractServiceImpl implements OrgRankExtractService {
 			));
 		}
 		//结案率 结案数/项目数
-		List<FactIndexGovrnAblityOrgMonthlyEntity> abilityList = factIndexGovrnAblityOrgMonthlyService.getOrgByCustomer(customerId, monthId, OrgTypeConstant.COMMUNITY);
+		List<OrgStatisticsResultDTO> closed =  factOriginProjectLogDailyService.getAgencyClosed(customerId, monthId);
-		if (CollectionUtils.isNotEmpty(abilityList)) {
+		if (CollectionUtils.isNotEmpty(closed)) {
-			list.forEach(entity -> abilityList.stream().filter(item -> item.getAgencyId().equals(entity.getOrgId())).forEach(dto ->
+			list.forEach(entity -> closed.stream().filter(item -> item.getOrgId().equals(entity.getOrgId())).forEach(dto -> {
-				entity.setCloseProjectRatio(dto.getClosedProjectRatio())
+				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));
+				}
+			}));
 		}
 		//满意率 满意和非常满意占比
 		List<OrgStatisticsResultDTO> satisfactionList =  factOriginProjectLogDailyService.getOrgSatisfaction(customerId, monthId, OrgTypeConstant.COMMUNITY);
@@ -252,11 +254,15 @@ public class OrgRankExtractServiceImpl implements OrgRankExtractService {
 			));
 		}
 		//结案率 结案数/项目数
-		List<FactIndexGovrnAblityOrgMonthlyEntity> abilityList = factIndexGovrnAblityOrgMonthlyService.getOrgByCustomer(customerId, monthId, OrgTypeConstant.STREET);
+		List<OrgStatisticsResultDTO> closed =  factOriginProjectLogDailyService.getAgencyClosed(customerId, monthId);
-		if (CollectionUtils.isNotEmpty(abilityList)) {
+		if (CollectionUtils.isNotEmpty(closed)) {
-			list.forEach(entity -> abilityList.stream().filter(item -> item.getAgencyId().equals(entity.getOrgId())).forEach(dto ->
+			list.forEach(entity -> closed.stream().filter(item -> item.getOrgId().equals(entity.getOrgId())).forEach(dto -> {
-				entity.setCloseProjectRatio(dto.getClosedProjectRatio())
+				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));
+				}
+			}));
 		}
 		//满意率 满意和非常满意占比
 		List<OrgStatisticsResultDTO> satisfactionList =  factOriginProjectLogDailyService.getOrgSatisfaction(customerId, monthId, OrgTypeConstant.STREET);
@@ -320,11 +326,15 @@ public class OrgRankExtractServiceImpl implements OrgRankExtractService {
 			));
 		}
 		//结案率 结案数/项目数
-		List<FactIndexGovrnAblityOrgMonthlyEntity> abilityList = factIndexGovrnAblityOrgMonthlyService.getOrgByCustomer(customerId, monthId, OrgTypeConstant.DISTRICT);
+		List<OrgStatisticsResultDTO> closed =  factOriginProjectLogDailyService.getAgencyClosed(customerId, monthId);
-		if (CollectionUtils.isNotEmpty(abilityList)) {
+		if (CollectionUtils.isNotEmpty(closed)) {
-			list.forEach(entity -> abilityList.stream().filter(item -> item.getAgencyId().equals(entity.getOrgId())).forEach(dto ->
+			list.forEach(entity -> closed.stream().filter(item -> item.getOrgId().equals(entity.getOrgId())).forEach(dto -> {
-				entity.setCloseProjectRatio(dto.getClosedProjectRatio())
+				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));
+				}
+			}));
 		}
 		//满意率 满意和非常满意占比
 		List<OrgStatisticsResultDTO> satisfactionList =  factOriginProjectLogDailyService.getOrgSatisfaction(customerId, monthId, OrgTypeConstant.STREET);

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

@@ -516,6 +516,36 @@
         ON a.GRID_ID = b.GRID_ID
     </select>
 
+    <select id="selectAgencyClosed" resultType="com.epmet.dto.extract.result.OrgStatisticsResultDTO">
+        SELECT
+            a.AGENCY_ID AS "orgId",
+            a.count AS "sum",
+            IFNULL( b.count, 0 ) AS "count"
+        FROM
+            ( SELECT
+                    AGENCY_ID,
+                    COUNT( ID ) AS "count"
+                FROM
+                    fact_origin_project_main_daily
+                WHERE
+                    CUSTOMER_ID = #{customerId}
+                    AND MONTH_ID = #{monthId}
+                    AND AGENCY_ID != ''
+                GROUP BY AGENCY_ID ) a
+        LEFT JOIN
+        ( SELECT
+                AGENCY_ID,
+                COUNT( ID ) AS "count"
+            FROM fact_origin_project_main_daily
+            WHERE
+                PROJECT_STATUS = 'closed'
+                AND CUSTOMER_ID = #{customerId}
+                AND MONTH_ID = #{monthId}
+                AND AGENCY_ID != ''
+            GROUP BY AGENCY_ID ) b
+        ON a.AGENCY_ID = b.AGENCY_ID
+    </select>
+
     <select id="selectNotReturn" resultType="com.epmet.dto.extract.result.TransferRightRatioResultDTO">
         SELECT
             DISTINCT(PROJECT_ID) AS projectId