wangli/workflow-engine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update - 修改基础表字段

Browse Source
This commit is contained in:
wangli 2023-07-17 18:24:20 +08:00
parent fe9a5ec10d
commit 3f25bdc5ad
7 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
workflow-engine-core/src/main/java/cn/axzo/workflow/core/repository/entity/TaskExtDO.java
View File

@ -81,7 +81,7 @@ public class TaskExtDO extends BaseOwnEntity<TaskExtDO> {
/**
* 审批人的安心筑用户身份id
*/
private Long identityId;
private String userId;
/**
* 参与单位下的具体公司ID

2
workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/converter/BpmTaskConvert.java
View File

@ -24,7 +24,7 @@ public class BpmTaskConvert {
TaskExtDO taskExtDO = new TaskExtDO();
taskExtDO.setTaskId(task.getId());
taskExtDO.setTenantId(task.getTenantId());
taskExtDO.setIdentityId(Long.valueOf(assignee));
taskExtDO.setUserId(assignee);
taskExtDO.setProcessDefinitionId(task.getProcessDefinitionId());
taskExtDO.setProcessInstanceId(task.getProcessInstanceId());
taskExtDO.setName(task.getName());

4
workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/dto/request/process/BpmProcessInstanceCreateDTO.java
View File

@ -4,7 +4,6 @@ import lombok.Data;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import java.util.Map;
@Data
@ -35,12 +34,13 @@ public class BpmProcessInstanceCreateDTO {
/**
* 发起人所在的(企业/项目)租户ID
*/
@NotBlank(message = "租户不能为空")
private String tenantId;
/**
* 发起人的身份ID
*/
@NotNull(message = "用户Id不能为空")
@NotBlank(message = "用户Id不能为空")
private String userId;
/**

5
workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/BpmProcessInstanceServiceImpl.java
View File

@ -152,8 +152,7 @@ public class BpmProcessInstanceServiceImpl implements BpmProcessInstanceService
// 创建流程实例
// 设置流程实例的开始人，参考https://wenku.baidu.com/view/5538062e7a563c1ec5da50e2524de518964bd3f9.html
String startUserId = createDTO.getUserId();
Authentication.setAuthenticatedUserId(startUserId);
Authentication.setAuthenticatedUserId(createDTO.getUserId());
String name = StringUtils.isNotBlank(createDTO.getCustomProcessInstanceName()) ?
createDTO.getCustomProcessInstanceName()
: definition.getName();
@ -171,7 +170,7 @@ public class BpmProcessInstanceServiceImpl implements BpmProcessInstanceService
extDO.setName(name);
extDO.setTenantId(createDTO.getTenantId());
// extDO.setStartCompanyId(createDTO.getCompanyId());
extDO.setStartUserId(startUserId);
extDO.setStartUserId(createDTO.getUserId());
extDO.setStartUserName(createDTO.getUserName());
extDO.setFormVariables(createDTO.getVariables());
extDO.setExt(createDTO.getExt());

8
workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/BpmTaskServiceImpl.java
View File

@ -201,7 +201,7 @@ public class BpmTaskServiceImpl implements BpmTaskService {
@Override
public void approveTask(BpmTaskAuditDTO taskAuditDTO) {
// 校验任务存在
Task task = checkTask(taskAuditDTO.getId(), taskAuditDTO.getUserName(), taskAuditDTO.getTenantId());
Task task = checkTask(taskAuditDTO.getId(), taskAuditDTO.getUserId(), taskAuditDTO.getTenantId());
// 校验流程实例存在
ProcessInstance instance = processInstanceService.getProcessInstance(
task.getProcessInstanceId(), null, true);
@ -301,8 +301,8 @@ public class BpmTaskServiceImpl implements BpmTaskService {
* 校验任务是否存在， 并且是否是分配给自己的任务
*
* @param tenantId 租户ID
* @param assignee 身份ID
* @param taskId task id
* @param assignee 用户ID
* @param taskId 任务ID
*/
private Task checkTask(String tenantId, String assignee,
String taskId) {
@ -349,7 +349,7 @@ public class BpmTaskServiceImpl implements BpmTaskService {
TaskExtDO taskExtDO = new TaskExtDO();
taskExtDO.setTaskId(task.getId());
taskExtDO.setTenantId(task.getTenantId());
taskExtDO.setIdentityId(Long.valueOf(task.getAssignee()));
taskExtDO.setUserId(task.getAssignee());
taskExtDO.setProcessDefinitionId(processDefinitionId);
taskExtDO.setUserName(task.getOwner());
taskExtMapper.updateByTaskId(taskExtDO);

3
workflow-engine-core/src/main/resources/sql/change.sql
View File

@ -36,3 +36,6 @@ UPDATE CURRENT_TIMESTAMP COMMENT '更新时间' AFTER `update_by`,
ALTER TABLE `bpm_process_instance_ext`
CHANGE COLUMN `start_identity_Id` `start_user_Id` varchar (255) NOT NULL COMMENT '发起流程的用户身份ID' AFTER `start_company_id`;
ALTER TABLE `bpm_task_ext`
CHANGE COLUMN `identity_id` `user_id` varchar (255) NOT NULL COMMENT '审批人用户身份ID' AFTER `company_id`;

22
workflow-engine-server/src/main/java/cn/axzo/server/controller/delegate/BpmTaskDelegateImpl.java
View File

@ -33,17 +33,17 @@ public class BpmTaskDelegateImpl implements BpmTaskDelegate {
assigners.add(user2);
}
if (Objects.equals("NODE1688636856135_0.9932837808231312_1", delegateTask.getTaskDefinitionKey())) {
BpmTaskDelegateAssigner user1 = new BpmTaskDelegateAssigner();
user1.setAssignerId("65712");
user1.setAssignerName("王汪");
assigners.add(user1);
BpmTaskDelegateAssigner user2 = new BpmTaskDelegateAssigner();
user2.setAssignerId("66624");
user2.setAssignerName("王颖");
assigners.add(user2);
}
// if (Objects.equals("NODE1688636856135_0.9932837808231312_1", delegateTask.getTaskDefinitionKey())) {
// BpmTaskDelegateAssigner user1 = new BpmTaskDelegateAssigner();
// user1.setAssignerId("65712");
// user1.setAssignerName("王汪");
// assigners.add(user1);
//
// BpmTaskDelegateAssigner user2 = new BpmTaskDelegateAssigner();
// user2.setAssignerId("66624");
// user2.setAssignerName("王颖");
// assigners.add(user2);
// }
return assigners;