bug:分析批次课程管理课程名称模糊查询无效

distributed-print-business/src/main/java/com/qmth/distributed/print/business/mapper/GradeBatchPaperMapper.java

@@ -26,14 +26,14 @@ public interface GradeBatchPaperMapper extends BaseMapper<GradeBatchPaper> {
      * @param iPage      分页参数
      * @param batchId    批次id
      * @param examId     考试id
-     * @param courseCode 课程编号
+     * @param courseName 课程名称
      * @param schoolId   学校id
      * @return 结果
      */
     IPage<GradeBatchPaperResult> findGradeBatchPaperPage(@Param("iPage") Page<GradeBatchPaperResult> iPage,
                                                          @Param("batchId") Long batchId,
                                                          @Param("examId") Long examId,
-                                                         @Param("courseCode") String courseCode,
+                                                         @Param("courseName") String courseName,
                                                          @Param("schoolId") Long schoolId);
 
     /**

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/GradeBatchPaperService.java

@@ -24,13 +24,13 @@ public interface GradeBatchPaperService extends IService<GradeBatchPaper> {
      *
      * @param batchId     批次id
      * @param examId      考试id
-     * @param courseCode  课程编号
+     * @param courseName  课程名称
      * @param pageNumber  分页页数
      * @param pageSize    分页容量
      * @param requestUser 请求用户
      * @return 分页结果
      */
-    IPage<GradeBatchPaperResult> findGradeBatchPaperPage(Long batchId, Long examId, String courseCode, int pageNumber, int pageSize, SysUser requestUser);
+    IPage<GradeBatchPaperResult> findGradeBatchPaperPage(Long batchId, Long examId, String courseName, int pageNumber, int pageSize, SysUser requestUser);
 
     /**
      * 查询可以作为分析样本的试卷

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/GradeBatchPaperServiceImpl.java

@@ -49,9 +49,10 @@ public class GradeBatchPaperServiceImpl extends ServiceImpl<GradeBatchPaperMappe
     GradeBatchService gradeBatchService;
 
     @Override
-    public IPage<GradeBatchPaperResult> findGradeBatchPaperPage(Long batchId, Long examId, String courseCode, int pageNumber, int pageSize, SysUser requestUser) {
+    public IPage<GradeBatchPaperResult> findGradeBatchPaperPage(Long batchId, Long examId, String courseName, int pageNumber, int pageSize, SysUser requestUser) {
         Long schoolId = requestUser.getSchoolId();
-        IPage<GradeBatchPaperResult> datasource = this.baseMapper.findGradeBatchPaperPage(new Page<>(pageNumber, pageSize), batchId, examId, courseCode, schoolId);
+        courseName = SystemConstant.translateSpecificSign(courseName);
+        IPage<GradeBatchPaperResult> datasource = this.baseMapper.findGradeBatchPaperPage(new Page<>(pageNumber, pageSize), batchId, examId, courseName, schoolId);
         for (GradeBatchPaperResult record : datasource.getRecords()) {
             Long teachingRoomId = record.getTeachingRoomId();
             SysOrg teachCollege = this.findTeachCollegeByOrgId(teachingRoomId);

distributed-print-business/src/main/resources/mapper/GradeBatchPaperMapper.xml

@@ -60,8 +60,8 @@
             <if test="examId != null and examId != ''">
                 AND be.id = #{examId}
             </if>
-            <if test="courseCode != null and courseCode != ''">
-                AND et.course_code = #{courseCode}
+            <if test="courseName != null and courseName != ''">
+                AND et.course_name like concat('%',#{courseName} ,'%')
             </if>
         </where>
     </select>

distributed-print/src/main/java/com/qmth/distributed/print/api/GradeBatchPaperController.java

@@ -57,7 +57,7 @@ public class GradeBatchPaperController {
     @ApiResponses({@ApiResponse(code = 200, message = "查询成功", response = GradeBatchPaperResult.class)})
     public Result findGradeBatchPaperPage(@ApiParam(value = "批次id", required = true) @RequestParam String batchId,
                                           @ApiParam(value = "考试id") @RequestParam(required = false) String examId,
-                                          @ApiParam(value = "课程编号") @RequestParam(required = false) String courseCode,
+                                          @ApiParam(value = "课程名称") @RequestParam(required = false) String courseName,
                                           @ApiParam(value = "分页页码", required = true) @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
                                           @ApiParam(value = "分页数", required = true) @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
 
@@ -65,7 +65,7 @@ public class GradeBatchPaperController {
             throw ExceptionResultEnum.ERROR.exception("参数不完整");
         }
         SysUser requestUser = (SysUser) ServletUtil.getRequestUser();
-        return ResultUtil.ok(gradeBatchPaperService.findGradeBatchPaperPage(SystemConstant.convertIdToLong(batchId), SystemConstant.convertIdToLong(examId), courseCode, pageNumber, pageSize, requestUser));
+        return ResultUtil.ok(gradeBatchPaperService.findGradeBatchPaperPage(SystemConstant.convertIdToLong(batchId), SystemConstant.convertIdToLong(examId), courseName, pageNumber, pageSize, requestUser));
     }
 
     @ApiOperation(value = "成绩分析批次课程-查询可分析试卷")