From 8b52a5680bebad2ede165c5729ea4bb58c906748 Mon Sep 17 00:00:00 2001
From: miaowenbo <1670593359@qq.com>
Date: Wed, 26 Nov 2025 15:29:02 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E6=9F=A5=E8=AF=A2=E6=8A=A5=E5=90=8D?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E5=88=86=E9=A1=B5=E6=B7=BB=E5=8A=A0=E6=A0=B9?=
 =?UTF-8?q?=E6=8D=AE=E6=8A=A5=E5=90=8D=E6=96=B9=E5=BC=8F=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/StudySignupServiceImpl.java  | 34 +++++++++----------
 1 file changed, 16 insertions(+), 18 deletions(-)

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());
 	}