Browse Source

流程设计增加表单样式字段

dzx 1 năm trước cách đây
mục cha
commit
8cb9934e5c

+ 4 - 0
src/main/java/com/xjrsoft/module/workflow/dto/UpdateWorkflowSchemaDto.java

@@ -1,6 +1,7 @@
 package com.xjrsoft.module.workflow.dto;
 
 import com.xjrsoft.module.workflow.model.ProcessConfig;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotNull;
@@ -26,4 +27,7 @@ public class UpdateWorkflowSchemaDto implements Serializable {
     @NotNull(message = "子节点配置不能为空")
     private List<Map<String, Object>> childNodeConfig;
 
+    @ApiModelProperty("样式(0:表单 1:表格)")
+    private Integer styleType;
+
 }

+ 3 - 0
src/main/java/com/xjrsoft/module/workflow/entity/WorkflowSchema.java

@@ -64,4 +64,7 @@ public class WorkflowSchema extends AuditEntity implements Serializable {
     @ApiModelProperty("流程设计图")
     private String workflowChat;
 
+    @ApiModelProperty("样式(0:表单 1:表格)")
+    private Integer styleType;
+
 }

+ 2 - 0
src/main/java/com/xjrsoft/module/workflow/service/impl/WorkflowExecuteServiceImpl.java

@@ -294,6 +294,7 @@ public class WorkflowExecuteServiceImpl implements IWorkflowExecuteService {
         WorkflowSchema workflowSchema = workflowSchemaMapper.selectOne(Wrappers.lambdaQuery(WorkflowSchema.class).eq(WorkflowSchema::getId, schemaIdVar.get().getValue()));
 
         UserTaskInfoVo vo = new UserTaskInfoVo();
+        vo.setStyleType(workflowSchema.getStyleType());
         vo.setWorkflowChat(workflowSchema.getWorkflowChat());
 
         //获取到整个流程模板的配置
@@ -533,6 +534,7 @@ public class WorkflowExecuteServiceImpl implements IWorkflowExecuteService {
 
         UserTaskInfoVo vo = new UserTaskInfoVo();
         vo.setWorkflowChat(workflowSchema.getWorkflowChat());
+        vo.setStyleType(workflowSchema.getStyleType());
         //如果 所有 节点 包含 用户任务 || 外部流程 ||子流程
         if (workflowSchemaConfig.getChildNodeConfig().stream().anyMatch(x -> x.containsValue(WorkflowConstant.BPMN_XML_USER_TASK_TYPE_NAME) || x.containsValue(WorkflowConstant.BPMN_XML_CALL_ACTIVITY_TYPE_NAME) || x.containsValue(WorkflowConstant.BPMN_XML_SUB_PROCESS_TYPE_NAME))) {
 //            ActivityInstance activityInstance = runtimeService.getActivityInstance(processId);

+ 4 - 0
src/main/java/com/xjrsoft/module/workflow/vo/UserTaskInfoVo.java

@@ -3,6 +3,7 @@ package com.xjrsoft.module.workflow.vo;
 import com.xjrsoft.module.workflow.entity.WorkflowApproveRecord;
 import com.xjrsoft.module.workflow.model.ButtonConfig;
 import com.xjrsoft.module.workflow.model.OpinionConfig;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.List;
@@ -70,4 +71,7 @@ public class UserTaskInfoVo {
      * 流程图
      */
     private String workflowChat;
+
+    @ApiModelProperty("样式(0:表单 1:表格)")
+    private Integer styleType = 0;
 }

+ 3 - 0
src/main/java/com/xjrsoft/module/workflow/vo/WorkflowSchemaInfoVo.java

@@ -38,4 +38,7 @@ public class WorkflowSchemaInfoVo {
 
     @ApiModelProperty("模板Json")
     private String jsonContent;
+
+    @ApiModelProperty("样式(0:表单 1:表格)")
+    private Integer styleType;
 }

+ 3 - 0
src/main/java/com/xjrsoft/module/workflow/vo/WorkflowSchemaPageVo.java

@@ -47,5 +47,8 @@ public class WorkflowSchemaPageVo implements Serializable {
     @ApiModelProperty("备注")
     private String remark;
 
+    @ApiModelProperty("样式(0:表单 1:表格)")
+    private Integer styleType;
+
 
 }