新增自定义流程属性-功能BUG修改

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

@@ -17,17 +17,17 @@ public class ExamTaskApplyParam {
     private ExamTask examTask;
     private ExamTaskDetail examTaskDetail;
 
-    @ApiModelProperty(value = "流程审批人列表")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private List<Long> approveUserIds;
+//    @ApiModelProperty(value = "流程审批人列表")
+//    @JsonSerialize(using = ToStringSerializer.class)
+//    private List<Long> approveUserIds;
 
-    public List<Long> getApproveUserIds() {
-        return approveUserIds;
-    }
+//    public List<Long> getApproveUserIds() {
+//        return approveUserIds;
+//    }
 
-    public void setApproveUserIds(List<Long> approveUserIds) {
-        this.approveUserIds = approveUserIds;
-    }
+//    public void setApproveUserIds(List<Long> approveUserIds) {
+//        this.approveUserIds = approveUserIds;
+//    }
 
     public ExamTask getExamTask() {
         return examTask;

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

@@ -1,13 +1,10 @@
 package com.qmth.distributed.print.business.bean.params;
 
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.qmth.teachcloud.common.enums.FlowApprovePassEnum;
 import io.swagger.annotations.ApiModelProperty;
 
 import javax.validation.constraints.NotNull;
 import java.io.Serializable;
-import java.util.List;
 
 /**
  * @Description: 流程任务审批参数
@@ -31,9 +28,9 @@ public class FlowTaskApproveParam implements Serializable {
     @ApiModelProperty(value = "流程驳回节点")
     private Integer setup;
 
-    @ApiModelProperty(value = "流程审批人列表")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private List<Long> approveUserIds;
+//    @ApiModelProperty(value = "流程审批人列表")
+//    @JsonSerialize(using = ToStringSerializer.class)
+//    private List<Long> approveUserIds;
 
     public String getTaskId() {
         return taskId;
@@ -67,11 +64,11 @@ public class FlowTaskApproveParam implements Serializable {
         this.setup = setup;
     }
 
-    public List<Long> getApproveUserIds() {
-        return approveUserIds;
-    }
-
-    public void setApproveUserIds(List<Long> approveUserIds) {
-        this.approveUserIds = approveUserIds;
-    }
+//    public List<Long> getApproveUserIds() {
+//        return approveUserIds;
+//    }
+//
+//    public void setApproveUserIds(List<Long> approveUserIds) {
+//        this.approveUserIds = approveUserIds;
+//    }
 }

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

@@ -982,7 +982,7 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
             if (Objects.nonNull(task)) {
                 Map<String, Object> map = new HashMap<>();
                 map.computeIfAbsent(SystemConstant.FLOW_TASK_ID, v -> task.getId());
-                map.computeIfAbsent(SystemConstant.APPROVE_USER_IDS, v -> examTaskDetail.getApproveUserIds());
+//                map.computeIfAbsent(SystemConstant.APPROVE_USER_IDS, v -> examTaskDetail.getApproveUserIds());
                 map.computeIfAbsent(SystemConstant.PAPAER_ATTACHMENT_IDS, v -> examTaskDetail.getPaperAttachmentIds());
                 activitiService.taskApprove(map);
             }
@@ -1537,7 +1537,7 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
                     if (Objects.nonNull(task)) {
                         Map<String, Object> map1 = new HashMap<>();
                         map1.computeIfAbsent(SystemConstant.FLOW_TASK_ID, v -> task.getId());
-                        map1.computeIfAbsent(SystemConstant.APPROVE_USER_IDS, v -> examTaskApplyParam.getApproveUserIds());
+//                        map1.computeIfAbsent(SystemConstant.APPROVE_USER_IDS, v -> examTaskApplyParam.getApproveUserIds());
                         map1.computeIfAbsent(SystemConstant.PAPAER_ATTACHMENT_IDS, v -> examTaskDetail.getPaperAttachmentIds());
                         activitiService.taskApprove(map1);
                     }
@@ -1762,7 +1762,7 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
                 if (Objects.nonNull(task)) {
                     Map<String, Object> map1 = new HashMap<>();
                     map1.computeIfAbsent(SystemConstant.FLOW_TASK_ID, v -> task.getId());
-                    map1.computeIfAbsent(SystemConstant.APPROVE_USER_IDS, v -> examTaskApplyTemp.getApproveUserIds());
+//                    map1.computeIfAbsent(SystemConstant.APPROVE_USER_IDS, v -> examTaskApplyTemp.getApproveUserIds());
                     map1.computeIfAbsent(SystemConstant.PAPAER_ATTACHMENT_IDS, v -> examTaskDetail.getPaperAttachmentIds());
                     activitiService.taskApprove(map1);
                 }

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

@@ -134,7 +134,7 @@ public class TFCustomFlowController {
         map.computeIfAbsent(SystemConstant.APPROVE_OPERATION, v -> flowTaskApproveParam.getApprovePass());
         map.computeIfAbsent(SystemConstant.APPROVE_REMARK, v -> flowTaskApproveParam.getRemark());
         map.computeIfAbsent(SystemConstant.APPROVE_SETUP, v -> flowTaskApproveParam.getSetup());
-        map.computeIfAbsent(SystemConstant.APPROVE_USER_IDS, v -> flowTaskApproveParam.getApproveUserIds());
+//        map.computeIfAbsent(SystemConstant.APPROVE_USER_IDS, v -> flowTaskApproveParam.getApproveUserIds());
         Map<String, Object> objectMap = activitiService.taskApprove(map);
 //        if (Objects.nonNull(objectMap)) {
 //            TFFlowApprove tfFlowApprove = (TFFlowApprove) objectMap.get("tfFlowApprove");

teachcloud-common/src/main/java/com/qmth/teachcloud/common/contant/SystemConstant.java

@@ -216,7 +216,7 @@ public class SystemConstant {
     public static final String APPROVE_REJECT_MAP = "approveRejectMap";//流程审批驳回变量
     public static final String SETUP_MAP = "setupMap";//流程步骤变量
     public static final String APPROVE_SETUP = "approveSetup";//流程节点
-    public static final String APPROVE_USER_IDS = "approveUserIds";//流程审批人列表
+//    public static final String APPROVE_USER_IDS = "approveUserIds";//流程审批人列表
     public static final String APPROVE_DIRECTOR_USER_IDS = "approveDirectorUserIds";//流程主任审批人列表
     public static final String APPROVE_PRESIDENT_USER_IDS = "approvePresidentUserIds";//流程院长审批人列表
     public static final String APPROVE_PRINT_USER_IDS = "approvePrintUserIds";//印刷人员审批人列表