Merge branch 'dev_v3.2.0' of http://git.qmth.com.cn/wangliang/distributed-print-service into dev_v3.2.0

distributed-print-business/src/main/java/com/qmth/distributed/print/business/entity/TSyncExamStudentScore.java

@@ -151,7 +151,7 @@ public class TSyncExamStudentScore implements Serializable {
         this.subjectName = (String) map.get("subjectName");
         this.paperType = (String) map.get("paperType");
         this.college = (String) map.get("college");
-        this.clazzName = (String) map.get("className");
+        this.clazzName = (String) map.get("clazzName");
         this.teacher = (String) map.get("teacher");
         this.status = (Integer) map.get("status");
         JSONArray jsonArray = (JSONArray) map.get("sheetUrls");

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

@@ -16,7 +16,7 @@ import java.util.List;
  * @author xf
  */
 public interface ExamPaperStructureMapper extends BaseMapper<ExamPaperStructure> {
-    IPage<ExamPaperStructure> listByPropositionTeacherId(@Param("page") Page<ExamPaperStructure> page, @Param("schoolId") Long schoolId, @Param("semesterId") Long semesterId, @Param("examId") Long examId, @Param("propositionTeacherId") Long propositionTeacherId, @Param("syncStatus") String syncStatus, @Param("structureStatusEnums") String[] structureStatusEnums);
+    IPage<ExamPaperStructure> listByPropositionTeacherId(@Param("page") Page<ExamPaperStructure> page, @Param("schoolId") Long schoolId, @Param("semesterId") Long semesterId, @Param("examId") Long examId, @Param("propositionTeacherId") Long propositionTeacherId, @Param("syncStatus") String syncStatus, @Param("structureStatusEnums") String[] structureStatusEnums, @Param("ready") Boolean ready);
 
-    List<ExamPaperStructure> listByPropositionTeacherId(@Param("schoolId") Long schoolId, @Param("semesterId") Long semesterId, @Param("examId") Long examId, @Param("propositionTeacherId") Long propositionTeacherId, @Param("syncStatus") String syncStatus, @Param("structureStatusEnums") String[] structureStatusEnums);
+    List<ExamPaperStructure> listByPropositionTeacherId(@Param("schoolId") Long schoolId, @Param("semesterId") Long semesterId, @Param("examId") Long examId, @Param("propositionTeacherId") Long propositionTeacherId, @Param("syncStatus") String syncStatus, @Param("structureStatusEnums") String[] structureStatusEnums, @Param("ready") Boolean ready);
 }

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

@@ -32,7 +32,7 @@ public interface GradeInitializeMapper {
                                                  @Param("userId") Long userId,
                                                  @Param("schoolId") Long schoolId);
 
-    List<GradeInitResult> listNeedAnalyzedPaperToWork(@Param("schoolId") Long schoolId, @Param("userId") Long userId);
+    List<GradeInitResult> listNeedAnalyzedPaperToWork(@Param("schoolId") Long schoolId, @Param("userId") Long userId, @Param("status") String status, @Param("ready") Boolean ready);
 
-    IPage<GradeInitResult> listNeedAnalyzedPaperToWork(@Param("iPage") Page<GradeInitResult> iPage, @Param("schoolId") Long schoolId, @Param("userId") Long userId);
+    IPage<GradeInitResult> listNeedAnalyzedPaperToWork(@Param("iPage") Page<GradeInitResult> iPage, @Param("schoolId") Long schoolId, @Param("userId") Long userId, @Param("status") String status, @Param("ready") Boolean ready);
 }

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

@@ -22,7 +22,7 @@ import java.util.Map;
  */
 public interface ExamPaperStructureService extends IService<ExamPaperStructure> {
 
-    IPage<ExamPaperStructure> listByPropositionTeacherId(Long semesterId, Long examId, Integer pageNumber, Integer pageSize, String[] structureStatusEnums);
+    IPage<ExamPaperStructure> listByPropositionTeacherId(Long semesterId, Long examId, Integer pageNumber, Integer pageSize, String[] structureStatusEnums, Boolean ready);
 
     ExamPaperStructure upload(String examPaperStructure, String md5, String keys, MultipartFile[] files);
 
@@ -38,7 +38,7 @@ public interface ExamPaperStructureService extends IService<ExamPaperStructure>
      */
     Map<QuestionType, List<Question>> parseExamCloudPaperStruct(List<ExamCloudPaperStructDto> examCloudPaperStructDtoList);
 
-    long countByPropositionTeacherId();
+    long countByPropositionTeacherId(Boolean ready);
 
     /**
      * 评卷参数提交

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

@@ -3,6 +3,7 @@ package com.qmth.distributed.print.business.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.qmth.distributed.print.business.bean.result.analyze.GradeInitResult;
 import com.qmth.teachcloud.common.entity.SysUser;
+import com.qmth.teachcloud.common.enums.GradeAnalyzePaperStatusEnum;
 
 /**
  * @Description: 教研分析对接-数据初始化服务实现类
@@ -20,9 +21,9 @@ public interface GradeInitializeService {
      * @param requestUser 请求的命题老师
      * @return 试卷结果
      */
-    IPage<GradeInitResult> findNeedAnalyzedPaper(Long semesterId, Long examId, String courseCode, SysUser requestUser,int pageNumber,int pageSize);
+    IPage<GradeInitResult> findNeedAnalyzedPaper(Long semesterId, Long examId, String courseCode, SysUser requestUser, int pageNumber, int pageSize);
 
-    long countByPropositionTeacherId();
+    long countByPropositionTeacherId(GradeAnalyzePaperStatusEnum status, Boolean ready);
 
-    IPage<GradeInitResult> listNeedAnalyzedPaperToWork(SysUser requestUser, Integer pageNumber, Integer pageSize);
+    IPage<GradeInitResult> listNeedAnalyzedPaperToWork(SysUser requestUser, Integer pageNumber, Integer pageSize, GradeAnalyzePaperStatusEnum status, Boolean ready);
 }

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

@@ -93,11 +93,11 @@ public class ExamPaperStructureServiceImpl extends ServiceImpl<ExamPaperStructur
     TBSyncTaskService tbSyncTaskService;
 
     @Override
-    public IPage<ExamPaperStructure> listByPropositionTeacherId(Long semesterId, Long examId, Integer pageNumber, Integer pageSize, String[] structureStatusEnums) {
+    public IPage<ExamPaperStructure> listByPropositionTeacherId(Long semesterId, Long examId, Integer pageNumber, Integer pageSize, String[] structureStatusEnums, Boolean ready) {
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
         Page<ExamPaperStructure> page = new Page<>(pageNumber, pageSize);
-        IPage<ExamPaperStructure> examPaperStructureIPage = this.baseMapper.listByPropositionTeacherId(page, schoolId, semesterId, examId, sysUser.getId(), ExamPrintPlanSyncStatusEnum.FINISH.name(), structureStatusEnums);
+        IPage<ExamPaperStructure> examPaperStructureIPage = this.baseMapper.listByPropositionTeacherId(page, schoolId, semesterId, examId, sysUser.getId(), ExamPrintPlanSyncStatusEnum.FINISH.name(), structureStatusEnums, ready);
         examPaperStructureIPage.getRecords().forEach(m -> {
             m.setStatusStr(ExamPaperStructureStatusEnum.INIT.equals(m.getStatus()) ? "未提交" : "已提交");
 
@@ -312,11 +312,11 @@ public class ExamPaperStructureServiceImpl extends ServiceImpl<ExamPaperStructur
     }
 
     @Override
-    public long countByPropositionTeacherId() {
+    public long countByPropositionTeacherId(Boolean ready) {
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
         String[] structureStatusEnums = new String[]{ExamPaperStructureStatusEnum.FINISH.name()};
-        List<ExamPaperStructure> examPaperStructureList = this.baseMapper.listByPropositionTeacherId(schoolId, null, null, sysUser.getId(), ExamPrintPlanSyncStatusEnum.FINISH.name(), structureStatusEnums);
+        List<ExamPaperStructure> examPaperStructureList = this.baseMapper.listByPropositionTeacherId(schoolId, null, null, sysUser.getId(), ExamPrintPlanSyncStatusEnum.FINISH.name(), structureStatusEnums, ready);
         return CollectionUtils.isEmpty(examPaperStructureList) ? 0 : examPaperStructureList.size();
     }
 
@@ -368,7 +368,7 @@ public class ExamPaperStructureServiceImpl extends ServiceImpl<ExamPaperStructur
             JSONArray jsonArrayPaper = JSONArray.parseArray(examTaskDetail.getPaperAttachmentIds());
             for (int i = 0; i < jsonArrayPaper.size(); i++) {
                 JSONObject object = jsonArrayPaper.getJSONObject(i);
-                if (!paperType.equals(String.valueOf(object.get("name")))){
+                if (!paperType.equals(String.valueOf(object.get("name")))) {
                     // 试卷类型不匹配跳过
                     continue;
                 }

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

@@ -15,6 +15,7 @@ import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * @Description: 教研分析对接-数据初始化服务实现类
@@ -51,18 +52,18 @@ public class GradeInitializeServiceImpl implements GradeInitializeService {
     }
 
     @Override
-    public long countByPropositionTeacherId() {
+    public long countByPropositionTeacherId(GradeAnalyzePaperStatusEnum status, Boolean ready) {
         SysUser requestUser = (SysUser) ServletUtil.getRequestUser();
         Long schoolId = requestUser.getSchoolId();
         Long userId = requestUser.getId();
-        List<GradeInitResult> findNeedAnalyzedPaper = gradeInitializeMapper.listNeedAnalyzedPaperToWork(schoolId, userId);
+        List<GradeInitResult> findNeedAnalyzedPaper = gradeInitializeMapper.listNeedAnalyzedPaperToWork(schoolId, userId, Objects.nonNull(status) ? status.name() : null, ready);
         return findNeedAnalyzedPaper.isEmpty() ? 0 : findNeedAnalyzedPaper.size();
     }
 
     @Override
-    public IPage<GradeInitResult> listNeedAnalyzedPaperToWork(SysUser requestUser, Integer pageNumber, Integer pageSize) {
+    public IPage<GradeInitResult> listNeedAnalyzedPaperToWork(SysUser requestUser, Integer pageNumber, Integer pageSize, GradeAnalyzePaperStatusEnum status, Boolean ready) {
         Long schoolId = requestUser.getSchoolId();
         Long userId = requestUser.getId();
-        return gradeInitializeMapper.listNeedAnalyzedPaperToWork(new Page<>(pageNumber, pageSize), schoolId, userId);
+        return gradeInitializeMapper.listNeedAnalyzedPaperToWork(new Page<>(pageNumber, pageSize), schoolId, userId, Objects.nonNull(status) ? status.name() : null, ready);
     }
 }

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

@@ -1235,7 +1235,7 @@ public class PrintCommonServiceImpl implements PrintCommonService {
             examStudent.setCollegeName(basicStudentResult.getCollegeName());
             examStudent.setMajorName(basicStudentResult.getMajorName());
             String prefix = convertUtil.randomNumberPrefix(examShortCode, courseShortCode, map.get(String.valueOf(basicClazzId)), basicExamRule.getExamNumberDigit());
-            SerialNumberParams ticketNumberParams = new SerialNumberParams(SystemConstant.NUMBER_CACHE + "ticketNumber-" + schoolId, prefix, basicExamRule.getExamNumberDigit() -prefix.length());
+            SerialNumberParams ticketNumberParams = new SerialNumberParams(SystemConstant.NUMBER_CACHE + "ticketNumber-" + schoolId, prefix, basicExamRule.getExamNumberDigit() - prefix.length());
             examStudent.setTicketNumber(createTempNumber(ticketNumberParams));
             examStudent.setSiteNumber(String.valueOf(atomicInteger.getAndIncrement()));
             examStudent.setExtendFields(extendFields);
@@ -1419,6 +1419,7 @@ public class PrintCommonServiceImpl implements PrintCommonService {
 
     /**
      * 上传pdf文件
+     *
      * @param pdfFile
      * @return
      */
@@ -1429,7 +1430,7 @@ public class PrintCommonServiceImpl implements PrintCommonService {
             String pdfDirName = pdfFile.getPath();
 
             String sysConfigPath = dictionaryConfig.fssLocalPdfDomain().getConfig() + File.separator;
-            String pdfDirNameStr = pdfDirName.replace("\\", "/").replaceAll(sysConfigPath.replace("\\", "/"),"");
+            String pdfDirNameStr = pdfDirName.replace("\\", "/").replaceAll(sysConfigPath.replace("\\", "/"), "");
 
             byte[] data = ByteArray.fromFile(pdfFile).value();
             String md5 = ByteArray.md5(data).toHexString();
@@ -1446,6 +1447,7 @@ public class PrintCommonServiceImpl implements PrintCommonService {
                 object.put(SystemConstant.PATH, pdfDirNameStr);
                 object.put(SystemConstant.TYPE, SystemConstant.OSS);
             }
+            object.put(SystemConstant.UPLOAD_TYPE, UploadFileEnum.PDF);
             return JSON.toJSONString(object);
         } catch (Exception e) {
             log.error(SystemConstant.LOG_ERROR, e);

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

@@ -86,32 +86,31 @@ public class PushLogicServiceImpl implements PushLogicService {
                             List<Map> students = stmmsUtils.getStudentScore(schoolId, examId, null, null, null, null, null, null, null, true, i, pageSize);
                             for (Map student : students) {
                                 try {
-                                    Long orgId = null, clazzId = null, majorId = null;
+                                    Long orgId = null, clazzId = null;
+                                    String clazzName = "";
+                                    String majorName = "";
                                     if (Objects.nonNull(student.get("studentCode")) && !Objects.equals("无", student.get("studentCode"))) {
                                         String studentCode = String.valueOf(student.get("studentCode"));
                                         String subjectCode = String.valueOf(student.get("subjectCode"));
                                         String examNumber = String.valueOf(student.get("examNumber"));
                                         Long printPlanId = Long.valueOf(student.get("examCode").toString()); // 计划ID
 
+                                        // 分布式印刷系统内部考生信息
                                         List<Map> studentInfos = examStudentService.listStudentScoreSync(schoolId, studentCode, examNumber, subjectCode, printPlanId);
                                         if (studentInfos == null || studentInfos.size() == 0) {
                                             throw ExceptionResultEnum.ERROR.exception("未找到此考生信息");
                                         }
-                                        Map stuMap = studentInfos.get(0);
+                                        Map dpsPrintStuMap = studentInfos.get(0);
 
-//                                        clazzId = stuMap.get("clazzId") == null || "".equals(stuMap.get("clazzId")) ? null : Long.parseLong(String.valueOf(stuMap.get("clazzId")));
-//                                        if (clazzId != null) {
-//                                            TeachClazz teachClazz = teachClazzService.getById(clazzId);
-//                                            if (teachClazz == null) {
-//                                                BasicClazz basicClazz = basicClazzService.getById(clazzId);
-//                                                if (Objects.nonNull(basicClazz)) {
-//                                                    majorId = basicClazz.getMajorId();
-//                                                    BasicMajor basicMajor = basicMajorService.getById(majorId);
-//                                                    orgId = basicMajor.getBelongOrgId();
-//                                                }
-//                                            }
-//                                        }
+                                        // 组装本系统内考生信息
+                                        clazzId = dpsPrintStuMap.get("clazzId") == null || "".equals(dpsPrintStuMap.get("clazzId")) ? null : Long.parseLong(String.valueOf(dpsPrintStuMap.get("clazzId")));
+                                        clazzName = String.valueOf(dpsPrintStuMap.get("clazzName"));
+                                        majorName = String.valueOf(dpsPrintStuMap.get("majorName"));
+                                        student.put("clazzId",clazzId);
+                                        student.put("clazzName",clazzName);
+                                        student.put("majorName",majorName);
                                     }
+
                                     student.put(SystemConstant.SCHOOL_ID, schoolId);
                                     student.put("semesterId", k);
                                     student.put("orgId", orgId);

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

@@ -66,10 +66,20 @@
             and be.id = #{examId}
         </if>
         <if test="structureStatusEnums != null and structureStatusEnums != ''">
-            AND ifnull(eps.status, 'INIT') NOT IN
-            <foreach collection="structureStatusEnums" item="item" index="index" open="(" separator="," close=")">
-                #{item}
-            </foreach>
+        <choose>
+            <when test="ready != null and ready != '' and ready == true">
+                AND eps.status IN
+                <foreach collection="structureStatusEnums" item="item" index="index" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </when>
+            <otherwise>
+                AND ifnull(eps.status, 'INIT') NOT IN
+                <foreach collection="structureStatusEnums" item="item" index="index" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </otherwise>
+        </choose>
         </if>
     </select>
 </mapper>

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

@@ -84,7 +84,17 @@
         MAX(paper_name) AS paper_name
         FROM
         grade_batch_paper
-        where status = 'SETTING_GRADE_PAPER_PARAM'
+        where  1 = 1
+        <if test="status != null and status != ''">
+            <choose>
+                <when test="ready != null and ready != '' and ready == true">
+                    and status <![CDATA[ <> ]]> #{status}
+                </when>
+                <otherwise>
+                    and status = #{status}
+                </otherwise>
+            </choose>
+        </if>
         GROUP BY school_id , paper_number , paper_type) pnpt ON et.school_id = pnpt.school_id
         AND et.paper_number = pnpt.paper_number
         AND LOCATE(pnpt.paper_type, etd.relate_paper_type)

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

@@ -13,12 +13,9 @@
             tsess.name,
             tsess.student_code as studentCode,
             tsess.exam_number as examNumber,
-            so.id as orgId,
-            so.name as orgName,
-            bm.id as majorId,
-            bm.name as majorName,
-            bc.id as clazz_id,
-            bc.clazz_name as clazzName,
+            tsess.major_name as majorName,
+            tsess.college as orgName,
+            tsess.clazz_name as clazzName,
             concat(edc.paper_number,edc.paper_type) as courseCode,
             edc.course_name as courseName,
             tsess.total_score as totalScore,
@@ -35,15 +32,8 @@
             bs.id = tsess.semester_id
         join basic_student bs2 on
             bs2.school_id = tsess.school_id and bs2.student_code = tsess.student_code
-        join (select id,clazz_name from basic_clazz where school_id = #{schoolId}
-                union all select id,teach_clazz_name clazz_name from teach_clazz where school_id = #{schoolId} ) bc on
-            bc.id = tsess.clazz_id
         join exam_student es on
             es.school_id = tsess.school_id and es.ticket_number = tsess.exam_number and es.student_code = tsess.student_code
-        left join basic_major bm on
-            bm.id = tsess.major_id
-        left join sys_org so on
-            so.id = tsess.org_id
         join exam_detail_course edc on
             edc.id = es.exam_detail_course_id
         join exam_task et on

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

@@ -52,7 +52,7 @@ public class ExamPaperStructureController {
                        @ApiParam(value = "考试ID", required = false) @RequestParam(required = false) Long examId,
                        @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
                        @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
-        IPage<ExamPaperStructure> examPaperStructureIPage = examPaperStructureService.listByPropositionTeacherId(semesterId, examId, pageNumber, pageSize, null);
+        IPage<ExamPaperStructure> examPaperStructureIPage = examPaperStructureService.listByPropositionTeacherId(semesterId, examId, pageNumber, pageSize, null, false);
         return ResultUtil.ok(examPaperStructureIPage);
     }
 
@@ -106,7 +106,7 @@ public class ExamPaperStructureController {
     /**
      * 设置科组长
      *
-     * @param data  data
+     * @param data data
      * @return Result
      */
     @ApiOperation(value = "设置科组长")

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

@@ -21,10 +21,7 @@ import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.BasicAttachment;
 import com.qmth.teachcloud.common.entity.SysUser;
 import com.qmth.teachcloud.common.entity.TBTask;
-import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
-import com.qmth.teachcloud.common.enums.FlowApprovePassEnum;
-import com.qmth.teachcloud.common.enums.TaskTypeEnum;
-import com.qmth.teachcloud.common.enums.UploadFileEnum;
+import com.qmth.teachcloud.common.enums.*;
 import com.qmth.teachcloud.common.service.BasicAttachmentService;
 import com.qmth.teachcloud.common.service.BasicStudentService;
 import com.qmth.teachcloud.common.util.Result;
@@ -99,6 +96,12 @@ public class ExamTaskController {
     @Resource
     TFFlowJoinService tfFlowJoinService;
 
+    @Resource
+    ExamPaperStructureService examPaperStructureService;
+
+    @Resource
+    GradeInitializeService gradeInitializeService;
+
     /**
      * 命题任务管理-查询
      *
@@ -430,7 +433,10 @@ public class ExamTaskController {
     @ApiOperation(value = "入库审核-查询-已审核数量")
     @RequestMapping(value = "/review_list_audited_count", method = RequestMethod.POST)
     public Result taskReviewListAuditedCount() {
-        return ResultUtil.ok(examTaskService.listTaskReviewAudited(null, null, null, null, null, null, null, null, null, null, null, null, SystemConstant.PAGE_NUMBER, SystemConstant.PAGE_SIZE).getRecords().size());
+        int taskReviewAuditedCount = examTaskService.listTaskReviewAudited(null, null, null, null, null, null, null, null, null, null, null, null, SystemConstant.PAGE_NUMBER, SystemConstant.PAGE_SIZE).getRecords().size();
+        long paperCount = examPaperStructureService.countByPropositionTeacherId(true);
+        long gradeCount = gradeInitializeService.countByPropositionTeacherId(GradeAnalyzePaperStatusEnum.SETTING_GRADE_PAPER_PARAM, true);
+        return ResultUtil.ok(taskReviewAuditedCount + paperCount + gradeCount);
     }
 
     /**

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

@@ -1,12 +1,9 @@
 package com.qmth.distributed.print.api;
 
-import com.qmth.boot.api.annotation.Aac;
-import com.qmth.boot.api.annotation.BOOL;
 import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.distributed.print.business.bean.params.analyze.GradeBatchPaperParam;
 import com.qmth.distributed.print.business.bean.result.EditResult;
 import com.qmth.distributed.print.business.bean.result.analyze.GradeBatchPaperResult;
-import com.qmth.distributed.print.business.entity.GradeBatch;
 import com.qmth.distributed.print.business.entity.GradeBatchPaper;
 import com.qmth.distributed.print.business.service.GradeBatchPaperService;
 import com.qmth.distributed.print.business.service.GradeBatchService;
@@ -115,7 +112,7 @@ public class GradeBatchPaperController {
     @ApiResponses({@ApiResponse(code = 200, message = "发布成功", response = EditResult.class)})
     public Result publish(@RequestParam Long batchId, @RequestParam Long gradeBatchPaperId) {
         GradeBatchPaper gradeBatchPaper = gradeBatchPaperService.getById(gradeBatchPaperId);
-        if(gradeBatchPaper == null){
+        if (gradeBatchPaper == null) {
             throw ExceptionResultEnum.ERROR.exception("没有批次课程信息");
         }
         asyncTeachCloudReportService.publish(gradeBatchPaper);

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

@@ -9,6 +9,7 @@ import com.qmth.distributed.print.business.service.ExamTaskService;
 import com.qmth.distributed.print.business.service.GradeInitializeService;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.SysUser;
+import com.qmth.teachcloud.common.enums.GradeAnalyzePaperStatusEnum;
 import com.qmth.teachcloud.common.util.Result;
 import com.qmth.teachcloud.common.util.ResultUtil;
 import com.qmth.teachcloud.common.util.ServletUtil;
@@ -72,7 +73,7 @@ public class WorkController {
     @ApiOperation(value = "阅卷待办任务-数量")
     @RequestMapping(value = "/structure/task/ready_count", method = RequestMethod.POST)
     public Result countStructure() {
-        return ResultUtil.ok(examPaperStructureService.countByPropositionTeacherId());
+        return ResultUtil.ok(examPaperStructureService.countByPropositionTeacherId(false));
     }
 
     /**
@@ -85,27 +86,27 @@ public class WorkController {
     public Result list(@RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
                        @RequestParam @Min(2) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
         String[] structureStatusEnums = new String[]{ExamPaperStructureStatusEnum.FINISH.name()};
-        return ResultUtil.ok(examPaperStructureService.listByPropositionTeacherId(null, null, pageNumber, pageSize, structureStatusEnums));
+        return ResultUtil.ok(examPaperStructureService.listByPropositionTeacherId(null, null, pageNumber, pageSize, structureStatusEnums, false));
     }
 
     /**
-     * 阅卷待办任务-数量
+     * 教研待办任务-数量
      */
     @ApiOperation(value = "教研待办任务-数量")
     @RequestMapping(value = "/grade/task/ready_count", method = RequestMethod.POST)
     public Result countReport() {
-        return ResultUtil.ok(gradeInitializeService.countByPropositionTeacherId());
+        return ResultUtil.ok(gradeInitializeService.countByPropositionTeacherId(GradeAnalyzePaperStatusEnum.SETTING_GRADE_PAPER_PARAM, false));
     }
 
     /**
-     * 阅卷待办任务
+     * 教研待办任务
      */
-    @ApiOperation(value = "阅卷待办任务-列表")
+    @ApiOperation(value = "教研待办任务-列表")
     @RequestMapping(value = "/grade/task/ready", method = RequestMethod.POST)
     public Result gradeList(@RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
                             @RequestParam @Min(2) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
         SysUser requestUser = (SysUser) ServletUtil.getRequestUser();
-        return ResultUtil.ok(gradeInitializeService.listNeedAnalyzedPaperToWork(requestUser, pageNumber, pageSize));
+        return ResultUtil.ok(gradeInitializeService.listNeedAnalyzedPaperToWork(requestUser, pageNumber, pageSize, GradeAnalyzePaperStatusEnum.SETTING_GRADE_PAPER_PARAM, false));
     }
 }