diff --git a/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseHandsOnDao.java b/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseHandsOnDao.java index 0b213e3d..0c99fc59 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseHandsOnDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseHandsOnDao.java @@ -2,6 +2,7 @@ package com.ibeetl.jlw.dao; import com.ibeetl.jlw.entity.TeacherOpenCourseHandsOn; import com.ibeetl.jlw.entity.TeacherOpenCourseHandsOnList; +import com.ibeetl.jlw.web.query.GetHandsOnListParam; import com.ibeetl.jlw.web.query.TeacherOpenCourseHandsOnQuery; import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; @@ -33,4 +34,5 @@ public interface TeacherOpenCourseHandsOnDao extends BaseMapper> getExcelValues(TeacherOpenCourseHandsOnQuery teacherOpenCourseHandsOnQuery); + List getHandsOnListNotPage(GetHandsOnListParam getHandsOnListParam); } diff --git a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseHandsOnList.java b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseHandsOnList.java index 929b1277..7adddb9f 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseHandsOnList.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseHandsOnList.java @@ -1,5 +1,7 @@ package com.ibeetl.jlw.entity; +import com.ibeetl.admin.core.entity.BaseEntity; + /** * 类功能说明 * @@ -7,7 +9,7 @@ package com.ibeetl.jlw.entity; * @Author 许良彤 * @Date 2022/10/29 20:47 */ -public class TeacherOpenCourseHandsOnList { +public class TeacherOpenCourseHandsOnList extends BaseEntity { /** * 项目名称 diff --git a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseHandsOnService.java b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseHandsOnService.java index 25c7c5ae..70015e0d 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseHandsOnService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseHandsOnService.java @@ -208,7 +208,16 @@ public class TeacherOpenCourseHandsOnService extends CoreBaseService getHandsOnList(GetHandsOnListParam param) { PageQuery teacherOpenCourseHandsOns = teacherOpenCourseHandsOnDao.getHandsOnList(param.getPageQuery()); - List teacherOpenCourseHandsOnLists = teacherOpenCourseHandsOns.getList(); + handsOnListHandler(teacherOpenCourseHandsOns.getList(),param); + return teacherOpenCourseHandsOns; + } + public List getHandsOnListNotPage(GetHandsOnListParam param) { + List teacherOpenCourseHandsOns = teacherOpenCourseHandsOnDao.getHandsOnListNotPage(param); + handsOnListHandler(teacherOpenCourseHandsOns,param); + return teacherOpenCourseHandsOns; + } + + private void handsOnListHandler(List teacherOpenCourseHandsOnLists,GetHandsOnListParam param){ List handIds = teacherOpenCourseHandsOnLists.stream().map(TeacherOpenCourseHandsOnList::getHandsOnId).collect(Collectors.toList()); List achievementList = new ArrayList<>(); if (CollectionUtils.isNotEmpty(handIds)) { @@ -227,10 +236,10 @@ public class TeacherOpenCourseHandsOnService extends CoreBaseService> getExcelValues(TeacherOpenCourseHandsOnQuery teacherOpenCourseHandsOnQuery) { return teacherOpenCourseHandsOnDao.getExcelValues(teacherOpenCourseHandsOnQuery); } diff --git a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseHandsOnController.java b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseHandsOnController.java index b59bfb3d..b5e10a8a 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseHandsOnController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseHandsOnController.java @@ -1,5 +1,6 @@ package com.ibeetl.jlw.web; +import cn.hutool.core.util.StrUtil; import cn.jlw.Interceptor.SCoreUser; import cn.jlw.util.ToolUtils; import cn.jlw.validate.ValidateConfig; @@ -7,6 +8,8 @@ import com.alibaba.fastjson.JSON; import com.ibeetl.admin.core.annotation.Function; import com.ibeetl.admin.core.entity.CoreUser; import com.ibeetl.admin.core.file.FileService; +import com.ibeetl.admin.core.util.BeanCopyUtil; +import com.ibeetl.admin.core.util.PlatformException; import com.ibeetl.admin.core.util.TimeTool; import com.ibeetl.admin.core.web.JsonResult; import com.ibeetl.jlw.entity.TeacherOpenCourseHandsOn; @@ -33,9 +36,14 @@ import org.springframework.web.servlet.ModelAndView; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; +import static com.ibeetl.admin.core.util.ExcelUtil.convertData; +import static com.ibeetl.admin.core.util.ExcelUtil.write; + /** * 教师开课-课程实操 教师开课-课程实操 接口 * 切记不要对非线程安全的静态变量进行写操作 @@ -315,6 +323,36 @@ public class TeacherOpenCourseHandsOnController{ } } + /** + * 导出实操列表 + * @param coreUser + * @return + */ + @GetMapping(MODEL + "/exportHandsOnList.do") + public void exportHandsOnList(GetHandsOnListParam param, HttpServletResponse response, @SCoreUser CoreUser coreUser) throws IOException { + if (null == coreUser) { + throw new PlatformException("请登录后再操作"); + } else { + + /** 构建表头 */ + Map header = new LinkedHashMap<>(11); + header.put("handsOnName", "项目名称"); + header.put("videoAvgScore", "观看视频平均得分"); + header.put("pptAvgScore", "观看PPT平均得分"); + header.put("theoryAvgScore", "理论测评平均得分"); + header.put("stepAvgScore", "实训操作步骤平均得分"); + header.put("reportAvgScore", "报告撰写平均得分"); + + List list = teacherOpenCourseHandsOnService.getHandsOnListNotPage(param); + + List> maps = BeanCopyUtil.baseEntity2MapWithParallel(list); + + + String filename = StrUtil.format("实操列表 {}.xlsx", System.currentTimeMillis()); + write(response, filename, "Sheet1", header.values(), convertData(header.keySet(), maps)); + + } + } // /** diff --git a/web/src/main/resources/sql/jlw/teacherOpenCourseHandsOn.md b/web/src/main/resources/sql/jlw/teacherOpenCourseHandsOn.md index acf88fc0..4cf9cf45 100644 --- a/web/src/main/resources/sql/jlw/teacherOpenCourseHandsOn.md +++ b/web/src/main/resources/sql/jlw/teacherOpenCourseHandsOn.md @@ -343,6 +343,15 @@ getHandsOnList from teacher_open_course_hands_on t where t.teacher_open_course_id =#teacherOpenCourseId# +getHandsOnListNotPage +=== +* 查询参数 + + select + t.* + from teacher_open_course_hands_on t + where t.teacher_open_course_id =#teacherOpenCourseId# + getExcelValues ===