From b07657472606be35b98340734f1f77e645a69989 Mon Sep 17 00:00:00 2001 From: AprilWind <2100166581@qq.com> Date: Tue, 17 Dec 2024 11:33:52 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E5=88=A0=E9=99=A4=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E5=88=86=E7=B1=BB=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/FlwCategoryController.java | 6 --- .../dromara/workflow/domain/FlowCategory.java | 5 --- .../workflow/domain/bo/FlowCategoryBo.java | 5 --- .../workflow/domain/vo/FlowCategoryVo.java | 7 ---- .../workflow/service/IFlwCategoryService.java | 8 ---- .../service/impl/FlwCategoryServiceImpl.java | 42 +------------------ script/sql/ry_workflow.sql | 9 +++- 7 files changed, 9 insertions(+), 73 deletions(-) diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwCategoryController.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwCategoryController.java index 4474ccd96..9783279c1 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwCategoryController.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwCategoryController.java @@ -96,12 +96,6 @@ public class FlwCategoryController extends BaseController { return R.fail("修改流程分类'" + category.getCategoryName() + "'失败，流程分类名称已存在"); } else if (category.getParentId().equals(categoryId)) { return R.fail("修改流程分类'" + category.getCategoryName() + "'失败，上级流程分类不能是自己"); - } else if (StringUtils.equals(SystemConstants.DISABLE, category.getStatus())) { - if (flwCategoryService.selectNormalChildrenCategoryById(categoryId) > 0) { - return R.fail("该流程分类包含未停用的子流程分类!"); - } else if (flwCategoryService.checkCategoryExistDefinition(categoryId)) { - return R.fail("该部门下存在已分配流程定义，不能禁用!"); - } } return toAjax(flwCategoryService.updateByBo(category)); } diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/FlowCategory.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/FlowCategory.java index 50c5049c4..2ec297c5a 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/FlowCategory.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/FlowCategory.java @@ -49,11 +49,6 @@ public class FlowCategory extends TenantEntity { */ private Long orderNum; - /** - * 流程分类状态（0正常 1停用） - */ - private String status; - /** * 删除标志（0代表存在 2代表删除） */ diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowCategoryBo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowCategoryBo.java index 97d221651..fd626eb0d 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowCategoryBo.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowCategoryBo.java @@ -44,9 +44,4 @@ public class FlowCategoryBo extends BaseEntity { */ private Long orderNum; - /** - * 流程分类状态（0正常 1停用） - */ - private String status; - } diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowCategoryVo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowCategoryVo.java index 120f4cc02..2c72143cb 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowCategoryVo.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowCategoryVo.java @@ -60,13 +60,6 @@ public class FlowCategoryVo implements Serializable { @ExcelProperty(value = "显示顺序") private Long orderNum; - /** - * 流程分类状态（0正常 1停用） - */ - @ExcelProperty(value = "流程分类状态", converter = ExcelDictConvert.class) - @ExcelDictFormat(readConverterExp = "0=正常,1=停用") - private String status; - /** * 创建时间 */ diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwCategoryService.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwCategoryService.java index 21f82c79d..43bc175fd 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwCategoryService.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwCategoryService.java @@ -60,14 +60,6 @@ public interface IFlwCategoryService { */ boolean checkCategoryNameUnique(FlowCategoryBo category); - /** - * 根据ID查询所有子流程分类数（正常状态） - * - * @param categoryId 流程分类ID - * @return 子流程分类数 - */ - long selectNormalChildrenCategoryById(Long categoryId); - /** * 查询流程分类是否存在流程定义 * diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwCategoryServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwCategoryServiceImpl.java index 6e97748c7..42f1c5555 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwCategoryServiceImpl.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwCategoryServiceImpl.java @@ -1,11 +1,9 @@ package org.dromara.workflow.service.impl; import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.convert.Convert; import cn.hutool.core.lang.tree.Tree; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; import org.dromara.common.core.constant.SystemConstants; @@ -26,7 +24,6 @@ import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; /** @@ -108,8 +105,7 @@ public class FlwCategoryServiceImpl implements IFlwCategoryService { tree.setId(dept.getCategoryId()) .setParentId(dept.getParentId()) .setName(dept.getCategoryName()) - .setWeight(dept.getOrderNum()) - .putExtra("disabled", SystemConstants.DISABLE.equals(dept.getStatus()))); + .setWeight(dept.getOrderNum())); Tree tree = StreamUtils.findFirst(trees, it -> it.getId().longValue() == d.getCategoryId()); treeList.add(tree); } @@ -150,19 +146,6 @@ public class FlwCategoryServiceImpl implements IFlwCategoryService { return !exist; } - /** - * 根据ID查询所有子流程分类数（正常状态） - * - * @param categoryId 流程分类ID - * @return 子流程分类数 - */ - @Override - public long selectNormalChildrenCategoryById(Long categoryId) { - return baseMapper.selectCount(new LambdaQueryWrapper() - .eq(FlowCategory::getStatus, SystemConstants.NORMAL) - .apply(DataBaseHelper.findInSet(categoryId, "ancestors"))); - } - /** * 查询流程分类是否存在流程定义 * @@ -194,7 +177,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.eq(StringUtils.isNotBlank(bo.getStatus()), FlowCategory::getStatus, bo.getStatus()); lqw.orderByAsc(FlowCategory::getAncestors); lqw.orderByAsc(FlowCategory::getParentId); lqw.orderByAsc(FlowCategory::getOrderNum); @@ -217,7 +199,6 @@ public class FlwCategoryServiceImpl implements IFlwCategoryService { FlowCategory info = baseMapper.selectById(bo.getParentId()); category.setAncestors(info.getAncestors() + StringUtils.SEPARATOR + category.getParentId()); } - return baseMapper.insert(category); } @@ -248,13 +229,7 @@ public class FlwCategoryServiceImpl implements IFlwCategoryService { } else { category.setAncestors(oldCategory.getAncestors()); } - int result = baseMapper.updateById(category); - if (SystemConstants.NORMAL.equals(category.getStatus()) && StringUtils.isNotEmpty(category.getAncestors()) - && !StringUtils.equals(SystemConstants.NORMAL, category.getAncestors())) { - // 如果该流程分类是启用状态，则启用该流程分类的所有上级流程分类 - updateParentCategoryStatusNormal(category); - } - return result; + return baseMapper.updateById(category); } /** @@ -279,19 +254,6 @@ public class FlwCategoryServiceImpl implements IFlwCategoryService { } } - /** - * 修改该流程分类的父级流程分类状态 - * - * @param category 当前流程分类 - */ - private void updateParentCategoryStatusNormal(FlowCategory category) { - String ancestors = category.getAncestors(); - Long[] categoryIds = Convert.toLongArray(ancestors); - baseMapper.update(null, new LambdaUpdateWrapper() - .set(FlowCategory::getStatus, SystemConstants.NORMAL) - .in(FlowCategory::getCategoryId, Arrays.asList(categoryIds))); - } - /** * 删除流程分类信息 * diff --git a/script/sql/ry_workflow.sql b/script/sql/ry_workflow.sql index 7af6847fd..3e11b25d0 100644 --- a/script/sql/ry_workflow.sql +++ b/script/sql/ry_workflow.sql @@ -157,7 +157,6 @@ create table flow_category ancestors varchar(500) default '' comment '祖级列表', category_name varchar(30) not null 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代表删除）', create_dept bigint(20) null comment '创建部门', create_by bigint(20) null comment '创建者', @@ -167,7 +166,13 @@ create table flow_category primary key (category_id) ) engine = innodb comment = '流程分类'; -INSERT INTO flow_category values (1, '000000', 0, '0', 'OA', 0, '0', '0', 103, 1, sysdate(), null, null); +INSERT INTO flow_category values (100, '000000', 0, '0', 'OA审批', 0, '0', 103, 1, sysdate(), null, null); +INSERT INTO flow_category values (101, '000000', 100, '0,100', '假勤管理', 0, '0', 103, 1, sysdate(), null, null); +INSERT INTO flow_category values (102, '000000', 100, '0,100', '人事管理', 0, '0', 103, 1, sysdate(), null, null); +INSERT INTO flow_category values (103, '000000', 100, '0,100', '财税管理', 0, '0', 103, 1, sysdate(), null, null); +INSERT INTO flow_category values (104, '000000', 100, '0,100', '资产管理', 0, '0', 103, 1, sysdate(), null, null); +INSERT INTO flow_category values (105, '000000', 100, '0,100', '工程管理', 0, '0', 103, 1, sysdate(), null, null); +INSERT INTO flow_category values (106, '000000', 100, '0,100', '商旅管理', 0, '0', 103, 1, sysdate(), null, null); -- ---------------------------- -- 请假单信息