Merge remote-tracking branch 'origin/dev_v3.0.0' into dev_v3.0.0

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

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.qmth.distributed.print.business.bean.dto.BasicPrintConfigDto;
 import com.qmth.teachcloud.common.entity.BasicPrintConfig;
-import com.sun.org.apache.xpath.internal.operations.Bool;
 
 /**
  * <p>
@@ -37,4 +36,12 @@ public interface BasicPrintConfigService extends IService<BasicPrintConfig> {
      */
     BasicPrintConfig getByCourseCodeAndPaperNumber(String courseCode, String paperNumber);
 
+    /**
+     * 根据examId和orgId查询印品
+     *
+     * @param examId 考试ID
+     * @param orgId 机构ID
+     * @return BasicPrintConfig
+     */
+    BasicPrintConfig getByExamIdAndOrgId(Long examId, Long orgId);
 }

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

@@ -168,7 +168,13 @@ public class BasicPrintConfigServiceImpl extends ServiceImpl<BasicPrintConfigMap
         if(examTask == null){
             throw ExceptionResultEnum.ERROR.exception("命题任务不存在");
         }
-        List<BasicPrintConfig> basicPrintConfigs = this.baseMapper.listBySchoolIdAndExamIdAndOrgId(schoolId, examTask.getExamId(), orgId, TemplateTypeEnum.PRINT_CONFIG.name());
+        return getByExamIdAndOrgId(examTask.getExamId(), orgId);
+    }
+
+    @Override
+    public BasicPrintConfig getByExamIdAndOrgId(Long examId, Long orgId) {
+        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("查询出多个印品配置");
         }

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

@@ -78,5 +78,17 @@ public class BasicPrintConfigController {
         boolean isSuccess = basicPrintConfigService.enable(id, enable);
         return ResultUtil.ok(isSuccess);
     }
+
+    /**
+     * 启用/禁用
+     *
+     */
+    @ApiOperation(value = "查询orgId印品")
+    @RequestMapping(value = "/get_by_exam_id and_org_id", method = RequestMethod.POST)
+    public Result getByOrgId(@RequestParam(value = "examId") Long examId,
+                             @RequestParam(value = "orgId") Long orgId) {
+        BasicPrintConfig basicPrintConfig = basicPrintConfigService.getByExamIdAndOrgId(examId, orgId);
+        return ResultUtil.ok(basicPrintConfig);
+    }
 }