3.0.0-bug修改

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

@@ -26,15 +26,15 @@ import java.util.Set;
  */
 public interface ExamTaskMapper extends BaseMapper<ExamTask> {
 
-    IPage<ExamTaskDto> listPage(Page<ExamTaskDto> page, @Param("schoolId") Long schoolId,@Param("semesterId") Long semesterId,@Param("examId") Long examId, @Param("enable") Boolean enable, @Param("status") String status, @Param("cardRuleId") Long cardRuleId, @Param("courseCode") String courseCode, @Param("paperNumber") String paperNumber, @Param("startTime") Long startTime, @Param("endTime") Long endTime, @Param("orgIds") Set<Long> orgIds, @Param("userName") String userName, @Param("createName") String createName);
+    IPage<ExamTaskDto> listPage(Page<ExamTaskDto> page, @Param("schoolId") Long schoolId, @Param("semesterId") Long semesterId, @Param("examId") Long examId, @Param("enable") Boolean enable, @Param("status") String status, @Param("cardRuleId") Long cardRuleId, @Param("courseCode") String courseCode, @Param("paperNumber") String paperNumber, @Param("startTime") Long startTime, @Param("endTime") Long endTime, @Param("orgIds") Set<Long> orgIds, @Param("userName") String userName, @Param("createName") String createName);
 
     List<BlurryUserDto> listUser(@Param("schoolId") Long schoolId, @Param("param") String param, @Param("orgIds") Set<Long> orgIds);
 
-    IPage<ExamTaskDto> listTaskApply(Page<ExamTaskDto> page, @Param("schoolId") Long schoolId, @Param("auditStatus") String auditStatus, @Param("cardRuleId") Long cardRuleId, @Param("courseCode") String courseCode, @Param("paperNumber") String paperNumber, @Param("startTime") Long startTime, @Param("endTime") Long endTime, @Param("userId") Long userId, @Param("orgIds") Set<Long> orgIds, @Param("userName") String userName);
+    IPage<ExamTaskDto> listTaskApply(Page<ExamTaskDto> page, @Param("schoolId") Long schoolId, @Param("semesterId") Long semesterId, @Param("examId") Long examId, @Param("auditStatus") String auditStatus, @Param("cardRuleId") Long cardRuleId, @Param("courseCode") String courseCode, @Param("paperNumber") String paperNumber, @Param("startTime") Long startTime, @Param("endTime") Long endTime, @Param("userId") Long userId, @Param("orgIds") Set<Long> orgIds, @Param("userName") String userName);
 
-    IPage<ExamTaskDto> listTaskReviewUnaudited(Page<ExamTaskDto> page, @Param("schoolId") Long schoolId, @Param("courseCode") String courseCode, @Param("paperNumber") String paperNumber, @Param("userId") Long userId, @Param("cardRuleId") Long cardRuleId, @Param("startTime") Long startTime, @Param("endTime") Long endTime, @Param("orgIds") Set<Long> orgIds, @Param("startCreateTime") Long startCreateTime, @Param("endCreateTime") Long endCreateTime, @Param("createName") String createName, @Param("currentUserId") Long currentUserId);
+    IPage<ExamTaskDto> listTaskReviewUnaudited(Page<ExamTaskDto> page, @Param("schoolId") Long schoolId, @Param("semesterId") Long semesterId, @Param("examId") Long examId, @Param("courseCode") String courseCode, @Param("paperNumber") String paperNumber, @Param("userId") Long userId, @Param("cardRuleId") Long cardRuleId, @Param("startTime") Long startTime, @Param("endTime") Long endTime, @Param("orgIds") Set<Long> orgIds, @Param("startCreateTime") Long startCreateTime, @Param("endCreateTime") Long endCreateTime, @Param("createName") String createName, @Param("currentUserId") Long currentUserId);
 
-    IPage<ExamTaskDto> listTaskReviewAudited(Page<ExamTaskDto> page, @Param("schoolId") Long schoolId, @Param("reviewStatus") String reviewStatus, @Param("courseCode") String courseCode, @Param("paperNumber") String paperNumber, @Param("userId") Long userId, @Param("cardRuleId") Long cardRuleId, @Param("startTime") Long startTime, @Param("endTime") Long endTime, @Param("orgIds") Set<Long> orgIds, @Param("startCreateTime") Long startCreateTime, @Param("endCreateTime") Long endCreateTime, @Param("createName") String createName, @Param("currentUserId") Long currentUserId);
+    IPage<ExamTaskDto> listTaskReviewAudited(Page<ExamTaskDto> page, @Param("schoolId") Long schoolId, @Param("semesterId") Long semesterId, @Param("examId") Long examId, @Param("reviewStatus") String reviewStatus, @Param("courseCode") String courseCode, @Param("paperNumber") String paperNumber, @Param("userId") Long userId, @Param("cardRuleId") Long cardRuleId, @Param("startTime") Long startTime, @Param("endTime") Long endTime, @Param("orgIds") Set<Long> orgIds, @Param("startCreateTime") Long startCreateTime, @Param("endCreateTime") Long endCreateTime, @Param("createName") String createName, @Param("currentUserId") Long currentUserId);
 
     IPage<ExamTaskDetailDto> listTaskPaper(Page<ExamTaskDetailDto> page, @Param("schoolId") Long schoolId, @Param("courseCode") String courseCode, @Param("paperNumber") String paperNumber, @Param("startTime") Long startTime, @Param("endTime") Long endTime, @Param("orgIds") Set<Long> orgIds, @Param("containsQuestionTeacher") boolean containsQuestionTeacher, @Param("userId") Long userId, @Param("makeMethod") MakeMethodEnum makeMethod, @Param("cardRuleId") Long cardRuleId);
 

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

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.qmth.distributed.print.business.bean.dto.BasicPrintConfigDto;
 import com.qmth.teachcloud.common.entity.BasicPrintConfig;
 
+import java.util.List;
+
 /**
  * <p>
  * 印品配置 服务类
@@ -44,4 +46,16 @@ public interface BasicPrintConfigService extends IService<BasicPrintConfig> {
      * @return BasicPrintConfig
      */
     BasicPrintConfig getByExamIdAndOrgId(Long examId, Long orgId);
+
+    /**
+     * 查询考试下设置印品的机构集合
+     * @param examId 考试ID
+     */
+    List<String> listOrgIdsByExamId(Long examId);
+
+    /**
+     * 删除
+     * @param id 印品配置ID
+     */
+    boolean delete(Long id);
 }

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

@@ -63,11 +63,11 @@ public interface ExamTaskService extends IService<ExamTask> {
 
     List<ExamTask> saveBatch(ExamTask task);
 
-    IPage<ExamTaskDto> listTaskApply(String auditStatus, Long cardRuleId, String courseCode, String paperNumber, Long startTime, Long endTime, String userName, Integer pageNumber, Integer pageSize);
+    IPage<ExamTaskDto> listTaskApply(Long semesterId, Long examId, String auditStatus, Long cardRuleId, String courseCode, String paperNumber, Long startTime, Long endTime, String userName, Integer pageNumber, Integer pageSize);
 
-    IPage<ExamTaskDto> listTaskReviewUnaudited(String courseCode, String paperNumber, Long userId, Long cardRuleId, Long startTime, Long endTime, Long startCreateTime, Long endCreateTime, String createName, Integer pageNumber, Integer pageSize);
+    IPage<ExamTaskDto> listTaskReviewUnaudited(Long semesterId, Long examId, String courseCode, String paperNumber, Long userId, Long cardRuleId, Long startTime, Long endTime, Long startCreateTime, Long endCreateTime, String createName, Integer pageNumber, Integer pageSize);
 
-    IPage<ExamTaskDto> listTaskReviewAudited(String reviewStatus, String courseCode, String paperNumber, Long userId, Long cardRuleId, Long startTime, Long endTime, Long startCreateTime, Long endCreateTime, String createName, Integer pageNumber, Integer pageSize);
+    IPage<ExamTaskDto> listTaskReviewAudited(Long semesterId, Long examId, String reviewStatus, String courseCode, String paperNumber, Long userId, Long cardRuleId, Long startTime, Long endTime, Long startCreateTime, Long endCreateTime, String createName, Integer pageNumber, Integer pageSize);
 
     boolean taskReviewSave(ExamTaskReviewLog taskReviewLog) throws IOException;
 

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

@@ -28,6 +28,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
@@ -100,7 +101,7 @@ public class BasicPrintConfigServiceImpl extends ServiceImpl<BasicPrintConfigMap
             queryWrapper.lambda().eq(BasicPrintConfig::getSchoolId, schoolId).eq(BasicPrintConfig::getExamId, basicPrintConfig.getExamId());
             List<BasicPrintConfig> basicPrintConfigs = this.list(queryWrapper);
 
-            if(basicPrintConfigs != null && basicPrintConfigs.size() > 0) {
+            if (basicPrintConfigs != null && basicPrintConfigs.size() > 0) {
                 List<Long> printConfigIds = basicPrintConfigs.stream().map(BasicPrintConfig::getId).collect(Collectors.toList());
                 QueryWrapper<BasicTemplateOrg> basicTemplateOrgQueryWrapper = new QueryWrapper<>();
                 basicTemplateOrgQueryWrapper.lambda().in(BasicTemplateOrg::getRuleId, printConfigIds).eq(BasicTemplateOrg::getType, TemplateTypeEnum.PRINT_CONFIG)
@@ -160,14 +161,14 @@ public class BasicPrintConfigServiceImpl extends ServiceImpl<BasicPrintConfigMap
 
         List<BasicPrintConfig> basicPrintConfigs = this.baseMapper.listBySchoolIdAndExamIdAndOrgId(schoolId, examId, orgId, TemplateTypeEnum.PRINT_CONFIG.name());
         if (basicPrintConfigs == null || basicPrintConfigs.size() == 0) {
-            throw ExceptionResultEnum.ERROR.exception("未找到课程[" + basicCourseService.findByCourseCode(courseCode,schoolId).getName() + "]所属教研室["+sysOrg.getName()+"]的印品配置");
+            throw ExceptionResultEnum.ERROR.exception("未找到课程[" + basicCourseService.findByCourseCode(courseCode, schoolId).getName() + "]所属教研室[" + sysOrg.getName() + "]的印品配置");
         }
         if (basicPrintConfigs.size() != 1) {
-            throw ExceptionResultEnum.ERROR.exception("考试["+basicExam.getName()+"],教研室["+sysOrg.getName()+"]查询出多个印品配置");
+            throw ExceptionResultEnum.ERROR.exception("考试[" + basicExam.getName() + "],教研室[" + sysOrg.getName() + "]查询出多个印品配置");
         }
         BasicPrintConfig printConfig = basicPrintConfigs.get(0);
-        if(!printConfig.getEnable()){
-            throw ExceptionResultEnum.ERROR.exception("考试["+basicExam.getName()+"],教研室["+sysOrg.getName()+"]印品配置已禁用，请先开启");
+        if (!printConfig.getEnable()) {
+            throw ExceptionResultEnum.ERROR.exception("考试[" + basicExam.getName() + "],教研室[" + sysOrg.getName() + "]印品配置已禁用，请先开启");
         }
         return printConfig;
     }
@@ -182,7 +183,7 @@ public class BasicPrintConfigServiceImpl extends ServiceImpl<BasicPrintConfigMap
             throw ExceptionResultEnum.ERROR.exception("未找到课程所属机构");
         }
         ExamTask examTask = examTaskService.getByCourseCodeAndPaperNumber(schoolId, courseCode, paperNumber);
-        if(examTask == null){
+        if (examTask == null) {
             throw ExceptionResultEnum.ERROR.exception("命题任务不存在");
         }
         return getByExamIdAndOrgId(examTask.getExamId(), orgId);
@@ -195,15 +196,39 @@ public class BasicPrintConfigServiceImpl extends ServiceImpl<BasicPrintConfigMap
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
         List<BasicPrintConfig> basicPrintConfigs = this.baseMapper.listBySchoolIdAndExamIdAndOrgId(schoolId, examId, orgId, TemplateTypeEnum.PRINT_CONFIG.name());
         if (basicPrintConfigs == null || basicPrintConfigs.size() == 0) {
-            throw ExceptionResultEnum.ERROR.exception("考试["+basicExam.getName()+"],教研室["+sysOrg.getName()+"]未设置印品");
+            throw ExceptionResultEnum.ERROR.exception("考试[" + basicExam.getName() + "],教研室[" + sysOrg.getName() + "]未设置印品");
         }
         if (basicPrintConfigs.size() != 1) {
-            throw ExceptionResultEnum.ERROR.exception("考试["+basicExam.getName()+"],教研室["+sysOrg.getName()+"]查询出多个印品配置");
+            throw ExceptionResultEnum.ERROR.exception("考试[" + basicExam.getName() + "],教研室[" + sysOrg.getName() + "]查询出多个印品配置");
         }
         BasicPrintConfig printConfig = basicPrintConfigs.get(0);
-        if(!printConfig.getEnable()){
-            throw ExceptionResultEnum.ERROR.exception("考试["+basicExam.getName()+"],教研室["+sysOrg.getName()+"]印品配置已禁用，请先开启");
+        if (!printConfig.getEnable()) {
+            throw ExceptionResultEnum.ERROR.exception("考试[" + basicExam.getName() + "],教研室[" + sysOrg.getName() + "]印品配置已禁用，请先开启");
         }
         return printConfig;
     }
+
+    @Override
+    public List<String> listOrgIdsByExamId(Long examId) {
+        QueryWrapper<BasicPrintConfig> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().eq(BasicPrintConfig::getExamId, examId);
+        List<BasicPrintConfig> basicPrintConfigs = this.list(queryWrapper);
+        List<String> orgIds = new ArrayList<>();
+        for (BasicPrintConfig basicPrintConfig : basicPrintConfigs) {
+            List<SysOrg> sysOrgList = basicTemplateOrgService.listByTypeAndTemplateId(TemplateTypeEnum.PRINT_CONFIG.name(), basicPrintConfig.getId());
+            for (SysOrg sysOrg : sysOrgList) {
+                orgIds.add(String.valueOf(sysOrg.getId()));
+            }
+        }
+        return orgIds;
+    }
+
+    @Transactional
+    @Override
+    public boolean delete(Long id) {
+        this.removeById(id);
+        // 删除适用学院
+        basicTemplateOrgService.removeByRuleId(id);
+        return true;
+    }
 }

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

@@ -745,13 +745,13 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
     }
 
     @Override
-    public IPage<ExamTaskDto> listTaskApply(String auditStatus, Long cardRuleId, String
+    public IPage<ExamTaskDto> listTaskApply(Long semesterId, Long examId, String auditStatus, Long cardRuleId, String
             courseCode, String paperNumber, Long startTime, Long endTime, String userName, Integer pageNumber, Integer pageSize) {
         userName = SystemConstant.translateSpecificSign(userName);
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
         Set<Long> orgIds = teachcloudCommonService.listSubOrgIds(null);
-        IPage<ExamTaskDto> examTaskDtoIPage = this.baseMapper.listTaskApply(new Page<>(pageNumber, pageSize), schoolId, auditStatus, cardRuleId, courseCode, paperNumber, startTime, endTime, sysUser.getId(), orgIds, userName);
+        IPage<ExamTaskDto> examTaskDtoIPage = this.baseMapper.listTaskApply(new Page<>(pageNumber, pageSize), schoolId, semesterId, examId, auditStatus, cardRuleId, courseCode, paperNumber, startTime, endTime, sysUser.getId(), orgIds, userName);
 //        List<PrintPlanStatusEnum> printPlanStatusEnumList = new ArrayList<>();
 //        printPlanStatusEnumList.add(PrintPlanStatusEnum.PRINTING);
 //        printPlanStatusEnumList.add(PrintPlanStatusEnum.PRINT_FINISH);
@@ -769,24 +769,24 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
     }
 
     @Override
-    public IPage<ExamTaskDto> listTaskReviewUnaudited(String courseCode, String paperNumber, Long userId, Long
+    public IPage<ExamTaskDto> listTaskReviewUnaudited(Long semesterId, Long examId, String courseCode, String paperNumber, Long userId, Long
             cardRuleId, Long startTime, Long endTime, Long startCreateTime, Long endCreateTime, String createName, Integer pageNumber, Integer pageSize) {
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
         createName = SystemConstant.translateSpecificSign(createName);
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
         Set<Long> orgIds = teachcloudCommonService.listSubOrgIds(null);
-        IPage<ExamTaskDto> examTaskDtoIPage = this.baseMapper.listTaskReviewUnaudited(new Page<>(pageNumber, pageSize), schoolId, courseCode, paperNumber, userId, cardRuleId, startTime, endTime, orgIds, startCreateTime, endCreateTime, createName, sysUser.getId());
+        IPage<ExamTaskDto> examTaskDtoIPage = this.baseMapper.listTaskReviewUnaudited(new Page<>(pageNumber, pageSize), schoolId, semesterId, examId, courseCode, paperNumber, userId, cardRuleId, startTime, endTime, orgIds, startCreateTime, endCreateTime, createName, sysUser.getId());
         return examTaskDtoIPage;
     }
 
     @Override
-    public IPage<ExamTaskDto> listTaskReviewAudited(String reviewStatus, String courseCode, String
+    public IPage<ExamTaskDto> listTaskReviewAudited(Long semesterId, Long examId, String reviewStatus, String courseCode, String
             paperNumber, Long userId, Long cardRuleId, Long startTime, Long endTime, Long startCreateTime, Long endCreateTime, String createName, Integer pageNumber, Integer pageSize) {
         createName = SystemConstant.translateSpecificSign(createName);
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
         Set<Long> orgIds = teachcloudCommonService.listSubOrgIds(null);
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
-        IPage<ExamTaskDto> examTaskDtoIPage = this.baseMapper.listTaskReviewAudited(new Page<>(pageNumber, pageSize), schoolId, reviewStatus, courseCode, paperNumber, userId, cardRuleId, startTime, endTime, orgIds, startCreateTime, endCreateTime, createName, sysUser.getId());
+        IPage<ExamTaskDto> examTaskDtoIPage = this.baseMapper.listTaskReviewAudited(new Page<>(pageNumber, pageSize), schoolId, semesterId, examId, reviewStatus, courseCode, paperNumber, userId, cardRuleId, startTime, endTime, orgIds, startCreateTime, endCreateTime, createName, sysUser.getId());
         return examTaskDtoIPage;
     }
 

distributed-print-business/src/main/java/com/qmth/distributed/print/business/util/CreatePdfUtil.java

@@ -696,6 +696,7 @@ public class CreatePdfUtil {
             dirNameA4 = dirNameA4.replaceAll("\\\\", "/");
             localA4PdfFile = new File(stringJoiner.toString() + File.separator + dirNameA4);
         }
+        // 试卷+题卡
         if (Objects.nonNull(dirNameA3)) {
             dirNameA3 = dirNameA3.replaceAll("\\\\", "/");
             localA3PdfFile = new File(stringJoiner.toString() + File.separator + dirNameA3);
@@ -704,12 +705,17 @@ public class CreatePdfUtil {
             tbTask.setImportFilePath(basicAttachment.getPath());
             examDetail.setAttachmentId(basicAttachment.getId());
         }
+        // 题卡
         if (Objects.nonNull(dirNameCardA3)) {
             dirNameCardA3 = dirNameCardA3.replaceAll("\\\\", "/");
             localA3PdfCardFile = new File(stringJoiner.toString() + File.separator + dirNameCardA3);
             basicAttachment = basicAttachmentService.saveAttachmentPdf(dirNameCardA3, userId);
-            tbTask.setImportFileName(basicAttachment.getName());
-            tbTask.setImportFilePath(basicAttachment.getPath());
+            if(StringUtils.isBlank(tbTask.getImportFileName())) {
+                tbTask.setImportFileName(basicAttachment.getName());
+            }
+            if(StringUtils.isBlank(tbTask.getImportFilePath())) {
+                tbTask.setImportFilePath(basicAttachment.getPath());
+            }
             examDetail.setCardAttachmentId(basicAttachment.getId());
         }
         examDetail.setPagesA3(PdfUtil.getPdfPages(localA3PdfFile));

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

@@ -153,8 +153,9 @@
                 bca.campus_name campusName
              FROM
                  teach_student ts
+                    join basic_student bs on ts.student_id = bs.id
                     INNER JOIN teach_clazz tc ON ts.teach_clazz_id = tc.id
-                    LEFT JOIN basic_campus bca ON ts.campus_id = bca.id
+                    LEFT JOIN basic_campus bca ON bs.campus_id = bca.id
             <where>
                 <if test="schoolId != null and schoolId != ''">
                     AND ts.school_id = #{schoolId}

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

@@ -222,6 +222,12 @@
             <if test="schoolId != null and schoolId != ''">
                 and a.school_id = #{schoolId}
             </if>
+            <if test="semesterId != null and semesterId != ''">
+                and g.id = #{semesterId}
+            </if>
+            <if test="examId != null and examId != ''">
+                and f.id = #{examId}
+            </if>
             <if test="auditStatus != null">
                 and e.status = #{auditStatus}
             </if>
@@ -313,6 +319,12 @@
             <if test="schoolId != null and schoolId != ''">
                 and a.school_id = #{schoolId}
             </if>
+            <if test="semesterId != null and semesterId != ''">
+                and bs.id = #{semesterId}
+            </if>
+            <if test="examId != null and examId != ''">
+                and be.id = #{examId}
+            </if>
             <if test="courseCode != null and courseCode != ''">
                 and a.course_code = #{courseCode}
             </if>
@@ -376,7 +388,11 @@
         f.status as flowStatus,
         a.teacher_name teacherName,
         a.lecturer_name lecturerName,
-        e.name teachingRoomName
+        e.name teachingRoomName,
+        a.exam_id examId,
+        be.name examName,
+        bs.id semesterId,
+        bs.name semesterName
         FROM
         exam_task a
         left join t_f_flow_join tffj on
@@ -391,6 +407,10 @@
             a.school_id = f.school_id and a.flow_id = f.flow_id
         LEFT JOIN
             sys_org e ON a.teaching_room_id = e.id
+        LEFT JOIN
+            basic_exam be on a.school_id = be.school_id and a.exam_id = be.id
+        LEFT JOIN
+            basic_semester bs on be.school_id = bs.school_id and be.semester_id = bs.id
         <where>
             a.enable = true and a.review = true
             and (f.status = 'AUDITING' or f.status = 'REJECT' or f.status = 'FINISH')

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

@@ -17,6 +17,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
+import java.util.List;
 
 /**
  * <p>
@@ -79,6 +80,17 @@ public class BasicPrintConfigController {
         return ResultUtil.ok(isSuccess);
     }
 
+    /**
+     *
+     * @param id 印品配置ID
+     */
+    @ApiOperation(value = "删除")
+    @RequestMapping(value = "/delete", method = RequestMethod.POST)
+    public Result delete(@RequestParam(value = "id", required = false) Long id) {
+        boolean isSuccess = basicPrintConfigService.delete(id);
+        return ResultUtil.ok(isSuccess);
+    }
+
     /**
      * 启用/禁用
      *
@@ -90,5 +102,16 @@ public class BasicPrintConfigController {
         BasicPrintConfig basicPrintConfig = basicPrintConfigService.getByExamIdAndOrgId(examId, orgId);
         return ResultUtil.ok(basicPrintConfig);
     }
+
+    /**
+     *  查询考试下设置印品的机构集合
+     * @param examId 考试ID
+     */
+    @ApiOperation(value = "查询考试下设置印品的机构集合")
+    @RequestMapping(value = "/list_org_id_by_exam_id", method = RequestMethod.POST)
+    public Result getByOrgId(@RequestParam(value = "examId") Long examId) {
+        List<String> orgIds = basicPrintConfigService.listOrgIdsByExamId(examId);
+        return ResultUtil.ok(orgIds);
+    }
 }
 

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

@@ -250,7 +250,9 @@ public class ExamTaskController {
      */
     @ApiOperation(value = "入库申请-分页查询")
     @RequestMapping(value = "/apply_list", method = RequestMethod.POST)
-    public Result taskApplyList(@RequestParam(value = "auditStatus", required = false) String auditStatus,
+    public Result taskApplyList(@RequestParam(value = "semesterId", required = false) Long semesterId,
+                                @RequestParam(value = "examId", required = false) Long examId,
+                                @RequestParam(value = "auditStatus", required = false) String auditStatus,
                                 @RequestParam(value = "cardRuleId", required = false) String cardRuleId,
                                 @RequestParam(value = "courseCode", required = false) String courseCode,
                                 @RequestParam(value = "paperNumber", required = false) String paperNumber,
@@ -259,7 +261,7 @@ public class ExamTaskController {
                                 @RequestParam(value = "userName", required = false) String userName,
                                 @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.listTaskApply(auditStatus, SystemConstant.convertIdToLong(cardRuleId), courseCode, paperNumber, startTime, endTime, userName, pageNumber, pageSize));
+        return ResultUtil.ok(examTaskService.listTaskApply(semesterId, examId, auditStatus, SystemConstant.convertIdToLong(cardRuleId), courseCode, paperNumber, startTime, endTime, userName, pageNumber, pageSize));
     }
 
     /**
@@ -370,7 +372,9 @@ public class ExamTaskController {
      */
     @ApiOperation(value = "入库审核-查询-未审核")
     @RequestMapping(value = "/review_list_unaudited", method = RequestMethod.POST)
-    public Result taskReviewListUnaudited(@RequestParam(value = "courseCode", required = false) String courseCode,
+    public Result taskReviewListUnaudited(@RequestParam(value = "semesterId", required = false) Long semesterId,
+                                          @RequestParam(value = "examId", required = false) Long examId,
+                                          @RequestParam(value = "courseCode", required = false) String courseCode,
                                           @RequestParam(value = "paperNumber", required = false) String paperNumber,
                                           @RequestParam(value = "userId", required = false) Long userId,
                                           @RequestParam(value = "cardRuleId", required = false) String cardRuleId,
@@ -381,7 +385,7 @@ public class ExamTaskController {
                                           @RequestParam(value = "createName", required = false) String createName,
                                           @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.listTaskReviewUnaudited(courseCode, paperNumber, userId, SystemConstant.convertIdToLong(cardRuleId), startTime, endTime, startCreateTime, endCreateTime, createName, pageNumber, pageSize));
+        return ResultUtil.ok(examTaskService.listTaskReviewUnaudited(semesterId, examId, courseCode, paperNumber, userId, SystemConstant.convertIdToLong(cardRuleId), startTime, endTime, startCreateTime, endCreateTime, createName, pageNumber, pageSize));
     }
 
     /**
@@ -402,8 +406,9 @@ public class ExamTaskController {
      */
     @ApiOperation(value = "入库审核-查询-已审核")
     @RequestMapping(value = "/review_list_audited", method = RequestMethod.POST)
-    public Result taskReviewListAudited(@RequestParam(value = "reviewStatus", required = false) String
-                                                reviewStatus,
+    public Result taskReviewListAudited(@RequestParam(value = "semesterId", required = false) Long semesterId,
+                                        @RequestParam(value = "examId", required = false) Long examId,
+                                        @RequestParam(value = "reviewStatus", required = false) String reviewStatus,
                                         @RequestParam(value = "courseCode", required = false) String courseCode,
                                         @RequestParam(value = "paperNumber", required = false) String paperNumber,
                                         @RequestParam(value = "userId", required = false) Long userId,
@@ -415,7 +420,7 @@ public class ExamTaskController {
                                         @RequestParam(value = "createName", required = false) String createName,
                                         @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.listTaskReviewAudited(reviewStatus, courseCode, paperNumber, userId, SystemConstant.convertIdToLong(cardRuleId), startTime, endTime, startCreateTime, endCreateTime, createName, pageNumber, pageSize));
+        return ResultUtil.ok(examTaskService.listTaskReviewAudited(semesterId, examId, reviewStatus, courseCode, paperNumber, userId, SystemConstant.convertIdToLong(cardRuleId), startTime, endTime, startCreateTime, endCreateTime, createName, pageNumber, pageSize));
     }
 
     /**