abu/wzj-boot
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update 优化代码 修复bug

Browse Source
This commit is contained in:
疯狂的狮子Li 2024-12-16 17:22:16 +08:00
parent 0d0725d53e
commit 1885b1445c
9 changed files with 8 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwDefinitionController.java
View File

@ -51,10 +51,12 @@ public class FlwDefinitionController extends BaseController {
/**
* 获取流程分类树列表
*
* @param categoryBo 参数
*/
@GetMapping("/categoryTree")
public R<List<Tree<Long>>> categoryTree(FlowCategoryBo dept) {
return R.ok(flwCategoryService.selectCategoryTreeList(dept));
public R<List<Tree<Long>>> categoryTree(FlowCategoryBo categoryBo) {
return R.ok(flwCategoryService.selectCategoryTreeList(categoryBo));
}
/**

5
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/FlowCategory.java
View File

@ -44,11 +44,6 @@ public class FlowCategory extends TenantEntity {
*/
private String categoryName;
/**
* 流程分类编码
*/
private String categoryCode;
/**
* 显示顺序
*/

5
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowCategoryBo.java
View File

@ -39,11 +39,6 @@ public class FlowCategoryBo extends BaseEntity {
@NotBlank(message = "流程分类名称不能为空", groups = {AddGroup.class, EditGroup.class})
private String categoryName;
/**
* 流程分类编码
*/
private String categoryCode;
/**
* 显示顺序
*/

10
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowCategoryVo.java
View File

@ -34,12 +34,12 @@ public class FlowCategoryVo implements Serializable {
private Long categoryId;
/**
* 父部门id
* 父级id
*/
private Long parentId;
/**
* 父部门名称
* 父类别名称
*/
private String parentName;
@ -54,12 +54,6 @@ public class FlowCategoryVo implements Serializable {
@ExcelProperty(value = "流程分类名称")
private String categoryName;
/**
* 流程分类编码
*/
@ExcelProperty(value = "流程分类编码")
private String categoryCode;
/**
* 显示顺序
*/

1
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwCategoryServiceImpl.java
View File

@ -194,7 +194,6 @@ public class FlwCategoryServiceImpl implements IFlwCategoryService {
lqw.eq(ObjectUtil.isNotNull(bo.getCategoryId()), FlowCategory::getCategoryId, bo.getCategoryId());
lqw.eq(ObjectUtil.isNotNull(bo.getParentId()), FlowCategory::getParentId, bo.getParentId());
lqw.like(StringUtils.isNotBlank(bo.getCategoryName()), FlowCategory::getCategoryName, bo.getCategoryName());
lqw.like(StringUtils.isNotBlank(bo.getCategoryCode()), FlowCategory::getCategoryCode, bo.getCategoryCode());
lqw.eq(StringUtils.isNotBlank(bo.getStatus()), FlowCategory::getStatus, bo.getStatus());
lqw.orderByAsc(FlowCategory::getAncestors);
lqw.orderByAsc(FlowCategory::getParentId);

16
ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/FlwDefMapper.xml
View File

@ -4,22 +4,6 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.dromara.workflow.mapper.FlwDefMapper">
<resultMap type="org.dromara.workflow.domain.vo.FlowDefinitionVo" id="FlowDefinitionResult">
<result property="id" column="id"/>
<result property="flowCode" column="flow_code"/>
<result property="flowName" column="flow_name"/>
<result property="category" column="category"/>
<result property="version" column="version"/>
<result property="isPublish" column="is_publish"/>
<result property="formCustom" column="form_custom"/>
<result property="formPath" column="form_path"/>
<result property="activityStatus" column="activity_status"/>
<result property="listenerType" column="listener_type"/>
<result property="listenerPath" column="listener_path"/>
<result property="ext" column="ext"/>
<result property="createTime" column="create_time"/>
<result property="updateTime" column="update_time"/>
<result property="delFlag" column="del_flag"/>
<result property="tenantId" column="tenant_id"/>
</resultMap>
<select id="selectDefinitionList" resultMap="FlowDefinitionResult">

19
ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/FlwInstanceMapper.xml
View File

@ -4,25 +4,6 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.dromara.workflow.mapper.FlwInstanceMapper">
<resultMap type="org.dromara.workflow.domain.vo.FlowInstanceVo" id="FlowInstanceResult">
<result property="id" column="id"/>
<result property="nodeCode" column="node_code"/>
<result property="nodeName" column="node_name"/>
<result property="nodeType" column="node_type"/>
<result property="definitionId" column="definition_id"/>
<result property="flowStatus" column="flow_status"/>
<result property="activityStatus" column="activity_status"/>
<result property="createTime" column="create_time"/>
<result property="updateTime" column="update_time"/>
<result property="tenantId" column="tenant_id"/>
<result property="businessId" column="business_id"/>
<result property="flowName" column="flow_name"/>
<result property="flowCode" column="flow_code"/>
<result property="formCustom" column="form_custom"/>
<result property="formPath" column="form_path"/>
<result property="delFlag" column="del_flag"/>
<result property="ext" column="ext"/>
<result property="createBy" column="create_by"/>
<result property="category" column="category"/>
</resultMap>
<select id="selectInstanceList" resultMap="FlowInstanceResult">

43
ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/FlwTaskMapper.xml
View File

@ -4,49 +4,8 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.dromara.workflow.mapper.FlwTaskMapper">
<resultMap type="org.dromara.workflow.domain.vo.FlowTaskVo" id="FlowTaskResult">
<result property="id" column="id"/>
<result property="nodeCode" column="node_code"/>
<result property="nodeName" column="node_name"/>
<result property="nodeType" column="node_type"/>
<result property="definitionId" column="definition_id"/>
<result property="instanceId" column="instance_id"/>
<result property="flowStatus" column="flow_status"/>
<result property="createTime" column="create_time"/>
<result property="updateTime" column="update_time"/>
<result property="tenantId" column="tenant_id"/>
<result property="businessId" column="business_id"/>
<result property="flowName" column="flow_name"/>
<result property="flowCode" column="flow_code"/>
<result property="formCustom" column="form_custom"/>
<result property="formPath" column="form_path"/>
<result property="delFlag" column="del_flag"/>
<result property="type" column="type"/>
<result property="createBy" column="create_by"/>
</resultMap>
<resultMap type="org.dromara.workflow.domain.vo.FlowHisTaskVo" id="FlowHisTaskResult">
<result property="id" column="id"/>
<result property="nodeCode" column="node_code"/>
<result property="nodeName" column="node_name"/>
<result property="nodeType" column="node_type"/>
<result property="targetNodeCode" column="target_node_code"/>
<result property="targetNodeName" column="target_node_name"/>
<result property="approver" column="approver"/>
<result property="collaborator" column="collaborator"/>
<result property="definitionId" column="definition_id"/>
<result property="instanceId" column="instance_id"/>
<result property="taskId" column="task_id"/>
<result property="cooperateType" column="cooperate_type"/>
<result property="flowStatus" column="flow_status"/>
<result property="message" column="message"/>
<result property="createTime" column="create_time"/>
<result property="updateTime" column="update_time"/>
<result property="businessId" column="business_id"/>
<result property="nodeName" column="node_name"/>
<result property="tenantId" column="tenant_id"/>
<result property="flowName" column="flow_name"/>
<result property="flowCode" column="flow_code"/>
<result property="delFlag" column="del_flag"/>
<result property="formPath" column="form_path"/>
</resultMap>
<select id="getTaskWaitByPage" resultMap="FlowTaskResult">
@ -66,7 +25,7 @@
d.flow_name,
d.flow_code,
d.form_custom,
COALESCE(t.form_path, d.form_path),
COALESCE(t.form_path, d.form_path) as form_path,
d.version,
uu.processed_by,
uu.type,

3
script/sql/ry_workflow.sql
View File

@ -156,7 +156,6 @@ create table flow_category
parent_id bigint(20) default 0 comment '父流程分类id',
ancestors varchar(500) default '' comment '祖级列表',
category_name varchar(30) not null comment '流程分类名称',
category_code varchar(100) default '' comment '流程分类编码',
order_num int(4) default 0 comment '显示顺序',
status char(1) default '0' comment '流程分类状态（0正常 1停用）',
del_flag char(1) default '0' comment '删除标志（0代表存在 2代表删除）',
@ -168,7 +167,7 @@ create table flow_category
primary key (category_id)
) engine = innodb comment = '流程分类';
INSERT INTO flow_category values (1, '000000', 0, '0', 'OA', 'OA', 0, '0', '0', 103, 1, sysdate(), null, null);
INSERT INTO flow_category values (1, '000000', 0, '0', 'OA', 0, '0', '0', 103, 1, sysdate(), null, null);
-- ----------------------------
-- 请假单信息