Merge remote-tracking branch 'origin/dev'

epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/ScreenProjectDetailResultDTO.java

@@ -1,7 +1,6 @@
 package com.epmet.evaluationindex.screen.dto.result;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.Data;
 
@@ -17,6 +16,9 @@ import java.util.List;
 @Data
 public class ScreenProjectDetailResultDTO implements Serializable {
     private static final long serialVersionUID = 1L;
+    private String customerId;
+    private String projectStatusCode;
+
     /**
      * 项目id
      */
@@ -57,7 +59,6 @@ public class ScreenProjectDetailResultDTO implements Serializable {
 
     @Data
     public static class processDTO{
-        @JsonIgnore
         private String processId;
         /**
          * 处理部门名称
@@ -85,6 +86,9 @@ public class ScreenProjectDetailResultDTO implements Serializable {
 
         @Data
         public static class AttachmentDTO{
+            //ATTACHMENT_ID
+            private String attachmentId;
+
             @JsonInclude(JsonInclude.Include.NON_NULL)
             /**
              * 文件名

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

@@ -64,7 +64,9 @@
             ALL_CATEGORY_NAME as categoryName,
             LINK_NAME as reportUserName,
             link_mobile as mobile,
-            project_address as reportAddress
+            project_address as reportAddress,
+            CUSTOMER_ID as customerId,
+            PROJECT_STATUS_CODE as projectStatusCode
         FROM
             screen_project_data
         WHERE
@@ -84,7 +86,7 @@
           PUBLIC_REPLY as suggestion,
           PROCESS_TIME as reponseTime,
           operation as operation,
-          TRANSFER_DEPT_NAME as whistleDeptName
+          IFNULL(TRANSFER_DEPT_NAME,'') as whistleDeptName
         from screen_project_process
         where del_flag = '0'
           and project_id = #{projectId}
@@ -92,6 +94,7 @@
     </select>
     <select id="selectProjectProcessAttachments" resultType="com.epmet.evaluationindex.screen.dto.result.ScreenProjectDetailResultDTO$processDTO$AttachmentDTO">
       select
+        ATTACHMENT_ID as attachmentId,
         file_name as fileName,
         attachment_name as attachmentName,
         attachment_size as attachmentSize,
@@ -102,6 +105,7 @@
       from screen_project_process_attachment
       where del_flag = '0'
        and file_place = 'public'
+       AND PROCESS_ID=#{processId}
       order by sort asc
     </select>
 </mapper>