From b0583d3821ed4e7d6525b06fd5fc4100e4c0b71e Mon Sep 17 00:00:00 2001
From: liu <liujiatong112@163.com>
Date: Fri, 5 Jul 2024 10:16:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96,=E5=A2=9E=E5=8A=A0=E6=8A=A5?=
 =?UTF-8?q?=E9=80=81=E6=97=B6=E9=97=B4=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../knowsub/vo/knowledge/KnowledgeFlowResVO.java            | 4 ++++
 .../knowsub/vo/knowledge/KnowledgePageResVO.java            | 3 +++
 .../src/main/resources/mapper/KnowledgeFlowRecordMapper.xml | 6 ++++--
 .../src/main/resources/mapper/KnowledgeMapper.xml           | 1 +
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/know_sub_model/src/main/java/com/supervision/knowsub/vo/knowledge/KnowledgeFlowResVO.java b/know_sub_model/src/main/java/com/supervision/knowsub/vo/knowledge/KnowledgeFlowResVO.java
index 85eac9f..c2c4416 100644
--- a/know_sub_model/src/main/java/com/supervision/knowsub/vo/knowledge/KnowledgeFlowResVO.java
+++ b/know_sub_model/src/main/java/com/supervision/knowsub/vo/knowledge/KnowledgeFlowResVO.java
@@ -3,6 +3,8 @@ package com.supervision.knowsub.vo.knowledge;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
+import java.time.LocalDate;
+
 @Data
 @Schema
 public class KnowledgeFlowResVO {
@@ -33,6 +35,8 @@ public class KnowledgeFlowResVO {
     private String submitUserName;
 
     private String submitUserId;
+    @Schema(description = "报送时间")
+    private LocalDate submitDate;
     @Schema(description = "知识来源 1人工提报")
     private String knowledgeFrom;
 
diff --git a/know_sub_model/src/main/java/com/supervision/knowsub/vo/knowledge/KnowledgePageResVO.java b/know_sub_model/src/main/java/com/supervision/knowsub/vo/knowledge/KnowledgePageResVO.java
index a33fefe..0d3f887 100644
--- a/know_sub_model/src/main/java/com/supervision/knowsub/vo/knowledge/KnowledgePageResVO.java
+++ b/know_sub_model/src/main/java/com/supervision/knowsub/vo/knowledge/KnowledgePageResVO.java
@@ -35,4 +35,7 @@ public class KnowledgePageResVO extends Knowledge {
 
     @Schema(description = "发文时间")
     private LocalDate publishDate;
+
+    @Schema(description = "报送时间")
+    private LocalDate submitDate;
 }
diff --git a/know_sub_model/src/main/resources/mapper/KnowledgeFlowRecordMapper.xml b/know_sub_model/src/main/resources/mapper/KnowledgeFlowRecordMapper.xml
index bb20e3f..4ace72e 100644
--- a/know_sub_model/src/main/resources/mapper/KnowledgeFlowRecordMapper.xml
+++ b/know_sub_model/src/main/resources/mapper/KnowledgeFlowRecordMapper.xml
@@ -40,7 +40,8 @@
         t1.flow_type as flowType,
         t2.publish_dept_id as publishDeptId,
         t2.submit_dept_id as submitDeptId,
-        t1.submit_user_id as submitUserId
+        t1.submit_user_id as submitUserId,
+        t2.create_time as submitDate
         from ks_knowledge_flow_todo t1
         left join ks_knowledge t2 on t1.knowledge_id = t2.id
         left join ks_knowledge_info t3 on t2.info_id = t3.id
@@ -88,7 +89,8 @@
         t2.publish_dept_id as publishDeptId,
         t1.submit_dept_id as submitDeptId,
         t1.submit_user_id as submitUserId,
-        t2.knowledge_from as knowledgeFrom
+        t2.knowledge_from as knowledgeFrom,
+        t2.create_time as submitDate
         from ks_knowledge_flow_record t1
         left join ks_knowledge t2 on t1.knowledge_id = t2.id
         left join ks_knowledge_info t3 on t2.info_id = t3.id
diff --git a/know_sub_model/src/main/resources/mapper/KnowledgeMapper.xml b/know_sub_model/src/main/resources/mapper/KnowledgeMapper.xml
index 32b2e6f..f844d82 100644
--- a/know_sub_model/src/main/resources/mapper/KnowledgeMapper.xml
+++ b/know_sub_model/src/main/resources/mapper/KnowledgeMapper.xml
@@ -32,6 +32,7 @@
     <select id="queryKnowledgePage" resultType="com.supervision.knowsub.vo.knowledge.KnowledgePageResVO">
         select
         t1.*,
+        t1.create_time as submitDate,
         t2.policy_type as policyType,
         t2.timeliness as timeliness,
         t2.publish_date as publishDate