From a713e4bef57b3067e27af73c1d588dea9e7dc434 Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Wed, 10 Mar 2021 18:52:33 +0800
Subject: [PATCH] screenProjectData

---
 .../toscreen/impl/ScreenProjectSettleServiceImpl.java |  5 +++--
 .../screen/ScreenProjectDataService.java              |  2 +-
 .../screen/impl/ScreenProjectDataServiceImpl.java     |  3 ++-
 .../evaluationindex/screen/ScreenProjectDataDao.xml   | 11 +++++++++--
 .../resources/mapper/project/ProjectProcessDao.xml    |  2 +-
 5 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenProjectSettleServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenProjectSettleServiceImpl.java
index 7d97fd2674..7f94601066 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenProjectSettleServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenProjectSettleServiceImpl.java
@@ -107,11 +107,12 @@ public class ScreenProjectSettleServiceImpl implements ScreenProjectSettleServic
 			userService.fillScreenProjectData(metaData);
 			//metaData = Optional.ofNullable(userService.getScreenProjectData(metaData)).orElse(metaData);
 		}
+
 		ScreenProjectDataDTO orientCase = new ScreenProjectDataDTO();
 		orientCase.setCustomerId(param.getCustomerId());
 		//待更新的数据 需要检测更新的字段为：①projectStatusCode    ②closeCaseTime    ③allCategoryName    ④projectLevel
 		List<ScreenProjectDataDTO> orientData =
-				targetDbService.getPending(orientCase);
+				targetDbService.getPending(orientCase,param.getDateId());
 
 		// 给metaData和orientData赋上分类信息
 		List<String> projectIds =
@@ -141,7 +142,7 @@ public class ScreenProjectSettleServiceImpl implements ScreenProjectSettleServic
 
 		if(!CollectionUtils.isEmpty(metaData)){
 			List<ScreenProjectImgDataDTO> imgs = topicService.buildNewScreenProjectImgData(metaData);
-			if(CollectionUtils.isEmpty(imgs)){
+			if(!CollectionUtils.isEmpty(imgs)){
 				//FIXME release here
 				targetImgService.insertBatch(imgs);
 			}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenProjectDataService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenProjectDataService.java
index 7078f229d1..3838eb4c50 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenProjectDataService.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenProjectDataService.java
@@ -114,7 +114,7 @@ public interface ScreenProjectDataService extends BaseService<ScreenProjectDataE
      * @author wangc
      * @date 2021.03.08 09:32
     */
-    List<ScreenProjectDataDTO> getPending(ScreenProjectDataDTO param);
+    List<ScreenProjectDataDTO> getPending(ScreenProjectDataDTO param,String dateId);
 
     /**
      * @Description collect或更新
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 9152e8f0b6..dbe158ef98 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
@@ -246,7 +246,8 @@ public class ScreenProjectDataServiceImpl extends BaseServiceImpl<ScreenProjectD
      */
     @Override
     @DataSource(value = DataSourceConstant.EVALUATION_INDEX, datasourceNameFromArg = true)
-    public List<ScreenProjectDataDTO> getPending(ScreenProjectDataDTO param) {
+    public List<ScreenProjectDataDTO> getPending(ScreenProjectDataDTO param,String dateId) {
+        param.setDataEndTime(dateId);
         return baseDao.selectPending(param);
     }
 
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 1f439d7a3a..a6c7b1eb6b 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
@@ -55,6 +55,7 @@
         <if test='null != projectLevel and "" != projectLevel'>
             and project_level = #{projectLevel}
         </if>
+        and data_end_time <![CDATA[<>]]> #{dataEndTime}
     </select>
 
     <insert id="insertBatch" parameterType="java.util.List">
@@ -150,9 +151,15 @@
                     </if>
                 </foreach>
             </trim>
+
+            <trim prefix="DATA_END_TIME = " suffix=",">
+                #{dataEndTime}
+            </trim>
+            <trim prefix="updated_time = " suffix=",">
+                now()
+            </trim>
         </trim>
-        DATA_END_TIME = #{dataEndTime},
-        updated_time = now()
+
         where
         <foreach collection="list" separator="or" item="i" index="index" >
             PROJECT_ID=#{i.projectId}
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 698d7d2417..e9079abc3b 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
@@ -403,7 +403,7 @@
 
     <select id="selectProcessAttachment" resultType="com.epmet.dto.screen.ScreenProjectProcessAttachmentDTO">
         SELECT
-            ID AS attachementId,
+            ID AS attachmentId,
             CUSTOMER_ID,
             PROJECT_ID,
             PROCESS_ID,