wangliang пре 4 година
родитељ
комит
de63678ac3

+ 5 - 5
distributed-print/src/main/java/com/qmth/distributed/print/api/ExamPrintPlanController.java

@@ -15,9 +15,9 @@ import com.qmth.distributed.print.business.bean.params.PrintPlanParams;
 import com.qmth.distributed.print.business.bean.params.RelatePaperParam;
 import com.qmth.distributed.print.business.bean.params.RelatePaperParam;
 import com.qmth.distributed.print.business.bean.result.EditResult;
 import com.qmth.distributed.print.business.bean.result.EditResult;
 import com.qmth.distributed.print.business.entity.ExamDetail;
 import com.qmth.distributed.print.business.entity.ExamDetail;
-import com.qmth.distributed.print.business.entity.ExamPrintPlan;
 import com.qmth.distributed.print.business.entity.SysUser;
 import com.qmth.distributed.print.business.entity.SysUser;
 import com.qmth.distributed.print.business.entity.TBTask;
 import com.qmth.distributed.print.business.entity.TBTask;
+import com.qmth.distributed.print.business.enums.ExamDetailStatusEnum;
 import com.qmth.distributed.print.business.enums.PrintPlanStatusEnum;
 import com.qmth.distributed.print.business.enums.PrintPlanStatusEnum;
 import com.qmth.distributed.print.business.enums.TaskTypeEnum;
 import com.qmth.distributed.print.business.enums.TaskTypeEnum;
 import com.qmth.distributed.print.business.service.*;
 import com.qmth.distributed.print.business.service.*;
@@ -304,10 +304,10 @@ public class ExamPrintPlanController {
         if (bindingResult.hasErrors()) {
         if (bindingResult.hasErrors()) {
             return ResultUtil.error(bindingResult.getAllErrors().get(0).getDefaultMessage());
             return ResultUtil.error(bindingResult.getAllErrors().get(0).getDefaultMessage());
         }
         }
-        List<ExamPrintPlan> examPrintPlanList = examPrintPlanService.listByIds(Arrays.asList(arraysParams.getIds()));
-        for (ExamPrintPlan examPrintPlan : examPrintPlanList) {
-            if (examPrintPlan.getStatus() != PrintPlanStatusEnum.READY && examPrintPlan.getStatus() != PrintPlanStatusEnum.PRINTING) {
-                throw ExceptionResultEnum.ERROR.exception("状态只能为就绪或印刷中才能打印");
+        List<ExamDetail> examDetailList = examDetailService.listByIds(Arrays.asList(arraysParams.getIds()));
+        for (ExamDetail ExamDetail : examDetailList) {
+            if (ExamDetail.getStatus() != ExamDetailStatusEnum.READY && ExamDetail.getStatus() != ExamDetailStatusEnum.PRINTING) {
+                throw ExceptionResultEnum.ERROR.exception("状态只能为就绪或印刷中才能下载");
             }
             }
         }
         }
         Map<String, Object> map = tbTaskService.saveTask(TaskTypeEnum.PRINT_PDF_DOWNLOAD, arraysParams, (SysUser) ServletUtil.getRequestUser());
         Map<String, Object> map = tbTaskService.saveTask(TaskTypeEnum.PRINT_PDF_DOWNLOAD, arraysParams, (SysUser) ServletUtil.getRequestUser());