Browse Source

新生报到功能调整

dzx 1 year ago
parent
commit
9f3cd70984

+ 1 - 0
src/main/java/com/xjrsoft/module/base/controller/BaseClassCourseController.java

@@ -279,6 +279,7 @@ public class BaseClassCourseController {
                 baseClassCourse.setCreateDate(new Date());
                 baseClassCourse.setDeleteMark(0);
                 baseClassCourse.setBaseSemesterId(baseSemesterId);
+                baseClassCourse.setCreateDate(new Date());
                 baseClassCourses.add(baseClassCourse);
             }
 

+ 1 - 1
src/main/java/com/xjrsoft/module/student/controller/BaseNewStudentController.java

@@ -355,7 +355,7 @@ public class BaseNewStudentController {
 
     @PostMapping("/report-export-query")
     @ApiOperation(value = "导出")
-    public ResponseEntity<byte[]> exportData(@Valid BaseNewStudentPageDto dto) {
+    public ResponseEntity<byte[]> exportData(@Valid @RequestBody BaseNewStudentPageDto dto) {
         if(dto.getBaseSemesterId() == null){
             LambdaQueryWrapper<BaseSemester> queryWrapper = new LambdaQueryWrapper<>();
             queryWrapper

+ 3 - 1
src/main/resources/mapper/student/BaseNewStudentMapper.xml

@@ -205,7 +205,9 @@
         <if test="dto.secondAmbition != null and dto.secondAmbition != ''">
             and t1.second_ambition = #{dto.secondAmbition}
         </if>
-
+        <if test="dto.classId != null">
+            AND t11.id = #{dto.classId}
+        </if>
         <if test="dto.startDate != null and dto.endDate != null">
             AND t13.report_time between #{dto.startDate} and #{dto.endDate}
         </if>