Merge branch 'refs/heads/zt-test' into test

This commit is contained in:
FCL
2026-01-19 10:56:11 +08:00
123 changed files with 4288 additions and 200 deletions

33
pom.xml
View File

@@ -12,19 +12,18 @@
</modules> </modules>
<name>${project.artifactId}</name> <name>${project.artifactId}</name>
<description>芋道项目基础脚手架</description> <description>项目基础脚手架</description>
<url>https://github.com/YunaiV/ruoyi-vue-pro</url>
<properties> <properties>
<revision>3.0.46</revision> <revision>3.0.47-SNAPSHOT</revision>
<business.supply.version>3.0.46</business.supply.version> <business.supply.version>3.0.47-SNAPSHOT</business.supply.version>
<business.base.version>3.0.46</business.base.version> <business.base.version>3.0.47-SNAPSHOT</business.base.version>
<business.logistic.version>3.0.46</business.logistic.version> <business.logistic.version>3.0.47-SNAPSHOT</business.logistic.version>
<business.manage.version>3.0.46</business.manage.version> <business.manage.version>3.0.47-SNAPSHOT</business.manage.version>
<business.qms.version>3.0.46</business.qms.version> <business.qms.version>3.0.47-SNAPSHOT</business.qms.version>
<business.mes.version>3.0.46</business.mes.version> <business.mes.version>3.0.47-SNAPSHOT</business.mes.version>
<business.capital.version>3.0.46</business.capital.version> <business.capital.version>3.0.47-SNAPSHOT</business.capital.version>
<business.product.version>3.0.46</business.product.version> <business.product.version>3.0.47-SNAPSHOT</business.product.version>
<!-- Maven 相关 --> <!-- Maven 相关 -->
<java.version>17</java.version> <java.version>17</java.version>
<maven.compiler.source>${java.version}</maven.compiler.source> <maven.compiler.source>${java.version}</maven.compiler.source>
@@ -195,7 +194,7 @@
<repository> <repository>
<id>ZT</id> <id>ZT</id>
<name>中铜 ZStack 私服</name> <name>中铜 ZStack 私服</name>
<url>http://172.16.46.63:30708/repository/test/</url> <url>http://172.16.46.63:30708/repository/zt-cloud/</url>
<releases> <releases>
<updatePolicy>always</updatePolicy> <updatePolicy>always</updatePolicy>
<checksumPolicy>warn</checksumPolicy> <checksumPolicy>warn</checksumPolicy>
@@ -213,11 +212,11 @@
<name>中铜 ZStack 私服</name> <name>中铜 ZStack 私服</name>
<url>http://172.16.46.63:30708/repository/test/</url> <url>http://172.16.46.63:30708/repository/test/</url>
</repository> </repository>
<!-- <snapshotRepository>--> <snapshotRepository>
<!-- <id>ZT</id>--> <id>ZT-snap</id>
<!-- <name>中铜 ZStack 私服</name>--> <name>中铜 ZStack 私服</name>
<!-- <url>https://your-nexus.example.com/repository/maven-snapshots/</url>--> <url>http://172.16.46.63:30708/repository/test-snap/</url>
<!-- </snapshotRepository>--> </snapshotRepository>
</distributionManagement> </distributionManagement>
<profiles> <profiles>

View File

@@ -12,7 +12,7 @@ import lombok.ToString;
@ToString(callSuper = true) @ToString(callSuper = true)
public class BpmFormPageReqDTO extends PageParam { public class BpmFormPageReqDTO extends PageParam {
@Schema(description = "表单名称", example = "芋道") @Schema(description = "表单名称", example = "ZT")
private String name; private String name;
} }

View File

@@ -12,7 +12,7 @@ public class BpmFormRespDTO {
@Schema(description = "表单编号", example = "1024") @Schema(description = "表单编号", example = "1024")
private Long id; private Long id;
@Schema(description = "表单名", example = "芋艿") @Schema(description = "表单名", example = "ZT")
private String name; private String name;
@Schema(description = "表单状态", example = "1") @Schema(description = "表单状态", example = "1")

View File

@@ -11,7 +11,7 @@ public class BpmFormSaveReqDTO {
@Schema(description = "表单编号", example = "1024") @Schema(description = "表单编号", example = "1024")
private Long id; private Long id;
@Schema(description = "表单名", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿") @Schema(description = "表单名", requiredMode = Schema.RequiredMode.REQUIRED, example = "ZT")
@NotEmpty(message = "表单名不能为空") @NotEmpty(message = "表单名不能为空")
private String name; private String name;

View File

@@ -13,10 +13,10 @@ public class BpmUserGroupRespDTO {
@Schema(description = "编号", example = "1024") @Schema(description = "编号", example = "1024")
private Long id; private Long id;
@Schema(description = "组名", example = "芋艿") @Schema(description = "组名", example = "ZT")
private String name; private String name;
@Schema(description = "描述", example = "芋艿") @Schema(description = "描述", example = "ZT")
private String description; private String description;
@Schema(description = "成员用户编号数组", example = "1,2,3") @Schema(description = "成员用户编号数组", example = "1,2,3")

View File

@@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.*;
import java.util.List; import java.util.List;
@FeignClient(name = ApiConstants.NAME) // TODO 芋艿fallbackFactory = @FeignClient(name = ApiConstants.NAME) // TODO ZTfallbackFactory =
@Tag(name = "RPC 服务 - 流程实例") @Tag(name = "RPC 服务 - 流程实例")
public interface BpmProcessInstanceApi { public interface BpmProcessInstanceApi {

View File

@@ -24,7 +24,7 @@ public class BpmApprovalDetailReqDTO {
@Schema(description = "流程实例的编号", example = "1024") @Schema(description = "流程实例的编号", example = "1024")
private String processInstanceId; // 使用场景:流程已发起时候传流程实例 ID private String processInstanceId; // 使用场景:流程已发起时候传流程实例 ID
// TODO @芋艿:如果未来 BPMN 增加流程图,它没有发起人节点,会有问题。 // TODO @ZT:如果未来 BPMN 增加流程图,它没有发起人节点,会有问题。
@Schema(description = "流程活动编号", example = "StartUserNode") @Schema(description = "流程活动编号", example = "StartUserNode")
private String activityId; // 用于获取表单权限。1发起流程时传"发起人节点" activityId 可获取发起人的表单权限2从抄送列表界面进来时传抄送的 activityId 可获取抄送人的表单权限; private String activityId; // 用于获取表单权限。1发起流程时传"发起人节点" activityId 可获取发起人的表单权限2从抄送列表界面进来时传抄送的 activityId 可获取抄送人的表单权限;

View File

@@ -16,7 +16,7 @@ public class BpmProcessInstancePageReqDTO extends PageParam {
@Schema(description = "流程实例的编号", example = "1024") @Schema(description = "流程实例的编号", example = "1024")
private String id; private String id;
@Schema(description = "流程实例的名字", example = "芋艿") @Schema(description = "流程实例的名字", example = "ZT")
private String name; private String name;
@Schema(description = "流程定义的编号", example = "2048") @Schema(description = "流程定义的编号", example = "2048")

View File

@@ -16,7 +16,7 @@ public class BpmProcessInstanceRespDTO {
@Schema(description = "流程实例的编号", example = "1024") @Schema(description = "流程实例的编号", example = "1024")
private String id; private String id;
@Schema(description = "流程实例的名字", example = "芋艿") @Schema(description = "流程实例的名字", example = "ZT")
private String name; private String name;
@Schema(description = "流程摘要") @Schema(description = "流程摘要")
@@ -49,7 +49,7 @@ public class BpmProcessInstanceRespDTO {
@Schema(description = "持续时间", example = "1000") @Schema(description = "持续时间", example = "1000")
private Long durationInMillis; private Long durationInMillis;
@Schema(description = "提交的表单值", example = "{\"name\": \"芋艿\"}") @Schema(description = "提交的表单值", example = "{\"name\": \"ZT\"}")
private Map<String, Object> formVariables; private Map<String, Object> formVariables;
@Schema(description = "业务的唯一标识", example = "1") @Schema(description = "业务的唯一标识", example = "1")
@@ -77,7 +77,7 @@ public class BpmProcessInstanceRespDTO {
@Schema(description = "流程任务的编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") @Schema(description = "流程任务的编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
private String id; private String id;
@Schema(description = "任务名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道") @Schema(description = "任务名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "ZT")
private String name; private String name;
@Schema(description = "任务分配人编号", requiredMode = Schema.RequiredMode.NOT_REQUIRED, example = "2048") @Schema(description = "任务分配人编号", requiredMode = Schema.RequiredMode.NOT_REQUIRED, example = "2048")

View File

@@ -13,7 +13,7 @@ import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH
@Data @Data
public class BpmTaskPageReqDTO extends PageParam { public class BpmTaskPageReqDTO extends PageParam {
@Schema(description = "流程任务名", example = "芋艿") @Schema(description = "流程任务名", example = "ZT")
private String name; private String name;
@Schema(description = "流程定义的编号", example = "2048") @Schema(description = "流程定义的编号", example = "2048")

Some files were not shown because too many files have changed in this diff Show More