功能开发，脚本
This commit is contained in:
lvshaohua
parent
5a77fe1131
commit
eb6d04d52b
@ -5,10 +5,10 @@ import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import lombok.Data;
|
||||
import lombok.ToString;
|
||||
|
||||
@TableName(value = "system_dict_data", autoResultMap = true)
|
||||
@TableName(value = "bpm_dict_data", autoResultMap = true)
|
||||
@Data
|
||||
@ToString(callSuper = true)
|
||||
public class SystemDictDataDO extends BpmBaseDO{
|
||||
public class BpmDictDataDO extends BpmBaseDO{
|
||||
/**
|
||||
* 编号，自增
|
||||
*/
|
||||
@ -1,10 +1,10 @@
|
||||
package cn.axzo.workflow.core.repository.mapper;
|
||||
|
||||
|
||||
import cn.axzo.workflow.core.repository.entity.SystemDictDataDO;
|
||||
import cn.axzo.workflow.core.repository.entity.BpmDictDataDO;
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
@Mapper
|
||||
public interface SystemDictDataMapper extends BaseMapper<SystemDictDataDO> {
|
||||
public interface SystemDictDataMapper extends BaseMapper<BpmDictDataDO> {
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
package cn.axzo.workflow.core.service.converter;
|
||||
|
||||
import cn.axzo.workflow.core.repository.entity.SystemDictDataDO;
|
||||
import cn.axzo.workflow.core.repository.entity.BpmDictDataDO;
|
||||
import cn.axzo.workflow.core.service.dto.response.model.BpmCategoryItemVo;
|
||||
import org.mapstruct.Mapper;
|
||||
import org.mapstruct.Mapping;
|
||||
@ -14,11 +14,11 @@ import static org.mapstruct.NullValueCheckStrategy.ALWAYS;
|
||||
nullValueCheckStrategy = ALWAYS,
|
||||
imports = Arrays.class
|
||||
)
|
||||
public interface BpmCategoryConverter extends EntityConverter<BpmCategoryItemVo, SystemDictDataDO>{
|
||||
public interface BpmCategoryConverter extends EntityConverter<BpmCategoryItemVo, BpmDictDataDO>{
|
||||
|
||||
@Mapping(target = "id", source = "category.id")
|
||||
@Mapping(target = "dictType", source = "category.dictType")
|
||||
@Mapping(target = "label", source = "category.label")
|
||||
@Mapping(target = "value", source = "category.value")
|
||||
BpmCategoryItemVo toVo(SystemDictDataDO category);
|
||||
BpmCategoryItemVo toVo(BpmDictDataDO category);
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
package cn.axzo.workflow.core.service.impl;
|
||||
|
||||
import cn.axzo.workflow.core.repository.entity.SystemDictDataDO;
|
||||
import cn.axzo.workflow.core.repository.entity.BpmDictDataDO;
|
||||
import cn.axzo.workflow.core.repository.mapper.SystemDictDataMapper;
|
||||
import cn.axzo.workflow.core.service.BpmCategoryService;
|
||||
import cn.axzo.workflow.core.service.converter.BpmCategoryConverter;
|
||||
@ -30,23 +30,23 @@ public class BpmCategoryServiceImpl implements BpmCategoryService {
|
||||
|
||||
@Override
|
||||
public int createBpmCategory(BpmCategoryCreateDTO createDTO) {
|
||||
SystemDictDataDO systemDictDataDO=new SystemDictDataDO();
|
||||
systemDictDataDO.setDictType("bpm_model_category");
|
||||
systemDictDataDO.setLabel(createDTO.getLabel());
|
||||
systemDictDataDO.setValue(createDTO.getValue());
|
||||
systemDictDataDO.setRemark(createDTO.getRemark());
|
||||
return systemDictDataMapper.insert(systemDictDataDO);
|
||||
BpmDictDataDO bpmDictDataDO =new BpmDictDataDO();
|
||||
bpmDictDataDO.setDictType("bpm_model_category");
|
||||
bpmDictDataDO.setLabel(createDTO.getLabel());
|
||||
bpmDictDataDO.setValue(createDTO.getValue());
|
||||
bpmDictDataDO.setRemark(createDTO.getRemark());
|
||||
return systemDictDataMapper.insert(bpmDictDataDO);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int updateBpmCategory(BpmCategoryUpdateDTO createDTO) {
|
||||
SystemDictDataDO systemDictDataDO=new SystemDictDataDO();
|
||||
systemDictDataDO.setId(createDTO.getId());
|
||||
systemDictDataDO.setDictType("bpm_model_category");
|
||||
systemDictDataDO.setLabel(createDTO.getLabel());
|
||||
systemDictDataDO.setValue(createDTO.getValue());
|
||||
systemDictDataDO.setRemark(createDTO.getRemark());
|
||||
return systemDictDataMapper.updateById(systemDictDataDO);
|
||||
BpmDictDataDO bpmDictDataDO =new BpmDictDataDO();
|
||||
bpmDictDataDO.setId(createDTO.getId());
|
||||
bpmDictDataDO.setDictType("bpm_model_category");
|
||||
bpmDictDataDO.setLabel(createDTO.getLabel());
|
||||
bpmDictDataDO.setValue(createDTO.getValue());
|
||||
bpmDictDataDO.setRemark(createDTO.getRemark());
|
||||
return systemDictDataMapper.updateById(bpmDictDataDO);
|
||||
}
|
||||
|
||||
@Override
|
||||
@ -57,13 +57,13 @@ public class BpmCategoryServiceImpl implements BpmCategoryService {
|
||||
@Override
|
||||
public List<BpmCategoryItemVo> findBpmCategory(BpmCategoryDTO findDTO) {
|
||||
|
||||
LambdaQueryWrapper<SystemDictDataDO> queryWrapper = Wrappers.lambdaQuery(SystemDictDataDO.class)
|
||||
.eq(StringUtils.isNotBlank(findDTO.getDictType()), SystemDictDataDO::getDictType, findDTO.getDictType())
|
||||
.eq(StringUtils.isNotBlank(findDTO.getLabel()), SystemDictDataDO::getLabel, findDTO.getLabel());
|
||||
LambdaQueryWrapper<BpmDictDataDO> queryWrapper = Wrappers.lambdaQuery(BpmDictDataDO.class)
|
||||
.eq(StringUtils.isNotBlank(findDTO.getDictType()), BpmDictDataDO::getDictType, findDTO.getDictType())
|
||||
.eq(StringUtils.isNotBlank(findDTO.getLabel()), BpmDictDataDO::getLabel, findDTO.getLabel());
|
||||
|
||||
List<SystemDictDataDO> systemDictDataDO = systemDictDataMapper.selectList(queryWrapper);
|
||||
List<BpmDictDataDO> bpmDictDataDO = systemDictDataMapper.selectList(queryWrapper);
|
||||
|
||||
List<BpmCategoryItemVo> categoryVOS = systemDictDataDO.stream().map(bpmCategoryConverter::toVo).collect(Collectors.toList());
|
||||
List<BpmCategoryItemVo> categoryVOS = bpmDictDataDO.stream().map(bpmCategoryConverter::toVo).collect(Collectors.toList());
|
||||
return categoryVOS;
|
||||
}
|
||||
}
|
||||
|
||||
@ -20,8 +20,8 @@ SET FOREIGN_KEY_CHECKS = 0;
|
||||
-- ----------------------------
|
||||
-- Table structure for ACT_EVT_LOG
|
||||
-- ----------------------------
|
||||
DROP TABLE IF EXISTS `system_dict_data`;
|
||||
CREATE TABLE `system_dict_data` (
|
||||
DROP TABLE IF EXISTS `bpm_dict_data`;
|
||||
CREATE TABLE `bpm_dict_data` (
|
||||
`id` bigint NOT NULL AUTO_INCREMENT COMMENT '字典编码',
|
||||
`sort` int NOT NULL DEFAULT '0' COMMENT '字典排序',
|
||||
`label` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '字典标签',
|
||||
@ -35,6 +35,79 @@ CREATE TABLE `system_dict_data` (
|
||||
`create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
|
||||
`updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '更新者',
|
||||
`update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
|
||||
`deleted` bit(1) NOT NULL DEFAULT '0' COMMENT '是否删除',
|
||||
`deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
|
||||
PRIMARY KEY (`id`)
|
||||
) ENGINE=InnoDB AUTO_INCREMENT=1161 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='字典数据表'
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='字典数据表';
|
||||
|
||||
|
||||
CREATE TABLE `bpm_task_ext` (
|
||||
`id` bigint NOT NULL AUTO_INCREMENT COMMENT '编号',
|
||||
`assignee_user_id` bigint DEFAULT NULL COMMENT '任务的审批人',
|
||||
`name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '任务的名字',
|
||||
`task_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '任务的编号',
|
||||
`result` tinyint NOT NULL COMMENT '任务的结果',
|
||||
`comment` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '审批建议',
|
||||
`end_time` datetime DEFAULT NULL COMMENT '任务的结束时间',
|
||||
`process_instance_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '流程实例的编号',
|
||||
`process_definition_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '流程定义的编号',
|
||||
`creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT '' COMMENT '创建者',
|
||||
`create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
|
||||
`updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT '' COMMENT '更新者',
|
||||
`update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
|
||||
`deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
|
||||
`tenant_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL DEFAULT '' COMMENT '租户编号(工作台ID)',
|
||||
`company_id` bigint DEFAULT NULL COMMENT '审批人用户所在项目部的具体公司',
|
||||
`identity_id` bigint NOT NULL COMMENT '审批人用户身份ID',
|
||||
`user_name` varchar(25) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL DEFAULT '' COMMENT '审批人的用户姓名',
|
||||
`organizational_structure_info` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL DEFAULT '' COMMENT '审批人的组织架构信息',
|
||||
`ext` text,
|
||||
PRIMARY KEY (`id`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci ROW_FORMAT=DYNAMIC COMMENT='工作流的流程任务的拓展表';
|
||||
|
||||
|
||||
|
||||
CREATE TABLE `bpm_process_instance_ext` (
|
||||
`id` bigint NOT NULL AUTO_INCREMENT COMMENT '编号',
|
||||
`name` varchar(644) DEFAULT NULL COMMENT '流程实例的名字',
|
||||
`custom_pro_inst_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL DEFAULT '' COMMENT '自定义流程实例的编号',
|
||||
`process_instance_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '流程实例的编号',
|
||||
`process_definition_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '流程定义的编号',
|
||||
`category` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '流程分类',
|
||||
`status` tinyint NOT NULL COMMENT '流程实例的状态',
|
||||
`result` tinyint NOT NULL COMMENT '流程实例的结果',
|
||||
`end_time` datetime DEFAULT NULL COMMENT '结束时间',
|
||||
`form_variables` text CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci COMMENT '表单值',
|
||||
`creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT '' COMMENT '创建者',
|
||||
`create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
|
||||
`updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT '' COMMENT '更新者',
|
||||
`update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
|
||||
`deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
|
||||
`tenant_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL DEFAULT '' COMMENT '租户编号(工作台ID)',
|
||||
`start_company_id` bigint DEFAULT NULL COMMENT '发起流程的用户所在项目部的具体公司',
|
||||
`start_identity_Id` bigint NOT NULL COMMENT '发起流程的用户身份ID',
|
||||
`start_user_name` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL DEFAULT '' COMMENT '发起流程的用户姓名',
|
||||
`ext` text,
|
||||
PRIMARY KEY (`id`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci ROW_FORMAT=DYNAMIC COMMENT='工作流的流程实例的拓展';
|
||||
|
||||
|
||||
|
||||
CREATE TABLE `bpm_process_definition_ext` (
|
||||
`id` bigint NOT NULL AUTO_INCREMENT COMMENT '编号',
|
||||
`process_definition_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '流程定义的编号',
|
||||
`model_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '流程模型的编号',
|
||||
`description` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '描述',
|
||||
`form_type` tinyint DEFAULT NULL COMMENT '表单类型',
|
||||
`form_id` bigint DEFAULT NULL COMMENT '表单编号',
|
||||
`form_conf` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '表单的配置',
|
||||
`form_fields` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci COMMENT '表单项的数组',
|
||||
`form_custom_create_path` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '自定义表单的提交路径',
|
||||
`form_custom_view_path` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '自定义表单的查看路径',
|
||||
`creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '创建者',
|
||||
`create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
|
||||
`updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '更新者',
|
||||
`update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
|
||||
`deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
|
||||
`tenant_id` bigint NOT NULL DEFAULT '0' COMMENT '租户编号',
|
||||
PRIMARY KEY (`id`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='Bpm 流程定义的拓展表\n'
|
||||
Loading…
Reference in New Issue
Block a user