Просмотр исходного кода

入库申请-新建命题任务

xiaof 3 лет назад
Родитель
Сommit
0ea6c39ac6

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

@@ -159,4 +159,6 @@ public interface ExamTaskService extends IService<ExamTask> {
      * @return
      */
     public IPage<WorkResult> getFlowTaskReadyList(IPage<Map> iPage, Long schoolId, Long orgId, Long userId);
+
+    void switchCard(Long examTaskId);
 }

+ 1 - 0
distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/ExamTaskPrintServiceImpl.java

@@ -283,6 +283,7 @@ public class ExamTaskPrintServiceImpl extends ServiceImpl<ExamTaskPrintMapper, E
 
     @Override
     public List<TaskPrintHouseDto> listHouse() {
+        // todo  xf
         return null;
     }
 

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

@@ -1315,4 +1315,35 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
     public IPage<WorkResult> getFlowTaskReadyList(IPage<Map> iPage, Long schoolId, Long orgId, Long userId) {
         return examTaskMapper.getFlowTaskReadyList(iPage, schoolId, orgId, String.valueOf(userId));
     }
+
+    @Transactional
+    @Override
+    public void switchCard(Long examTaskId) {
+        ExamTaskDetail examTaskDetail = examTaskDetailService.getByExamTaskId(examTaskId);
+        if(examTaskDetail == null){
+            throw ExceptionResultEnum.ERROR.exception("命题任务不存在");
+        }
+        if(examTaskDetail.getCardId() == null){
+            throw ExceptionResultEnum.ERROR.exception("命题任务没有绑定题卡");
+        }
+        ExamCard examCard = examCardService.getById(examTaskDetail.getCardId());
+        if(examCard == null){
+            throw ExceptionResultEnum.ERROR.exception("题卡不存在");
+        }
+        if(MakeMethodEnum.CUST.equals(examCard.getMakeMethod())){
+            throw ExceptionResultEnum.ERROR.exception("客户制卡方式,不能切换");
+        }
+
+        if(MakeMethodEnum.SELF.equals(examCard.getMakeMethod())) {
+            UpdateWrapper<ExamTaskDetail> updateWrapper = new UpdateWrapper<>();
+            updateWrapper.lambda().eq(ExamTaskDetail::getCardId, examTaskDetail.getCardId());
+            examTaskDetailService.remove(updateWrapper);
+
+            examCardService.removeById(examTaskDetail.getCardId());
+        }
+
+        UpdateWrapper<ExamTaskDetail> examTaskDetailUpdateWrapper = new UpdateWrapper<>();
+        examTaskDetailUpdateWrapper.lambda().set(ExamTaskDetail::getCardId, null).eq(ExamTaskDetail::getId, examTaskDetail.getId());
+        examTaskDetailService.update(examTaskDetailUpdateWrapper);
+    }
 }

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

@@ -553,22 +553,19 @@ public class ExamTaskController {
     }
 
     /**
-     * 暂存/提交
+     * 入库申请-新建命题任务
      *
      * @param examTaskApplyParam
      * @return
      */
     @ApiOperation(value = "暂存/提交")
-    @RequestMapping(value = "/apply_save", method = RequestMethod.POST)
-    public Result taskApplySave(@RequestBody ExamTaskApplyParam examTaskApplyParam) throws IOException {
-
+    @RequestMapping(value = "/save_task_apply", method = RequestMethod.POST)
+    public Result saveTaskApply(@RequestBody ExamTaskApplyParam examTaskApplyParam) throws IOException {
+        SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
         ExamTask task = examTaskService.saveExamTaskNew(examTaskApplyParam.getExamTask());
-        //发送短信
-        if (task.getId() != null) {
-            basicMessageService.sendNoticeTaskCreate(task);
-        }
-
+        task.setUserId(sysUser.getId());
         ExamTaskDetail examTaskDetail = examTaskApplyParam.getExamTaskDetail();
+        examTaskDetail.setExamTaskId(task.getId());
         boolean isSuccess = examTaskService.saveExamTaskDetail(examTaskDetail);
         ExamTask examTask = examTaskService.getById(examTaskDetail.getExamTaskId());
         if (examTaskDetail.getOperateType().equals(ExamStatusEnum.SUBMIT.name()) && !examTask.getReview()) {
@@ -579,6 +576,19 @@ public class ExamTaskController {
         return ResultUtil.ok(isSuccess);
     }
 
+    /**
+     * 入库申请-新建命题任务-切换题卡
+     *
+     * @param examTaskId
+     * @return
+     */
+    @ApiOperation(value = "切换题卡")
+    @RequestMapping(value = "/switch_card", method = RequestMethod.POST)
+    public Result switchCard(@RequestParam(value = "examTaskId") Long examTaskId) {
+        examTaskService.switchCard(examTaskId);
+        return ResultUtil.ok(true, "");
+    }
+
     /**
      * 查看印刷任务发布
      *
@@ -626,8 +636,8 @@ public class ExamTaskController {
     @ApiOperation(value = "卷库查询-发布印刷任务-班级列表")
     @RequestMapping(value = "/list_task_print_class", method = RequestMethod.POST)
     public Result listTaskPrintClass(@RequestParam(value = "printPlanId") String printPlanId,
-                                       @RequestParam(value = "courseCode") String courseCode,
-                                       @RequestParam(value = "paperNumber") String paperNumber) {
+                                     @RequestParam(value = "courseCode") String courseCode,
+                                     @RequestParam(value = "paperNumber") String paperNumber) {
         List<TaskPrintClassDto> classDtos = examTaskPrintService.listClass(printPlanId, courseCode, paperNumber);
         return ResultUtil.ok(classDtos);
     }