WxxyDeveloper/JSL_OrganizeInternalOA
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug:子模块子系统查询，添加bug修复 #30

Merged
XiaoLFeng merged 5 commits from feature-jie into develop 2024-04-19 19:15:35 +08:00
Conversation 0 Commits 5 Files Changed 11 +8 -8
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit a4aa3bd939 - Show all commits

8
src/main/java/com/jsl/oa/config/startup/PermissionList.java
View File

@ -23,8 +23,8 @@ public class PermissionList {
permissionList.add(new PermissionVO("info:get_header_image", "获取头部图片")); permissionList.add(new PermissionVO("info:get_header_image", "获取头部图片"));
permissionList.add(new PermissionVO("info:edit_header_image", "编辑头部图片")); permissionList.add(new PermissionVO("info:edit_header_image", "编辑头部图片"));
permissionList.add(new PermissionVO("info:delete_header_image", "删除头部图片")); permissionList.add(new PermissionVO("info:delete_header_image", "删除头部图片"));
permissionPrincipal.add(new PermissionVO("project:child:add", "增加子系统")); permissionList.add(new PermissionVO("project:child:add", "增加子系统"));
permissionPrincipal.add(new PermissionVO("project:module:add", "增加子模块")); permissionList.add(new PermissionVO("project:module:add", "增加子模块"));
permissionPrincipal.add(new PermissionVO("auth:change_password", "修改密码")); permissionPrincipal.add(new PermissionVO("auth:change_password", "修改密码"));
permissionPrincipal.add(new PermissionVO("info:get_header_image", "获取头部图片")); permissionPrincipal.add(new PermissionVO("info:get_header_image", "获取头部图片"));
@ -38,7 +38,7 @@ public class PermissionList {
permissionDeveloper.add(new PermissionVO("info:get_header_image", "获取头部图片")); permissionDeveloper.add(new PermissionVO("info:get_header_image", "获取头部图片"));
permissionDeveloper.add(new PermissionVO("info:edit_header_image", "编辑头部图片")); permissionDeveloper.add(new PermissionVO("info:edit_header_image", "编辑头部图片"));
permissionDeveloper.add(new PermissionVO("info:delete_header_image", "删除头部图片")); permissionDeveloper.add(new PermissionVO("info:delete_header_image", "删除头部图片"));
permissionPrincipal.add(new PermissionVO("project:child:add", "增加子系统")); permissionDeveloper.add(new PermissionVO("project:child:add", "增加子系统"));
permissionPrincipal.add(new PermissionVO("project:module:add", "增加子模块")); permissionDeveloper.add(new PermissionVO("project:module:add", "增加子模块"));
} }
} }

6
src/main/resources/mysql/oa_project_child.sql
View File

@ -6,15 +6,15 @@ create table oa_project_child
name varchar(100) not null comment '项目名称', name varchar(100) not null comment '项目名称',
principal_id bigint unsigned not null comment '项目负责人', principal_id bigint unsigned not null comment '项目负责人',
description json null comment '项目描述（技术选择，描述）', description json null comment '项目描述（技术选择，描述）',
cycle int unsigned not null comment '项目周期', cycle int unsigned not null comment '系统周期',
work_load int unsigned default '1' not null comment '工作量（人天）', work_load int unsigned default '1' not null comment '工作量（人天）',
files json null comment '子项目文件', files json null comment '子项目文件',
complete_time date null comment '完成时间', complete_time date null comment '完成时间',
created_at timestamp default CURRENT_TIMESTAMP not null comment '创建时间', created_at timestamp default CURRENT_TIMESTAMP not null comment '创建时间',
updated_at timestamp null comment '更新时间', updated_at timestamp null comment '更新时间',
is_delete tinyint(1) default 0 not null comment '项目是否删除', is_delete tinyint(1) default 0 not null comment '项目是否删除',
dead_line timestamp not null comment '子模块的截止时间', dead_line timestamp not null comment '子系统的截止时间',
status varchar(8) default 'progress' not null comment '模块状态（draft: 草稿，progress: 进行，pause: 暂停，abnormal: 异常，complete: 完成）', status varchar(8) default 'progress' not null comment '系统状态（draft: 草稿，progress: 进行，pause: 暂停，abnormal: 异常，complete: 完成）',
constraint oa_project_child_oa_user_id_fk constraint oa_project_child_oa_user_id_fk
foreign key (principal_id) references oa_user (id) foreign key (principal_id) references oa_user (id)
on update cascade on update cascade

2
src/main/resources/mysql/oa_project_modules.sql
View File

@ -6,7 +6,7 @@ create table oa_project_modules
name varchar(100) not null comment '模块名称', name varchar(100) not null comment '模块名称',
principal_id bigint unsigned not null comment '模块负责人', principal_id bigint unsigned not null comment '模块负责人',
description json null comment '项目描述（技术选择，描述）', description json null comment '项目描述（技术选择，描述）',
cycle int unsigned not null comment '项目周期', cycle int unsigned not null comment '模块周期',
362612387 marked this conversation as resolved Outdated
XiaoLFeng commented 2024-04-19 19:06:56 +08:00
Outdated
Review
Copy Link

项目还是模块？

项目还是模块？
work_load int unsigned default '1' not null comment '工作量（人天）', work_load int unsigned default '1' not null comment '工作量（人天）',
complete_time datetime null comment '完成时间', complete_time datetime null comment '完成时间',
created_at timestamp default CURRENT_TIMESTAMP not null comment '创建时间', created_at timestamp default CURRENT_TIMESTAMP not null comment '创建时间',