bug

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

@@ -71,7 +71,7 @@ public interface ActivitiService {
      *
      * @param map
      */
-    public void taskApprove(Map<String, Object> map);
+    public Map<String, Object> taskApprove(Map<String, Object> map);
 
     /**
      * 获取所有流程节点

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

@@ -313,7 +313,7 @@ public class ActivitiServiceImpl implements ActivitiService {
      */
     @Override
     @Transactional
-    public void taskApprove(Map<String, Object> map) {
+    public Map<String, Object> taskApprove(Map<String, Object> map) {
         String flowTaskId = null;
         try {
             SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
@@ -444,6 +444,11 @@ public class ActivitiServiceImpl implements ActivitiService {
                 }
                 examTask.updateInfo(sysUser.getId());
                 examTaskService.updateById(examTask);
+                Map<String, Object> objectMap = new HashMap<>();
+                objectMap.putIfAbsent("tfFlowApprove", tfFlowApprove);
+                objectMap.putIfAbsent("examTask", examTask);
+                objectMap.putIfAbsent("sysUser", sysUser);
+                return objectMap;
             } else {
                 throw ExceptionResultEnum.ERROR.exception("正在审批中，请稍候再试！");
             }
@@ -458,6 +463,7 @@ public class ActivitiServiceImpl implements ActivitiService {
         } finally {
             redisUtil.releaseLock(SystemConstant.REDIS_LOCK_FLOW_TASK_PREFIX + flowTaskId);
         }
+        return null;
     }
 
     /**

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

@@ -260,7 +260,6 @@ public class ExamTaskController {
      * 入库申请查询
      *
      * @param auditStatus
-     * @param reviewStatus
      * @param cardRuleId
      * @param courseCode
      * @param paperNumber

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

@@ -11,7 +11,9 @@ import com.qmth.distributed.print.business.bean.result.EditResult;
 import com.qmth.distributed.print.business.bean.result.FlowApproveResult;
 import com.qmth.distributed.print.business.bean.result.FlowTaskApprovePeopleAllResult;
 import com.qmth.distributed.print.business.bean.result.FlowTaskResult;
+import com.qmth.distributed.print.business.entity.ExamTask;
 import com.qmth.distributed.print.business.entity.TFFlow;
+import com.qmth.distributed.print.business.entity.TFFlowApprove;
 import com.qmth.distributed.print.business.entity.TFFlowApproveLog;
 import com.qmth.distributed.print.business.service.ActivitiService;
 import com.qmth.distributed.print.business.service.PrintCommonService;
@@ -20,10 +22,7 @@ import com.qmth.distributed.print.business.service.TFFlowService;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.BasicAttachment;
 import com.qmth.teachcloud.common.entity.SysUser;
-import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
-import com.qmth.teachcloud.common.enums.FieldUniqueEnum;
-import com.qmth.teachcloud.common.enums.FlowApprovePassEnum;
-import com.qmth.teachcloud.common.enums.UploadFileEnum;
+import com.qmth.teachcloud.common.enums.*;
 import com.qmth.teachcloud.common.service.BasicAttachmentService;
 import com.qmth.teachcloud.common.util.AesUtil;
 import com.qmth.teachcloud.common.util.Result;
@@ -41,6 +40,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
 import javax.validation.Valid;
+import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
@@ -75,6 +75,7 @@ public class TFFlowController {
     @Resource
     TFFlowApproveLogService tfFlowApproveLogService;
 
+
     @ApiOperation(value = "注册流程")
     @Transactional
     @ApiResponses({@ApiResponse(code = 200, message = "常规信息", response = ResultUtil.class)})
@@ -157,7 +158,20 @@ public class TFFlowController {
         map.computeIfAbsent(SystemConstant.APPROVE_OPERATION, v -> approvePass);
         map.computeIfAbsent(SystemConstant.APPROVE_REMARK, v -> remark);
         map.computeIfAbsent(SystemConstant.APPROVE_SETUP, v -> setup);
-        activitiService.taskApprove(map);
+        Map<String, Object> objectMap = activitiService.taskApprove(map);
+        if(Objects.nonNull(objectMap)) {
+            TFFlowApprove tfFlowApprove = (TFFlowApprove) objectMap.get("tfFlowApprove");
+            //审核通过，生成pdf
+            if(Objects.nonNull(tfFlowApprove) && FlowGdykdxApproveSetupEnum.FINISH.getSetup() == tfFlowApprove.getSetup()) {
+                ExamTask examTask = (ExamTask) objectMap.get("examTask");
+                SysUser sysUser = (SysUser) objectMap.get("sysUser");
+                try {
+                    printCommonService.checkData(examTask.getSchoolId(), examTask.getCourseCode(), examTask.getPaperNumber(), sysUser);
+                } catch (IOException e) {
+                    throw ExceptionResultEnum.ERROR.exception("生成pdf失败");
+                }
+            }
+        }
         return ResultUtil.ok();
     }