From ab75c460cc0b44e33216b06fc3db21431a4909ba Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Wed, 13 Jan 2021 13:28:54 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=8A=BD=E5=8F=96?=
 =?UTF-8?q?=E5=8E=9F=E5=A7=8B=E6=95=B0=E6=8D=AE=E6=97=B6=E5=AF=B9=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E7=9A=84=E9=A1=B9=E7=9B=AE=E8=BF=9B=E8=A1=8C=E6=B8=85?=
 =?UTF-8?q?=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../extract/FactOriginProjectOrgPeriodDailyDao.java      | 2 +-
 .../extract/todata/impl/ProjectExtractServiceImpl.java   | 2 +-
 .../ScreenGrassrootsGovernDataAbsorptionServiceImpl.java | 3 +++
 .../extract/FactOriginProjectOrgPeriodDailyDao.xml       | 9 ++++++---
 .../main/resources/mapper/project/ProjectProcessDao.xml  | 8 +++++---
 5 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectOrgPeriodDailyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectOrgPeriodDailyDao.java
index d107e0e2fe..70a1fee036 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectOrgPeriodDailyDao.java
+++ b/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 批量插入
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/ProjectExtractServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/ProjectExtractServiceImpl.java
index 63b158e72c..35b5bbd577 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/ProjectExtractServiceImpl.java
+++ b/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);
 			}
 		}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenGrassrootsGovernDataAbsorptionServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenGrassrootsGovernDataAbsorptionServiceImpl.java
index d0ab7c49a8..a1071ea6fa 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenGrassrootsGovernDataAbsorptionServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenGrassrootsGovernDataAbsorptionServiceImpl.java
@@ -184,6 +184,9 @@ public class ScreenGrassrootsGovernDataAbsorptionServiceImpl implements ScreenGr
         List<ScreenDifficultyImgDataEntity> imgList = new LinkedList<>();
         imgMap.values().forEach(list -> {imgList.addAll(list);});
 
+        difficulties.removeIf( diff -> StringUtils.isBlank(diff.getLatestOperateDesc())
+            || StringUtils.isBlank(diff.getEventContent()) || StringUtils.isBlank(diff.getEventImgUrl()));
+
         screenDifficultyDataService.dataClean(param.getCustomerId(),difficulties,imgList);
         log.info("【大屏数据抽取-难点赌点执行完毕】 客户Id{} 难点赌点数据{}",param.getCustomerId(),JSON.toJSONString(difficulties));
     }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectOrgPeriodDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectOrgPeriodDailyDao.xml
index a01747d444..d607aac0d0 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectOrgPeriodDailyDao.xml
+++ b/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">
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectProcessDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectProcessDao.xml
index 3236a09bea..9e2bd9fe1d 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectProcessDao.xml
+++ b/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() != ''">

From 1630085a5255d34683f1781ccba0c44b59338214 Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Wed, 13 Jan 2021 13:57:44 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=9C=A8=E6=8A=BD=E5=8F=96=E9=9A=BE?=
 =?UTF-8?q?=E7=82=B9=E8=B5=8C=E7=82=B9=E6=97=B6=E4=B8=8D=E8=83=BD=E5=9B=A0?=
 =?UTF-8?q?=E4=B8=BA=E6=B2=A1=E6=9C=89=E5=9B=BE=E7=89=87=E6=88=96=E5=86=85?=
 =?UTF-8?q?=E5=AE=B9=E5=B0=86=E5=85=B6=E5=BF=BD=E7=95=A5=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ScreenGrassrootsGovernDataAbsorptionServiceImpl.java  | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenGrassrootsGovernDataAbsorptionServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenGrassrootsGovernDataAbsorptionServiceImpl.java
index a1071ea6fa..5a560cd05c 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenGrassrootsGovernDataAbsorptionServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenGrassrootsGovernDataAbsorptionServiceImpl.java
@@ -184,8 +184,7 @@ public class ScreenGrassrootsGovernDataAbsorptionServiceImpl implements ScreenGr
         List<ScreenDifficultyImgDataEntity> imgList = new LinkedList<>();
         imgMap.values().forEach(list -> {imgList.addAll(list);});
 
-        difficulties.removeIf( diff -> StringUtils.isBlank(diff.getLatestOperateDesc())
-            || StringUtils.isBlank(diff.getEventContent()) || StringUtils.isBlank(diff.getEventImgUrl()));
+        difficulties.removeIf( diff -> StringUtils.isBlank(diff.getLatestOperateDesc()));
 
         screenDifficultyDataService.dataClean(param.getCustomerId(),difficulties,imgList);
         log.info("【大屏数据抽取-难点赌点执行完毕】 客户Id{} 难点赌点数据{}",param.getCustomerId(),JSON.toJSONString(difficulties));