开学报到导出调整

src/main/java/com/xjrsoft/module/student/controller/StudentReportPlanController.java

@@ -158,7 +158,7 @@ public class StudentReportPlanController {
                 return RT.error("已发布，无法再次发布");
             }
 
-            studentReportPlanService.release(reportPlan);
+//            studentReportPlanService.release(reportPlan);
             reportPlan.setStatus(dto.getStatus());
             reportPlan.setModifyDate(new Date());
             reportPlan.setModifyUserId(StpUtil.getLoginIdAsLong());

src/main/java/com/xjrsoft/module/student/controller/StudentReportRecordController.java

@@ -390,8 +390,8 @@ public class StudentReportRecordController {
             if(dto.getClassId() == null){
                 dto.setClassId(classId);
             }
-//            Long planId = planService.getEffectivePlanId(dto.getTeacherId(), dto.getClassId());
-//            dto.setStudentReportPlanId(planId);
+            Long planId = planService.getEffectivePlanId(dto.getTeacherId(), dto.getClassId());
+            dto.setStudentReportPlanId(planId);
         }
         Page<StudentReportRecordPlanPageVo> planPage = studentReportRecordService.getPlanPage(new Page<>(dto.getLimit(), dto.getSize()), dto);
         PageOutput<StudentReportRecordPlanPageVo> pageOutput = ConventPage.getPageOutput(planPage, StudentReportRecordPlanPageVo.class);

src/main/resources/mapper/student/StudentReportRecordMapper.xml

@@ -84,7 +84,9 @@
         LEFT JOIN xjr_dictionary_detail t9 ON t2.stduy_status = t9.code
         LEFT JOIN xjr_dictionary_detail t10 ON t2.archives_status = t10.code
         WHERE t1.delete_mark = 0 AND t1.enabled_mark = 1
-        and t1.student_report_plan_id = #{dto.studentReportPlanId}
+        <if test="dto.studentReportPlanId != null">
+            and t1.student_report_plan_id = #{dto.studentReportPlanId}
+        </if>
         <if test="dto.keyword != null and dto.keyword != ''">
             and t1.name like concat('%', #{dto.keyword},'%')
         </if>