From b9f3d09346ad256efef7b380b4a569eb0930268d Mon Sep 17 00:00:00 2001
From: wxyclub <tjzdwxy@163.com>
Date: Thu, 16 Nov 2023 11:06:18 +0800
Subject: [PATCH] =?UTF-8?q?bug:=2078295=E5=86=85=E5=A4=96=E9=83=A8?=
 =?UTF-8?q?=E4=BC=9A=E8=AE=AE=E6=B7=BB=E5=8A=A0=E5=88=9B=E5=BB=BA=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E5=92=8C=E4=BF=AE=E6=94=B9=E6=97=B6=E9=97=B4=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=EF=BC=8C=E6=B7=BB=E5=8A=A0=E5=88=9B=E5=BB=BA=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../slrs/InsideOntSideMeeting/entity/MeetingTopic.java | 10 ++++++++++
 .../service/impl/InsideOutsideMeetingServiceImpl.java  |  2 +-
 .../InsideOntSideMeeting/InsideOntSideMeeting.xml      |  2 ++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/entity/MeetingTopic.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/entity/MeetingTopic.java
index dd9435f5..fa77fe1a 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/entity/MeetingTopic.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/entity/MeetingTopic.java
@@ -12,6 +12,8 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.util.Date;
+
 /**
  * @author tjzdw
  * @description
@@ -55,4 +57,12 @@ public class MeetingTopic extends BaseEntity {
     @TableField("AGENDA_CONTENT")
     @Excel(name = "议题主要内容")
     private String agendaContent;
+
+    @ApiModelProperty(value = "创建时间")
+    @TableField("CREATE_TIME")
+    private Date createTime;
+
+    @ApiModelProperty(value = "修改时间")
+    @TableField("MODIFY_TIME")
+    private Date modifyTime;
 }
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/service/impl/InsideOutsideMeetingServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/service/impl/InsideOutsideMeetingServiceImpl.java
index f2b90b2b..e0703eb0 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/service/impl/InsideOutsideMeetingServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/service/impl/InsideOutsideMeetingServiceImpl.java
@@ -81,7 +81,7 @@ public class InsideOutsideMeetingServiceImpl extends ServiceImpl<InsideOutsideMe
             // 获取会议课题列表
             LambdaQueryWrapper<MeetingTopic> wrapper = new LambdaQueryWrapper<>();
             wrapper.eq(MeetingTopic::getMeetingId, meetingId);
-            wrapper.orderByAsc(MeetingTopic::getAgendaName);
+            wrapper.orderByAsc(MeetingTopic::getCreateTime);
             List<MeetingTopic> meetingTopicList = meetingTopicService.list(wrapper);
             insideOutsideMeeting.setMeetingTopicList(meetingTopicList);
         }
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/InsideOntSideMeeting/InsideOntSideMeeting.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/InsideOntSideMeeting/InsideOntSideMeeting.xml
index 0d663ed3..9773ed28 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/InsideOntSideMeeting/InsideOntSideMeeting.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/InsideOntSideMeeting/InsideOntSideMeeting.xml
@@ -26,6 +26,8 @@
             <result column="REPORTER" property="reporter" />
             <result column="REPORTING_UNIT" property="reportingUnit" />
             <result column="AGENDA_CONTENT" property="agendaContent" />
+            <result column="CREATE_TIME" property="createTime" />
+            <result column="MODIFY_TIME" property="modifyTime" />
         </collection>
     </resultMap>
     <sql id="Base_Column_List">