bug修复

teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/mapper/TBExamStudentMapper.java

@@ -91,7 +91,7 @@ public interface TBExamStudentMapper extends BaseMapper<TBExamStudent> {
      * @param courseCode
      * @return
      */
-    List<TBExamStudentResult> selectClassList(@Param("schoolId") Long schoolId, @Param("examId") Long examId, @Param("courseCode") String courseCode);
+    List<TBExamStudentResult> selectClassList(@Param("schoolId") Long schoolId, @Param("examId") Long examId,@Param("teacherId") Long teacherId, @Param("courseCode") String courseCode);
 
     /**
      * 开课成绩查询
@@ -126,9 +126,9 @@ public interface TBExamStudentMapper extends BaseMapper<TBExamStudent> {
      * @param studentParam
      * @return
      */
-    IPage<InspectCollegeResult> listInspectCollegeResult(@Param("page") Page<InspectCollegeResult> page, @Param("schoolId") Long schoolId, @Param("semester") String semester, @Param("examId") Long examId, @Param("courseCode") String courseCode, @Param("current") Boolean current, @Param("inspectCollegeId") Long inspectCollegeId, @Param("teacherId") Long teacherId, @Param("studentParam") String studentParam, @Param("column") String column, @Param("order") String order);
+    IPage<InspectCollegeResult> listInspectCollegeResult(@Param("page") Page<InspectCollegeResult> page, @Param("schoolId") Long schoolId, @Param("semester") String semester, @Param("examId") Long examId, @Param("courseCode") String courseCode, @Param("current") Boolean current, @Param("inspectCollegeId") Long inspectCollegeId, @Param("teacherId") Long teacherId, @Param("clazzId") Long clazzId, @Param("studentParam") String studentParam, @Param("column") String column, @Param("order") String order);
 
-    List<InspectCollegeResult> listInspectCollegeResult(@Param("schoolId") Long schoolId, @Param("semester") String semester, @Param("examId") Long examId, @Param("courseCode") String courseCode, @Param("current") Boolean current, @Param("inspectCollegeId") Long inspectCollegeId, @Param("teacherId") Long teacherId, @Param("studentParam") String studentParam, @Param("column") String column, @Param("order") String order);
+    List<InspectCollegeResult> listInspectCollegeResult(@Param("schoolId") Long schoolId, @Param("semester") String semester, @Param("examId") Long examId, @Param("courseCode") String courseCode, @Param("current") Boolean current, @Param("inspectCollegeId") Long inspectCollegeId, @Param("teacherId") Long teacherId, @Param("clazzId") Long clazzId, @Param("studentParam") String studentParam, @Param("column") String column, @Param("order") String order);
 
     /**
      * 学生报告预览-列表接口

teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/service/TBExamStudentService.java

@@ -82,7 +82,7 @@ public interface TBExamStudentService extends IService<TBExamStudent> {
      * @param courseCode
      * @return
      */
-    List<TBExamStudentResult> selectClassList(Long schoolId, Long examId, String courseCode);
+    List<TBExamStudentResult> selectClassList(Long schoolId, Long examId,Long teacherId, String courseCode);
 
     /**
      * 开课成绩查询
@@ -144,7 +144,7 @@ public interface TBExamStudentService extends IService<TBExamStudent> {
      * @param order
      * @return
      */
-    IPage<InspectCollegeResult> listInspectCollegeResult(SemesterEnum semester, Long examId, String courseCode, Boolean current, Long inspectCollegeId, Long teacherId, String studentParam, Integer pageNumber, Integer pageSize, String column, OrderEnum order);
+    IPage<InspectCollegeResult> listInspectCollegeResult(SemesterEnum semester, Long examId, String courseCode, Boolean current, Long inspectCollegeId, Long teacherId, Long clazzId, String studentParam, Integer pageNumber, Integer pageSize, String column, OrderEnum order);
 
     /**
      * 考查成绩查询-导出查询结果
@@ -159,7 +159,7 @@ public interface TBExamStudentService extends IService<TBExamStudent> {
      * @param column
      * @param order
      */
-    void exportInspectCollegeResult(SemesterEnum semester, Long examId, String courseCode, Boolean current, Long teachCollegeId, Long teacherId, String studentParam, String column, OrderEnum order) throws Exception;
+    void exportInspectCollegeResult(SemesterEnum semester, Long examId, String courseCode, Boolean current, Long teachCollegeId, Long teacherId, Long clazzId, String studentParam, String column, OrderEnum order) throws Exception;
 
     /**
      * 学生报告预览-列表接口

teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/service/impl/TBExamStudentServiceImpl.java

@@ -179,8 +179,8 @@ public class TBExamStudentServiceImpl extends ServiceImpl<TBExamStudentMapper, T
      * @return
      */
     @Override
-    public List<TBExamStudentResult> selectClassList(Long schoolId, Long examId, String courseCode) {
-        return tbExamStudentMapper.selectClassList(schoolId, examId, courseCode);
+    public List<TBExamStudentResult> selectClassList(Long schoolId, Long examId,Long teacherId, String courseCode) {
+        return tbExamStudentMapper.selectClassList(schoolId, examId, teacherId, courseCode);
     }
 
     @Override
@@ -272,15 +272,15 @@ public class TBExamStudentServiceImpl extends ServiceImpl<TBExamStudentMapper, T
     }
 
     @Override
-    public IPage<InspectCollegeResult> listInspectCollegeResult(SemesterEnum semester, Long examId, String courseCode, Boolean current, Long inspectCollegeId, Long teacherId, String studentParam, Integer pageNumber, Integer pageSize, String column, OrderEnum order) {
+    public IPage<InspectCollegeResult> listInspectCollegeResult(SemesterEnum semester, Long examId, String courseCode, Boolean current, Long inspectCollegeId, Long teacherId, Long clazzId, String studentParam, Integer pageNumber, Integer pageSize, String column, OrderEnum order) {
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
-        return tbExamStudentMapper.listInspectCollegeResult(new Page<>(pageNumber, pageSize), schoolId, Objects.nonNull(semester) ? semester.name() : null, examId, courseCode, current, inspectCollegeId, teacherId, studentParam, column, Objects.nonNull(order) ? order.name() : null);
+        return tbExamStudentMapper.listInspectCollegeResult(new Page<>(pageNumber, pageSize), schoolId, Objects.nonNull(semester) ? semester.name() : null, examId, courseCode, current, inspectCollegeId, teacherId, clazzId, studentParam, column, Objects.nonNull(order) ? order.name() : null);
     }
 
     @Override
-    public void exportInspectCollegeResult(SemesterEnum semester, Long examId, String courseCode, Boolean current, Long teachCollegeId, Long teacherId, String studentParam, String column, OrderEnum order) throws Exception {
+    public void exportInspectCollegeResult(SemesterEnum semester, Long examId, String courseCode, Boolean current, Long teachCollegeId, Long teacherId, Long clazzId, String studentParam, String column, OrderEnum order) throws Exception {
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
-        List<InspectCollegeResult> list = tbExamStudentMapper.listInspectCollegeResult(schoolId, Objects.nonNull(semester) ? semester.name() : null, examId, courseCode, current, teachCollegeId, teacherId, studentParam, column, Objects.nonNull(order) ? order.name() : null);
+        List<InspectCollegeResult> list = tbExamStudentMapper.listInspectCollegeResult(schoolId, Objects.nonNull(semester) ? semester.name() : null, examId, courseCode, current, teachCollegeId, teacherId, clazzId, studentParam, column, Objects.nonNull(order) ? order.name() : null);
         ExcelUtil.excelExport("考查成绩查询", InspectCollegeResult.class, list, ServletUtil.getResponse());
     }
 

teachcloud-report-business/src/main/resources/mapper/TBExamStudentMapper.xml

@@ -127,6 +127,9 @@
         tbsc.id = tbes.clazz_id
         <where>
             <include refid="conditionSql"/>
+            <if test="teacherId != null and teacherId != ''">
+                and tbes.teacher_id = #{teacherId}
+            </if>
         </where>
     </select>
 
@@ -258,6 +261,9 @@
             <if test="teacherId != null">
                 and a.teacher_id = #{teacherId}
             </if>
+            <if test="clazzId != null">
+                and a.clazz_id = #{clazzId}
+            </if>
             <if test="studentParam != null and studentParam != ''">
                 and (a.ticket_number like concat('%' ,#{studentParam}, '%')
                 or a.student_code like concat('%' ,#{studentParam}, '%')

teachcloud-report/src/main/java/com/qmth/teachcloud/report/api/SysReportController.java

@@ -144,7 +144,8 @@ public class SysReportController {
     @ApiResponses({@ApiResponse(code = 200, message = "考生信息", response = TBExamStudentResult.class)})
     public Result listClass(@ApiParam(value = "学校id", required = true) @RequestParam String schoolId,
                             @ApiParam(value = "考试id", required = true) @RequestParam String examId,
+                            @ApiParam(value = "考试id", required = false) @RequestParam(required = false) String teacherId,
                             @ApiParam(value = "科目编码", required = true) @RequestParam String courseCode) {
-        return ResultUtil.ok(tbExamStudentService.selectClassList(SystemConstant.convertIdToLong(schoolId), SystemConstant.convertIdToLong(examId), courseCode));
+        return ResultUtil.ok(tbExamStudentService.selectClassList(SystemConstant.convertIdToLong(schoolId), SystemConstant.convertIdToLong(examId), SystemConstant.convertIdToLong(teacherId), courseCode));
     }
 }

teachcloud-report/src/main/java/com/qmth/teachcloud/report/api/TBExamStudentController.java

@@ -115,6 +115,7 @@ public class TBExamStudentController {
             @ApiParam(value = "课程代码", required = true) @RequestParam(required = false) String courseCode,
             @ApiParam(value = "考试类型", required = true) @RequestParam(required = false) Boolean current,
             @ApiParam(value = "教师ID", required = true) @RequestParam(required = false) Long teacherId,
+            @ApiParam(value = "班级ID", required = true) @RequestParam(required = false) Long clazzId,
             @ApiParam(value = "模糊查询", required = true) @RequestParam(required = false) String studentParam,
             @ApiParam(value = "分页页码", required = true) @RequestParam Integer pageNumber,
             @ApiParam(value = "分页数量", required = true) @RequestParam Integer pageSize,
@@ -123,7 +124,7 @@ public class TBExamStudentController {
 
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
         Long orgId = sysUser.getOrgId();
-        return ResultUtil.ok(tbExamStudentService.listInspectCollegeResult(semester, examId, courseCode, current, orgId, teacherId, studentParam, pageNumber, pageSize, column, order));
+        return ResultUtil.ok(tbExamStudentService.listInspectCollegeResult(semester, examId, courseCode, current, orgId, teacherId, clazzId, studentParam, pageNumber, pageSize, column, order));
     }
 
     @ApiOperation(value = "考查成绩查询-导出查询结果")
@@ -136,11 +137,12 @@ public class TBExamStudentController {
             @ApiParam(value = "考试类型", required = true) @RequestParam(required = false) Boolean current,
             @ApiParam(value = "开课学院ID", required = true) @RequestParam(required = false) Long teachCollegeId,
             @ApiParam(value = "教师ID", required = true) @RequestParam(required = false) Long teacherId,
+            @ApiParam(value = "班级ID", required = true) @RequestParam(required = false) Long clazzId,
             @ApiParam(value = "模糊查询", required = true) @RequestParam(required = false) String studentParam,
             @ApiParam(value = "排序列", required = false) @RequestParam(required = false) String column,
             @ApiParam(value = "排序规则", required = false) @RequestParam(required = false) OrderEnum order) throws Exception {
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
         Long orgId = sysUser.getOrgId();
-        tbExamStudentService.exportInspectCollegeResult(semester, examId, courseCode, current, orgId, teacherId, studentParam, column, order);
+        tbExamStudentService.exportInspectCollegeResult(semester, examId, courseCode, current, orgId, teacherId, clazzId, studentParam, column, order);
     }
 }