screenProjectData

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenProjectDataDao.java

@@ -37,6 +37,8 @@ public interface ScreenProjectDataDao extends BaseDao<ScreenProjectDataEntity> {
 
     int deleteByDateIdAndCustomerId(@Param("customerId") String customerId,@Param("dateId") String dateId);
 
+    int deleteByProjectTimeAndCustomerId(@Param("customerId") String customerId,@Param("dateId") String dateId);
+
     int checkIfExisted(@Param("customerId") String customerId);
 
     List<ScreenProjectDataDTO> selectPending(ScreenProjectDataDTO param);

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenProjectProcessDao.java

@@ -36,6 +36,8 @@ public interface ScreenProjectProcessDao extends BaseDao<ScreenProjectProcessEnt
 
     int deleteByDateIdAndCustomerId(@Param("customerId") String customerId, @Param("dateId") String dateId);
 
+    int deleteByProcessTimeAndCustomerId(@Param("customerId") String customerId, @Param("dateId") String dateId);
+
     int countByCustomerId(@Param("customerId") String customerId);
 
     void insertBatch(@Param("list") List<ScreenProjectProcessDTO> list);

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

@@ -137,13 +137,13 @@ public class ScreenProjectSettleServiceImpl implements ScreenProjectSettleServic
 		processService.updateProjectCloseTime(metaData);
 		//更新结案时间和结案状态
 		processService.updateProjectStatus(orientData,param.getDateId(),param.getCustomerId());
-		//FIXME release here
+
 		targetDbService.insertOrUpdateBatch(param.getCustomerId(),param.getDateId(),metaData,orientData);
 
 		if(!CollectionUtils.isEmpty(metaData)){
 			List<ScreenProjectImgDataDTO> imgs = topicService.buildNewScreenProjectImgData(metaData);
 			if(!CollectionUtils.isEmpty(imgs)){
-				//FIXME release here
+
 				targetImgService.insertBatch(imgs);
 			}
 		}
@@ -151,11 +151,10 @@ public class ScreenProjectSettleServiceImpl implements ScreenProjectSettleServic
 		//
 		List<ScreenProjectProcessDTO> processes = processService.buildNewScreenProjectProcessData(param.getCustomerId(), param.getDateId(),!targetProcessService.checkIfHistoricalDataExists(param.getCustomerId()));
 		if(!CollectionUtils.isEmpty(processes)){
-			//FIXME release here
 			targetProcessService.insertBatch(processes,param.getCustomerId(),param.getDateId());
 			List<ScreenProjectProcessAttachmentDTO> attachments = processService.buildProcessAttachmentData(processes.stream().map(ScreenProjectProcessDTO::getProcessId).distinct().collect(Collectors.toList()));
 			if(!CollectionUtils.isEmpty(attachments)){
-				//FIXME release here
+
 				targetAttachmentService.insertBatch(attachments);
 			}
 		}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectDataServiceImpl.java

@@ -266,9 +266,9 @@ public class ScreenProjectDataServiceImpl extends BaseServiceImpl<ScreenProjectD
         //库中无数据，范围性删除无意义，只是针对在数据库有历史数据的情况下，保证对同一天进行反
         //复采集时数不会重复
         if(!CollectionUtils.isEmpty(meta)){
-            int affectedRows = baseDao.deleteByDateIdAndCustomerId(customerId,dateId);
+            int affectedRows = baseDao.deleteByProjectTimeAndCustomerId(customerId,dateId);
             while (affectedRows > 0) {
-                affectedRows = baseDao.deleteByDateIdAndCustomerId(customerId, dateId);
+                affectedRows = baseDao.deleteByProjectTimeAndCustomerId(customerId, dateId);
             }
             List<List<ScreenProjectDataDTO>> partition = ListUtils.partition(meta, NumConstant.ONE_HUNDRED);
             partition.forEach(part -> baseDao.insertBatch(part));

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectProcessServiceImpl.java

@@ -163,9 +163,9 @@ public class ScreenProjectProcessServiceImpl extends BaseServiceImpl<ScreenProje
 
     @Override
     public void insertBatch(List<ScreenProjectProcessDTO> list,String customerId,String dateId) {
-        int affectedRows = baseDao.deleteByDateIdAndCustomerId(customerId, dateId);
+        int affectedRows = baseDao.deleteByProcessTimeAndCustomerId(customerId, dateId);
         while (affectedRows > 0) {
-            affectedRows = baseDao.deleteByDateIdAndCustomerId(customerId, dateId);
+            affectedRows = baseDao.deleteByProcessTimeAndCustomerId(customerId, dateId);
         }
 
         List<List<ScreenProjectProcessDTO>> partition = ListUtils.partition(list,NumConstant.ONE_HUNDRED);

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/topic/impl/TopicServiceImpl.java

@@ -2,6 +2,7 @@ package com.epmet.service.topic.impl;
 
 import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.constant.DataSourceConstant;
 import com.epmet.dao.topic.TopicDao;
 import com.epmet.dto.AgencySubTreeDto;
@@ -223,8 +224,10 @@ public class TopicServiceImpl implements TopicService {
         if(CollectionUtils.isEmpty(imgs)) return null;
         return imgs.stream().flatMap(img -> list.stream().filter(project -> StringUtils.equals(img.getTopicId(),project.getTopicId())).map(
                 match -> {
-                    img.setProjectId(match.getProjectId());
-                    return img;
+                    ScreenProjectImgDataDTO matchedImg
+                            = ConvertUtils.sourceToTarget(img,ScreenProjectImgDataDTO.class);
+                    matchedImg.setProjectId(match.getProjectId());
+                    return matchedImg;
                 }
         )).collect(Collectors.toList());
     }

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectDataDao.xml

@@ -40,6 +40,13 @@
         limit 1000
     </delete>
 
+    <delete id="deleteByProjectTimeAndCustomerId">
+        delete from screen_project_data
+        where customer_id = #{customerId}
+        and DATE_FORMAT(PROJECT_CREATE_TIME,'%Y%m%d') = #{dateId}
+        limit 1000
+    </delete>
+
     <select id="checkIfExisted" resultType="int">
         select count(id) from screen_project_data
         where del_flag = '0' and customer_id = #{customerId}

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectProcessDao.xml

@@ -10,6 +10,12 @@
         limit 1000
     </delete>
 
+    <delete id="deleteByProcessTimeAndCustomerId">
+        delete from screen_project_process
+        where customer_id = #{customerId}
+        and DATE_FORMAT(PROCESS_TIME,'%Y%m%d') = #{dateId}
+        limit 1000
+    </delete>
 
     <select id="countByCustomerId" resultType="int">
         select count(id) from `screen_project_process`