江西中医药流程修改

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/dto/ExamTaskDetailCardDto.java

@@ -1,5 +1,7 @@
 package com.qmth.distributed.print.business.bean.dto;
 
+import io.swagger.annotations.ApiModelProperty;
+
 /**
  * @Date: 2021/3/31.
  */
@@ -23,6 +25,17 @@ public class ExamTaskDetailCardDto {
     // 审核流程taskId
     private String flowTaskId;
 
+    @ApiModelProperty(value = "是否是子流程驳回")
+    private boolean subFlowReject;
+
+    public boolean isSubFlowReject() {
+        return subFlowReject;
+    }
+
+    public void setSubFlowReject(boolean subFlowReject) {
+        this.subFlowReject = subFlowReject;
+    }
+
     public String getExamTaskId() {
         return examTaskId;
     }

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

@@ -1,6 +1,5 @@
 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;
@@ -326,6 +325,7 @@ public class ExamTaskController {
                 TExamTaskFlow tExamTaskFlow = tExamTaskFlowService.findByFlowLevel(Long.parseLong(detail.getExamTaskId()));
                 task = taskService.createTaskQuery().processInstanceId(String.valueOf(tExamTaskFlow.getFlowId())).singleResult();
                 if (Objects.nonNull(task)) {
+                    detail.setSubFlowReject(true);
                     detail.setFlowTaskId(task.getId());
                     detail.setFlowId(String.valueOf(tExamTaskFlow.getFlowId()));
                 }
@@ -804,7 +804,7 @@ public class ExamTaskController {
                                        @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
                                        @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
         Set<Long> classIds = Arrays.stream(classId.split(",")).map(SystemConstant::convertIdToLong).collect(Collectors.toSet());
-        return ResultUtil.ok(basicStudentService.basicStudentPage(null, null, null,null,classIds, pageNumber, pageSize));
+        return ResultUtil.ok(basicStudentService.basicStudentPage(null, null, null, null, classIds, pageNumber, pageSize));
     }
 
     /**