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

feature-zrx #32

Merged
XiaoLFeng merged 12 commits from feature-zrx into develop 2024-04-19 22:41:30 +08:00
Conversation 0 Commits 12 Files Changed 19 +5 -7
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit b8b1ebd3cf - Show all commits

6
src/main/java/com/jsl/oa/controllers/ProjectController.java
View File

@ -1,9 +1,9 @@
package com.jsl.oa.controllers; package com.jsl.oa.controllers;
import com.jsl.oa.annotations.NeedPermission; import com.jsl.oa.annotations.NeedPermission;
import com.jsl.oa.model.vodata.ProjectChildAddVO;
import com.jsl.oa.model.vodata.ProjectEditVO; import com.jsl.oa.model.vodata.ProjectEditVO;
import com.jsl.oa.model.vodata.ProjectInfoVO; import com.jsl.oa.model.vodata.ProjectInfoVO;
import com.jsl.oa.model.vodata.ProjectChildAddVO;
import com.jsl.oa.model.vodata.ProjectModuleAddVO; import com.jsl.oa.model.vodata.ProjectModuleAddVO;
import com.jsl.oa.model.vodata.business.info.ProjectShowVO; import com.jsl.oa.model.vodata.business.info.ProjectShowVO;
import com.jsl.oa.services.ProjectService; import com.jsl.oa.services.ProjectService;
@ -227,7 +227,7 @@ public class ProjectController {
* @return * @return
*/ */
@PostMapping("/project/module/add") @PostMapping("/project/module/add")
@NeedPermission("project:module:add") @NeedPermission("project:module_add")
public BaseResponse projectModuleAdd( public BaseResponse projectModuleAdd(
@RequestBody @Validated ProjectModuleAddVO projectModuleAddVO, @RequestBody @Validated ProjectModuleAddVO projectModuleAddVO,
@NotNull BindingResult bindingResult, @NotNull BindingResult bindingResult,
@ -248,7 +248,7 @@ public class ProjectController {
* @return {@link BaseResponse} * @return {@link BaseResponse}
*/ */
@PostMapping("/project/child/add") @PostMapping("/project/child/add")
@NeedPermission("project:child:add") @NeedPermission("project:child_add")
public BaseResponse projectChildAdd( public BaseResponse projectChildAdd(
HttpServletRequest request, HttpServletRequest request,
@RequestBody @Validated ProjectChildAddVO projectChildAddVO, @RequestBody @Validated ProjectChildAddVO projectChildAddVO,

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

@ -6,16 +6,14 @@ 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 null comment '模块周期',
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 '创建时间',
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 '子模块的截止时间',
status varchar(8) default 'progress' not null comment '模块状态（draft: 草稿，progress: 进行，pause: 暂停，abnormal: 异常，complete: 完成）',
constraint oa_project_modules_oa_user_id_fk constraint oa_project_modules_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
) )
comment '模块表'; comment '模块表';