From 1483c2715410664348e13bd5537727712c92c090 Mon Sep 17 00:00:00 2001 From: yangdj <18302547071@163> Date: Thu, 22 Dec 2022 16:43:30 +0800 Subject: [PATCH 1/2] 1 --- .../api/student/ApiStudentService.java | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/web/src/main/java/com/ibeetl/jlw/service/api/student/ApiStudentService.java b/web/src/main/java/com/ibeetl/jlw/service/api/student/ApiStudentService.java index 9516bd68..effff637 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/api/student/ApiStudentService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/api/student/ApiStudentService.java @@ -94,26 +94,26 @@ public class ApiStudentService { // List> pieMaps = new ArrayList<>(); Map map1 = new HashMap<>(); - map1.put("value", "现金账户"); - map1.put("name", 835000); + map1.put("name", "现金账户"); + map1.put("value", 835000); Map map2 = new HashMap<>(); - map2.put("value", "银行账户"); - map2.put("name", 572924); + map2.put("name", "银行账户"); + map2.put("value", 572924); Map map3 = new HashMap<>(); - map3.put("value", "P2P账户"); - map3.put("name", 150370); + map3.put("name", "P2P账户"); + map3.put("value", 150370); Map map4 = new HashMap<>(); - map4.put("value", "众筹账户"); - map4.put("name", 558499); + map4.put("name", "众筹账户"); + map4.put("value", 558499); Map map5 = new HashMap<>(); - map5.put("value", "股票基金投资账户"); - map5.put("name", 1118689); + map5.put("name", "股票基金投资账户"); + map5.put("value", 1118689); Map map6 = new HashMap<>(); - map6.put("value", "期货投资账户"); - map6.put("name", 247149); + map6.put("name", "期货投资账户"); + map6.put("value", 247149); Map map7 = new HashMap<>(); - map7.put("value", "期权投资账户"); - map7.put("name", 5038001); + map7.put("name", "期权投资账户"); + map7.put("value", 5038001); pieMaps.add(map1); pieMaps.add(map2); pieMaps.add(map3); From c196f2dc3271fc76dee7d9b2db0a01dd2bac7eb3 Mon Sep 17 00:00:00 2001 From: xuliangtong <1124839262@qq.com> Date: Thu, 22 Dec 2022 16:51:52 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=A6=96=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jlw/dao/StudentHandsOnTaskReportDao.java | 2 +- .../jlw/entity/api/teacher/TeacherIndexData.java | 3 ++- .../service/StudentHandsOnTaskReportService.java | 2 +- .../service/api/teacher/ApiTeacherService.java | 3 ++- .../web/TeacherOpenCourseNoticeController.java | 2 +- .../sql/jlw/studentHandsOnTaskReport.md | 11 +++++++++-- .../resources/sql/jlw/teacherOpenCourseNotice.md | 16 +++++++++------- 7 files changed, 25 insertions(+), 14 deletions(-) diff --git a/web/src/main/java/com/ibeetl/jlw/dao/StudentHandsOnTaskReportDao.java b/web/src/main/java/com/ibeetl/jlw/dao/StudentHandsOnTaskReportDao.java index 6f8f0e55..dfb9ff49 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/StudentHandsOnTaskReportDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/StudentHandsOnTaskReportDao.java @@ -28,7 +28,7 @@ public interface StudentHandsOnTaskReportDao extends BaseMapper getValuesByQuery(StudentHandsOnTaskReportQuery studentHandsOnTaskReportQuery); List getValuesByQueryNotWithPermission(StudentHandsOnTaskReportQuery studentHandsOnTaskReportQuery); - List getReportList(List collect); + List> getReportList(List collect); List> getExcelValues(StudentHandsOnTaskReportQuery studentHandsOnTaskReportQuery); } diff --git a/web/src/main/java/com/ibeetl/jlw/entity/api/teacher/TeacherIndexData.java b/web/src/main/java/com/ibeetl/jlw/entity/api/teacher/TeacherIndexData.java index d6973217..a8278ac7 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/api/teacher/TeacherIndexData.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/api/teacher/TeacherIndexData.java @@ -12,6 +12,7 @@ import lombok.experimental.Accessors; import org.beetl.sql.fetch.annotation.Fetch; import java.util.List; +import java.util.Map; /** * 教师端-首页实体 @@ -28,7 +29,7 @@ public class TeacherIndexData { * 代办事项 * 课程实操-实训任务 */ - private List toDoList; + private List> toDoList; /** * 通知公告 diff --git a/web/src/main/java/com/ibeetl/jlw/service/StudentHandsOnTaskReportService.java b/web/src/main/java/com/ibeetl/jlw/service/StudentHandsOnTaskReportService.java index 8b85e6a2..c3225ecd 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/StudentHandsOnTaskReportService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/StudentHandsOnTaskReportService.java @@ -163,7 +163,7 @@ public class StudentHandsOnTaskReportService extends CoreBaseService getReportList(List collect) { + public List> getReportList(List collect) { if(ObjectUtil.isEmpty(collect)) { return ListUtil.empty(); } diff --git a/web/src/main/java/com/ibeetl/jlw/service/api/teacher/ApiTeacherService.java b/web/src/main/java/com/ibeetl/jlw/service/api/teacher/ApiTeacherService.java index 3d3243eb..4aff4930 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/api/teacher/ApiTeacherService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/api/teacher/ApiTeacherService.java @@ -22,6 +22,7 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.List; +import java.util.Map; import java.util.stream.Collectors; import static com.ibeetl.admin.core.util.user.CacheUserUtil.getUser; @@ -91,7 +92,7 @@ public class ApiTeacherService { // 实训评阅列表查询 List collect = openCourseList.stream().map(TeacherOpenCourseMergeTeacher::getTeacherOpenCourseId).collect(Collectors.toList()); - List reportList = studentHandsOnTaskReportService.getReportList(collect); + List> reportList = studentHandsOnTaskReportService.getReportList(collect); return TeacherIndexData.builder() diff --git a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseNoticeController.java b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseNoticeController.java index 1c627807..1f29249c 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseNoticeController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseNoticeController.java @@ -227,7 +227,7 @@ public class TeacherOpenCourseNoticeController{ * 获取未读公告数目 * @return */ - @GetMapping("/getUnreadNotice") + @GetMapping(API+ "/getUnreadNotice") public JsonResult getUnreadNotice(Long teacherOpenCourseId, @SCoreUser CoreUser coreUser) { return teacherOpenCourseNoticeService.getUnreadNotice(teacherOpenCourseId, coreUser); } diff --git a/web/src/main/resources/sql/jlw/studentHandsOnTaskReport.md b/web/src/main/resources/sql/jlw/studentHandsOnTaskReport.md index 4c34e367..6df7dbaa 100644 --- a/web/src/main/resources/sql/jlw/studentHandsOnTaskReport.md +++ b/web/src/main/resources/sql/jlw/studentHandsOnTaskReport.md @@ -390,8 +390,15 @@ getReportList * 根据开课ID进行查询 -select t.* -from student_hands_on_task_report t where t.teacher_open_course_id in (#join(collect)#) +select count(t.teacher_open_course_id) open_course_num, +sc.class_name class_name,toc.teacher_open_course_title open_course_name +from student_hands_on_task_report t +left join teacher_open_course toc on t.teacher_open_course_id = toc.teacher_open_course_id +left join student t1 on t.student_id = t1.student_id +left join school_class sc on t1.class_id = sc.class_id +where +t.teacher_open_course_id in (#join(collect)#) +group by t.teacher_open_course_id,t1.class_id getExcelValues diff --git a/web/src/main/resources/sql/jlw/teacherOpenCourseNotice.md b/web/src/main/resources/sql/jlw/teacherOpenCourseNotice.md index 8ece7e09..b2c4c968 100644 --- a/web/src/main/resources/sql/jlw/teacherOpenCourseNotice.md +++ b/web/src/main/resources/sql/jlw/teacherOpenCourseNotice.md @@ -63,7 +63,7 @@ queryByConditionQuery t.* @} from teacher_open_course_notice t - where 1=1 + where 1=1 @if(!isEmpty(teacherOpenCourseNoticeId)){ and t.teacher_open_course_notice_id =#teacherOpenCourseNoticeId# @} @@ -207,7 +207,7 @@ getTeacherOpenCourseNoticeValues select t.* from teacher_open_course_notice t - where 1=1 + where 1=1 @if(!isEmpty(teacherOpenCourseNoticeId)){ and t.teacher_open_course_notice_id =#teacherOpenCourseNoticeId# @} @@ -255,6 +255,7 @@ getValuesByQuery and find_in_set(t.teacher_open_course_notice_id,#teacherOpenCourseNoticeIdPlural#) @} @if(!isEmpty(schoolClassIds)){ + and t.school_class_ids =#schoolClassIds# and (find_in_set(#schoolClassIds#, t.school_class_ids) or t.school_class_ids = "ALL") @} @if(!isEmpty(teacherOpenCourseIds)){ @@ -353,13 +354,14 @@ getValuesByQueryNotWithPermission where b.student_status = 1 and ba.class_status = 1 and b.student_id = #studentId# ), t.school_class_ids) @} + getClassByOpenCourseId === * 根据开课课程查询关联的班级 -select * from school_class where class_status = 1 +select * from school_class where class_status = 1 and find_in_set(class_id, - (select group_concat(school_class_id) - from teacher_open_course_merge_school_class - where teacher_open_course_merge_school_class_status = 1 - and teacher_open_course_id = ${teacherOpenCourseNotice.teacherOpenCourseIds})) \ No newline at end of file + (select group_concat(school_class_id) + from teacher_open_course_merge_school_class + where teacher_open_course_merge_school_class_status = 1 + and teacher_open_course_id = ${teacherOpenCourseNotice.teacherOpenCourseIds}))