代码调整

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

@@ -1394,7 +1394,7 @@
             <if test="finishStatus != null and finishStatus != ''">
                 <choose>
                     <when test="finishStatus == 'FINISH'">
-                        and (t.unGenerated = and or t.unPrinted = 0)
+                        and (t.unGenerated = 0 and t.unPrinted = 0)
                     </when>
                     <otherwise>
                         and (t.unGenerated <![CDATA[ > ]]> 0 or t.unPrinted <![CDATA[ > ]]> 0)

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

@@ -44,14 +44,14 @@ public class StatisticalManagementController {
     public Result printCount(@ApiParam(value = "学期ID", required = true) @RequestParam Long semesterId,
                                  @ApiParam(value = "考试ID", required = true) @RequestParam Long examId,
                                  @ApiParam(value = "印刷计划ID") @RequestParam(required = false) Long printPlanId,
-                                 @ApiParam(value = "开课学院id") @RequestParam(required = false) Long collegeId,
+                                 @ApiParam(value = "开课学院id") @RequestParam(required = false) Long openCollegeId,
                                  @ApiParam(value = "课程ID") @RequestParam(required = false) Long courseId,
                                  @ApiParam(value = "试卷编号") @RequestParam(required = false) String paperNumber,
                                  @ApiParam(value = "题卡类型，GENERIC：通卡，CUSTOM：自定义") @RequestParam(required = false) CardTypeEnum cardType,
                                  @ApiParam(value = "状态，FINISH：已完成，UN_FINISH：未完成") @RequestParam(required = false) StatisticsStatusEnum finishStatus,
                                  @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
                                  @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
-        return ResultUtil.ok(examTaskService.printCountList(new Page<>(pageNumber, pageSize), semesterId, examId, printPlanId, collegeId, courseId, paperNumber, cardType, finishStatus));
+        return ResultUtil.ok(examTaskService.printCountList(new Page<>(pageNumber, pageSize), semesterId, examId, printPlanId, openCollegeId, courseId, paperNumber, cardType, finishStatus));
     }
 
     @ApiOperation(value = "印刷任务统计导出")
@@ -60,12 +60,12 @@ public class StatisticalManagementController {
     public void printCountExport(@ApiParam(value = "学期ID", required = true) @RequestParam Long semesterId,
                                      @ApiParam(value = "考试ID", required = true) @RequestParam Long examId,
                                      @ApiParam(value = "印刷计划ID") @RequestParam(required = false) Long printPlanId,
-                                     @ApiParam(value = "开课学院id") @RequestParam(required = false) Long collegeId,
+                                     @ApiParam(value = "开课学院id") @RequestParam(required = false) Long openCollegeId,
                                      @ApiParam(value = "课程ID") @RequestParam(required = false) Long courseId,
                                      @ApiParam(value = "试卷编号") @RequestParam(required = false) String paperNumber,
                                      @ApiParam(value = "题卡类型，GENERIC：通卡，CUSTOM：自定义") @RequestParam(required = false) CardTypeEnum cardType,
                                      @ApiParam(value = "状态，FINISH：已完成，UN_FINISH：未完成") @RequestParam(required = false) StatisticsStatusEnum finishStatus) throws Exception {
-        List<PrintCountResult> statementResultList = examTaskService.printCountListExport(semesterId, examId, printPlanId, collegeId, courseId, paperNumber, cardType, finishStatus);
+        List<PrintCountResult> statementResultList = examTaskService.printCountListExport(semesterId, examId, printPlanId, openCollegeId, courseId, paperNumber, cardType, finishStatus);
         ExcelUtil.excelExport("印刷进度", PrintCountResult.class, statementResultList, ServletUtil.getResponse());
     }
 
@@ -74,13 +74,13 @@ public class StatisticalManagementController {
     @ApiResponses({@ApiResponse(code = 200, message = "分页查询", response = ScanCountResult.class)})
     public Result scanCount(@ApiParam(value = "学期ID", required = true) @RequestParam Long semesterId,
                                  @ApiParam(value = "考试ID", required = true) @RequestParam Long examId,
-                                 @ApiParam(value = "开课学院id") @RequestParam(required = false) Long collegeId,
+                                 @ApiParam(value = "开课学院id") @RequestParam(required = false) Long openCollegeId,
                                  @ApiParam(value = "课程ID") @RequestParam(required = false) Long courseId,
                                  @ApiParam(value = "试卷编号") @RequestParam(required = false) String paperNumber,
                                  @ApiParam(value = "题卡类型，GENERIC：通卡，CUSTOM：自定义") @RequestParam(required = false) CardTypeEnum cardType,
                                  @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
                                  @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
-        return ResultUtil.ok(examTaskService.scanCountList(new Page<>(pageNumber, pageSize), semesterId, examId, collegeId, courseId, paperNumber, cardType));
+        return ResultUtil.ok(examTaskService.scanCountList(new Page<>(pageNumber, pageSize), semesterId, examId, openCollegeId, courseId, paperNumber, cardType));
     }
 
     @ApiOperation(value = "扫描任务统计导出")
@@ -88,11 +88,11 @@ public class StatisticalManagementController {
     @ApiResponses({@ApiResponse(code = 200, message = "导出成功", response = ScanCountResult.class)})
     public void scanCountExport(@ApiParam(value = "学期ID", required = true) @RequestParam Long semesterId,
                                      @ApiParam(value = "考试ID", required = true) @RequestParam Long examId,
-                                     @ApiParam(value = "开课学院id") @RequestParam(required = false) Long collegeId,
+                                     @ApiParam(value = "开课学院id") @RequestParam(required = false) Long openCollegeId,
                                      @ApiParam(value = "课程ID") @RequestParam(required = false) Long courseId,
                                      @ApiParam(value = "试卷编号") @RequestParam(required = false) String paperNumber,
                                      @ApiParam(value = "题卡类型，GENERIC：通卡，CUSTOM：自定义") @RequestParam(required = false) CardTypeEnum cardType) throws Exception {
-        List<ScanCountResult> printTaskResultList = examTaskService.scanCountListExport(semesterId, examId, collegeId, courseId, paperNumber, cardType);
+        List<ScanCountResult> printTaskResultList = examTaskService.scanCountListExport(semesterId, examId, openCollegeId, courseId, paperNumber, cardType);
         ExcelUtil.excelExport("扫描进度", ScanCountResult.class, printTaskResultList, ServletUtil.getResponse());
     }
 }