命题老师重新提交试卷

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

@@ -0,0 +1,30 @@
+package com.qmth.distributed.print.business.bean.params;
+
+
+import com.qmth.distributed.print.business.entity.ExamTaskDetail;
+
+/**
+ * @Date: 2021/3/23.
+ */
+public class ExamTaskReApplyParam {
+
+    private ExamTaskDetail examTaskDetail;
+
+    private String flowTaskId;
+
+    public ExamTaskDetail getExamTaskDetail() {
+        return examTaskDetail;
+    }
+
+    public void setExamTaskDetail(ExamTaskDetail examTaskDetail) {
+        this.examTaskDetail = examTaskDetail;
+    }
+
+    public String getFlowTaskId() {
+        return flowTaskId;
+    }
+
+    public void setFlowTaskId(String flowTaskId) {
+        this.flowTaskId = flowTaskId;
+    }
+}

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

@@ -6,6 +6,7 @@ import com.qmth.distributed.print.business.bean.dto.*;
 import com.qmth.distributed.print.business.bean.dto.approvalForm.ExamTaskApprovalFormDto;
 import com.qmth.distributed.print.business.bean.dto.examObject.ExamObjectDto;
 import com.qmth.distributed.print.business.bean.params.ExamTaskApplyParam;
+import com.qmth.distributed.print.business.bean.params.ExamTaskReApplyParam;
 import com.qmth.distributed.print.business.bean.result.WorkResult;
 import com.qmth.distributed.print.business.entity.ExamTask;
 import com.qmth.distributed.print.business.entity.ExamTaskApplyTemp;
@@ -249,4 +250,10 @@ public interface ExamTaskService extends IService<ExamTask> {
      * @return
      */
     public String getProcessDefinitionIdByMaxVersion(String key);
+
+    /**
+     * 印刷员驳回，命题老师重新提交
+     * @param map
+     */
+    void applyResave(ExamTaskReApplyParam map);
 }

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

@@ -11,10 +11,7 @@ import com.google.gson.Gson;
 import com.qmth.distributed.print.business.bean.dto.*;
 import com.qmth.distributed.print.business.bean.dto.approvalForm.*;
 import com.qmth.distributed.print.business.bean.dto.examObject.ExamObjectDto;
-import com.qmth.distributed.print.business.bean.params.ExamDetailList;
-import com.qmth.distributed.print.business.bean.params.ExamDetailParams;
-import com.qmth.distributed.print.business.bean.params.ExamTaskApplyParam;
-import com.qmth.distributed.print.business.bean.params.SerialNumberParams;
+import com.qmth.distributed.print.business.bean.params.*;
 import com.qmth.distributed.print.business.bean.result.WorkResult;
 import com.qmth.distributed.print.business.entity.*;
 import com.qmth.distributed.print.business.enums.*;
@@ -1947,6 +1944,22 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
         return examTaskMapper.getProcessDefinitionIdByMaxVersion(key);
     }
 
+    @Transactional
+    @Override
+    public void applyResave(ExamTaskReApplyParam examTaskReApplyParam) {
+        ExamTaskDetail examTaskDetail = examTaskReApplyParam.getExamTaskDetail();
+        UpdateWrapper<ExamTaskDetail> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.lambda().set(ExamTaskDetail::getPaperAttachmentIds, examTaskDetail.getPaperAttachmentIds()).eq(ExamTaskDetail::getExamTaskId, examTaskDetail.getExamTaskId());
+        examTaskDetailService.update(updateWrapper);
+
+        String flowTaskId = examTaskReApplyParam.getFlowTaskId();
+
+        Map<String, Object> map1 = new HashMap<>();
+        map1.putIfAbsent(SystemConstant.FLOW_TASK_ID, flowTaskId);
+        map1.computeIfAbsent(SystemConstant.PAPAER_ATTACHMENT_IDS, v -> examTaskDetail.getPaperAttachmentIds());
+        activitiService.taskApprove(map1);
+    }
+
     /**
      * 简单校验提交参数
      *

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

@@ -1,5 +1,6 @@
 package com.qmth.distributed.print.api;
 
+import com.alibaba.fastjson.JSONObject;
 import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.boot.api.exception.ApiException;
 import com.qmth.distributed.print.business.bean.dto.ExamTaskDetailCardDto;
@@ -8,6 +9,7 @@ import com.qmth.distributed.print.business.bean.dto.ExamTaskPrintDto;
 import com.qmth.distributed.print.business.bean.params.ApproveFormParams;
 import com.qmth.distributed.print.business.bean.params.ExamTaskApplyParam;
 import com.qmth.distributed.print.business.bean.params.ExamTaskPrintParams;
+import com.qmth.distributed.print.business.bean.params.ExamTaskReApplyParam;
 import com.qmth.distributed.print.business.bean.result.EditResult;
 import com.qmth.distributed.print.business.entity.*;
 import com.qmth.distributed.print.business.enums.ExamStatusEnum;
@@ -337,6 +339,13 @@ public class ExamTaskController {
         return ResultUtil.ok(isSuccess);
     }
 
+    @ApiOperation(value = "审核-印刷员驳回后命题老师修改")
+    @RequestMapping(value = "/apply_resave", method = RequestMethod.POST)
+    public Result taskReApplySave(@RequestBody ExamTaskReApplyParam examTaskReApplyParam) {
+        examTaskService.applyResave(examTaskReApplyParam);
+        return ResultUtil.ok();
+    }
+
     /**
      * 入库申请-撤销申请
      *