印刷任务管理

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

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

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

@@ -26,7 +26,6 @@ import java.util.Map;
 public interface ExamDetailService extends IService<ExamDetail> {
     /**
      * 计算印刷计划下的总科次
-     *
      * @param printPlanId 印刷计划id
      * @return 该印刷计划下总科次
      */
@@ -34,7 +33,6 @@ public interface ExamDetailService extends IService<ExamDetail> {
 
     /**
      * 计算印刷计划下的总卷袋数
-     *
      * @param printPlanId 印刷计划id
      * @return 该印刷计划下总卷袋数
      */
@@ -48,7 +46,6 @@ public interface ExamDetailService extends IService<ExamDetail> {
 
     /**
      * 查询有效的考务字段
-     *
      * @param schoolId 学校id
      * @return 考务字段
      */
@@ -56,7 +53,6 @@ public interface ExamDetailService extends IService<ExamDetail> {
 
     /**
      * 考务数据模板下载
-     *
      * @param schoolId 学校id
      * @return 是否成功
      */
@@ -65,65 +61,61 @@ public interface ExamDetailService extends IService<ExamDetail> {
 
     /**
      * 查询考务数据-简略
-     *
-     * @param schoolId    学校id
+     * @param schoolId 学校id
      * @param printPlanId 印刷计划id
-     * @param courseCode  课程代码
+     * @param courseCode 课程代码
      * @param paperNumber 试卷编号
-     * @param examPlace   考点
-     * @param examRoom    考场
+     * @param examPlace 考点
+     * @param examRoom 考场
      * @param packageCode 卷袋编号
-     * @param pageNumber  分页页码
-     * @param pageSize    分页数量
+     * @param pageNumber 分页页码
+     * @param pageSize 分页数量
      * @return 查询结果
      */
-    IPage<ExaminationResult> findExaminationBriefPage(Long schoolId, Long printPlanId, String courseCode, String paperNumber,
-                                                      String examPlace, String examRoom, String packageCode, int pageNumber, int pageSize);
+    IPage<ExaminationResult> findExaminationBriefPage(Long schoolId,Long printPlanId,String courseCode,String paperNumber,
+                                                      String examPlace,String examRoom,String packageCode,int pageNumber,int pageSize);
 
     /**
      * 查询考务数据-汇总数据查询
-     *
-     * @param schoolId    学校id
+     * @param schoolId 学校id
      * @param printPlanId 印刷计划id
-     * @param courseCode  课程代码
+     * @param courseCode 课程代码
      * @param paperNumber 试卷编号
-     * @param examPlace   考点
-     * @param examRoom    考场
+     * @param examPlace 考点
+     * @param examRoom 考场
      * @param packageCode 卷袋编号
      * @return 查询结果
      */
-    SummarizedDataResult findSummarizedData(Long schoolId, Long printPlanId, String courseCode, String paperNumber,
-                                            String examPlace, String examRoom, String packageCode);
+    SummarizedDataResult findSummarizedData(Long schoolId,Long printPlanId,String courseCode,String paperNumber,
+                                            String examPlace,String examRoom,String packageCode);
 
 
     /**
      * 查询考务数据-明细
-     *
-     * @param printPlanId  印刷计划id
-     * @param courseCode   课程代码
-     * @param paperNumber  试卷编号
-     * @param examPlace    考点
-     * @param examRoom     考场
+     * @param printPlanId 印刷计划id
+     * @param courseCode 课程代码
+     * @param paperNumber 试卷编号
+     * @param examPlace 考点
+     * @param examRoom 考场
      * @param studentParam 学生查询参数
-     * @param pageNumber   分页页码
-     * @param pageSize     分页数量
+     * @param pageNumber 分页页码
+     * @param pageSize 分页数量
      * @return 查询结果
      */
-    IPage<ExaminationDetailResult> findExaminationDetail(Long printPlanId, String courseCode, String paperNumber, String examPlace,
-                                                         String examRoom, String studentParam, int pageNumber, int pageSize);
+    IPage<ExaminationDetailResult> findExaminationDetail(Long printPlanId,String courseCode,String paperNumber,String examPlace,
+                                                         String examRoom,String studentParam,int pageNumber,int pageSize);
+
+    IPage<ExaminationDetailResult> findExaminationDetail(Long convertIdToLong, int pageNumber, int pageSize);
 
     /**
      * 查询印刷计划下考点数据源
-     *
      * @return 考点集合
      */
     List<String> findExamPlaceDatasource();
 
     /**
      * 查询印刷计划下考场数据源
-     *
      * @return 考场集合
      */
     List<String> findExamRoomDatasource();
-
 }

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

@@ -238,6 +238,12 @@ public class ExamDetailServiceImpl extends ServiceImpl<ExamDetailMapper, ExamDet
         return examDetailMapper.findDetailPage(new Page<>(pageNumber,pageSize),printPlanId,courseCode,paperNumber,examPlace,examRoom,studentParam);
     }
 
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public IPage<ExaminationDetailResult> findExaminationDetail(Long examDetailId, int pageNumber, int pageSize) {
+        return examDetailMapper.findDetailPageById(new Page<>(pageNumber,pageSize),examDetailId);
+    }
+
     @Transactional(rollbackFor = Exception.class)
     @Override
     public List<String> findExamPlaceDatasource() {

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

@@ -179,5 +179,39 @@
             </if>
         </where>
     </select>
+    <select id="findDetailPageById"
+            resultType="com.qmth.distributed.print.business.bean.result.ExaminationDetailResult">
+        SELECT
+            stu.id AS id,
+            stu.exam_detail_course_id,
+            stu.student_name AS studentName,
+            stu.student_code AS studentCode,
+            stu.ticket_number AS ticketNumber,
+            stu.site_number AS siteNumber,
+            stu.create_id AS createId,
+            stu.create_time AS createTime,
+            CONCAT(cou.course_name,
+                   '(',
+                   cou.course_code,
+                   ')') AS courseNameCode,
+            cou.paper_number AS paperNumber,
+            det.print_plan_id AS printPlanId,
+            det.print_plan_name AS printPlanName,
+            det.exam_place AS examPlace,
+            det.exam_room AS examRoom
+        FROM
+            exam_student stu
+                INNER JOIN
+            exam_detail_course cou ON stu.exam_detail_course_id = cou.id
+                AND stu.school_id = cou.school_id
+                INNER JOIN
+            exam_detail det ON cou.exam_detail_id = det.id
+                AND stu.school_id = det.school_id
+        <where>
+            <if test="examDetailId != null and examDetailId > 0">
+                AND det.id = #{examDetailId}
+            </if>
+        </where>
+    </select>
 
 </mapper>

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

@@ -106,6 +106,16 @@ public class ExamDetailController {
                 courseCode, paperNumber, examPlace, examRoom, studentParam, pageNumber, pageSize));
     }
 
+    @ApiOperation(value = "考务数据导入-查看明细弹窗")
+    @RequestMapping(value = "/data_detail_list", method = RequestMethod.POST)
+    @ApiResponses({@ApiResponse(code = 200, message = "查询成功", response = Result.class)})
+    public Result findExaminationDetailById(@ApiParam(value = "考务场次id",required = true) String examDetailId,
+                                        @ApiParam(value = "分页页码", required = true) @RequestParam int pageNumber,
+                                        @ApiParam(value = "分页数", required = true) @RequestParam int pageSize) {
+
+        return ResultUtil.ok(examDetailService.findExaminationDetail(SystemConstant.convertIdToLong(examDetailId),pageNumber,pageSize));
+    }
+
     @ApiOperation(value = "考务数据导入-考点模糊查询")
     @RequestMapping(value = "/data_place_query", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "查询成功", response = Result.class)})