diff --git a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudySignupServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudySignupServiceImpl.java index 80512d23..e4380c38 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudySignupServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudySignupServiceImpl.java @@ -1,22 +1,5 @@ package com.xboe.school.study.service.impl; -import java.io.IOException; -import java.time.LocalDateTime; -import java.time.ZoneOffset; -import java.util.List; -import java.util.Optional; - -import javax.transaction.Transactional; - -import com.xboe.module.course.dao.CourseContentDao; -import com.xboe.module.course.dto.CourseContentDto; -import com.xboe.module.course.entity.CourseContent; -import com.xboe.school.study.dao.StudyCourseItemDao; -import com.xboe.school.study.entity.StudyCourseItem; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.xboe.common.OrderCondition; import com.xboe.common.PageList; import com.xboe.common.beans.KeyValue; @@ -24,16 +7,27 @@ import com.xboe.core.orm.FieldFilters; import com.xboe.core.orm.FieldUpdateType; import com.xboe.core.orm.QueryBuilder; import com.xboe.core.orm.UpdateBuilder; +import com.xboe.module.course.dao.CourseContentDao; import com.xboe.module.course.dao.CourseDao; import com.xboe.module.course.dto.CourseStudyDto; import com.xboe.module.course.service.ICourseStudySearch; import com.xboe.school.study.dao.StudyCourseDao; +import com.xboe.school.study.dao.StudyCourseItemDao; import com.xboe.school.study.dao.StudySignupDao; import com.xboe.school.study.entity.StudyCourse; +import com.xboe.school.study.entity.StudyCourseItem; import com.xboe.school.study.entity.StudySignup; import com.xboe.school.study.service.IStudySignupService; - import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import javax.transaction.Transactional; +import java.io.IOException; +import java.time.LocalDateTime; +import java.time.ZoneOffset; +import java.util.List; @Slf4j @Service @@ -232,6 +226,10 @@ public class StudySignupServiceImpl implements IStudySignupService{ if(StringUtils.isNotBlank(ss.getAid())) { query.addFilter(FieldFilters.eq("aid", ss.getAid())); } + // 25.11.26新增:添加根据报名方式查询(1自主报名,2管理代报) + if (ss.getSignType() != null) { + query.addFilter(FieldFilters.eq("signType", ss.getSignType())); + } } return signupDao.findPage(query.builder()); }