From a4786fae8fe760d5e88881cd1d258d50da1dff2f Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 25 六月 2025 08:58:39 +0800
Subject: [PATCH] bug修改
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TProjectTeamController.java | 111 ++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 96 insertions(+), 15 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TProjectTeamController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TProjectTeamController.java
index a3011d5..0688c45 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TProjectTeamController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TProjectTeamController.java
@@ -6,12 +6,16 @@
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.dto.TProjectTeamDTO;
import com.ruoyi.system.dto.UpAndDownDTO;
import com.ruoyi.system.model.TProjectTeam;
import com.ruoyi.system.model.TProjectTeamStaff;
import com.ruoyi.system.query.TProjectTeamQuery;
+import com.ruoyi.system.service.ISysUserService;
import com.ruoyi.system.service.TProjectTeamService;
import com.ruoyi.system.service.TProjectTeamStaffService;
import com.ruoyi.system.vo.TProjectTeamVO;
@@ -19,11 +23,11 @@
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
/**
* <p>
@@ -40,35 +44,53 @@
private final TProjectTeamService projectTeamService;
private final TProjectTeamStaffService projectTeamStaffService;
+ private final ISysUserService sysUserService;
+ private final TokenService tokenService;
@Autowired
- public TProjectTeamController(TProjectTeamService projectTeamService, TProjectTeamStaffService projectTeamStaffService) {
+ public TProjectTeamController(TProjectTeamService projectTeamService, TProjectTeamStaffService projectTeamStaffService, ISysUserService sysUserService, TokenService tokenService) {
this.projectTeamService = projectTeamService;
this.projectTeamStaffService = projectTeamStaffService;
+ this.sysUserService = sysUserService;
+ this.tokenService = tokenService;
}
/**
* 获取项目组管理列表
*/
- @PreAuthorize("@ss.hasPermi('system:projectTeam:list')")
- @ApiOperation(value = "获取项目组分页列表")
+ //@PreAuthorize("@ss.hasPermi('system:projectTeam:list')")
+ @ApiOperation(value = "获取项目组分页列表",response = TProjectTeamQuery.class)
@PostMapping(value = "/api/t-project-team/pageList")
public R<PageInfo<TProjectTeamVO>> pageList(@RequestBody String param) {
TProjectTeamQuery query = JSON.parseObject(param, TProjectTeamQuery.class);
- return R.ok(projectTeamService.pageList(query));
+ PageInfo<TProjectTeamVO> tProjectTeamVOPageInfo = projectTeamService.pageList(query);
+ return R.ok(tProjectTeamVOPageInfo);
}
/**
* 添加项目组管理
*/
- @PreAuthorize("@ss.hasPermi('system:projectTeam:add')")
+ //@PreAuthorize("@ss.hasPermi('system:projectTeam:add')")
@Log(title = "项目组信息-新增项目组", businessType = BusinessType.INSERT)
@ApiOperation(value = "添加项目组",response = TProjectTeamDTO.class)
@PostMapping(value = "/api/t-project-team/add")
public R<Boolean> add(@RequestBody String param) {
TProjectTeamDTO dto = JSON.parseObject(param,TProjectTeamDTO.class);
+ List<TProjectTeamStaff> staffs = dto.getStaffs();
+ // 判断工艺工程师是否存在其他项目组中
+ staffs.stream().filter(staff -> staff.getRoleType() == 3).forEach(staff -> {
+ long count = projectTeamStaffService.count(Wrappers.lambdaQuery(TProjectTeamStaff.class).eq(TProjectTeamStaff::getUserId, staff.getUserId()));
+ if(count > 0){
+ throw new ServiceException("该工艺工程师已存在项目组");
+ }
+ });
+ staffs.stream().filter(staff -> staff.getRoleType() == 2).forEach(staff -> {
+ long count = projectTeamStaffService.count(Wrappers.lambdaQuery(TProjectTeamStaff.class).eq(TProjectTeamStaff::getUserId, staff.getUserId()));
+ if(count > 0){
+ throw new ServiceException("该审批人已存在项目组");
+ }
+ });
projectTeamService.save(dto);
// 保存项目组成员
- List<TProjectTeamStaff> staffs = dto.getStaffs();
for (TProjectTeamStaff staff : staffs) {
staff.setTeamId(dto.getId());
}
@@ -79,17 +101,34 @@
/**
* 修改项目组
*/
- @PreAuthorize("@ss.hasPermi('system:projectTeam:edit')")
+ //@PreAuthorize("@ss.hasPermi('system:projectTeam:edit')")
@Log(title = "项目组信息-修改项目组", businessType = BusinessType.UPDATE)
@ApiOperation(value = "修改项目组")
@PostMapping(value = "/api/t-project-team/update")
public R<Boolean> update(@RequestBody String param) {
TProjectTeamDTO dto = JSON.parseObject(param,TProjectTeamDTO.class);
+ List<TProjectTeamStaff> staffs = dto.getStaffs();
+ // 判断工艺工程师是否存在其他项目组中
+ staffs.stream().filter(staff -> staff.getRoleType() == 3).forEach(staff -> {
+ long count = projectTeamStaffService.count(Wrappers.lambdaQuery(TProjectTeamStaff.class)
+ .ne(TProjectTeamStaff::getTeamId, dto.getId())
+ .eq(TProjectTeamStaff::getUserId, staff.getUserId()));
+ if(count > 0){
+ throw new ServiceException("该工艺工程师已存在项目组");
+ }
+ });
+ staffs.stream().filter(staff -> staff.getRoleType() == 2).forEach(staff -> {
+ long count = projectTeamStaffService.count(Wrappers.lambdaQuery(TProjectTeamStaff.class)
+ .ne(TProjectTeamStaff::getTeamId, dto.getId())
+ .eq(TProjectTeamStaff::getUserId, staff.getUserId()));
+ if(count > 0){
+ throw new ServiceException("该工艺工程师已存在项目组");
+ }
+ });
projectTeamService.updateById(dto);
// 删除项目组成员
projectTeamStaffService.remove(Wrappers.lambdaQuery(TProjectTeamStaff.class).eq(TProjectTeamStaff::getTeamId, dto.getId()));
// 保存项目组成员
- List<TProjectTeamStaff> staffs = dto.getStaffs();
for (TProjectTeamStaff staff : staffs) {
staff.setTeamId(dto.getId());
}
@@ -100,7 +139,7 @@
/**
* 查看项目组详情
*/
- @PreAuthorize("@ss.hasPermi('system:projectTeam:detail')")
+ //@PreAuthorize("@ss.hasPermi('system:projectTeam:detail')")
@ApiOperation(value = "查看项目组详情")
@GetMapping(value = "/open/t-project-team/getDetailById")
public R<TProjectTeamVO> getDetailById(@RequestParam String id) {
@@ -108,14 +147,23 @@
TProjectTeamVO projectTeamVO = new TProjectTeamVO();
BeanUtils.copyProperties(projectTeam, projectTeamVO);
// 查询项目组人员
- projectTeamVO.setStaffs(projectTeamStaffService.list(Wrappers.lambdaQuery(TProjectTeamStaff.class).eq(TProjectTeamStaff::getTeamId, id)));
+ List<TProjectTeamStaff> list = projectTeamStaffService.list(Wrappers.lambdaQuery(TProjectTeamStaff.class).eq(TProjectTeamStaff::getTeamId, id));
+ // 查询所有人员
+ List<SysUser> sysUsers = sysUserService.selectList();
+ for (TProjectTeamStaff tProjectTeamStaff : list) {
+ sysUsers.stream().filter(sysUser -> sysUser.getUserId().equals(tProjectTeamStaff.getUserId())).forEach(sysUser -> {
+ tProjectTeamStaff.setNickName(sysUser.getNickName());
+ tProjectTeamStaff.setAvatar(sysUser.getAvatar());
+ });
+ }
+ projectTeamVO.setStaffs(list);
return R.ok(projectTeamVO);
}
/**
* 删除项目组
*/
- @PreAuthorize("@ss.hasPermi('system:projectTeam:delete')")
+ //@PreAuthorize("@ss.hasPermi('system:projectTeam:delete')")
@Log(title = "项目组信息-删除项目组", businessType = BusinessType.DELETE)
@ApiOperation(value = "删除项目组")
@DeleteMapping(value = "/open/t-project-team/deleteById")
@@ -128,7 +176,7 @@
/**
* 批量删除项目组
*/
- @PreAuthorize("@ss.hasPermi('system:projectTeam:delete')")
+ //@PreAuthorize("@ss.hasPermi('system:projectTeam:delete')")
@Log(title = "项目组信息-删除项目组", businessType = BusinessType.DELETE)
@ApiOperation(value = "批量删除项目组")
@DeleteMapping(value = "/open/t-project-team/deleteByIds")
@@ -141,7 +189,7 @@
/**
* 修改项目组
*/
- @PreAuthorize("@ss.hasPermi('system:projectTeam:upAndDown')")
+ //@PreAuthorize("@ss.hasPermi('system:projectTeam:upAndDown')")
@Log(title = "项目组信息-修改项目组状态", businessType = BusinessType.UPDATE)
@ApiOperation(value = "修改项目组状态",response = UpAndDownDTO.class)
@PostMapping(value = "/api/t-project-team/upAndDown")
@@ -153,5 +201,38 @@
return R.ok();
}
+ /**
+ * 查看项目组详情
+ */
+ @ApiOperation(value = "查询当前用户项目组信息")
+ @GetMapping(value = "/open/t-project-team/getDetailByUserId")
+ public R<TProjectTeamVO> getDetailByUserId() {
+ Long userId = tokenService.getLoginUser().getUserId();
+ Integer roleType = tokenService.getLoginUser().getUser().getRoleType();
+ TProjectTeamStaff projectTeamStaff = projectTeamStaffService.getOne(Wrappers.lambdaQuery(TProjectTeamStaff.class)
+ .eq(TProjectTeamStaff::getUserId, userId)
+ .eq(TProjectTeamStaff::getRoleType, roleType)
+ .last("LIMIT 1"));
+ if(Objects.isNull(projectTeamStaff)){
+ return R.fail("当前用户未分配项目组,无法查看项目组信息");
+ }
+ TProjectTeam projectTeam = projectTeamService.getById(projectTeamStaff.getTeamId());
+ TProjectTeamVO projectTeamVO = new TProjectTeamVO();
+ BeanUtils.copyProperties(projectTeam, projectTeamVO);
+ // 查询项目组人员
+ List<TProjectTeamStaff> list = projectTeamStaffService.list(Wrappers.lambdaQuery(TProjectTeamStaff.class).eq(TProjectTeamStaff::getTeamId, projectTeamStaff.getTeamId()));
+ // 查询所有人员
+ List<SysUser> sysUsers = sysUserService.selectList();
+ for (TProjectTeamStaff tProjectTeamStaff : list) {
+ sysUsers.stream().filter(sysUser -> sysUser.getUserId().equals(tProjectTeamStaff.getUserId())).forEach(sysUser -> {
+ tProjectTeamStaff.setNickName(sysUser.getNickName());
+ tProjectTeamStaff.setAvatar(sysUser.getAvatar());
+ });
+ }
+ projectTeamVO.setStaffs(list);
+ projectTeamVO.setStaffName(list.stream().map(TProjectTeamStaff::getNickName).collect(Collectors.joining(",")));
+ return R.ok(projectTeamVO);
+ }
+
}
--
Gitblit v1.7.1