project_main添加isResolved状态

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/FactOriginProjectMainDailyDTO.java

@@ -108,6 +108,11 @@ public class FactOriginProjectMainDailyDTO implements Serializable {
      */
 	private String projectStatus;
 
+	/**
+	 * resolved   unresolved
+	 * */
+	private String isResolved;
+
     /**
      * 创建话题用户的ID
      */

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

@@ -108,6 +108,11 @@ public class FactOriginProjectMainDailyEntity extends BaseEpmetEntity {
      */
 	private String projectStatus;
 
+	/**
+	 * resolved   unresolved
+	 * */
+	private String isResolved;
+
     /**
      * 创建话题用户的ID
      */

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/project/ProjectProcessEntity.java

@@ -87,4 +87,9 @@ public class ProjectProcessEntity extends BaseEpmetEntity {
      */
 	private String costWorkdays;
 
+	/**
+	 * 是否解决
+	 * */
+	private String isResolved;
+
 }

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

@@ -88,6 +88,7 @@ public class ProjectExtractServiceImpl implements ProjectExtractService {
 						entity.setProjectStatus("close");
 						entity.setCreatedTime(DateUtils.stringToDate(pending.getDateId(), DateUtils.DATE_PATTERN_YYYYMMDD));
 						entity.setUpdatedTime(process.getUpdatedTime());
+						entity.setIsResolved(process.getIsResolved());
 						return entity;
 					})).collect(Collectors.toList());
 
@@ -134,6 +135,7 @@ public class ProjectExtractServiceImpl implements ProjectExtractService {
 				entity.setDateId(dimId.getDateId());
 				entity.setIssueId(project.getOriginId());
 				entity.setProjectStatus(project.getStatus());
+				entity.setIsResolved(project.getClosedStatus());
 				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

@@ -78,7 +78,8 @@
     <select id="selectClosedProjectList" resultType="com.epmet.entity.project.ProjectProcessEntity">
         SELECT
             pp.PROJECT_ID,
-            pp.CREATED_TIME
+            pp.CREATED_TIME,
+            p.CLOSED_STATUS AS isResolved
         FROM project_process pp
         INNER JOIN project p ON pp.PROJECT_ID = p.ID
         WHERE p.CUSTOMER_ID = #{customerId}