3.0.0-bug修改

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/params/ExamDetailParams.java

@@ -12,6 +12,7 @@ public class ExamDetailParams {
     private String paperNumber;
     private String courseCode;
     private String courseName;
+    private Integer printCount;
     private List<ExamDetailList> list;
 
     public Long getExamStartTime() {
@@ -54,6 +55,14 @@ public class ExamDetailParams {
         this.courseName = courseName;
     }
 
+    public Integer getPrintCount() {
+        return printCount;
+    }
+
+    public void setPrintCount(Integer printCount) {
+        this.printCount = printCount;
+    }
+
     public List<ExamDetailList> getList() {
         return list;
     }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/params/PrintPlanParams.java

@@ -27,8 +27,8 @@ public class PrintPlanParams {
     private Long schoolId;
 
     @JsonSerialize(using = ToStringSerializer.class)
-    @ApiModelProperty(value = "学期ID")
-    private Long semesterId;
+    @ApiModelProperty(value = "考试ID")
+    private Long examId;
 
     @JsonSerialize(using = ToStringSerializer.class)
     @ApiModelProperty(value = "机构id")
@@ -92,12 +92,12 @@ public class PrintPlanParams {
         this.schoolId = schoolId;
     }
 
-    public Long getSemesterId() {
-        return semesterId;
+    public Long getExamId() {
+        return examId;
     }
 
-    public void setSemesterId(Long semesterId) {
-        this.semesterId = semesterId;
+    public void setExamId(Long examId) {
+        this.examId = examId;
     }
 
     public Long getOrgId() {

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

@@ -118,6 +118,10 @@ public class ExamDetail extends BaseEntity implements Serializable {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long printHouseId;
 
+    @ApiModelProperty(value = "模式2，考生数量（打印数量）")
+    @TableField("print_count")
+    private Integer printCount;
+
     public Long getSchoolId() {
         return schoolId;
     }
@@ -313,4 +317,12 @@ public class ExamDetail extends BaseEntity implements Serializable {
     public void setCardAttachmentId(Long cardAttachmentId) {
         this.cardAttachmentId = cardAttachmentId;
     }
+
+    public Integer getPrintCount() {
+        return printCount;
+    }
+
+    public void setPrintCount(Integer printCount) {
+        this.printCount = printCount;
+    }
 }

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

@@ -21,5 +21,5 @@ public interface BasicExamMapper extends BaseMapper<BasicExam> {
      * @param schoolId 学校id
      * @return 分页结果
      */
-    IPage<BasicExamDto> findBasicExamPage(@Param("objectPage") Page<Object> objectPage, @Param("schoolId") Long schoolId, @Param("semesterId") Boolean semesterId, @Param("enable") Boolean enable, @Param("o") Object o);
+    IPage<BasicExamDto> findBasicExamPage(@Param("objectPage") Page<Object> objectPage, @Param("schoolId") Long schoolId, @Param("semesterId") Long semesterId, @Param("enable") Boolean enable, @Param("o") Object o);
 }

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

@@ -53,7 +53,7 @@ public interface BasicExamService extends IService<BasicExam> {
      * @param pageNumber 分页参数
      * @param pageSize   分页参数
      */
-    IPage<BasicExamDto> basicExamPage(Boolean semesterId, Boolean enable, Integer pageNumber, Integer pageSize);
+    IPage<BasicExamDto> basicExamPage(Long semesterId, Boolean enable, Integer pageNumber, Integer pageSize);
 
     /**
      * 启用/禁用

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

@@ -118,7 +118,7 @@ public class BasicExamServiceImpl extends ServiceImpl<BasicExamMapper, BasicExam
     }
 
     @Override
-    public IPage<BasicExamDto> basicExamPage(Boolean semesterId, Boolean enable, Integer pageNumber, Integer pageSize) {
+    public IPage<BasicExamDto> basicExamPage(Long semesterId, Boolean enable, Integer pageNumber, Integer pageSize) {
         Long schoolId = SystemConstant.convertIdToLong(ServletUtil.getRequestHeaderSchoolId().toString());
         return this.baseMapper.findBasicExamPage(new Page<>(pageNumber, pageSize), schoolId, semesterId, enable, null);
     }

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

@@ -10,16 +10,20 @@ import com.qmth.distributed.print.business.entity.BasicTemplateOrg;
 import com.qmth.distributed.print.business.entity.ExamTask;
 import com.qmth.distributed.print.business.enums.TemplateTypeEnum;
 import com.qmth.distributed.print.business.mapper.BasicPrintConfigMapper;
+import com.qmth.distributed.print.business.service.BasicExamService;
 import com.qmth.distributed.print.business.service.BasicPrintConfigService;
 import com.qmth.distributed.print.business.service.BasicTemplateOrgService;
 import com.qmth.distributed.print.business.service.ExamTaskService;
 import com.qmth.teachcloud.common.contant.SystemConstant;
+import com.qmth.teachcloud.common.entity.BasicExam;
 import com.qmth.teachcloud.common.entity.BasicPrintConfig;
 import com.qmth.teachcloud.common.entity.SysOrg;
 import com.qmth.teachcloud.common.entity.SysUser;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
 import com.qmth.teachcloud.common.service.BasicCourseService;
+import com.qmth.teachcloud.common.service.SysOrgService;
 import com.qmth.teachcloud.common.util.ServletUtil;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -48,6 +52,12 @@ public class BasicPrintConfigServiceImpl extends ServiceImpl<BasicPrintConfigMap
     @Resource
     private BasicCourseService basicCourseService;
 
+    @Autowired
+    private BasicExamService basicExamService;
+
+    @Autowired
+    private SysOrgService sysOrgService;
+
     @Override
     public IPage<BasicPrintConfigDto> listPage(Long examId, Boolean enable, Long createStartTime, Long createEndTime, Integer pageNumber, Integer pageSize) {
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
@@ -145,16 +155,19 @@ public class BasicPrintConfigServiceImpl extends ServiceImpl<BasicPrintConfigMap
         if (orgId == null) {
             throw ExceptionResultEnum.ERROR.exception("未找到课程所属机构");
         }
+        BasicExam basicExam = basicExamService.getById(examId);
+        SysOrg sysOrg = sysOrgService.getById(orgId);
+
         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() + "】对应的印品配置");
+            throw ExceptionResultEnum.ERROR.exception("未找到课程[" + basicCourseService.findByCourseCode(courseCode,schoolId).getName() + "]所属教研室["+sysOrg.getName()+"]的印品配置");
         }
         if (basicPrintConfigs.size() != 1) {
-            throw ExceptionResultEnum.ERROR.exception("查询出多个印品配置");
+            throw ExceptionResultEnum.ERROR.exception("考试["+basicExam.getName()+"],教研室["+sysOrg.getName()+"]查询出多个印品配置");
         }
         BasicPrintConfig printConfig = basicPrintConfigs.get(0);
         if(!printConfig.getEnable()){
-            throw ExceptionResultEnum.ERROR.exception("该机构印品配置已禁用");
+            throw ExceptionResultEnum.ERROR.exception("考试["+basicExam.getName()+"],教研室["+sysOrg.getName()+"]印品配置已禁用，请先开启");
         }
         return printConfig;
     }
@@ -177,17 +190,19 @@ public class BasicPrintConfigServiceImpl extends ServiceImpl<BasicPrintConfigMap
 
     @Override
     public BasicPrintConfig getByExamIdAndOrgId(Long examId, Long orgId) {
+        BasicExam basicExam = basicExamService.getById(examId);
+        SysOrg sysOrg = sysOrgService.getById(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("查询出多个印品配置");
+            throw ExceptionResultEnum.ERROR.exception("考试["+basicExam.getName()+"],教研室["+sysOrg.getName()+"]未设置印品");
         }
         if (basicPrintConfigs.size() != 1) {
-            throw ExceptionResultEnum.ERROR.exception("查询出多个印品配置");
+            throw ExceptionResultEnum.ERROR.exception("考试["+basicExam.getName()+"],教研室["+sysOrg.getName()+"]查询出多个印品配置");
         }
         BasicPrintConfig printConfig = basicPrintConfigs.get(0);
         if(!printConfig.getEnable()){
-            throw ExceptionResultEnum.ERROR.exception("该机构印品配置已禁用");
+            throw ExceptionResultEnum.ERROR.exception("考试["+basicExam.getName()+"],教研室["+sysOrg.getName()+"]印品配置已禁用，请先开启");
         }
         return printConfig;
     }

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

@@ -40,7 +40,7 @@
             <if test="semesterId != null and semesterId != ''">
                 and a.semester_id = #{semesterId}
             </if>
-            <if test="enable != null and enable != ''">
+            <if test="enable != null">
                 and a.enable = #{enable}
             </if>
         </where>

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

@@ -40,7 +40,7 @@ public class BasicExamController {
     @ApiOperation(value = "考试管理-查询")
     @RequestMapping(value = "/page", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "查询成功", response = Result.class)})
-    public Result pageExam(@RequestParam(value = "semesterId", required = false) Boolean semesterId,
+    public Result pageExam(@RequestParam(value = "semesterId", required = false) Long semesterId,
                            @RequestParam(value = "enable", required = false) Boolean enable,
                            @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
                            @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {