附件详情页导出

web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseStudentSigninSettingService.java

@@ -177,6 +177,10 @@ public class TeacherOpenCourseStudentSigninSettingService extends CoreBaseServic
         return teacherOpenCourseStudentSigninSettingDao.getValuesByQueryNotWithPermission(teacherOpenCourseStudentSigninSettingQuery);
     }
 
+    public void parser(Object obj) {
+        dictParser(obj);
+    }
+
     public TeacherOpenCourseStudentSigninSetting getInfo (Long teacherOpenCourseStudentSigninSettingId){
         TeacherOpenCourseStudentSigninSettingQuery teacherOpenCourseStudentSigninSettingQuery = new TeacherOpenCourseStudentSigninSettingQuery();
         teacherOpenCourseStudentSigninSettingQuery.setTeacherOpenCourseStudentSigninSettingId(teacherOpenCourseStudentSigninSettingId);

web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseStudentSigninSettingController.java

@@ -1,19 +1,19 @@
 package com.ibeetl.jlw.web;
 
 import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.jlw.Interceptor.SCoreUser;
 import cn.jlw.validate.ValidateConfig;
 import com.ibeetl.admin.core.annotation.Function;
-import com.ibeetl.admin.core.entity.CoreDict;
 import com.ibeetl.admin.core.entity.CoreUser;
 import com.ibeetl.admin.core.file.FileService;
 import com.ibeetl.admin.core.service.CoreDictService;
 import com.ibeetl.admin.core.web.JsonResult;
 import com.ibeetl.jlw.entity.TeacherOpenCourseStudentSigninSetting;
 import com.ibeetl.jlw.entity.vo.SigninSettingSummaryVO;
+import com.ibeetl.jlw.service.TeacherOpenCourseService;
 import com.ibeetl.jlw.service.TeacherOpenCourseStudentSigninSettingService;
 import com.ibeetl.jlw.web.query.TeacherOpenCourseStudentSigninSettingQuery;
 import org.apache.commons.lang3.StringUtils;
@@ -30,10 +30,10 @@ import javax.servlet.http.HttpServletResponse;
 import javax.validation.constraints.NotNull;
 import java.io.IOException;
 import java.util.List;
-import java.util.Map;
+import java.util.stream.Collectors;
 
+import static cn.hutool.core.util.ObjectUtil.defaultIfNull;
 import static com.ibeetl.admin.core.util.ExcelUtil.write;
-import static java.util.stream.Collectors.groupingBy;
 
 /**
  * 学生签到设置 教师-我的课程-开课-学生签到-配置 接口
@@ -51,6 +51,7 @@ public class TeacherOpenCourseStudentSigninSettingController{
 
     @Autowired private TeacherOpenCourseStudentSigninSettingService teacherOpenCourseStudentSigninSettingService;
     @Autowired private CoreDictService coreDictService;
+    @Autowired private TeacherOpenCourseService teacherOpenCourseService;
 
     @Autowired FileService fileService;
 
@@ -202,16 +203,11 @@ public class TeacherOpenCourseStudentSigninSettingController{
     @GetMapping(MODEL + "/exportSummary.json")
     @ResponseBody
     public String exportSummary(TeacherOpenCourseStudentSigninSettingQuery condition, HttpServletResponse response) throws IOException {
+        condition.setTeacherOpenCourseStudentSigninSettingStatus(defaultIfNull(condition.getTeacherOpenCourseStudentSigninSettingStatus(), 1));
         List<TeacherOpenCourseStudentSigninSetting> list = teacherOpenCourseStudentSigninSettingService.getValuesByQueryNotWithPermission(condition);
-
-        Map<String, List<CoreDict>> studentSigninTypeMap  = coreDictService.findAllByType("student_signin_type").stream().collect(groupingBy(CoreDict::getValue));
-        list.forEach(item -> {
-            CoreDict first = CollectionUtil.getFirst(studentSigninTypeMap.get(item.getTeacherOpenCourseStudentSigninSettingType()));
-            if (first != null) {
-                item.set("teacherOpenCourseStudentSigninSettingType", first.getValue());
-            }
-        });
-
+        teacherOpenCourseStudentSigninSettingService.parser(list);
+        // 过滤数据
+        list = list.stream().filter(item -> ObjectUtil.isAllNotEmpty(item.getTeacherOpenCourseIdText(), item.getSchoolClassIdsText())).collect(Collectors.toList());
         String filename = StrUtil.format("开课签到汇总导出{}.xlsx", DateUtil.now());
         write(response, filename,"Sheet1", SigninSettingSummaryVO.class, BeanUtil.copyToList(list, SigninSettingSummaryVO.class));
         return null;

web/src/main/resources/sql/jlw/teacherOpenCourseStudentSigninSetting.md

@@ -8,7 +8,6 @@ queryByCondition
   t.*
   @}
   from teacher_open_course_student_signin_setting t
-  inner join student ta on ta.student_status = 1
   where 1=1  
   @//数据权限，该sql语句功能点,如果不考虑数据权限，可以删除此行  
   and #function("teacherOpenCourseStudentSigninSetting.query")#