修改 项目原始数据抽取 删除数据提出

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

@@ -16,7 +16,6 @@ import com.epmet.dto.issue.IssueDTO;
 import com.epmet.dto.party.PartyMemberDTO;
 import com.epmet.dto.project.FinishOrgDTO;
 import com.epmet.dto.project.ProcessInfoDTO;
-import com.epmet.dto.project.ProjectOrgRelationDTO;
 import com.epmet.dto.project.result.ProjectOrgPeriodResultDTO;
 import com.epmet.dto.result.WorkDayResultDTO;
 import com.epmet.dto.topic.ResiTopicDTO;
@@ -42,8 +41,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.text.SimpleDateFormat;
-import java.util.*;
-import java.util.stream.Collector;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.LinkedList;
+import java.util.List;
 import java.util.stream.Collectors;
 
 /**
@@ -192,8 +193,8 @@ public class ProjectExtractServiceImpl implements ProjectExtractService {
 				entity.setFinishOrgIds(org);
 			}));
 			//插入数据
+			factOriginProjectMainDailyService.deleteByDate(customerId, dateString);
 			if (!list.isEmpty()) {
-				factOriginProjectMainDailyService.deleteByDate(customerId, dateString);
 				factOriginProjectMainDailyService.insertBatch(list);
 			}
 		}
@@ -368,8 +369,8 @@ public class ProjectExtractServiceImpl implements ProjectExtractService {
 							path =path.substring(NumConstant.ZERO,path.length() - NumConstant.ONE);
 						}
 						entity.setPids(path);
-					}else{
-						log.warn("【data-statistical】业务数据抽取模块，ProjectExtractServiceImpl.saveOriginProjectDaily:查询出的项目节点发起人所属的orgIdPath不正确，agencyId->{},orgIdPath->{}",process.getAgencyId(),process.getPids());
+					} else {
+						log.warn("【data-statistical】业务数据抽取模块，ProjectExtractServiceImpl.saveOriginProjectDaily:查询出的项目节点发起人所属的orgIdPath不正确，agencyId->{},orgIdPath->{}", process.getAgencyId(), process.getPids());
 						entity.setPid(NumConstant.ZERO_STR);
 						entity.setPids("");
 					}
@@ -378,8 +379,8 @@ public class ProjectExtractServiceImpl implements ProjectExtractService {
 			return entity;
 		}).collect(Collectors.toList()));
 
+		factOriginProjectLogDailyService.deleteByDate(customerId, dateString);
 		if (!logList.isEmpty()) {
-			factOriginProjectLogDailyService.deleteByDate(customerId, dateString);
 			factOriginProjectLogDailyService.insertBatch(logList);
 		}