项目数据抽取部分修改并去除多于字段【CLOSED_STATUS】

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/FactOriginProjectMainDailyEntity.java

@@ -133,6 +133,4 @@ public class FactOriginProjectMainDailyEntity extends BaseEpmetEntity {
      */
 	private String finishOrgIds;
 
-	private String closedStatus;
-
 }

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

@@ -87,12 +87,11 @@ public class ProjectExtractServiceImpl implements ProjectExtractService {
             List<FactOriginProjectMainDailyEntity> closeProjects =
                     pendingList.stream().flatMap(pending -> closedList.stream().filter(closed -> pending.getId().equals(closed.getProjectId())).map(process -> {
                         FactOriginProjectMainDailyEntity entity = new FactOriginProjectMainDailyEntity();
-                        entity.setId(process.getId());
+                        entity.setId(process.getProjectId());
 						entity.setProjectStatus("close");
 						entity.setCreatedTime(DateUtils.stringToDate(pending.getDateId(), DateUtils.DATE_PATTERN_YYYYMMDD));
 						entity.setUpdatedTime(process.getUpdatedTime());
 						entity.setIsResolved(process.getIsResolved());
-						entity.setClosedStatus(entity.getIsResolved());
 						return entity;
 					})).collect(Collectors.toList());
 
@@ -140,7 +139,6 @@ public class ProjectExtractServiceImpl implements ProjectExtractService {
 				entity.setIssueId(project.getOriginId());
 				entity.setProjectStatus(project.getStatus());
 				entity.setIsResolved(project.getClosedStatus());
-                entity.setClosedStatus(entity.getIsResolved());
 				entity.setCreatedTime(project.getCreatedTime());
 				entity.setUpdatedTime(project.getUpdatedTime());
 				entity.setPids(project.getOrgIdPath());

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectProcessDao.xml

@@ -77,7 +77,7 @@
     </select>
     <select id="selectClosedProjectList" resultType="com.epmet.entity.project.ProjectProcessEntity">
         SELECT
-            pp.PROJECT_ID,
+            pp.PROJECT_ID ,
             pp.CREATED_TIME,
             p.CLOSED_STATUS AS isResolved
         FROM project_process pp
@@ -215,7 +215,7 @@
             pp.PROJECT_ID,
             pp.OPERATION,
             pp.STAFF_ID,
-            pp.CREATED_TIME,
+            pp.CREATED_TIME
         FROM
             project_process pp
         INNER JOIN project p ON pp.PROJECT_ID = p.ID