难点赌点添加阈值校验

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/project/ProjectDao.java

@@ -21,7 +21,6 @@ import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.ProjectDTO;
 import com.epmet.dto.project.ProjectAgencyDTO;
 import com.epmet.dto.project.ProjectGridDTO;
-import com.epmet.dto.project.ProjectInfoDTO;
 import com.epmet.entity.project.ProjectEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -103,4 +102,15 @@ public interface ProjectDao extends BaseDao<ProjectEntity> {
      * @return java.lang.String
      */
     String selectParameterValueByKey(@Param("customerId") String customerId);
+
+    /**
+     * @Description 得到超过阈值滞留的项目Id集合
+     * 规定只要项目的任何一个负责人(被流转到的，自始至终不管有没有处理)超过了自定义或默认的滞留时间就算难点赌点
+     * @param customerId
+     * @param exclude
+     * @return java.util.List<java.lang.String>
+     * @author wangc
+     * @date 2020.11.06 14:14
+     */
+    List<String> selectOvertimeProjectIds(@Param("customerId") String customerId,@Param("exclude") List<String> exclude,@Param("value") Integer value);
 }

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

@@ -17,6 +17,7 @@ import com.epmet.service.evaluationindex.screen.ScreenPartyUserRankDataService;
 import com.epmet.service.org.CustomerGridService;
 import com.epmet.service.point.UserPointService;
 import com.epmet.service.project.ProjectProcessService;
+import com.epmet.service.project.ProjectService;
 import com.epmet.service.topic.TopicService;
 import com.epmet.service.user.UserService;
 import lombok.extern.slf4j.Slf4j;
@@ -62,6 +63,8 @@ public class ScreenGrassrootsGovernDataAbsorptionServiceImpl implements ScreenGr
     private ProjectProcessService projectProcessService;
     @Autowired
     private TopicService topicService;
+    @Autowired
+    private ProjectService projectService;
     /**
      * @Description 用户积分、党员分值数据中转站
      * @param param
@@ -135,8 +138,11 @@ public class ScreenGrassrootsGovernDataAbsorptionServiceImpl implements ScreenGr
     @Override
     public void difficultyDataHub(ScreenCentralZoneDataFormDTO param) {
 
+        //查询难点赌点中有无已结案的项目，若有则保留
+        List<String> existed = screenDifficultyDataService.selectExistedInfo(param.getCustomerId());
+
         //查询数据
-        List<ScreenDifficultyDataEntity> difficulties = factOriginProjectMainDailyService.getDifficultyBaseInfo(param.getCustomerId(),screenDifficultyDataService.selectExistedInfo(param.getCustomerId()));
+        List<ScreenDifficultyDataEntity> difficulties = factOriginProjectMainDailyService.getDifficultyBaseInfo(param.getCustomerId(),projectService.getOvertimeProjectByParameter(param.getCustomerId(),existed));
         if(CollectionUtils.isEmpty(difficulties)) return;
         List<String> projectIds = difficulties.stream().map(ScreenDifficultyDataEntity :: getEventId).distinct().collect(Collectors.toList());
         //最近一次操作

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/ProjectService.java

@@ -99,4 +99,15 @@ public interface ProjectService extends BaseService<ProjectEntity> {
      * @return java.lang.String
      */
     String getParameterValueByKey(String customerId);
+
+    /**
+     * @Description 得到超过阈值滞留的项目Id集合
+     * 规定只要项目的任何一个负责人(被流转到的，自始至终不管有没有处理)超过了自定义或默认的滞留时间就算难点赌点
+     * @param customerId
+     * @param exclude
+     * @return java.util.List<java.lang.String>
+     * @author wangc
+     * @date 2020.11.06 14:14
+     */
+    List<String> getOvertimeProjectByParameter(String customerId,List<String> exclude);
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/impl/ProjectServiceImpl.java

@@ -19,15 +19,15 @@ package com.epmet.service.project.impl;
 
 import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.constant.DataSourceConstant;
 import com.epmet.dao.project.ProjectDao;
 import com.epmet.dto.ProjectDTO;
 import com.epmet.dto.project.ProjectAgencyDTO;
 import com.epmet.dto.project.ProjectGridDTO;
-import com.epmet.dto.project.ProjectInfoDTO;
 import com.epmet.entity.project.ProjectEntity;
 import com.epmet.service.project.ProjectService;
-import org.springframework.beans.factory.annotation.Autowired;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -82,4 +82,20 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 		return baseDao.selectParameterValueByKey(customerId);
 	}
 
+	/**
+	 * @Description 得到超过阈值滞留的项目Id集合
+	 * 规定只要项目的任何一个负责人(被流转到的，自始至终不管有没有处理)超过了自定义或默认的滞留时间就算难点赌点
+	 * @param customerId
+	 * @param exclude
+	 * @return java.util.List<java.lang.String>
+	 * @author wangc
+	 * @date 2020.11.06 14:14
+	 */
+	@Override
+	public List<String> getOvertimeProjectByParameter(String customerId, List<String> exclude) {
+		String parameter = baseDao.selectParameterValueByKey(customerId);
+		if(StringUtils.isBlank(parameter)) parameter = baseDao.selectParameterValueByKey("default");
+		return baseDao.selectOvertimeProjectIds(customerId, exclude, StringUtils.isBlank(parameter) ? NumConstant.FIVE : Integer.parseInt(parameter));
+	}
+
 }

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

@@ -106,4 +106,45 @@
           and PARAMETER_KEY ='detention_days'
     </select>
 
+
+    <select id="selectOvertimeProjectIds" resultType="string">
+        SELECT
+        DISTINCT
+            project.ID
+        FROM
+            project project
+        WHERE
+            project.del_flag = '0'
+            AND project.customer_id = #{customerId}
+            <if test="null != exclude and exclude.size() > 0">
+                <foreach collection="exclude" item="id" open="AND ( " separator=" OR " close=" ) ">
+                    project.ID <![CDATA[ <> ]]> #{ID}
+                </foreach>
+            </if>
+            AND EXISTS (
+        SELECT
+            stff.ID
+        FROM
+            project_staff stff
+            LEFT JOIN project_org_relation period ON stff.ID = period.PROJECT_STAFF_ID
+            AND period.DEL_FLAG = '0'
+        WHERE
+            stff.DEL_FLAG = '0'
+          	AND stff.CUSTOMER_ID = #{customerId}
+	        AND project.ID = stff.PROJECT_ID
+            AND ABS(
+            TIMESTAMPDIFF(
+            DAY,
+            period.INFORMED_DATE,
+        IF
+            (
+            period.HANDLED_DATE IS NULL,
+        IF
+            ( project.`STATUS` = 'closed', project.UPDATED_TIME, NOW( ) ),
+            period.HANDLED_DATE
+            )
+            )
+            ) > #{value}
+            )
+    </select>
 </mapper>