Merge remote-tracking branch 'origin/dev_bugfix_screen' into dev

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

@@ -63,7 +63,7 @@ public interface FactOriginProjectOrgPeriodDailyDao extends BaseDao<FactOriginPr
      * @author wangc
      * @date 2020.10.19 16:26
     */
-    void deleteByProjectIds(@Param("list") List<String> list);
+    void deleteByProjectIds(@Param("list") List<String> list,@Param("customerId") String customerId);
 
     /**
      * @Description 批量插入

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

@@ -439,7 +439,7 @@ public class ProjectExtractServiceImpl implements ProjectExtractService {
 		if(!CollectionUtils.isEmpty(formattingData)) {
 			List<String> projectIds = formattingData.stream().map(FactOriginProjectOrgPeriodDailyEntity::getProjectId).distinct().collect(Collectors.toList());
 			if (!CollectionUtils.isEmpty(projectIds)) {
-				factOriginProjectOrgPeriodDailyDao.deleteByProjectIds(projectIds);
+				factOriginProjectOrgPeriodDailyDao.deleteByProjectIds(null,param.getCustomerId());
 				factOriginProjectOrgPeriodDailyDao.insertBatch(formattingData);
 			}
 		}

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

@@ -184,6 +184,8 @@ public class ScreenGrassrootsGovernDataAbsorptionServiceImpl implements ScreenGr
         List<ScreenDifficultyImgDataEntity> imgList = new LinkedList<>();
         imgMap.values().forEach(list -> {imgList.addAll(list);});
 
+        difficulties.removeIf( diff -> StringUtils.isBlank(diff.getLatestOperateDesc()));
+
         screenDifficultyDataService.dataClean(param.getCustomerId(),difficulties,imgList);
         log.info("【大屏数据抽取-难点赌点执行完毕】 客户Id{} 难点赌点数据{}",param.getCustomerId(),JSON.toJSONString(difficulties));
     }

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

@@ -39,9 +39,12 @@
         fact_origin_project_org_period_daily
         WHERE
         DEL_FLAG = '0'
-        <foreach collection="list" open="AND ( " close=" )" separator=" OR " item="item">
-            PROJECT_ID = #{item}
-        </foreach>
+        AND CUSTOMER_ID = #{customerId}
+        <if test="null != list and list.size() > 0">
+            <foreach collection="list" open="AND ( " close=" )" separator=" OR " item="item">
+                PROJECT_ID = #{item}
+            </foreach>
+        </if>
     </delete>
 
     <select id="selectResponsiveness" resultType="com.epmet.dto.extract.result.OrgStatisticsResultDTO">

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

@@ -56,9 +56,10 @@
         ps.ORG_ID_PATH AS pids,
         pp.CREATED_TIME
         FROM project_staff ps
-        INNER JOIN project_process pp ON ps.PROCESS_ID = pp.ID
-        INNER JOIN project p ON pp.PROJECT_ID = p.ID
+        INNER JOIN project_process pp ON ps.PROCESS_ID = pp.ID AND pp.DEL_FLAG = '0'
+        INNER JOIN project p ON pp.PROJECT_ID = p.ID AND p.DEL_FLAG = '0'
         WHERE p.CUSTOMER_ID = #{customerId}
+        AND ps.DEL_FLAG = '0'
         <if test="date != null and date.trim() != ''">
             AND DATE_FORMAT(pp.CREATED_TIME, '%Y%m%d') = #{date}
         </if>
@@ -296,12 +297,13 @@
             pp.CREATED_TIME
         FROM
             project_process pp
-        INNER JOIN project p ON pp.PROJECT_ID = p.ID
+        INNER JOIN project p ON pp.PROJECT_ID = p.ID AND p.DEL_FLAG = '0'
         LEFT JOIN project_staff ps ON pp.PROJECT_ID = ps.PROJECT_ID
         AND pp.STAFF_ID = ps.STAFF_ID
         AND pp.DEPARTMENT_NAME = ps.DEPARTMENT_NAME
         WHERE
             1=1
+          AND pp.DEL_FLAG = '0'
           AND p.CUSTOMER_ID = #{customerId}
           AND pp.OPERATION = 'response'
         <if test="date != null and date.trim() != ''">