diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualsales/BaseVehicleActualSalesFlowDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualsales/BaseVehicleActualSalesFlowDto.java deleted file mode 100644 index 7c9bdbede2..0000000000 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualsales/BaseVehicleActualSalesFlowDto.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.yxt.anrui.base.api.basevehicleactualsales; - -import com.yxt.common.core.dto.Dto; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - * @Author dimengzhe - * @Date 2022/4/21 11:35 - * @Description - */ -@Data -public class BaseVehicleActualSalesFlowDto implements Dto { - private static final long serialVersionUID = 3748090563013456721L; - - @ApiModelProperty(value = "业务sid") - private String businessSid; - - @ApiModelProperty("任务Id") - private String taskId; - - @ApiModelProperty("用户Id") - private String userId; - @ApiModelProperty("用户Sid") - private String userSid; - - @ApiModelProperty("任务意见") - private String comment; - - @ApiModelProperty("流程实例Id") - private String instanceId; - - @ApiModelProperty("节点") - private String targetKey; - - @ApiModelProperty("流程变量信息") - private Map values = new HashMap<>(); - - @ApiModelProperty("审批人") - private String assignee; - - @ApiModelProperty("候选人") - private List candidateUsers = new ArrayList<>(); - - @ApiModelProperty("审批组") - private List candidateGroups = new ArrayList<>(); -} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualsales/BaseVehicleActualSalesFlowQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualsales/BaseVehicleActualSalesFlowQuery.java deleted file mode 100644 index b8fb8d7864..0000000000 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualsales/BaseVehicleActualSalesFlowQuery.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.yxt.anrui.base.api.basevehicleactualsales; - -import com.yxt.common.core.query.Query; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @Author dimengzhe - * @Date 2022/4/21 11:32 - * @Description 审核相关参数 - */ -@Data -public class BaseVehicleActualSalesFlowQuery implements Query { - private static final long serialVersionUID = -3729579148766080074L; - - @ApiModelProperty(value = "处理意见") - private String comment; - @ApiModelProperty(value = "流程id") - private String instanceId; - @ApiModelProperty(value = "环节id") - private String taskId; - @ApiModelProperty(value = "用户sid") - private String userSid; - @ApiModelProperty(value = "业务sid") - private String businessSid; -} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualsales/flow/BaseActualSalesCompleteDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualsales/flow/BaseActualSalesCompleteDto.java index 2a55eb2c48..517b39c3f9 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualsales/flow/BaseActualSalesCompleteDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualsales/flow/BaseActualSalesCompleteDto.java @@ -37,6 +37,6 @@ public class BaseActualSalesCompleteDto implements Dto { @ApiModelProperty(value = "业务sid") @NotBlank(message = "参数错误:businessSid") private String businessSid; - @ApiModelProperty(value = "分支字段及业务字段") - private Map formVariables; +// @ApiModelProperty(value = "分支字段及业务字段") +// private Map formVariables; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/flow/BusVehicleApplyCompleteDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/flow/BusVehicleApplyCompleteDto.java index 3c683f7e0c..b0830454ae 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/flow/BusVehicleApplyCompleteDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/flow/BusVehicleApplyCompleteDto.java @@ -36,6 +36,6 @@ public class BusVehicleApplyCompleteDto implements Dto { @ApiModelProperty(value = "业务sid") @NotBlank(message = "参数错误:businessSid") private String businessSid; - @ApiModelProperty(value = "分支字段及业务字段") - private Map formVariables; +// @ApiModelProperty(value = "分支字段及业务字段") +// private Map formVariables; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/flow/GetNodeQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/flow/GetNodeQuery.java index 331debefe0..dd980fef22 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/flow/GetNodeQuery.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/flow/GetNodeQuery.java @@ -5,7 +5,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.validation.constraints.NotBlank; -import java.util.Map; /** * @Author dimengzhe @@ -20,6 +19,6 @@ public class GetNodeQuery implements Query { @NotBlank(message = "参数错误:taskDefKey") private String taskDefKey; - @ApiModelProperty(value = "分支字段及业务字段") - private Map formVariables; + /* @ApiModelProperty(value = "分支字段及业务字段") + private Map formVariables;*/ } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincostapply/flow/FinCostCompleteDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincostapply/flow/FinCostCompleteDto.java index 31fb0d0b42..f38ca8d515 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincostapply/flow/FinCostCompleteDto.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincostapply/flow/FinCostCompleteDto.java @@ -37,6 +37,6 @@ public class FinCostCompleteDto implements Dto { @ApiModelProperty(value = "业务sid") @NotBlank(message = "参数错误:businessSid") private String businessSid; - @ApiModelProperty(value = "暂不确定是不是需要前端传的:还是有分支的时候传??") - private Map formVariables; +// @ApiModelProperty(value = "暂不确定是不是需要前端传的:还是有分支的时候传??") +// private Map formVariables; } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincostapply/flow/FinCostGetNodeQuery.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincostapply/flow/FinCostGetNodeQuery.java index deebfea774..99723c72c2 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincostapply/flow/FinCostGetNodeQuery.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincostapply/flow/FinCostGetNodeQuery.java @@ -20,6 +20,6 @@ public class FinCostGetNodeQuery implements Query { @NotBlank(message = "参数错误:taskDefKey") private String taskDefKey; - @ApiModelProperty(value = "不确定是否需要前端传:还是有分支网关的时候传??") - private Map formVariables; +// @ApiModelProperty(value = "不确定是否需要前端传:还是有分支网关的时候传??") +// private Map formVariables; } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/flow/FinPayCompleteDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/flow/FinPayCompleteDto.java index 57013eb965..d19118c04d 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/flow/FinPayCompleteDto.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/flow/FinPayCompleteDto.java @@ -37,6 +37,6 @@ public class FinPayCompleteDto implements Dto { @ApiModelProperty(value = "业务sid") @NotBlank(message = "参数错误:businessSid") private String businessSid; - @ApiModelProperty(value = "暂不确定是不是需要前端传的:还是有分支的时候传??") - private Map formVariables; +// @ApiModelProperty(value = "暂不确定是不是需要前端传的:还是有分支的时候传??") +// private Map formVariables; } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/flow/FinPayGetNodeQuery.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/flow/FinPayGetNodeQuery.java index bc16e8ff61..c1f9f56bcd 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/flow/FinPayGetNodeQuery.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/flow/FinPayGetNodeQuery.java @@ -20,6 +20,6 @@ public class FinPayGetNodeQuery implements Query { @NotBlank(message = "参数错误:taskDefKey") private String taskDefKey; - @ApiModelProperty(value = "不确定是否需要前端传:还是有分支网关的时候传??") - private Map formVariables; +// @ApiModelProperty(value = "不确定是否需要前端传:还是有分支网关的时候传??") +// private Map formVariables; } diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/flow/app/FlowTaskDoVo.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/flow/app/FlowTaskDoVo.java index cb298c6279..ec5c7920ae 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/flow/app/FlowTaskDoVo.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/flow/app/FlowTaskDoVo.java @@ -37,7 +37,6 @@ public class FlowTaskDoVo implements Vo { @ApiModelProperty(value = "任务id") private String taskId; @ApiModelProperty("节点id") - @JsonIgnore private String taskDefKey; @ApiModelProperty(value = "app集合") private AppVo appVariables; diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/flowable/GetNodeQuery.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/flowable/GetNodeQuery.java index af27b79cb9..e2bb128f20 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/flowable/GetNodeQuery.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/flowable/GetNodeQuery.java @@ -15,7 +15,7 @@ public class GetNodeQuery implements Query { @NotBlank(message = "参数错误:taskDefKey") private String taskDefKey; - @ApiModelProperty(value = "分支字段及业务字段") - private Map formVariables; +// @ApiModelProperty(value = "分支字段及业务字段") +// private Map formVariables; } diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/flowable/ScmCarTransferCompleteDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/flowable/ScmCarTransferCompleteDto.java index 32564d795a..d91c7221d8 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/flowable/ScmCarTransferCompleteDto.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/flowable/ScmCarTransferCompleteDto.java @@ -32,7 +32,7 @@ public class ScmCarTransferCompleteDto implements Dto { @ApiModelProperty(value = "业务sid") @NotBlank(message = "参数错误:businessSid") private String businessSid; - @ApiModelProperty(value = "暂不确定是不是需要前端传的:还是有分支的时候传??") - private Map formVariables; +// @ApiModelProperty(value = "暂不确定是不是需要前端传的:还是有分支的时候传??") +// private Map formVariables; }