From e4e718d4e87db3a04bf87db52e8775502a3e01e8 Mon Sep 17 00:00:00 2001 From: chenhao <852066789@qq.com> Date: Thu, 10 Oct 2024 16:42:48 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E4=BC=98=E5=8C=96=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business/project/ProjectController.java | 28 +++++++++++++++++-- .../pms/business/project/domain/Project.java | 4 --- .../project/mapper/ProjectMapper.java | 1 + .../service/impl/ProjectServiceImpl.java | 14 +++++++--- .../mapper/business/Project/ProjectMapper.xml | 5 ++++ 5 files changed, 41 insertions(+), 11 deletions(-) diff --git a/pms-admin/src/main/java/tech/unissense/pms/web/controller/business/project/ProjectController.java b/pms-admin/src/main/java/tech/unissense/pms/web/controller/business/project/ProjectController.java index 2f970d3..b3669ab 100644 --- a/pms-admin/src/main/java/tech/unissense/pms/web/controller/business/project/ProjectController.java +++ b/pms-admin/src/main/java/tech/unissense/pms/web/controller/business/project/ProjectController.java @@ -9,6 +9,7 @@ import tech.unissense.pms.business.work.logger.domain.WorkLogger; import tech.unissense.pms.common.annotation.Log; import tech.unissense.pms.common.core.controller.BaseController; import tech.unissense.pms.common.core.domain.AjaxResult; +import tech.unissense.pms.common.core.page.TableDataInfo; import tech.unissense.pms.common.enums.BusinessType; import tech.unissense.pms.common.utils.uuid.IdUtils; import tech.unissense.pms.common.utils.uuid.UUID; @@ -36,11 +37,11 @@ public class ProjectController extends BaseController */ // @PreAuthorize("@ss.hasPermi('system:dept:list')") @GetMapping("/list") - public AjaxResult list(Project project) + public TableDataInfo list(Project project) { startPage(); - List depts = service.permissisonList(project); - return success(depts); + List projectList = service.permissisonList(project); + return getDataTable(projectList); } /** @@ -52,9 +53,21 @@ public class ProjectController extends BaseController public AjaxResult addData(@RequestBody Project project) { service.insert(project); + return success(project); + } + /** + * 新增数据 + */ + // @PreAuthorize("@ss.hasPermi('system:dept:list')") + @PostMapping("/update") + @Log(title = "项目管理", businessType = BusinessType.UPDATE) + public AjaxResult updateDate(@RequestBody Project project) + { + service.update(project); return success(); } + /** * 获取项目编号 * @return @@ -103,6 +116,15 @@ public class ProjectController extends BaseController { return success(service.getTeamInfo(projectId)); } + /** + * 根据项目获取人员信息 + */ + // @PreAuthorize("@ss.hasPermi('system:dept:remove')") + @GetMapping("/info/{projectId}") + public AjaxResult getProject(@PathVariable Integer projectId) + { + return success(service.queryById(projectId)); + } /** * 项目执行表 */ diff --git a/pms-business/src/main/java/tech/unissense/pms/business/project/domain/Project.java b/pms-business/src/main/java/tech/unissense/pms/business/project/domain/Project.java index b97f137..449d0b5 100644 --- a/pms-business/src/main/java/tech/unissense/pms/business/project/domain/Project.java +++ b/pms-business/src/main/java/tech/unissense/pms/business/project/domain/Project.java @@ -74,10 +74,6 @@ public class Project extends BaseEntity { * 项目人数 */ private Integer teamNum; - /** - * 项目人员 - */ - private List projectTeamList; private Long queryUserId; diff --git a/pms-business/src/main/java/tech/unissense/pms/business/project/mapper/ProjectMapper.java b/pms-business/src/main/java/tech/unissense/pms/business/project/mapper/ProjectMapper.java index c5b0450..150859c 100644 --- a/pms-business/src/main/java/tech/unissense/pms/business/project/mapper/ProjectMapper.java +++ b/pms-business/src/main/java/tech/unissense/pms/business/project/mapper/ProjectMapper.java @@ -79,5 +79,6 @@ public interface ProjectMapper { */ int deleteById(Integer projectId); + int logicalDeleteById(Integer projectId); } diff --git a/pms-business/src/main/java/tech/unissense/pms/business/project/service/impl/ProjectServiceImpl.java b/pms-business/src/main/java/tech/unissense/pms/business/project/service/impl/ProjectServiceImpl.java index d92f3e5..fbcb86d 100644 --- a/pms-business/src/main/java/tech/unissense/pms/business/project/service/impl/ProjectServiceImpl.java +++ b/pms-business/src/main/java/tech/unissense/pms/business/project/service/impl/ProjectServiceImpl.java @@ -73,6 +73,9 @@ public class ProjectServiceImpl implements IProjectService { private void dataPermissions(Project project) { SysUser user = SecurityUtils.getLoginUser().getUser(); StringBuilder sql = new StringBuilder(); + if (user.isAdmin()){ + return; + } if (CollUtil.isEmpty(user.getRoles())){ sql.append(" and 1=2"); project.getParams().put("dataScope",sql); @@ -98,11 +101,14 @@ public class ProjectServiceImpl implements IProjectService { */ @Override public Project insert(Project project) { + if (StringUtils.isEmpty(project.getState())){ + project.setState("0"); + } // 新增项目 this.projectMapper.insert(project); - project.getProjectTeamList().forEach(item -> item.setProjectId(project.getProjectId())); - // 新增项目人员 - teamService.insertBatch(project.getProjectTeamList()); + // project.getProjectTeamList().forEach(item -> item.setProjectId(project.getProjectId())); + // // 新增项目人员 + // teamService.insertBatch(project.getProjectTeamList()); return project; } @@ -126,7 +132,7 @@ public class ProjectServiceImpl implements IProjectService { */ @Override public boolean deleteById(Integer projectId) { - return this.projectMapper.deleteById(projectId) > 0; + return this.projectMapper.logicalDeleteById(projectId) > 0; } @Override diff --git a/pms-business/src/main/resources/mapper/business/Project/ProjectMapper.xml b/pms-business/src/main/resources/mapper/business/Project/ProjectMapper.xml index f152c9e..891ad46 100644 --- a/pms-business/src/main/resources/mapper/business/Project/ProjectMapper.xml +++ b/pms-business/src/main/resources/mapper/business/Project/ProjectMapper.xml @@ -267,6 +267,11 @@ where project_id = #{projectId} + + update pms_project + set state = 1 + where project_id = #{projectId} +