From 0b0bd748d9681cf99e141a94e567c50dc17542b9 Mon Sep 17 00:00:00 2001
From: xiaozhequ <792962424@qq.com>
Date: Tue, 2 Jul 2024 09:42:47 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=9C=A8=E7=BA=BF=E8=AF=BE=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/CourseServiceImpl.java       | 54 +++++++++++++++++++
 1 file changed, 54 insertions(+)

diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseServiceImpl.java
index 71aa20a6..8f714d0f 100644
--- a/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseServiceImpl.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseServiceImpl.java
@@ -276,7 +276,10 @@ public class CourseServiceImpl implements ICourseService {
 		list.addAll(noAudiences);
 		//成长路径的课
 		List<String> grow = getGrow(dto);
+		//已报名的课
+		List<String> enroll = getEnroll(dto);
 		list.addAll(grow);
+		list.addAll(enroll);
 		list.addAll(list1);
 		list.addAll(list2);
 
@@ -660,6 +663,57 @@ public class CourseServiceImpl implements ICourseService {
 
 		return list1;
 	}
+	private List<String> getEnroll(CourseQueryDto dto) {
+		List<Long> list=new ArrayList<>();
+		if(StringUtil.isNotBlank(dto.getOrgIds())){
+			if(dto.getOrgIds().contains(",")){
+				String[] split = dto.getOrgIds().split(",");
+				List<String> strings = Arrays.asList(split);
+				String sql = "SELECT DISTINCT\n" +
+						"\tsc.course_id \n" +
+						"FROM\n" +
+						"\tboe_base.boe_study_course sc\n" +
+						"\tINNER JOIN boe_base.boe_course c ON sc.course_id = c.id \n" +
+						"WHERE\n" +
+						"\tsc.aid = ?1 \n" +
+						"\tAND c.deleted =0\n"+
+						"and c.org_id  not in(?2)\n" +
+						"and (c.sys_create_aid !=?3 or c.sys_create_aid is null)";
+				list = courseTeacherDao.sqlFindList(sql,dto.getOrgAid(),strings,dto.getOrgAid());
+
+			}
+			else {
+				String sql = "SELECT DISTINCT\n" +
+						"\tsc.course_id \n" +
+						"FROM\n" +
+						"\tboe_base.boe_study_course sc\n" +
+						"\tINNER JOIN boe_base.boe_course c ON sc.course_id = c.id \n" +
+						"WHERE\n" +
+						"\tsc.aid = ?1 \n" +
+						"\tAND c.deleted =0\n"+
+						"and c.org_id  !=?2\n" +
+						"and (c.sys_create_aid !=?3 or c.sys_create_aid is null)";
+				list = courseTeacherDao.sqlFindList(sql,dto.getOrgAid(), dto.getOrgIds(),dto.getOrgAid());
+			}
+		}else {
+			String sql = "SELECT DISTINCT\n" +
+					"\tsc.course_id \n" +
+					"FROM\n" +
+					"\tboe_base.boe_study_course sc\n" +
+					"\tINNER JOIN boe_base.boe_course c ON sc.course_id = c.id \n" +
+					"WHERE\n" +
+					"\tsc.aid = ?1 \n" +
+					"\tAND c.deleted =0\n"+
+					"and (c.sys_create_aid !=?2 or c.sys_create_aid is null)";
+			list = courseTeacherDao.sqlFindList(sql,dto.getOrgAid(),dto.getOrgAid());
+		}
+		List<String>list1=new ArrayList<>();
+		for (Object obj : list) {
+			list1.add(obj.toString());
+		}
+
+		return list1;
+	}
 	public static <T> List<T> paginate(List<T> list, int pageNumber, int pageSize) {
 		if (list == null || list.isEmpty() || pageNumber <= 0 || pageSize <= 0) {
 			return null;