From 75311c7fe932f7b1d4ae0c513745c9ef9d633fd0 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Fri, 9 Jul 2021 17:44:22 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=95=B0=E6=8D=AE=E4=B8=8A?=
 =?UTF-8?q?=E6=8A=A5=E5=88=A0=E9=99=A4=E6=94=B9=E4=B8=BA=E7=89=A9=E7=90=86?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../screen/ScreenProjectDataDao.java           | 18 ++++++++++++++++++
 .../screen/ScreenProjectImgDataDao.java        |  2 ++
 .../impl/ScreenProjectDataServiceImpl.java     | 10 ++--------
 .../screen/ScreenProjectDataDao.xml            | 13 +++++++++++++
 .../screen/ScreenProjectImgDataDao.xml         |  4 ++++
 5 files changed, 39 insertions(+), 8 deletions(-)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenProjectDataDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenProjectDataDao.java
index 1cdb4a1e8d..5410417202 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenProjectDataDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenProjectDataDao.java
@@ -46,4 +46,22 @@ public interface ScreenProjectDataDao extends BaseDao<ScreenProjectDataEntity> {
     void insertBatch(@Param("list") List<ScreenProjectDataDTO> list);
 
     void updateBatch(@Param("list") List<ScreenProjectDataDTO> list,@Param("dateId") String dateId);
+
+    /**
+     * 根据项目ID删除数据
+     * @author zhaoqifeng
+     * @date 2021/7/9 17:33
+     * @param projectId
+     * @return int
+     */
+    int deleteByProjectId(@Param("projectId") String projectId);
+
+    /**
+     * 根据项目ID删除数据
+     * @author zhaoqifeng
+     * @date 2021/7/9 17:33
+     * @param list
+     * @return int
+     */
+    void deleteByProjectIds(@Param("list") List<String> list);
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenProjectImgDataDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenProjectImgDataDao.java
index 4904f32724..9335e8aa61 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenProjectImgDataDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenProjectImgDataDao.java
@@ -37,4 +37,6 @@ public interface ScreenProjectImgDataDao extends BaseDao<ScreenProjectImgDataEnt
 	void deleteByProjectIds(@Param("list") List<String> list);
 
 	void insertBatch(@Param("list") List<ScreenProjectImgDataDTO> list);
+
+	int deleteByProjectId(@Param("projectId") String projectId);
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectDataServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectDataServiceImpl.java
index bf8c212f6b..15deb2bb57 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectDataServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectDataServiceImpl.java
@@ -177,14 +177,8 @@ public class ScreenProjectDataServiceImpl extends BaseServiceImpl<ScreenProjectD
                 }
             }
             //先删除该projectId对应的旧数据
-            QueryWrapper<ScreenProjectDataEntity> deleteWrapper = new QueryWrapper<>();
-            deleteWrapper.eq(StringUtils.isNotBlank(item.getProjectId()), "project_id", item.getProjectId())
-                    .eq(StringUtils.isNotBlank(param.getCustomerId()), "customer_id", param.getCustomerId());
-            baseDao.delete(deleteWrapper);
-            QueryWrapper<ScreenProjectImgDataEntity> screenProjectImgDataEntityQueryWrapper = new QueryWrapper<>();
-            screenProjectImgDataEntityQueryWrapper.eq(StringUtils.isNotBlank(item.getProjectId()), "project_id", item.getProjectId())
-                    .eq(StringUtils.isNotBlank(param.getCustomerId()), "customer_id", param.getCustomerId());
-            screenProjectImgDataDao.delete(screenProjectImgDataEntityQueryWrapper);
+            baseDao.deleteByProjectId(item.getProjectId());
+            screenProjectImgDataDao.deleteByProjectId(item.getProjectId());
 
             //如果orgType未知，获取一下
 //            if ("unknown".equals(item.getOrgType())){
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectDataDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectDataDao.xml
index 51c75a1c17..2a123547f4 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectDataDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectDataDao.xml
@@ -46,6 +46,19 @@
         and DATE_FORMAT(PROJECT_CREATE_TIME,'%Y%m%d') = #{dateId}
         limit 1000
     </delete>
+    <delete id="deleteByProjectId">
+        delete from screen_project_data
+        where PROJECT_ID = #{projectId}
+    </delete>
+
+    <delete id="deleteByProjectIds">
+        delete from screen_project_data
+        <where>
+            <foreach collection="list" item="projectId" separator=" or ">
+                PROJECT_ID = #{projectId}
+            </foreach>
+        </where>
+    </delete>
 
     <select id="checkIfExisted" resultType="int">
         select count(id) from screen_project_data
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectImgDataDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectImgDataDao.xml
index a9caf4992e..fc0dc48b34 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectImgDataDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectImgDataDao.xml
@@ -26,6 +26,10 @@
             </foreach>
         </where>
     </delete>
+    <delete id="deleteByProjectId">
+        delete from screen_project_img_data
+        where PROJECT_ID = #{projectId}
+    </delete>
 
 
     <insert id="insertBatch" parameterType="java.util.List">