feat:会议部分接口,flow工作流新增业务表单路由详情
This commit is contained in:
1 parent
ab33a29662
commit
401c66c7f0
19 files changed
+124
-8
No files matched your search
+8
@@ -1,5 +1,7 @@
|
||||
package com.bsd.pjcloud.flow.task.dto;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.Data;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
@@ -94,4 +96,10 @@ public class TaskDto {
|
||||
*/
|
||||
private String processName;
|
||||
|
||||
|
||||
/**
|
||||
* 表单详情路由
|
||||
*/
|
||||
private String formDetail;
|
||||
|
||||
}
|
||||
+3
-3
@@ -142,7 +142,7 @@ public class Process {
|
||||
private String businessKey;
|
||||
|
||||
|
||||
// @Schema(description = "表单详情路由")
|
||||
// @TableField("form_detail")
|
||||
// private String formDetail;
|
||||
@Schema(description = "表单详情路由")
|
||||
@TableField("form_detail")
|
||||
private String formDetail;
|
||||
}
|
||||
+1
@@ -35,6 +35,7 @@ public class ProcessGroup {
|
||||
@TableField("sort")
|
||||
private Integer sort;
|
||||
|
||||
|
||||
/**
|
||||
* 用户id
|
||||
*/
|
||||
|
||||
+5
@@ -2,6 +2,7 @@ package com.bsd.pjcloud.flow.task.entity;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.*;
|
||||
import com.bsd.pjcloud.common.core.util.TenantTable;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
import lombok.experimental.Accessors;
|
||||
@@ -72,6 +73,10 @@ public class ProcessInstanceRecord {
|
||||
@TableField("group_name")
|
||||
private String groupName;
|
||||
|
||||
|
||||
@TableField("form_detail")
|
||||
private String formDetail;
|
||||
|
||||
/**
|
||||
* 状态
|
||||
*/
|
||||
|
||||
+1
-1
@@ -46,7 +46,7 @@ public class ProcessInstanceController {
|
||||
|
||||
/**
|
||||
* 查询当前登录用户的待办任务
|
||||
* @param pageDto
|
||||
* @param queryParamDto
|
||||
* @return
|
||||
*/
|
||||
@SneakyThrows
|
||||
|
||||
+1
@@ -132,6 +132,7 @@ public class ProcessInstanceServiceImpl implements IProcessInstanceService {
|
||||
|
||||
record.setRootUserId(processInstanceRecord.getUserId());
|
||||
record.setGroupName(processInstanceRecord.getGroupName());
|
||||
record.setFormDetail(processInstanceRecord.getFormDetail());
|
||||
record.setRootUserName(startUser.getUsername());
|
||||
record.setRootUserAvatarUrl(startUser.getAvatar());
|
||||
record.setStartTime(processInstanceRecord.getCreateTime());
|
||||
|
||||
+1
-1
@@ -199,7 +199,7 @@ public class RemoteServiceImpl implements IRemoteService {
|
||||
entity.setGroupId(oaFormGroups.getId());
|
||||
entity.setGroupName(oaFormGroups.getGroupName());
|
||||
entity.setStatus(NodeStatusEnum.JXZ.getCode());
|
||||
|
||||
entity.setFormDetail(oaForms.getFormDetail());
|
||||
processInstanceRecordService.save(entity);
|
||||
|
||||
return R.ok();
|
||||
|
||||
Reference in new issue
Block a user