代码调整

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/result/statistics/StatementResult.java → distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/result/statistics/PrintCountResult.java

@@ -12,14 +12,14 @@ import java.io.Serializable;
 import java.util.Objects;
 
 /**
- * @Description: 命题任务统计 result
+ * @Description: 印刷任务统计 result
  * @Param:
  * @return:
  * @Author: wangliang
  * @Date: 2024/7/10
  */
 @JsonInclude(JsonInclude.Include.NON_NULL)
-public class StatementResult implements Serializable {
+public class PrintCountResult implements Serializable {
 
     @ApiModelProperty(value = "主键")
     @JsonSerialize(using = ToStringSerializer.class)

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/result/statistics/PrintTaskResult.java → distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/result/statistics/ScanCountResult.java

@@ -11,14 +11,14 @@ import java.io.Serializable;
 import java.util.Objects;
 
 /**
- * @Description: 印刷任务统计 result
+ * @Description: 扫描任务统计 result
  * @Param:
  * @return:
  * @Author: wangliang
- * @Date: 2024/7/10
+ * @Date: 2024/7/11
  */
 @JsonInclude(JsonInclude.Include.NON_NULL)
-public class PrintTaskResult implements Serializable {
+public class ScanCountResult implements Serializable {
 
     @ApiModelProperty(value = "主键")
     @JsonSerialize(using = ToStringSerializer.class)

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

@@ -6,8 +6,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.qmth.distributed.print.business.bean.dto.*;
 import com.qmth.distributed.print.business.bean.dto.approvalForm.ExamPackageDetail;
 import com.qmth.distributed.print.business.bean.result.WorkResult;
-import com.qmth.distributed.print.business.bean.result.statistics.PrintTaskResult;
-import com.qmth.distributed.print.business.bean.result.statistics.StatementResult;
+import com.qmth.distributed.print.business.bean.result.statistics.ScanCountResult;
+import com.qmth.distributed.print.business.bean.result.statistics.PrintCountResult;
 import com.qmth.distributed.print.business.entity.ExamTask;
 import com.qmth.distributed.print.business.enums.PrintPlanStatusEnum;
 import com.qmth.teachcloud.common.bean.dto.BlurryUserDto;
@@ -116,7 +116,7 @@ public interface ExamTaskMapper extends BaseMapper<ExamTask> {
      * @param dpr
      * @return
      */
-    IPage<StatementResult> statementCountList(IPage<Map> iPage, @Param("schoolId") Long schoolId, @Param("semesterId") Long semesterId, @Param("examId") Long examId, @Param("printPlanId") Long printPlanId, @Param("collegeId") Long collegeId, @Param("courseId") Long courseId, @Param("paperNumber") String paperNumber, @Param("cardType") String cardType, @Param("finishStatus") String finishStatus, @Param("dpr") DataPermissionRule dpr);
+    IPage<PrintCountResult> printCountList(IPage<Map> iPage, @Param("schoolId") Long schoolId, @Param("semesterId") Long semesterId, @Param("examId") Long examId, @Param("printPlanId") Long printPlanId, @Param("collegeId") Long collegeId, @Param("courseId") Long courseId, @Param("paperNumber") String paperNumber, @Param("cardType") String cardType, @Param("finishStatus") String finishStatus, @Param("dpr") DataPermissionRule dpr);
 
     /**
      * 命题任务统计导出
@@ -133,7 +133,7 @@ public interface ExamTaskMapper extends BaseMapper<ExamTask> {
      * @param dpr
      * @return
      */
-    List<StatementResult> statementCountListExport(@Param("schoolId") Long schoolId, @Param("semesterId") Long semesterId, @Param("examId") Long examId, @Param("printPlanId") Long printPlanId, @Param("collegeId") Long collegeId, @Param("courseId") Long courseId, @Param("paperNumber") String paperNumber, @Param("cardType") String cardType, @Param("finishStatus") String finishStatus, @Param("dpr") DataPermissionRule dpr);
+    List<PrintCountResult> printCountListExport(@Param("schoolId") Long schoolId, @Param("semesterId") Long semesterId, @Param("examId") Long examId, @Param("printPlanId") Long printPlanId, @Param("collegeId") Long collegeId, @Param("courseId") Long courseId, @Param("paperNumber") String paperNumber, @Param("cardType") String cardType, @Param("finishStatus") String finishStatus, @Param("dpr") DataPermissionRule dpr);
 
     /**
      * 印刷任务统计查询
@@ -149,7 +149,7 @@ public interface ExamTaskMapper extends BaseMapper<ExamTask> {
      * @param dpr
      * @return
      */
-    IPage<PrintTaskResult> printTaskList(IPage<Map> iPage, @Param("schoolId") Long schoolId, @Param("semesterId") Long semesterId, @Param("examId") Long examId, @Param("collegeId") Long collegeId, @Param("courseId") Long courseId, @Param("paperNumber") String paperNumber, @Param("cardType") String cardType, @Param("dpr") DataPermissionRule dpr);
+    IPage<ScanCountResult> scanCountList(IPage<Map> iPage, @Param("schoolId") Long schoolId, @Param("semesterId") Long semesterId, @Param("examId") Long examId, @Param("collegeId") Long collegeId, @Param("courseId") Long courseId, @Param("paperNumber") String paperNumber, @Param("cardType") String cardType, @Param("dpr") DataPermissionRule dpr);
 
     /**
      * 印刷任务统计导出
@@ -164,5 +164,5 @@ public interface ExamTaskMapper extends BaseMapper<ExamTask> {
      * @param dpr
      * @return
      */
-    List<PrintTaskResult> printTaskListExport(@Param("schoolId") Long schoolId, @Param("semesterId") Long semesterId, @Param("examId") Long examId, @Param("collegeId") Long collegeId, @Param("courseId") Long courseId, @Param("paperNumber") String paperNumber, @Param("cardType") String cardType, @Param("dpr") DataPermissionRule dpr);
+    List<ScanCountResult> scanCountListExport(@Param("schoolId") Long schoolId, @Param("semesterId") Long semesterId, @Param("examId") Long examId, @Param("collegeId") Long collegeId, @Param("courseId") Long courseId, @Param("paperNumber") String paperNumber, @Param("cardType") String cardType, @Param("dpr") DataPermissionRule dpr);
 }

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

@@ -10,8 +10,8 @@ import com.qmth.distributed.print.business.bean.params.ExamTaskSubmitPram;
 import com.qmth.distributed.print.business.bean.params.MakeupExamTaskTotalParam;
 import com.qmth.distributed.print.business.bean.result.WorkResult;
 import com.qmth.distributed.print.business.bean.result.examTaskStudent.ExamTaskStudentObjectResult;
-import com.qmth.distributed.print.business.bean.result.statistics.PrintTaskResult;
-import com.qmth.distributed.print.business.bean.result.statistics.StatementResult;
+import com.qmth.distributed.print.business.bean.result.statistics.ScanCountResult;
+import com.qmth.distributed.print.business.bean.result.statistics.PrintCountResult;
 import com.qmth.distributed.print.business.entity.ExamDetail;
 import com.qmth.distributed.print.business.entity.ExamTask;
 import com.qmth.distributed.print.business.entity.ExamTaskDetail;
@@ -212,7 +212,7 @@ public interface ExamTaskService extends IService<ExamTask> {
      * @param finishStatus
      * @return
      */
-    public IPage<StatementResult> statementCountList(IPage<Map> iPage, Long semesterId, Long examId, Long printPlanId, Long collegeId, Long courseId, String paperNumber, CardTypeEnum cardType, StatisticsStatusEnum finishStatus);
+    public IPage<PrintCountResult> printCountList(IPage<Map> iPage, Long semesterId, Long examId, Long printPlanId, Long collegeId, Long courseId, String paperNumber, CardTypeEnum cardType, StatisticsStatusEnum finishStatus);
 
     /**
      * 命题任务统计导出
@@ -227,7 +227,7 @@ public interface ExamTaskService extends IService<ExamTask> {
      * @param finishStatus
      * @return
      */
-    public List<StatementResult> statementCountListExport(Long semesterId, Long examId, Long printPlanId, Long collegeId, Long courseId, String paperNumber, CardTypeEnum cardType, StatisticsStatusEnum finishStatus);
+    public List<PrintCountResult> printCountListExport(Long semesterId, Long examId, Long printPlanId, Long collegeId, Long courseId, String paperNumber, CardTypeEnum cardType, StatisticsStatusEnum finishStatus);
 
     /**
      * 印刷任务统计查询
@@ -241,7 +241,7 @@ public interface ExamTaskService extends IService<ExamTask> {
      * @param cardType
      * @return
      */
-    public IPage<PrintTaskResult> printTaskList(IPage<Map> iPage, Long semesterId, Long examId, Long collegeId, Long courseId, String paperNumber, CardTypeEnum cardType);
+    public IPage<ScanCountResult> scanCountList(IPage<Map> iPage, Long semesterId, Long examId, Long collegeId, Long courseId, String paperNumber, CardTypeEnum cardType);
 
     /**
      * 印刷任务统计导出
@@ -254,5 +254,5 @@ public interface ExamTaskService extends IService<ExamTask> {
      * @param cardType
      * @return
      */
-    public List<PrintTaskResult> printTaskListExport(Long semesterId, Long examId, Long collegeId, Long courseId, String paperNumber, CardTypeEnum cardType);
+    public List<ScanCountResult> scanCountListExport(Long semesterId, Long examId, Long collegeId, Long courseId, String paperNumber, CardTypeEnum cardType);
 }

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

@@ -18,8 +18,8 @@ import com.qmth.distributed.print.business.bean.params.*;
 import com.qmth.distributed.print.business.bean.result.BasicExamStudentResult;
 import com.qmth.distributed.print.business.bean.result.WorkResult;
 import com.qmth.distributed.print.business.bean.result.examTaskStudent.ExamTaskStudentObjectResult;
-import com.qmth.distributed.print.business.bean.result.statistics.PrintTaskResult;
-import com.qmth.distributed.print.business.bean.result.statistics.StatementResult;
+import com.qmth.distributed.print.business.bean.result.statistics.ScanCountResult;
+import com.qmth.distributed.print.business.bean.result.statistics.PrintCountResult;
 import com.qmth.distributed.print.business.entity.*;
 import com.qmth.distributed.print.business.enums.*;
 import com.qmth.distributed.print.business.mapper.ExamTaskMapper;
@@ -1982,11 +1982,11 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
      * @return
      */
     @Override
-    public IPage<StatementResult> statementCountList(IPage<Map> iPage, Long semesterId, Long examId, Long printPlanId, Long collegeId, Long courseId, String paperNumber, CardTypeEnum cardType, StatisticsStatusEnum finishStatus) {
+    public IPage<PrintCountResult> printCountList(IPage<Map> iPage, Long semesterId, Long examId, Long printPlanId, Long collegeId, Long courseId, String paperNumber, CardTypeEnum cardType, StatisticsStatusEnum finishStatus) {
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
         SysUser requestUser = (SysUser) ServletUtil.getRequestUser();
         DataPermissionRule dpr = basicRoleDataPermissionService.findDataPermission(schoolId, requestUser.getId(), ServletUtil.getRequest().getServletPath());
-        return this.baseMapper.statementCountList(iPage, schoolId, semesterId, examId, printPlanId, collegeId, courseId, paperNumber, Objects.nonNull(cardType) ? cardType.name() : null, Objects.nonNull(finishStatus) ? finishStatus.name() : null, dpr);
+        return this.baseMapper.printCountList(iPage, schoolId, semesterId, examId, printPlanId, collegeId, courseId, paperNumber, Objects.nonNull(cardType) ? cardType.name() : null, Objects.nonNull(finishStatus) ? finishStatus.name() : null, dpr);
     }
 
     /**
@@ -2003,11 +2003,11 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
      * @return
      */
     @Override
-    public List<StatementResult> statementCountListExport(Long semesterId, Long examId, Long printPlanId, Long collegeId, Long courseId, String paperNumber, CardTypeEnum cardType, StatisticsStatusEnum finishStatus) {
+    public List<PrintCountResult> printCountListExport(Long semesterId, Long examId, Long printPlanId, Long collegeId, Long courseId, String paperNumber, CardTypeEnum cardType, StatisticsStatusEnum finishStatus) {
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
         SysUser requestUser = (SysUser) ServletUtil.getRequestUser();
         DataPermissionRule dpr = basicRoleDataPermissionService.findDataPermission(schoolId, requestUser.getId(), ServletUtil.getRequest().getServletPath());
-        return this.baseMapper.statementCountListExport(schoolId, semesterId, examId, printPlanId, collegeId, courseId, paperNumber, Objects.nonNull(cardType) ? cardType.name() : null, Objects.nonNull(finishStatus) ? finishStatus.name() : null, dpr);
+        return this.baseMapper.printCountListExport(schoolId, semesterId, examId, printPlanId, collegeId, courseId, paperNumber, Objects.nonNull(cardType) ? cardType.name() : null, Objects.nonNull(finishStatus) ? finishStatus.name() : null, dpr);
     }
 
     /**
@@ -2023,11 +2023,11 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
      * @return
      */
     @Override
-    public IPage<PrintTaskResult> printTaskList(IPage<Map> iPage, Long semesterId, Long examId, Long collegeId, Long courseId, String paperNumber, CardTypeEnum cardType) {
+    public IPage<ScanCountResult> scanCountList(IPage<Map> iPage, Long semesterId, Long examId, Long collegeId, Long courseId, String paperNumber, CardTypeEnum cardType) {
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
         SysUser requestUser = (SysUser) ServletUtil.getRequestUser();
         DataPermissionRule dpr = basicRoleDataPermissionService.findDataPermission(schoolId, requestUser.getId(), ServletUtil.getRequest().getServletPath());
-        return this.baseMapper.printTaskList(iPage, schoolId, semesterId, examId, collegeId, courseId, paperNumber, Objects.nonNull(cardType) ? cardType.name() : null, dpr);
+        return this.baseMapper.scanCountList(iPage, schoolId, semesterId, examId, collegeId, courseId, paperNumber, Objects.nonNull(cardType) ? cardType.name() : null, dpr);
     }
 
     /**
@@ -2042,11 +2042,11 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
      * @return
      */
     @Override
-    public List<PrintTaskResult> printTaskListExport(Long semesterId, Long examId, Long collegeId, Long courseId, String paperNumber, CardTypeEnum cardType) {
+    public List<ScanCountResult> scanCountListExport(Long semesterId, Long examId, Long collegeId, Long courseId, String paperNumber, CardTypeEnum cardType) {
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
         SysUser requestUser = (SysUser) ServletUtil.getRequestUser();
         DataPermissionRule dpr = basicRoleDataPermissionService.findDataPermission(schoolId, requestUser.getId(), ServletUtil.getRequest().getServletPath());
-        return this.baseMapper.printTaskListExport(schoolId, semesterId, examId, collegeId, courseId, paperNumber, Objects.nonNull(cardType) ? cardType.name() : null, dpr);
+        return this.baseMapper.scanCountListExport(schoolId, semesterId, examId, collegeId, courseId, paperNumber, Objects.nonNull(cardType) ? cardType.name() : null, dpr);
     }
 
     private ExamTaskPaperData saveTikuPaperData(Long examId, Long paperId, String uuid, File zipFile) {

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

@@ -1300,7 +1300,7 @@
         AND a.paper_number = b.paper_number
     </select>
 
-    <sql id="statementStatusCount">
+    <sql id="printStatusCount">
         select
             count(1)
         from
@@ -1318,7 +1318,7 @@
                   and edc.exam_detail_id = ed.id
     </sql>
 
-    <sql id="statementCountCommon">
+    <sql id="printCountCommon">
         select
         t.*,
         ec.type as cardType,
@@ -1331,13 +1331,13 @@
         et.paper_number as paperNumber,
         replace(substring_index(substring_index(convert((etd.paper_attachment_ids ->>'$[*].cardId') using utf8), ']', 1), '[',-1), '"', '') as cardId,
         so.name as college,
-        (<include refid="statementStatusCount" />)) as totalExamination,
-        (<include refid="statementStatusCount" /> and ed.status in ('READY', 'WAITING', 'PRINTING', 'FINISH'))) as generate,
-        (<include refid="statementStatusCount" /> and ed.status in ('NEW', 'CREATING'))) as unGenerated,
-        (<include refid="statementStatusCount" /> and ed.status = 'FINISH')) as printed,
-        (<include refid="statementStatusCount" /> and ed.status in ('READY', 'WAITING', 'PRINTING'))) as unPrinted,
-        (<include refid="statementStatusCount" /> and ed.status = 'CANCEL')) as invalid,
-        (<include refid="statementStatusCount" /> and ed.status = 'REJECT')) as reject
+        (<include refid="printStatusCount" />)) as totalExamination,
+        (<include refid="printStatusCount" /> and ed.status in ('READY', 'WAITING', 'PRINTING', 'FINISH'))) as generate,
+        (<include refid="printStatusCount" /> and ed.status in ('NEW', 'CREATING'))) as unGenerated,
+        (<include refid="printStatusCount" /> and ed.status = 'FINISH')) as printed,
+        (<include refid="printStatusCount" /> and ed.status in ('READY', 'WAITING', 'PRINTING'))) as unPrinted,
+        (<include refid="printStatusCount" /> and ed.status = 'CANCEL')) as invalid,
+        (<include refid="printStatusCount" /> and ed.status = 'REJECT')) as reject
         from exam_task et
         left join basic_course bc on bc.id = et.course_id
         left join exam_task_detail etd on etd.exam_task_id = et.id
@@ -1405,15 +1405,15 @@
         order by t.paperNumber desc
     </sql>
 
-    <select id="statementCountList" resultType="com.qmth.distributed.print.business.bean.result.statistics.StatementResult">
-        <include refid="statementCountCommon" />
+    <select id="printCountList" resultType="com.qmth.distributed.print.business.bean.result.statistics.PrintCountResult">
+        <include refid="printCountCommon" />
     </select>
 
-    <select id="statementCountListExport" resultType="com.qmth.distributed.print.business.bean.result.statistics.StatementResult">
-        <include refid="statementCountCommon" />
+    <select id="printCountListExport" resultType="com.qmth.distributed.print.business.bean.result.statistics.PrintCountResult">
+        <include refid="printCountCommon" />
     </select>
 
-    <sql id="printTaskCommon">
+    <sql id="scanCountCommon">
         select
         t.*,
         ec.type as cardType,
@@ -1491,11 +1491,11 @@
         order by t.paperNumber desc
     </sql>
 
-    <select id="printTaskList" resultType="com.qmth.distributed.print.business.bean.result.statistics.PrintTaskResult">
-        <include refid="printTaskCommon" />
+    <select id="scanCountList" resultType="com.qmth.distributed.print.business.bean.result.statistics.ScanCountResult">
+        <include refid="scanCountCommon" />
     </select>
 
-    <select id="printTaskListExport" resultType="com.qmth.distributed.print.business.bean.result.statistics.PrintTaskResult">
-        <include refid="printTaskCommon" />
+    <select id="scanCountListExport" resultType="com.qmth.distributed.print.business.bean.result.statistics.ScanCountResult">
+        <include refid="scanCountCommon" />
     </select>
 </mapper>

distributed-print/install/mysql/upgrade/3.4.0.sql

@@ -257,10 +257,10 @@ INSERT INTO sys_privilege
 VALUES(2087, '统计管理', 'count', 'MENU', 1, 6, NULL, NULL, 1, 0, 1);
 INSERT INTO sys_privilege
 (id, name, url, `type`, parent_id, `sequence`, property, related, enable, default_auth, front_display)
-VALUES(2088, '命题任务统计', 'StatementCount', 'MENU', 2087, 1, NULL, NULL, 1, 0, 1);
+VALUES(2088, '印刷任务统计', 'StatementCount', 'MENU', 2087, 1, NULL, NULL, 1, 0, 1);
 INSERT INTO sys_privilege
 (id, name, url, `type`, parent_id, `sequence`, property, related, enable, default_auth, front_display)
-VALUES(2089, '印刷任务统计', 'PrintCount', 'MENU', 2087, 2, NULL, NULL, 1, 0, 1);
+VALUES(2089, '扫描任务统计', 'PrintCount', 'MENU', 2087, 2, NULL, NULL, 1, 0, 1);
 INSERT INTO sys_privilege
 (id, name, url, `type`, parent_id, `sequence`, property, related, enable, default_auth, front_display)
 VALUES(2090, '查询', 'Select', 'BUTTON', 2088, 1, 'AUTH', '2093', 1, 0, 1);
@@ -272,13 +272,13 @@ INSERT INTO sys_privilege
 VALUES(2092, '列表', 'List', 'LIST', 2088, 1, 'AUTH', '2093', 1, 0, 1);
 INSERT INTO sys_privilege
 (id, name, url, `type`, parent_id, `sequence`, property, related, enable, default_auth, front_display)
-VALUES(2093, '命题任务统计查询', '/api/admin/statistics/statement/count', 'URL', 2088, 1, 'AUTH', NULL, 1, 1, 1);
+VALUES(2093, '印刷任务统计查询', '/api/admin/statistics/print/count', 'URL', 2088, 1, 'AUTH', NULL, 1, 1, 1);
 INSERT INTO sys_privilege
 (id, name, url, `type`, parent_id, `sequence`, property, related, enable, default_auth, front_display)
 VALUES(2094, '导出印刷进度', 'Export', 'BUTTON', 2088, 2, 'AUTH', '2095', 1, 0, 1);
 INSERT INTO sys_privilege
 (id, name, url, `type`, parent_id, `sequence`, property, related, enable, default_auth, front_display)
-VALUES(2095, '命题任务统计导出', '/api/admin/statistics/statement/count/export', 'URL', 2088, 2, 'AUTH', NULL, 1, 1, 1);
+VALUES(2095, '印刷任务统计导出', '/api/admin/statistics/print/count/export', 'URL', 2088, 2, 'AUTH', NULL, 1, 1, 1);
 
 ALTER TABLE `exam_task` ADD COLUMN `source` VARCHAR(45) NULL COMMENT '命题任务创建方式（ASSIGN：命题任务指派，SELF：老师自主发起）' AFTER `approve_form_attachment_id`;
 UPDATE exam_task et
@@ -306,10 +306,10 @@ INSERT INTO sys_privilege
 VALUES(2098, '列表', 'List', 'LIST', 2089, 1, 'AUTH', '2099', 1, 0, 1);
 INSERT INTO sys_privilege
 (id, name, url, `type`, parent_id, `sequence`, property, related, enable, default_auth, front_display)
-VALUES(2099, '印刷任务统计查询', '/api/admin/statistics/print/task/count', 'URL', 2089, 1, 'AUTH', NULL, 1, 1, 1);
+VALUES(2099, '扫描任务统计查询', '/api/admin/statistics/scan/count', 'URL', 2089, 1, 'AUTH', NULL, 1, 1, 1);
 INSERT INTO sys_privilege
 (id, name, url, `type`, parent_id, `sequence`, property, related, enable, default_auth, front_display)
 VALUES(2106, '导出扫描进度', 'Export', 'BUTTON', 2089, 2, 'AUTH', '2107', 1, 0, 1);
 INSERT INTO sys_privilege
 (id, name, url, `type`, parent_id, `sequence`, property, related, enable, default_auth, front_display)
-VALUES(2107, '印刷任务统计导出', '/api/admin/statistics/print/task/count/export', 'URL', 2089, 2, 'AUTH', NULL, 1, 1, 1);
+VALUES(2107, '扫描任务统计导出', '/api/admin/statistics/scan/count/export', 'URL', 2089, 2, 'AUTH', NULL, 1, 1, 1);

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

@@ -2,8 +2,8 @@ package com.qmth.distributed.print.api;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.qmth.boot.api.constant.ApiConstant;
-import com.qmth.distributed.print.business.bean.result.statistics.PrintTaskResult;
-import com.qmth.distributed.print.business.bean.result.statistics.StatementResult;
+import com.qmth.distributed.print.business.bean.result.statistics.ScanCountResult;
+import com.qmth.distributed.print.business.bean.result.statistics.PrintCountResult;
 import com.qmth.distributed.print.business.enums.CardTypeEnum;
 import com.qmth.distributed.print.business.enums.StatisticsStatusEnum;
 import com.qmth.distributed.print.business.service.ExamTaskService;
@@ -38,10 +38,10 @@ public class StatisticalManagementController {
     @Resource
     ExamTaskService examTaskService;
 
-    @ApiOperation(value = "命题任务统计查询")
-    @RequestMapping(value = "/statement/count", method = RequestMethod.POST)
-    @ApiResponses({@ApiResponse(code = 200, message = "分页查询", response = StatementResult.class)})
-    public Result statementCount(@ApiParam(value = "学期ID", required = true) @RequestParam Long semesterId,
+    @ApiOperation(value = "印刷任务统计查询")
+    @RequestMapping(value = "/print/count", method = RequestMethod.POST)
+    @ApiResponses({@ApiResponse(code = 200, message = "分页查询", response = PrintCountResult.class)})
+    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,
@@ -51,13 +51,13 @@ public class StatisticalManagementController {
                                  @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.statementCountList(new Page<>(pageNumber, pageSize), semesterId, examId, printPlanId, collegeId, courseId, paperNumber, cardType, finishStatus));
+        return ResultUtil.ok(examTaskService.printCountList(new Page<>(pageNumber, pageSize), semesterId, examId, printPlanId, collegeId, courseId, paperNumber, cardType, finishStatus));
     }
 
-    @ApiOperation(value = "命题任务统计导出")
-    @RequestMapping(value = "/statement/count/export", method = RequestMethod.POST)
-    @ApiResponses({@ApiResponse(code = 200, message = "导出成功", response = StatementResult.class)})
-    public void statementCountExport(@ApiParam(value = "学期ID", required = true) @RequestParam Long semesterId,
+    @ApiOperation(value = "印刷任务统计导出")
+    @RequestMapping(value = "/print/count/export", method = RequestMethod.POST)
+    @ApiResponses({@ApiResponse(code = 200, message = "导出成功", response = PrintCountResult.class)})
+    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,
@@ -65,14 +65,14 @@ public class StatisticalManagementController {
                                      @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<StatementResult> statementResultList = examTaskService.statementCountListExport(semesterId, examId, printPlanId, collegeId, courseId, paperNumber, cardType, finishStatus);
-        ExcelUtil.excelExport("印刷进度", StatementResult.class, statementResultList, ServletUtil.getResponse());
+        List<PrintCountResult> statementResultList = examTaskService.printCountListExport(semesterId, examId, printPlanId, collegeId, courseId, paperNumber, cardType, finishStatus);
+        ExcelUtil.excelExport("印刷进度", PrintCountResult.class, statementResultList, ServletUtil.getResponse());
     }
 
-    @ApiOperation(value = "印刷任务统计查询")
-    @RequestMapping(value = "/print/task/count", method = RequestMethod.POST)
-    @ApiResponses({@ApiResponse(code = 200, message = "分页查询", response = PrintTaskResult.class)})
-    public Result printTaskCount(@ApiParam(value = "学期ID", required = true) @RequestParam Long semesterId,
+    @ApiOperation(value = "扫描任务统计查询")
+    @RequestMapping(value = "/scan/count", method = RequestMethod.POST)
+    @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 courseId,
@@ -80,20 +80,20 @@ public class StatisticalManagementController {
                                  @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.printTaskList(new Page<>(pageNumber, pageSize), semesterId, examId, collegeId, courseId, paperNumber, cardType));
+        return ResultUtil.ok(examTaskService.scanCountList(new Page<>(pageNumber, pageSize), semesterId, examId, collegeId, courseId, paperNumber, cardType));
     }
 
-    @ApiOperation(value = "印刷任务统计导出")
-    @RequestMapping(value = "/print/task/count/export", method = RequestMethod.POST)
-    @ApiResponses({@ApiResponse(code = 200, message = "导出成功", response = PrintTaskResult.class)})
-    public void printTaskCountExport(@ApiParam(value = "学期ID", required = true) @RequestParam Long semesterId,
+    @ApiOperation(value = "扫描任务统计导出")
+    @RequestMapping(value = "/scan/count/export", method = RequestMethod.POST)
+    @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 courseId,
                                      @ApiParam(value = "试卷编号") @RequestParam(required = false) String paperNumber,
                                      @ApiParam(value = "题卡类型，GENERIC：通卡，CUSTOM：自定义") @RequestParam(required = false) CardTypeEnum cardType) throws Exception {
-        List<PrintTaskResult> printTaskResultList = examTaskService.printTaskListExport(semesterId, examId, collegeId, courseId, paperNumber, cardType);
-        ExcelUtil.excelExport("扫描进度", PrintTaskResult.class, printTaskResultList, ServletUtil.getResponse());
+        List<ScanCountResult> printTaskResultList = examTaskService.scanCountListExport(semesterId, examId, collegeId, courseId, paperNumber, cardType);
+        ExcelUtil.excelExport("扫描进度", ScanCountResult.class, printTaskResultList, ServletUtil.getResponse());
     }
 }