Commit Graph

2075 Commits

Author SHA1 Message Date
liuzixi
233e7c29df fix: 修正问题10 2025-12-23 21:41:44 +08:00
liu.zixi
744f648748 fix: 问题27修复 2025-12-23 18:46:06 +08:00
miaowenbo
be966faa02 fix:导出作业文件名逻辑修改 2025-12-23 16:10:18 +08:00
miaowenbo
44fc0a82c6 fix:导出作业文件名修改为学生名+文件名,如果学生名不存在用“空学生名称”占位 2025-12-23 15:58:50 +08:00
liu.zixi
e9c884c246 merge: AI课程特性融合至新的在线管理 2025-12-23 09:52:34 +08:00
liu.zixi
90d09cac25 fix: 问题19修复 2025-12-23 09:44:10 +08:00
liu.zixi
6c08b27ed3 fix: 问题15修复 2025-12-22 19:44:55 +08:00
liu.zixi
b2632c9877 fix: 问题13修复 2025-12-22 19:32:37 +08:00
yangxinyu
b5bf0429aa fix:【FCJDFDXTXS-202】 2025-12-22 18:32:01 +08:00
liu.zixi
4c8c571a82 fix: 排序时对sys_create_time做适配 2025-12-22 16:30:43 +08:00
liu.zixi
15193bd624 Merge branch 'refs/heads/release-20250328-master' into 251114-feature-course-online
# Conflicts:
#	servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseManageApi.java
#	servers/boe-server-all/src/main/java/com/xboe/module/course/entity/Course.java
#	servers/boe-server-all/src/main/java/com/xboe/module/course/entity/CourseContent.java
#	servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseApi.java
#	servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyServiceImpl.java
#	servers/boe-server-all/src/main/resources/application-prod.yml
#	servers/boe-server-all/src/main/resources/application-test.yml
2025-12-22 10:34:24 +08:00
liuzixi
6560e60011 fix: 课程时长四舍五入 2025-12-20 10:11:45 +08:00
joshen
b867c37f28 commit 2025-12-19 23:11:38 +08:00
joshen
0b9f95fab8 commit 2025-12-19 23:06:58 +08:00
joshen
04fea4b530 commit 2025-12-19 22:56:25 +08:00
joshen
97288c73b4 commit 2025-12-19 22:53:38 +08:00
joshen
2a07973c81 commit 2025-12-19 21:09:41 +08:00
joshen
5e9a40330c commit 2025-12-19 20:16:41 +08:00
joshen
e521b3fbe8 commit 2025-12-19 20:14:39 +08:00
joshen
1f5e9769f9 Merge remote-tracking branch 'nyx/release-20250328-master-20251219-lwj' into release-20250328-master 2025-12-19 20:05:19 +08:00
joshen
63d5e09170 Merge branch 'player-20251117' into release-20250328-master
# Conflicts:
#	servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseAuditApi.java
#	servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseFullTextApi.java
#	servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseManageApi.java
#	servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseServiceImpl.java
#	servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseApi.java
2025-12-19 20:03:44 +08:00
huangrun
4bcef7a327 修改冲突 2025-12-19 18:59:22 +08:00
lwj
255864204e 修改1155审核时间格式 2025-12-19 18:31:17 +08:00
liu.zixi
f82e3e8566 fix: 导出的score四舍五入 2025-12-19 17:53:34 +08:00
liu.zixi
34681bab97 Merge remote-tracking branch 'origin/release-20250328-master-20251219' into release-20250328-master-20251219 2025-12-19 17:35:21 +08:00
lwj
9852b24983 修改1155逻辑 2025-12-19 17:20:10 +08:00
肖建涛
02788430e9 1155增加审批人审批时间 2025-12-19 17:16:45 +08:00
liu.zixi
b396926e16 fix: 密级高于内部的案例处理 2025-12-19 16:58:22 +08:00
郭诚奇
94939824bd feat: 新增初始化会话接口,给前端返回初始化会话id 2025-12-19 16:58:20 +08:00
liu.zixi
8d0ee29cf7 feat: 丰富一下导出excel的内容和样式 2025-12-19 16:58:19 +08:00
miaowenbo
f3fa572802 fix:资源学习完成人数统计排除未报名人员 2025-12-19 16:30:50 +08:00
liu.zixi
ff0d2240df fix: 【FCJDFDXTXS-190】修复报名记录影响的学习记录 2025-12-19 15:30:29 +08:00
liu.zixi
179e1b7fb1 fix: 【FCJDFDXTXS-190】修复报名记录的一些bug 2025-12-19 15:21:16 +08:00
zhrh
9ba9cf2157 szx-1194 删除日志 2025-12-19 14:55:37 +08:00
zhrh
ff44d58283 szx-1194 获取用户信息用http添加日志修改 2025-12-19 14:55:36 +08:00
zhrh
9dff7bdd1f szx-1194 获取用户信息用http添加日志修改 2025-12-19 14:55:35 +08:00
zhrh
b4a130d433 szx-1194 获取用户信息用http添加日志 2025-12-19 14:55:33 +08:00
zhrh
8f82d53736 szx-1194 获取用户信息用http 2025-12-19 14:55:32 +08:00
zhrh
b9bb7bc651 szx-1194 审批时邮箱的获取由前端传入改为后端获取添加日志 2025-12-19 14:55:31 +08:00
zhrh
0c44e5d63c szx-1194 审批时邮箱的获取由前端传入改为后端获取 2025-12-19 14:55:30 +08:00
liu.zixi
d10d8b444c fix: 【FCJDFDXTXS-199】资源学习情况-作业/考试导出问题修复 2025-12-19 12:31:32 +08:00
liu.zixi
9e0d6586b7 fix: 【FCJDFDXTXS-199】资源学习情况-作业/考试导出问题修复 2025-12-19 12:01:04 +08:00
liu.zixi
8987db2c0f fix: 【FCJDFDXTXS-199】资源学习情况-作业导出问题修复 2025-12-19 11:55:11 +08:00
liu.zixi
3dcd3d01fe fix: 【FCJDFDXTXS-199】资源学习情况导出调试 2025-12-19 11:43:00 +08:00
liu.zixi
cd11b70b0f fix: 【FCJDFDXTXS-199】资源学习情况导出调试 2025-12-19 11:39:49 +08:00
yangxinyu
2ef1901b54 fix:添加学习记录导出接口aid查询 2025-12-19 11:28:25 +08:00
liu.zixi
fa3f625183 fix: 【FCJDFDXTXS-199】资源学习情况的作业、考试的导出查询、拼excel数据逻辑修正 2025-12-19 10:34:12 +08:00
liu.zixi
27b0bd2749 fix: 【FCJDFDXTXS-201】编辑后不从es里删除 2025-12-19 10:15:53 +08:00
liu.zixi
fa62805efb fix: 【FCJDFDXTXS-190】手动添加报名记录逻辑修正:1.修改学习人数 2.判断此前是否存在记录 2025-12-19 09:51:01 +08:00
liu.zixi
4b8b9e47dc fix: 【FCJDFDXTXS-190】资源学习情况 2025-12-18 19:25:17 +08:00