Эх сурвалжийг харах

[bug]考务明细查询-考生参数模糊查询

caozixuan 4 жил өмнө
parent
commit
13d07c410f

+ 1 - 1
distributed-print-business/src/main/java/com/qmth/distributed/print/business/mapper/ExamDetailMapper.java

@@ -41,7 +41,7 @@ public interface ExamDetailMapper extends BaseMapper<ExamDetail> {
                                                   @Param("paperNumber") String paperNumber,
                                                   @Param("examPlace") String examPlace,
                                                   @Param("examRoom") String examRoom,
-                                                  @Param("studentParam") String studentParam);
+                                                  @Param("studentParams") String studentParams);
 
     IPage<ExaminationDetailResult> findDetailPageById(@Param("page") Page<ExaminationDetailResult> page,
                                                   @Param("examDetailId") Long examDetailId);

+ 2 - 2
distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/ExamDetailService.java

@@ -97,13 +97,13 @@ public interface ExamDetailService extends IService<ExamDetail> {
      * @param paperNumber 试卷编号
      * @param examPlace 考点
      * @param examRoom 考场
-     * @param studentParam 学生查询参数
+     * @param studentParams 学生查询参数
      * @param pageNumber 分页页码
      * @param pageSize 分页数量
      * @return 查询结果
      */
     IPage<ExaminationDetailResult> findExaminationDetail(Long schoolId, Long printPlanId,String courseCode,String paperNumber,String examPlace,
-                                                         String examRoom,String studentParam,int pageNumber,int pageSize);
+                                                         String examRoom,String studentParams,int pageNumber,int pageSize);
 
     IPage<ExaminationDetailResult> findExaminationDetail(Long convertIdToLong, int pageNumber, int pageSize);
 

+ 2 - 2
distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/ExamDetailServiceImpl.java

@@ -283,8 +283,8 @@ public class ExamDetailServiceImpl extends ServiceImpl<ExamDetailMapper, ExamDet
 
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public IPage<ExaminationDetailResult> findExaminationDetail(Long schoolId, Long printPlanId, String courseCode, String paperNumber, String examPlace, String examRoom, String studentParam, int pageNumber, int pageSize) {
-        return examDetailMapper.findDetailPage(new Page<>(pageNumber, pageSize),schoolId, printPlanId, courseCode, paperNumber, examPlace, examRoom, studentParam);
+    public IPage<ExaminationDetailResult> findExaminationDetail(Long schoolId, Long printPlanId, String courseCode, String paperNumber, String examPlace, String examRoom, String studentParams, int pageNumber, int pageSize) {
+        return examDetailMapper.findDetailPage(new Page<>(pageNumber, pageSize),schoolId, printPlanId, courseCode, paperNumber, examPlace, examRoom, studentParams);
     }
 
     @Transactional(rollbackFor = Exception.class)

+ 2 - 2
distributed-print-business/src/main/resources/mapper/ExamDetailMapper.xml

@@ -193,8 +193,8 @@
             <if test="examRoom != null and examRoom.length > 0">
                 AND det.exam_room = #{examRoom}
             </if>
-            <if test="studentParam != null and studentParam.length > 0">
-                AND (stu.ticket_number LIKE CONCAT('%',#{studentParam},'%') OR stu.student_code LIKE CONCAT('%',#{studentParam},'%') OR stu.student_name LIKE CONCAT('%',#{studentParam},'%'))
+            <if test="studentParams != null and studentParams.length > 0">
+                AND (stu.ticket_number LIKE CONCAT('%',#{studentParams},'%') OR stu.student_code LIKE CONCAT('%',#{studentParams},'%') OR stu.student_name LIKE CONCAT('%',#{studentParams},'%'))
             </if>
         </where>
     </select>

+ 2 - 2
distributed-print/src/main/java/com/qmth/distributed/print/api/ExamDetailController.java

@@ -100,13 +100,13 @@ public class ExamDetailController {
                                         @ApiParam(value = "试卷编号") @RequestParam(required = false) String paperNumber,
                                         @ApiParam(value = "考点") @RequestParam(required = false) String examPlace,
                                         @ApiParam(value = "考场") @RequestParam(required = false) String examRoom,
-                                        @ApiParam(value = "学生查询参数") @RequestParam(required = false) String studentParam,
+                                        @ApiParam(value = "学生查询参数") @RequestParam(required = false) String studentParams,
                                         @ApiParam(value = "分页页码", required = true) @RequestParam int pageNumber,
                                         @ApiParam(value = "分页数", required = true) @RequestParam int pageSize) {
 
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
         return ResultUtil.ok(examDetailService.findExaminationDetail(schoolId,SystemConstant.convertIdToLong(printPlanId),
-                courseCode, paperNumber, examPlace, examRoom, studentParam, pageNumber, pageSize));
+                courseCode, paperNumber, examPlace, examRoom, studentParams, pageNumber, pageSize));
     }
 
     @ApiOperation(value = "考务数据导入-查看明细弹窗")