添加课表导出接口

src/main/java/com/xjrsoft/module/courseTable/service/ICourseTableService.java

@@ -6,10 +6,12 @@ import com.xjrsoft.module.courseTable.entity.CourseTable;
 import com.xjrsoft.module.courseTable.vo.ClassListVo;
 import com.xjrsoft.module.schedule.dto.CourseTableAdjustDto;
 import com.xjrsoft.module.schedule.dto.CourseTableDto;
+import com.xjrsoft.module.schedule.dto.ScheduleWeekExportQueryDto;
 import com.xjrsoft.module.schedule.entity.WfCourseAdjust;
 import com.xjrsoft.module.schedule.vo.CourseListVo;
 import com.xjrsoft.module.schedule.vo.CourseTableVo;
 
+import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Date;
@@ -41,4 +43,6 @@ public interface ICourseTableService extends IService<CourseTable> {
      * @return
      */
     Boolean adjustCourse(WfCourseAdjust courseAdjust) throws Exception;
+
+    ByteArrayOutputStream listScheduleWeekExportQuery(ScheduleWeekExportQueryDto dto);
 }

src/main/java/com/xjrsoft/module/courseTable/service/impl/CourseTableServiceImpl.java

@@ -35,6 +35,7 @@ import com.xjrsoft.module.courseTable.service.ICourseTableService;
 import com.xjrsoft.module.courseTable.vo.ClassListVo;
 import com.xjrsoft.module.schedule.dto.CourseTableAdjustDto;
 import com.xjrsoft.module.schedule.dto.CourseTableDto;
+import com.xjrsoft.module.schedule.dto.ScheduleWeekExportQueryDto;
 import com.xjrsoft.module.schedule.entity.WfCourseAdjust;
 import com.xjrsoft.module.schedule.mapper.CourseTableBakMapper;
 import com.xjrsoft.module.schedule.util.ScheduleUtil;
@@ -53,6 +54,7 @@ import org.apache.poi.xwpf.usermodel.XWPFTableRow;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.time.DayOfWeek;
@@ -342,6 +344,12 @@ public class CourseTableServiceImpl extends ServiceImpl<CourseTableMapper, Cours
         return Boolean.TRUE;
     }
 
+    @Override
+    public ByteArrayOutputStream listScheduleWeekExportQuery(ScheduleWeekExportQueryDto dto) {
+
+        return null;
+    }
+
     /**
      * 提交顶课接口
      * @param courseTable

src/main/java/com/xjrsoft/module/job/EvaluateTask.java

@@ -36,7 +36,7 @@ public class EvaluateTask {
             for(EvaluateManage evaluateManage : evaluateManageList){
                 //TODO 根据评价的频率进行新增
 
-                //默认每天新增根据评价管理
+                //默认每天新增根据评价管理id
                 String insertSubmitScoreSql = "insert into evaluate_submit_record (id, evaluate_manage_id, evaluate_executer_id, create_date, evaluated_object, evaluated_object_id, status)" +
                         "            (SELECT" +
                         "                 UUID()," +

src/main/java/com/xjrsoft/module/organization/dto/AddDepartmentDto.java

@@ -21,7 +21,7 @@ public class AddDepartmentDto  implements Serializable {
 
     @ApiModelProperty("机构名称")
     @NotNull(message = "机构名称不能为空！")
-    @Length(min = 1,max = 20,message = "机构名称最少2个字符，最多20个字符！")
+    @Length(min = 1,max = 50,message = "机构名称最少2个字符，最多50个字符！")
     private String name;
 
     @ApiModelProperty("机构名称")

src/main/java/com/xjrsoft/module/organization/dto/UpdateDepartmentDto.java

@@ -25,7 +25,7 @@ public class UpdateDepartmentDto  implements Serializable {
 
     @ApiModelProperty("机构名称")
     @NotNull(message = "机构名称不能为空！")
-    @Length(min = 1,max = 10,message = "机构名称最少2个字符，最多20个字符！")
+    @Length(min = 1,max = 50,message = "机构名称最少2个字符，最多50个字符！")
     private String name;
 
     @ApiModelProperty("机构名称")
@@ -33,7 +33,7 @@ public class UpdateDepartmentDto  implements Serializable {
 
     @ApiModelProperty("编码")
     @NotNull(message = "机构编码不能为空！")
-    @Length(min = 1,max = 20,message = "机构编码最少2个字符，最多10个字符！")
+    @Length(min = 1,max = 10,message = "机构编码最少2个字符，最多10个字符！")
     private String code;
 
     @ApiModelProperty("电话")

src/main/java/com/xjrsoft/module/schedule/controller/ScheduleController.java

@@ -5,6 +5,7 @@ import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.db.Db;
+import com.alibaba.excel.support.ExcelTypeEnum;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
@@ -19,6 +20,7 @@ import com.xjrsoft.module.courseTable.service.ICourseTableService;
 import com.xjrsoft.module.schedule.dto.CourseTableAdjustDto;
 import com.xjrsoft.module.schedule.dto.CourseTableDto;
 import com.xjrsoft.module.schedule.dto.CourseTablePreCheckDto;
+import com.xjrsoft.module.schedule.dto.ScheduleWeekExportQueryDto;
 import com.xjrsoft.module.schedule.entity.CourseReceiveMsg;
 import com.xjrsoft.module.schedule.entity.JianyueData;
 import com.xjrsoft.module.schedule.service.ICourseReceiveMsgService;
@@ -31,16 +33,17 @@ import com.xjrsoft.module.student.entity.BaseStudentSchoolRoll;
 import com.xjrsoft.module.student.service.impl.IBaseStudentSchoolRollService;
 import com.xjrsoft.module.teacher.entity.BaseTeacher;
 import com.xjrsoft.module.teacher.service.IBaseTeacherService;
+import com.xjrsoft.module.textbook.dto.TextbookClaimExportQueryDto;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import org.apache.commons.lang3.concurrent.BasicThreadFactory;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
 
 import javax.sql.DataSource;
+import javax.validation.Valid;
+import java.io.ByteArrayOutputStream;
 import java.sql.SQLException;
 import java.time.DayOfWeek;
 import java.time.LocalDateTime;
@@ -231,4 +234,14 @@ public class ScheduleController {
 
         return jsonParser.parse(result).getAsJsonObject();
     }
+
+    @PostMapping("/schedule-week-export-query")
+    @ApiOperation(value = "按周导出课表")
+    public ResponseEntity<byte[]> scheduleWeekExportQuery(@Valid @RequestBody ScheduleWeekExportQueryDto dto) {
+//    @GetMapping("/schedule-week-export-query")
+//    @ApiOperation(value = "按周导出课表")
+//    public ResponseEntity<byte[]> textbookClaimExportQuery(@Valid ScheduleWeekExportQueryDto dto) {
+        ByteArrayOutputStream bot = courseTableService.listScheduleWeekExportQuery(dto);
+        return RT.fileStream(bot.toByteArray(), "scheduleWeek" + ExcelTypeEnum.XLSX.getValue());
+    }
 }

src/main/java/com/xjrsoft/module/schedule/dto/ScheduleWeekExportQueryDto.java

@@ -0,0 +1,5 @@
+package com.xjrsoft.module.schedule.dto;
+
+public class ScheduleWeekExportQueryDto extends CourseTableDto {
+
+}

src/main/resources/mapper/textbook/TextbookWarehouseRecordMapper.xml

@@ -32,6 +32,7 @@
         LEFT JOIN base_course_subject t5 ON t3.course_subject_id = t5.id
         LEFT JOIN xjr_dictionary_detail t6 ON t3.textbook_type = t6.code AND t6.item_id = 1739209191193636865
         LEFT JOIN base_grade t7 ON t3.grade_id = t7.id
+        LEFT JOIN textbook_class_relation t8 ON t8.textbook_id = t3.id
         WHERE t1.delete_mark = 0
         <if test="dto.textbookType != null and dto.textbookType != ''">
             and t3.textbook_type = #{dto.textbookType}
@@ -49,7 +50,7 @@
             and t3.course_subject_id = #{dto.courseSubjectId}
         </if>
         <if test="dto.classId != null">
-            and t3.class_id like concat('%',#{dto.classId}, '%')
+            and t8.class_id = #{dto.classId}
         </if>
         <if test="dto.bookName != null and dto.bookName != ''">
             and t3.book_name like concat('%',#{dto.bookName}, '%')