Merge remote-tracking branch 'origin/beetlsql3-dev' into beetlsql3-dev

beetlsql3-dev
Mlxa0324 2 years ago
commit fc5bfe0a08

@ -28,7 +28,7 @@ public interface StudentHandsOnTaskReportDao extends BaseMapper<StudentHandsOnTa
List<StudentHandsOnTaskReport> getValuesByQuery(StudentHandsOnTaskReportQuery studentHandsOnTaskReportQuery);
List<StudentHandsOnTaskReport> getValuesByQueryNotWithPermission(StudentHandsOnTaskReportQuery studentHandsOnTaskReportQuery);
List<StudentHandsOnTaskReport> getReportList(List<Long> collect);
List<Map<String, Object>> getReportList(List<Long> collect);
List<Map<String, Object>> getExcelValues(StudentHandsOnTaskReportQuery studentHandsOnTaskReportQuery);
}

@ -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<StudentHandsOnTaskReport> toDoList;
private List<Map<String, Object>> toDoList;
/**
*

@ -163,7 +163,7 @@ public class StudentHandsOnTaskReportService extends CoreBaseService<StudentHand
}
}
public List<StudentHandsOnTaskReport> getReportList(List<Long> collect) {
public List<Map<String, Object>> getReportList(List<Long> collect) {
if(ObjectUtil.isEmpty(collect)) {
return ListUtil.empty();
}

@ -94,26 +94,26 @@ public class ApiStudentService {
//
List<Map<String, Object>> pieMaps = new ArrayList<>();
Map<String, Object> map1 = new HashMap<>();
map1.put("value", "现金账户");
map1.put("name", 835000);
map1.put("name", "现金账户");
map1.put("value", 835000);
Map<String, Object> map2 = new HashMap<>();
map2.put("value", "银行账户");
map2.put("name", 572924);
map2.put("name", "银行账户");
map2.put("value", 572924);
Map<String, Object> map3 = new HashMap<>();
map3.put("value", "P2P账户");
map3.put("name", 150370);
map3.put("name", "P2P账户");
map3.put("value", 150370);
Map<String, Object> map4 = new HashMap<>();
map4.put("value", "众筹账户");
map4.put("name", 558499);
map4.put("name", "众筹账户");
map4.put("value", 558499);
Map<String, Object> map5 = new HashMap<>();
map5.put("value", "股票基金投资账户");
map5.put("name", 1118689);
map5.put("name", "股票基金投资账户");
map5.put("value", 1118689);
Map<String, Object> map6 = new HashMap<>();
map6.put("value", "期货投资账户");
map6.put("name", 247149);
map6.put("name", "期货投资账户");
map6.put("value", 247149);
Map<String, Object> 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);

@ -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<Long> collect = openCourseList.stream().map(TeacherOpenCourseMergeTeacher::getTeacherOpenCourseId).collect(Collectors.toList());
List<StudentHandsOnTaskReport> reportList = studentHandsOnTaskReportService.getReportList(collect);
List<Map<String, Object>> reportList = studentHandsOnTaskReportService.getReportList(collect);
return TeacherIndexData.builder()

@ -227,7 +227,7 @@ public class TeacherOpenCourseNoticeController{
*
* @return
*/
@GetMapping("/getUnreadNotice")
@GetMapping(API+ "/getUnreadNotice")
public JsonResult<Integer> getUnreadNotice(Long teacherOpenCourseId, @SCoreUser CoreUser coreUser) {
return teacherOpenCourseNoticeService.getUnreadNotice(teacherOpenCourseId, coreUser);
}

@ -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

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

Loading…
Cancel
Save