bug: 78295内外部会议添加创建时间和修改时间字段,添加创建时间排序
This commit is contained in:
+10
@@ -12,6 +12,8 @@ import lombok.Data;
|
|||||||
import lombok.EqualsAndHashCode;
|
import lombok.EqualsAndHashCode;
|
||||||
import lombok.experimental.Accessors;
|
import lombok.experimental.Accessors;
|
||||||
|
|
||||||
|
import java.util.Date;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author tjzdw
|
* @author tjzdw
|
||||||
* @description
|
* @description
|
||||||
@@ -55,4 +57,12 @@ public class MeetingTopic extends BaseEntity {
|
|||||||
@TableField("AGENDA_CONTENT")
|
@TableField("AGENDA_CONTENT")
|
||||||
@Excel(name = "议题主要内容")
|
@Excel(name = "议题主要内容")
|
||||||
private String agendaContent;
|
private String agendaContent;
|
||||||
|
|
||||||
|
@ApiModelProperty(value = "创建时间")
|
||||||
|
@TableField("CREATE_TIME")
|
||||||
|
private Date createTime;
|
||||||
|
|
||||||
|
@ApiModelProperty(value = "修改时间")
|
||||||
|
@TableField("MODIFY_TIME")
|
||||||
|
private Date modifyTime;
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -81,7 +81,7 @@ public class InsideOutsideMeetingServiceImpl extends ServiceImpl<InsideOutsideMe
|
|||||||
// 获取会议课题列表
|
// 获取会议课题列表
|
||||||
LambdaQueryWrapper<MeetingTopic> wrapper = new LambdaQueryWrapper<>();
|
LambdaQueryWrapper<MeetingTopic> wrapper = new LambdaQueryWrapper<>();
|
||||||
wrapper.eq(MeetingTopic::getMeetingId, meetingId);
|
wrapper.eq(MeetingTopic::getMeetingId, meetingId);
|
||||||
wrapper.orderByAsc(MeetingTopic::getAgendaName);
|
wrapper.orderByAsc(MeetingTopic::getCreateTime);
|
||||||
List<MeetingTopic> meetingTopicList = meetingTopicService.list(wrapper);
|
List<MeetingTopic> meetingTopicList = meetingTopicService.list(wrapper);
|
||||||
insideOutsideMeeting.setMeetingTopicList(meetingTopicList);
|
insideOutsideMeeting.setMeetingTopicList(meetingTopicList);
|
||||||
}
|
}
|
||||||
|
|||||||
+2
@@ -26,6 +26,8 @@
|
|||||||
<result column="REPORTER" property="reporter" />
|
<result column="REPORTER" property="reporter" />
|
||||||
<result column="REPORTING_UNIT" property="reportingUnit" />
|
<result column="REPORTING_UNIT" property="reportingUnit" />
|
||||||
<result column="AGENDA_CONTENT" property="agendaContent" />
|
<result column="AGENDA_CONTENT" property="agendaContent" />
|
||||||
|
<result column="CREATE_TIME" property="createTime" />
|
||||||
|
<result column="MODIFY_TIME" property="modifyTime" />
|
||||||
</collection>
|
</collection>
|
||||||
</resultMap>
|
</resultMap>
|
||||||
<sql id="Base_Column_List">
|
<sql id="Base_Column_List">
|
||||||
|
|||||||
Reference in New Issue
Block a user