From 90850ee8277782d86bf727ae19494652e3dce4a7 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 20 二月 2025 14:04:46 +0800
Subject: [PATCH] 审批流
---
ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/IndexController.java | 2
ruoyi-system/src/main/java/com/ruoyi/system/model/StateProcessModule.java | 12 ++++++
ruoyi-system/src/main/java/com/ruoyi/system/model/StateTaskCenter.java | 17 ++++++++
ruoyi-system/src/main/java/com/ruoyi/system/model/StateProcessExtInstance.java | 10 ++++
ruoyi-system/src/main/java/com/ruoyi/system/model/StateProcessTemplate.java | 22 +++++++++++
ruoyi-system/src/main/java/com/ruoyi/system/model/StateProcessInstanceAction.java | 22 ++++++++++
6 files changed, 81 insertions(+), 4 deletions(-)
diff --git a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/IndexController.java b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/IndexController.java
index 9b43b29..46f9630 100644
--- a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/IndexController.java
+++ b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/IndexController.java
@@ -266,7 +266,7 @@
* 获取报修管理列表
*/
@ApiOperation(value = "管理员-房屋维修分页列表")
- @PostMapping(value = "/pageList")
+ @PostMapping(value = "/houstPageList")
public R<PageInfo<TFaultRepairMessageVO>> pageList(@RequestBody TFaultRepairMessageAppletQuery query) {
return R.ok(tFaultRepairMessageService.pageListApplet(query));
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/StateProcessExtInstance.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/StateProcessExtInstance.java
index 455df0d..34a4f30 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/StateProcessExtInstance.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/StateProcessExtInstance.java
@@ -1,19 +1,27 @@
package com.ruoyi.system.model;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ruoyi.common.core.domain.BaseModel;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
@TableName(value = "state_process_ext_instance")
public class StateProcessExtInstance extends BaseModel {
- @TableId(type = IdType.NONE)
+ @TableId(value = "id", type = IdType.ASSIGN_ID)
private String id;
+ @ApiModelProperty(value = "模板id")
+ @TableField("template_id")
private String templateId;
+ @ApiModelProperty(value = "flw流程id")
+ @TableField("process_id")
private String processId;
+ @ApiModelProperty(value = "flw流程版本")
+ @TableField("process_version")
private Integer processVersion;
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/StateProcessInstanceAction.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/StateProcessInstanceAction.java
index 2ae643c..93c1d27 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/StateProcessInstanceAction.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/StateProcessInstanceAction.java
@@ -1,24 +1,44 @@
package com.ruoyi.system.model;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ruoyi.common.core.domain.BaseModel;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
+@ApiModel(value = "工作流-实例操作记录表")
@TableName(value = "state_process_instance_action")
public class StateProcessInstanceAction extends BaseModel {
- @TableId(type = IdType.NONE)
+ @TableId(value = "id", type = IdType.ASSIGN_ID)
private String id;
+ @ApiModelProperty(value = "流程实例id")
+ @TableField("instance_id")
private String instanceId;
+ @ApiModelProperty(value = "抄送、自动审批：true")
+ @TableField("robot")
private boolean robot;
+ @ApiModelProperty(value = "审批办理人id")
+ @TableField("auditor_id")
private String auditorId;
+ @ApiModelProperty(value ="动作类型")
+ @TableField("action_type")
private Integer actionType;
+ @ApiModelProperty(value = "抄送人")
+ @TableField("user_ids")
private String userIds;
+ @ApiModelProperty(value = "分配人ID")
+ @TableField("assignee_id")
private String assigneeId;
+ @ApiModelProperty(value = "节点ID")
+ @TableField("node_id")
private String nodeId;
+ @ApiModelProperty(value = "备注")
+ @TableField("remark")
private String remark;
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/StateProcessModule.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/StateProcessModule.java
index 8a92a80..9d3c826 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/StateProcessModule.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/StateProcessModule.java
@@ -1,9 +1,11 @@
package com.ruoyi.system.model;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ruoyi.common.core.domain.BaseModel;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
@@ -17,9 +19,19 @@
* 2=合同签订
* 3=合同提前终止
*/
+ @ApiModelProperty(value = "规格类型")
+ @TableField("category")
private String category;
+ @ApiModelProperty(value = "涉及类型")
+ @TableField("name")
private String name;
+ @ApiModelProperty(value = "流程名称")
+ @TableField("template_name")
private String templateName;
+ @ApiModelProperty(value = "流程id")
+ @TableField("template_id")
private String templateId;
+ @ApiModelProperty(value = "备注")
+ @TableField("remark")
private String remark;
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/StateProcessTemplate.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/StateProcessTemplate.java
index 8c649b4..2dd679d 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/StateProcessTemplate.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/StateProcessTemplate.java
@@ -1,25 +1,47 @@
package com.ruoyi.system.model;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ruoyi.common.core.domain.BaseModel;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
+@ApiModel(value = "工作流-模版")
@TableName(value = "state_process_template")
public class StateProcessTemplate extends BaseModel {
@TableId(value = "id", type = IdType.ASSIGN_ID)
private String id;
+ @ApiModelProperty(value = "模版标识")
+ @TableField("template_key")
private String templateKey;
+ @ApiModelProperty(value = "版本,默认1")
+ @TableField("template_version")
private Integer templateVersion;
+ @ApiModelProperty(value = "模版名称")
+ @TableField("template_name")
private String templateName;
+ @ApiModelProperty(value = "基础设置")
+ @TableField("settings")
private String settings;
+ @ApiModelProperty(value = "流程定义")
+ @TableField("process")
private String process;
+ @ApiModelProperty(value = "备注")
+ @TableField("remark")
private String remark;
+ @ApiModelProperty(value = "0:停用;1:正常")
+ @TableField("status")
private Integer status;
+ @ApiModelProperty(value = "workflow_id")
+ @TableField("workflow_id")
private Long workFlowId;
+ @ApiModelProperty(value = "workflow流程版本")
+ @TableField("workflow_version")
private Integer workflowVersion;
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/StateTaskCenter.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/StateTaskCenter.java
index fe4e792..3386057 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/StateTaskCenter.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/StateTaskCenter.java
@@ -1,22 +1,37 @@
package com.ruoyi.system.model;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ruoyi.common.core.domain.BaseModel;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
+@ApiModel(value = "任务")
@TableName(value = "state_task_center" )
public class StateTaskCenter extends BaseModel {
- @TableId(type = IdType.NONE)
+ @TableId(value = "id", type = IdType.ASSIGN_ID)
private String id;
+ @ApiModelProperty(value = "任务名称")
+ @TableField("name")
private String name;
+ @ApiModelProperty(value = "模块名称")
+ @TableField("module_name")
private String moduleName;
+ @ApiModelProperty(value = "系统摘要")
+ @TableField("remark")
private String remark;
+ @ApiModelProperty(value = "类型")
+ @TableField("category")
private String category;
+ @ApiModelProperty(value = "流程id")
+ @TableField("flow_id")
private String flowId;
+ @TableField("variable")
private String variable;
}
--
Gitblit v1.7.1