办结效率为空时放入默认值0

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

@@ -22,6 +22,7 @@ import com.epmet.dto.extract.FactOriginProjectMainDailyDTO;
 import com.epmet.dto.extract.result.OrgStatisticsResultDTO;
 import com.epmet.dto.extract.result.GridProjectClosedTotalResultDTO;
 import com.epmet.entity.evaluationindex.extract.FactOriginProjectMainDailyEntity;
+import com.epmet.entity.evaluationindex.screen.ScreenDifficultyDataEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -169,4 +170,14 @@ public interface FactOriginProjectMainDailyDao extends BaseDao<FactOriginProject
 	 * @return java.util.List<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
 	 */
 	List<OrgStatisticsResultDTO> getGridResolveProject(@Param("customerId") String customerId, @Param("monthId")String monthId);
+
+	/**
+	 * @Description 查询难点赌点的基本信息，要排除之前已经结案过的项目
+	 * @param customerId
+	 * @param list
+	 * @return java.util.List<com.epmet.entity.evaluationindex.screen.ScreenDifficultyDataEntity>
+	 * @author wangc
+	 * @date 2020.09.28 10:19
+	*/
+	List<ScreenDifficultyDataEntity> selectDifficultyBaseInfo(@Param("customerId")String customerId,@Param("list")List<String> list);
 }

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

@@ -23,6 +23,7 @@ import com.epmet.dto.extract.FactOriginProjectMainDailyDTO;
 import com.epmet.dto.extract.result.GridProjectClosedTotalResultDTO;
 import com.epmet.dto.extract.result.OrgStatisticsResultDTO;
 import com.epmet.entity.evaluationindex.extract.FactOriginProjectMainDailyEntity;
+import com.epmet.entity.evaluationindex.screen.ScreenDifficultyDataEntity;
 
 import java.util.List;
 import java.util.Map;
@@ -216,4 +217,14 @@ public interface FactOriginProjectMainDailyService extends BaseService<FactOrigi
      * @return java.util.List<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
      */
     List<OrgStatisticsResultDTO> getGridResolveProject(String customerId, String monthId);
+
+    /**
+     * @Description 查询难点赌点基础信息
+     * @param customerId
+     * @param list
+     * @return java.util.List<com.epmet.entity.evaluationindex.screen.ScreenDifficultyDataEntity>
+     * @author wangc
+     * @date 2020.09.28 10:23
+    */
+    List<ScreenDifficultyDataEntity> getDifficultyBaseInfo(String customerId , List<String> list);
 }

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

@@ -31,6 +31,7 @@ import com.epmet.dto.extract.FactOriginProjectMainDailyDTO;
 import com.epmet.dto.extract.result.GridProjectClosedTotalResultDTO;
 import com.epmet.dto.extract.result.OrgStatisticsResultDTO;
 import com.epmet.entity.evaluationindex.extract.FactOriginProjectMainDailyEntity;
+import com.epmet.entity.evaluationindex.screen.ScreenDifficultyDataEntity;
 import com.epmet.service.evaluationindex.extract.todata.FactOriginProjectMainDailyService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
@@ -213,4 +214,17 @@ public class FactOriginProjectMainDailyServiceImpl extends BaseServiceImpl<FactO
     public List<OrgStatisticsResultDTO> getGridResolveProject(String customerId, String monthId) {
         return baseDao.getGridResolveProject(customerId, monthId);
     }
+
+    /**
+     * @Description 查询难点赌点基础信息
+     * @param customerId
+     * @param list
+     * @return java.util.List<com.epmet.entity.evaluationindex.screen.ScreenDifficultyDataEntity>
+     * @author wangc
+     * @date 2020.09.28 10:23
+     */
+    @Override
+    public List<ScreenDifficultyDataEntity> getDifficultyBaseInfo(String customerId, List<String> list) {
+        return null;
+    }
 }

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

@@ -1,6 +1,7 @@
 package com.epmet.service.evaluationindex.extract.todata.impl;
 
 import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.dao.evaluationindex.extract.FactOriginGroupMainDailyDao;
 import com.epmet.dto.extract.FactOriginGroupMainDailyDTO;
@@ -101,6 +102,11 @@ public class GroupExtractServiceImpl implements GroupExtractService {
                         group.setAgencyId(attr.getAgencyId());
                         group.setParentId(attr.getParentId());
                         group.setPids(attr.getPids());
+                        if(StringUtils.isBlank(group.getPids().trim()) || NumConstant.ZERO_STR.equals(group.getPids().trim())){
+                            group.setPids(group.getAgencyId());
+                        }else{
+                            group.setPids(group.getPids().concat(StrConstant.COLON).concat(group.getAgencyId()));
+                        }
                     }
                     if(null != group.getCreatedTime()){
                         DimIdGenerator.DimIdBean dateInfo = DimIdGenerator.getDimIdBean(group.getCreatedTime());
@@ -124,6 +130,11 @@ public class GroupExtractServiceImpl implements GroupExtractService {
                                 member.setAgencyId(attr.getAgencyId());
                                 member.setParentId(attr.getParentId());
                                 member.setPids(attr.getPids());
+                                if(StringUtils.isBlank(member.getPids().trim()) || NumConstant.ZERO_STR.equals(member.getPids().trim())){
+                                    member.setPids(member.getAgencyId());
+                                }else{
+                                    member.setPids(member.getPids().concat(StrConstant.COLON).concat(member.getAgencyId()));
+                                }
                             }
                             memberList.add(member);
                         });

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

@@ -1,9 +1,11 @@
 package com.epmet.service.evaluationindex.extract.toscreen.impl;
 
 import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.dto.org.GridInfoDTO;
 import com.epmet.dto.screen.form.ScreenCentralZoneDataFormDTO;
+import com.epmet.entity.evaluationindex.screen.ScreenDifficultyDataEntity;
 import com.epmet.entity.evaluationindex.screen.ScreenPartyUserRankDataEntity;
 import com.epmet.service.evaluationindex.extract.toscreen.ScreenGrassrootsGovernDataAbsorptionService;
 import com.epmet.service.evaluationindex.indexcal.CpcIndexCalculateService;
@@ -88,7 +90,8 @@ public class ScreenGrassrootsGovernDataAbsorptionServiceImpl implements ScreenGr
                     user.setGridName(gridInfo.getGridName());
                     user.setOrgId(gridInfo.getAgencyId());
                     user.setOrgName(gridInfo.getOrgName());
-                    user.setAllParentIds(gridInfo.getPids());
+                    //原始数据Pid使用英文:隔开，大屏数据要求按照英文,隔开
+                    user.setAllParentIds(gridInfo.getPids().replaceAll(StrConstant.COLON,StrConstant.COMMA));
                 }
                 Integer point = pointMap.get(user.getUserId());
                 BigDecimal score = scoreMap.get(user.getUserId());
@@ -114,6 +117,6 @@ public class ScreenGrassrootsGovernDataAbsorptionServiceImpl implements ScreenGr
      **/
     @Override
     public void difficultyDataHub(ScreenCentralZoneDataFormDTO param) {
-
+        ScreenDifficultyDataEntity entity = new ScreenDifficultyDataEntity();
     }
 }

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

@@ -282,4 +282,101 @@
                  fm.GRID_ID) b
             ON a.GRID_ID = b.GRID_ID
     </select>
+
+
+    <!-- 根据客户Id查询 -->
+    <select id="selectDifficultyBaseInfo" resultType="com.epmet.entity.evaluationindex.screen.ScreenDifficultyDataEntity">
+
+        SELECT
+        project.CUSTOMER_ID,
+        project.ID AS EVENT_ID,
+        'grid' AS orgType,
+        project.GRID_ID AS orgId,
+        project.AGENCY_ID AS parentId,
+        project.TOPIC_ID AS eventImgUrl,
+        gridInfo.allPathName AS eventSource,
+        project.PROJECT_STATUS AS eventStatusCode,
+        IF
+        ( project.PROJECT_STATUS = 'pending', '处理中', '已结案' ) AS eventStatusDesc,
+        relation.reOrg AS eventReOrg,
+        handleCount.HandledCount AS eventHandledCount,
+        costTime.costTime AS eventCostTime ,
+        gridInfo.allParentIds
+        FROM
+        fact_origin_project_main_daily project
+        LEFT JOIN (
+        SELECT
+        grid.ID AS dimGridId,
+        concat(
+        IF
+        (
+        ISNULL( agency.ALL_PARENT_NAME ) || LENGTH( trim( agency.ALL_PARENT_NAME ) ) <![CDATA[<]]> 1,
+        '',
+        concat( agency.ALL_PARENT_NAME, '-' )
+        ),
+        agency.AGENCY_NAME,
+        '-',
+        grid.GRID_NAME
+        ) AS allPathName,
+        REPLACE(concat(
+        IF
+        (
+        ISNULL( agency.PIDS ) || LENGTH( trim( agency.PIDS ) ) <![CDATA[<]]> 1,
+        '',
+        concat( agency.PIDS, ':' )
+        ),
+        agency.ID
+        ),':',',') AS allParentIds
+        FROM
+        DIM_GRID grid
+        LEFT JOIN DIM_AGENCY agency ON grid.AGENCY_ID = agency.ID
+        AND agency.DEL_FLAG = '0'
+        AND agency.CUSTOMER_ID = #{customerId}
+        WHERE
+        grid.DEL_FLAG = '0'
+        AND grid.CUSTOMER_ID = #{customerId}
+        ) gridInfo ON project.GRID_ID = gridInfo.dimGridId
+        LEFT JOIN ( SELECT PROJECT_ID, COUNT( DISTINCT ORG_ID ) AS reOrg FROM fact_origin_project_org_period_daily WHERE DEL_FLAG = '0' AND CUSTOMER_ID = '3ef7e4bb195eb9e622d68b52509aa940' GROUP BY PROJECT_ID ) relation ON project.ID = relation.PROJECT_ID -- 处理次数
+        LEFT JOIN (
+        SELECT
+        PROJECT_ID,
+        COUNT( ID ) AS handledCount
+        FROM
+        fact_origin_project_org_period_daily
+        WHERE
+        DEL_FLAG = '0'
+        AND CUSTOMER_ID = #{customerId}
+        AND IS_RESOLVED = 'resolved'
+        GROUP BY
+        PROJECT_ID
+        ) handleCount ON project.ID = handleCount.PROJECT_ID
+        LEFT JOIN (
+        SELECT
+        main.ID AS PROJECT_ID,
+        TIMESTAMPDIFF(
+        MINUTE,
+        str_to_date( main.DATE_ID, '%Y%m%d' ),
+        IF
+        ( main.IS_RESOLVED = 'resolved', time.HANDLED_DATE, NOW( ) )
+        ) AS costTime
+        FROM
+        fact_origin_project_main_daily main
+        LEFT JOIN fact_origin_project_org_period_daily time ON main.ID = time.PROJECT_ID
+        AND time.DEL_FLAG = '0'
+        AND time.OPERATION = 'close'
+        WHERE
+        main.DEL_FLAG = '0'
+        AND main.CUSTOMER_ID = #{customerId}
+        GROUP BY
+        main.ID
+        ) costTime ON project.ID = costTime.PROJECT_ID
+        WHERE
+        project.DEL_FLAG = '0'
+        AND project.CUSTOMER_ID = #{customerId}
+        <if test="null != list and list.size() != 0">
+            <foreach collection="list" item="projectId" open="AND " separator=" AND " >
+                project.ID <![CDATA[<>]]> #{projectId}
+            </foreach>
+        </if>
+    </select>
 </mapper>