1. 合并 bpm 版本
This commit is contained in:
@@ -24,7 +24,6 @@ import jakarta.annotation.Resource;
|
||||
import jakarta.validation.Valid;
|
||||
import org.flowable.engine.history.HistoricProcessInstance;
|
||||
import org.flowable.engine.repository.ProcessDefinition;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
@@ -41,7 +40,7 @@ import static com.zt.plat.framework.web.core.util.WebFrameworkUtils.getLoginUser
|
||||
* @author jason
|
||||
*/
|
||||
@RestController
|
||||
@Validated
|
||||
@Valid
|
||||
public class BpmProcessInstanceApiImpl implements BpmProcessInstanceApi {
|
||||
|
||||
@Resource
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
package com.zt.plat.module.bpm.controller.admin.definition.vo.model.simple;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonIgnore;
|
||||
import com.fasterxml.jackson.annotation.JsonInclude;
|
||||
import com.zt.plat.framework.common.core.KeyValue;
|
||||
import com.zt.plat.framework.common.validation.InEnum;
|
||||
import com.zt.plat.module.bpm.enums.definition.*;
|
||||
import com.zt.plat.module.bpm.framework.flowable.core.enums.BpmTaskCandidateStrategyEnum;
|
||||
import com.fasterxml.jackson.annotation.JsonIgnore;
|
||||
import com.fasterxml.jackson.annotation.JsonInclude;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import jakarta.validation.Valid;
|
||||
import jakarta.validation.constraints.NotEmpty;
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
package com.zt.plat.module.bpm.controller.admin.task.vo.instance;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonIgnore;
|
||||
import com.zt.plat.module.bpm.controller.admin.base.user.UserSimpleBaseVO;
|
||||
import com.zt.plat.module.bpm.controller.admin.definition.vo.process.BpmProcessDefinitionRespVO;
|
||||
import com.zt.plat.module.bpm.controller.admin.task.vo.task.BpmTaskRespVO;
|
||||
import com.fasterxml.jackson.annotation.JsonIgnore;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.Data;
|
||||
|
||||
|
||||
@@ -0,0 +1,88 @@
|
||||
package com.zt.plat.module.bpm.controller.admin.task.vo.instance;
|
||||
|
||||
import com.zt.plat.framework.mybatis.core.dataobject.BaseDO;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
/**
|
||||
* 流程抄送 VO
|
||||
*
|
||||
* @author kr
|
||||
* @since 2025-12-31
|
||||
*/
|
||||
@Data
|
||||
@NoArgsConstructor
|
||||
public class BpmProcessInstanceCopyVO extends BaseDO {
|
||||
|
||||
/**
|
||||
* 编号
|
||||
*/
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
* 发起人 Id
|
||||
*/
|
||||
@Schema(description ="发起人 Id")
|
||||
private Long startUserId;
|
||||
|
||||
/**
|
||||
* 发起人 姓名
|
||||
*/
|
||||
@Schema(description ="发起人 姓名")
|
||||
private String startUserName;
|
||||
/**
|
||||
* 流程名
|
||||
*/
|
||||
@Schema(description ="流程名")
|
||||
private String processInstanceName;
|
||||
/**
|
||||
* 流程实例的编号
|
||||
*/
|
||||
@Schema(description ="流程实例的编号")
|
||||
private String processInstanceId;
|
||||
/**
|
||||
* 流程实例的流程定义编号
|
||||
*/
|
||||
@Schema(description ="流程实例的流程定义编号")
|
||||
private String processDefinitionId;
|
||||
/**
|
||||
* 流程分类
|
||||
*/
|
||||
@Schema(description ="流程分类")
|
||||
private String category;
|
||||
/**
|
||||
* 流程活动的编号
|
||||
*/
|
||||
@Schema(description ="流程活动的编号")
|
||||
private String activityId;
|
||||
/**
|
||||
* 流程活动的名字
|
||||
*/
|
||||
@Schema(description ="流程活动的名字")
|
||||
private String activityName;
|
||||
/**
|
||||
* 流程活动的编号
|
||||
*/
|
||||
@Schema(description ="流程活动的编号")
|
||||
private String taskId;
|
||||
|
||||
/**
|
||||
* 用户编号(被抄送的用户编号)
|
||||
*/
|
||||
@Schema(description ="用户编号(被抄送的用户编号)")
|
||||
private Long userId;
|
||||
|
||||
/**
|
||||
* 用户姓名(被抄送的用户姓名)
|
||||
*/
|
||||
@Schema(description ="用户姓名(被抄送的用户姓名)")
|
||||
private String userName;
|
||||
|
||||
/**
|
||||
* 抄送意见
|
||||
*/
|
||||
@Schema(description ="抄送意见")
|
||||
private String reason;
|
||||
|
||||
}
|
||||
@@ -1,9 +1,9 @@
|
||||
package com.zt.plat.module.bpm.controller.admin.task.vo.instance;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonIgnore;
|
||||
import com.zt.plat.framework.common.core.KeyValue;
|
||||
import com.zt.plat.module.bpm.controller.admin.base.user.UserSimpleBaseVO;
|
||||
import com.zt.plat.module.bpm.controller.admin.definition.vo.process.BpmProcessDefinitionRespVO;
|
||||
import com.fasterxml.jackson.annotation.JsonIgnore;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.Data;
|
||||
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
package com.zt.plat.module.bpm.controller.admin.task.vo.task;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonIgnore;
|
||||
import com.zt.plat.framework.common.core.KeyValue;
|
||||
import com.zt.plat.module.bpm.controller.admin.base.user.UserSimpleBaseVO;
|
||||
import com.fasterxml.jackson.annotation.JsonIgnore;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.Data;
|
||||
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
package com.zt.plat.module.bpm.dal.dataobject.definition;
|
||||
|
||||
import com.zt.plat.framework.mybatis.core.dataobject.BaseDO;
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.KeySequence;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import com.zt.plat.framework.mybatis.core.dataobject.BaseDO;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
package com.zt.plat.module.bpm.dal.dataobject.definition;
|
||||
|
||||
import com.zt.plat.framework.mybatis.core.dataobject.BaseDO;
|
||||
import com.baomidou.mybatisplus.annotation.*;
|
||||
import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
|
||||
import com.zt.plat.framework.mybatis.core.dataobject.BaseDO;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
package com.zt.plat.module.bpm.dal.dataobject.definition;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.*;
|
||||
import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
|
||||
import com.zt.plat.framework.mybatis.core.dataobject.BaseDO;
|
||||
import com.zt.plat.framework.mybatis.core.type.LongListTypeHandler;
|
||||
import com.zt.plat.module.bpm.controller.admin.definition.vo.model.BpmModelMetaInfoVO;
|
||||
@@ -9,6 +7,8 @@ import com.zt.plat.module.bpm.enums.definition.BpmAutoApproveTypeEnum;
|
||||
import com.zt.plat.module.bpm.enums.definition.BpmModelFormTypeEnum;
|
||||
import com.zt.plat.module.bpm.enums.definition.BpmModelTypeEnum;
|
||||
import com.zt.plat.module.system.api.user.dto.AdminUserRespDTO;
|
||||
import com.baomidou.mybatisplus.annotation.*;
|
||||
import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
package com.zt.plat.module.bpm.dal.dataobject.definition;
|
||||
|
||||
import com.zt.plat.framework.mybatis.core.dataobject.BaseDO;
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.KeySequence;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import com.zt.plat.framework.mybatis.core.dataobject.BaseDO;
|
||||
import lombok.*;
|
||||
|
||||
/**
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user