FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug: 内外部会议分页bug修改

Browse Source
This commit is contained in:
wxyclub
2023-11-22 15:56:27 +08:00
parent d65a5da9b5
commit 9c1e8b45fd
4 changed files with 29 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/dao/InsideOutsideMeetingDao.java
+1 -1
View File
@@ -16,7 +16,7 @@ import java.util.List;
@Mapper
public interface InsideOutsideMeetingDao extends BaseMapper<InsideOutsideMeeting> {
List<Integer> queryByPageCount(InsideOutsideMeetingVO page);
Integer queryByPageCount(InsideOutsideMeetingVO page);
List<InsideOutsideMeetingVO> queryByPage(InsideOutsideMeetingVO page);
adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/entity/InsideOutsideMeetingVO.java
+4 -3
View File
@@ -40,9 +40,10 @@ public class InsideOutsideMeetingVO extends BasePage {
@Excel(name = "会议地点", needMerge = true)
private String meetingAddress;
private String agendaNameStr;
@Excel(name = "参会人员", needMerge = true)
private String participants;
private List<String> participantsList;
private String meetingMinutes;
@@ -82,9 +83,9 @@ public class InsideOutsideMeetingVO extends BasePage {
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
private Date modifyTime;
private String sortField = "ID";
private String sortField = "meetingTime";
private String sortMode = "asc";
private String sortMode = "desc";
// 会议时间查询字段
private String meetingTimeBegin;
adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/service/impl/InsideOutsideMeetingServiceImpl.java
+3 -6
View File
@@ -176,19 +176,16 @@ public class InsideOutsideMeetingServiceImpl extends ServiceImpl<InsideOutsideMe
@Override
public List<InsideOutsideMeetingVO> queryByPage(InsideOutsideMeetingVO page){
if (StringUtils.isNotBlank(page.getParticipants())) {
page.setParticipantsList(Arrays.asList(page.getParticipants().split(",")));
}
// 设置排序字段
if (StringUtils.isNotBlank(page.getSortField())) {
// 小驼峰变成 ABC_DEF
String sortField = StringUtils.join(StringUtils.splitByCharacterTypeCamelCase(page.getSortField()),"_").toUpperCase();
page.setSortField(sortField);
} else {
page.setSortField("ID");
page.setSortMode("asc");
page.setSortField("MEETING_TIME");
page.setSortMode("desc");
}
int rowCount = this.baseMapper.queryByPageCount(page).size();
int rowCount = this.baseMapper.queryByPageCount(page);
page.getPager().setRowCount(rowCount);
List<InsideOutsideMeetingVO> insideOutsideMeetingVOList = this.baseMapper.queryByPage(page);
for (InsideOutsideMeetingVO insideOutsideMeeting : insideOutsideMeetingVOList) {