zgty/zt-bpm
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'test' into test-dsc

Browse Source 
* test:
  新增根据流程管控按钮是否可用配置功能. http://172.16.46.63:31560/index.php?m=task&f=view&taskID=551
  1. 补全基准的菜单 sql 语句
This commit is contained in:
ranke
2025-12-30 18:18:18 +08:00
parent 30f182828a 0eff938f9e
commit 3211dbe2b5
5 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/controller/admin/definition/vo/model/BpmModelMetaInfoVO.java
View File

@@ -56,6 +56,10 @@ public class BpmModelMetaInfoVO {
@NotNull(message = "是否可见不能为空") @NotNull(message = "是否可见不能为空")
private Boolean visible; private Boolean visible;
@Schema(description = "是否允许重新发起", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
@NotNull(message = "是否允许重新发起不能为空")
private Boolean restart;
@Schema(description = "可发起用户编号数组", example = "[1,2,3]") @Schema(description = "可发起用户编号数组", example = "[1,2,3]")
private List<Long> startUserIds; private List<Long> startUserIds;

1
zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/controller/admin/definition/vo/model/BpmModelRespVO.java
View File

@@ -5,6 +5,7 @@ import com.zt.plat.module.bpm.controller.admin.base.user.UserSimpleBaseVO;
import com.zt.plat.module.bpm.controller.admin.definition.vo.model.simple.BpmSimpleModelNodeVO; import com.zt.plat.module.bpm.controller.admin.definition.vo.model.simple.BpmSimpleModelNodeVO;
import com.zt.plat.module.bpm.controller.admin.definition.vo.process.BpmProcessDefinitionRespVO; import com.zt.plat.module.bpm.controller.admin.definition.vo.process.BpmProcessDefinitionRespVO;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotNull;
import lombok.Data; import lombok.Data;
import java.time.LocalDateTime; import java.time.LocalDateTime;

1
zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/controller/admin/definition/vo/model/BpmModelSaveReqVO.java
View File

@@ -4,6 +4,7 @@ import com.zt.plat.module.bpm.controller.admin.definition.vo.model.simple.BpmSim
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.Valid; import jakarta.validation.Valid;
import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotEmpty;
import jakarta.validation.constraints.NotNull;
import lombok.Data; import lombok.Data;
@Schema(description = "管理后台 - 流程模型的保存 Request VO") @Schema(description = "管理后台 - 流程模型的保存 Request VO")

9
zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/convert/task/BpmProcessInstanceConvert.java
View File

@@ -87,9 +87,16 @@ public interface BpmProcessInstanceConvert {
}); });
} }
} }
BpmProcessDefinitionInfoDO processDefinitionInfo = processDefinitionInfoMap.get(respVO.getProcessDefinitionId());
if (processDefinitionInfo != null) {
// 摘要 // 摘要
respVO.setSummary(FlowableUtils.getSummary(processDefinitionInfoMap.get(respVO.getProcessDefinitionId()), respVO.setSummary(FlowableUtils.getSummary(processDefinitionInfo,
pageResult.getList().get(i).getProcessVariables())); pageResult.getList().get(i).getProcessVariables()));
// 是否可见
respVO.getProcessDefinition().setVisible(processDefinitionInfo.getVisible());
// 是否可以重新发起流程
respVO.getProcessDefinition().setRestart(processDefinitionInfo.getRestart());
}
// 表单 // 表单
respVO.setFormVariables(pageResult.getList().get(i).getProcessVariables()); respVO.setFormVariables(pageResult.getList().get(i).getProcessVariables());
} }

7
zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/dal/dataobject/definition/BpmProcessDefinitionInfoDO.java
View File

@@ -129,6 +129,13 @@ public class BpmProcessDefinitionInfoDO extends BaseDO {
* 目的：如果 false 不可见，则不展示在“发起流程”的列表里 * 目的：如果 false 不可见，则不展示在“发起流程”的列表里
*/ */
private Boolean visible; private Boolean visible;
/**
* 是否允许重新发起
*
* 目的：如果 false 则不可以重新发起流程
*/
private Boolean restart;
/** /**
* 排序值 * 排序值
*/ */