mirror of
https://codeup.aliyun.com/67762337eccfc218f6110e0e/per-boe/java-servers.git
synced 2025-12-25 10:42:59 +08:00
fix:【FCJDFDXTXS-188】修改导出报名记录排序+导出报名记录aid查询
This commit is contained in:
@@ -230,8 +230,6 @@ public class StudyCourseApi extends ApiBaseController{
|
||||
userInfoMap.put(user.getAid(), user);
|
||||
}
|
||||
}
|
||||
// 按报名时间倒序排序
|
||||
signRecordList.sort(Comparator.comparing(StudySignup::getSignTime).reversed());
|
||||
// 4. 原始数据→导出DTO(格式化处理:状态转中文、日期转字符串等)
|
||||
List<CourseSignDto> exportDtoList = new ArrayList<>();
|
||||
if (signRecordList != null) {
|
||||
|
||||
@@ -22,6 +22,12 @@ public class CourseSignDto {
|
||||
*/
|
||||
private String name;
|
||||
|
||||
/**
|
||||
* 25.12.18新增 通过aid模糊查询
|
||||
*/
|
||||
private String aid;
|
||||
|
||||
|
||||
/**
|
||||
* 报名状态(1.自主报名 2.手动加入)
|
||||
*/
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
package com.xboe.school.study.service.impl;
|
||||
|
||||
import com.alibaba.cloud.commons.lang.StringUtils;
|
||||
import com.xboe.common.OrderDirection;
|
||||
import com.xboe.core.orm.FieldFilters;
|
||||
import com.xboe.core.orm.QueryBuilder;
|
||||
import com.xboe.school.study.dao.CourseSignDao;
|
||||
@@ -41,7 +42,14 @@ public class CourseSignServiceImpl implements ICourseSignService {
|
||||
if (queryDto.getSignType() != null) {
|
||||
query.addFilter(FieldFilters.eq("signType", queryDto.getSignType()));
|
||||
}
|
||||
//4. aid查询
|
||||
if (queryDto.getAid() != null) {
|
||||
String aidstr = queryDto.getAid();
|
||||
query.addFilter(FieldFilters.in("aid", aidstr.split( ",")));
|
||||
}
|
||||
|
||||
}
|
||||
query.addOrder("id", OrderDirection.DESC);
|
||||
return coursesignDao.findList(query.builder());
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user