From 6f10b63b234bc7b562afdbf954e6b762d8568581 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 27 六月 2025 16:44:47 +0800
Subject: [PATCH] bug修改
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TProjectTeamController.java | 257 +++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 228 insertions(+), 29 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 d743b56..65b1130 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,24 +6,26 @@
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.model.*;
import com.ruoyi.system.query.TProjectTeamQuery;
-import com.ruoyi.system.service.TProjectTeamService;
-import com.ruoyi.system.service.TProjectTeamStaffService;
+import com.ruoyi.system.service.*;
import com.ruoyi.system.vo.TProjectTeamVO;
import io.swagger.annotations.Api;
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.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
/**
* <p>
@@ -40,35 +42,79 @@
private final TProjectTeamService projectTeamService;
private final TProjectTeamStaffService projectTeamStaffService;
+ private final ISysUserService sysUserService;
+ private final TokenService tokenService;
+ private final TProjectProposalService projectProposalService;
+ private final TExperimentDispatchService experimentDispatchService;
+ private final TTestMethodConfirmSheetService testMethodConfirmSheetService;
+ private final TExperimentSchemeService experimentSchemeService;
+ private final TSamplingRecordService samplingRecordService;
+ private final TExperimentResultReportService experimentResultReportService;
+ private final TQaTestItemService qaTestItemService;
+ private final TQaProduceReportService qaProduceReportService;
+ private final TFeasibilityStudyReportService feasibilityStudyReportService;
+ private final TInspectionReportService inspectionReportService;
+ private final TProjectApprovalReportService projectApprovalReportService;
+ private final TTesterOtherTaskService testerOtherTaskService;
+ private final TTestMethodConfirmSheetOriginalService testMethodConfirmSheetOriginalService;
@Autowired
- public TProjectTeamController(TProjectTeamService projectTeamService, TProjectTeamStaffService projectTeamStaffService) {
+ public TProjectTeamController(TProjectTeamService projectTeamService, TProjectTeamStaffService projectTeamStaffService, ISysUserService sysUserService, TokenService tokenService, TProjectProposalService projectProposalService, TExperimentDispatchService experimentDispatchService, TTestMethodConfirmSheetService testMethodConfirmSheetService, TExperimentSchemeService experimentSchemeService, TSamplingRecordService samplingRecordService, TExperimentResultReportService experimentResultReportService, TQaTestItemService qaTestItemService, TQaProduceReportService qaProduceReportService, TFeasibilityStudyReportService feasibilityStudyReportService, TInspectionReportService inspectionReportService, TProjectApprovalReportService projectApprovalReportService, TTesterOtherTaskService testerOtherTaskService, TTestMethodConfirmSheetOriginalService testMethodConfirmSheetOriginalService) {
this.projectTeamService = projectTeamService;
this.projectTeamStaffService = projectTeamStaffService;
+ this.sysUserService = sysUserService;
+ this.tokenService = tokenService;
+ this.projectProposalService = projectProposalService;
+ this.experimentDispatchService = experimentDispatchService;
+ this.testMethodConfirmSheetService = testMethodConfirmSheetService;
+ this.experimentSchemeService = experimentSchemeService;
+ this.samplingRecordService = samplingRecordService;
+ this.experimentResultReportService = experimentResultReportService;
+ this.qaTestItemService = qaTestItemService;
+ this.qaProduceReportService = qaProduceReportService;
+ this.feasibilityStudyReportService = feasibilityStudyReportService;
+ this.inspectionReportService = inspectionReportService;
+ this.projectApprovalReportService = projectApprovalReportService;
+ this.testerOtherTaskService = testerOtherTaskService;
+ this.testMethodConfirmSheetOriginalService = testMethodConfirmSheetOriginalService;
}
/**
* 获取项目组管理列表
*/
- @PreAuthorize("@ss.hasPermi('system:projectTeam:list')")
- @ApiOperation(value = "获取项目组分页列表")
- @PostMapping(value = "/api/pageList")
+ //@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 = "添加项目组")
- @PostMapping(value = "/api/add")
+ @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 +125,34 @@
/**
* 修改项目组
*/
- @PreAuthorize("@ss.hasPermi('system:projectTeam:edit')")
+ //@PreAuthorize("@ss.hasPermi('system:projectTeam:edit')")
@Log(title = "项目组信息-修改项目组", businessType = BusinessType.UPDATE)
@ApiOperation(value = "修改项目组")
- @PostMapping(value = "/api/update")
+ @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,25 +163,34 @@
/**
* 查看项目组详情
*/
- @PreAuthorize("@ss.hasPermi('system:projectTeam:detail')")
+ //@PreAuthorize("@ss.hasPermi('system:projectTeam:detail')")
@ApiOperation(value = "查看项目组详情")
- @GetMapping(value = "/open/getDetailById")
+ @GetMapping(value = "/open/t-project-team/getDetailById")
public R<TProjectTeamVO> getDetailById(@RequestParam String id) {
TProjectTeam projectTeam = projectTeamService.getById(id);
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/deleteById")
+ @DeleteMapping(value = "/open/t-project-team/deleteById")
public R<Boolean> deleteById(@RequestParam String id) {
// 删除项目组成员
projectTeamStaffService.remove(Wrappers.lambdaQuery(TProjectTeamStaff.class).eq(TProjectTeamStaff::getTeamId, id));
@@ -128,10 +200,10 @@
/**
* 批量删除项目组
*/
- @PreAuthorize("@ss.hasPermi('system:projectTeam:delete')")
+ //@PreAuthorize("@ss.hasPermi('system:projectTeam:delete')")
@Log(title = "项目组信息-删除项目组", businessType = BusinessType.DELETE)
@ApiOperation(value = "批量删除项目组")
- @DeleteMapping(value = "/api/deleteByIds")
+ @DeleteMapping(value = "/open/t-project-team/deleteByIds")
public R<Boolean> deleteByIds(@RequestBody List<String> ids) {
// 删除项目组成员
projectTeamStaffService.remove(Wrappers.lambdaQuery(TProjectTeamStaff.class).in(TProjectTeamStaff::getTeamId, ids));
@@ -141,17 +213,144 @@
/**
* 修改项目组
*/
- @PreAuthorize("@ss.hasPermi('system:projectTeam:upAndDown')")
- @Log(title = "项目组信息-修改项目组", businessType = BusinessType.UPDATE)
- @ApiOperation(value = "修改项目组")
- @PostMapping(value = "/api/upAndDown")
+ //@PreAuthorize("@ss.hasPermi('system:projectTeam:upAndDown')")
+ @Log(title = "项目组信息-修改项目组状态", businessType = BusinessType.UPDATE)
+ @ApiOperation(value = "修改项目组状态",response = UpAndDownDTO.class)
+ @PostMapping(value = "/api/t-project-team/upAndDown")
public R<Boolean> upAndDown(@RequestBody String param) {
UpAndDownDTO dto = JSON.parseObject(param,UpAndDownDTO.class);
TProjectTeam projectTeam = projectTeamService.getById(dto.getId());
projectTeam.setStatus(dto.getStatus());
projectTeamService.updateById(projectTeam);
+
+ // 封存项目课题方案
+ List<TProjectProposal> projectProposals = projectProposalService.list(Wrappers.lambdaQuery(TProjectProposal.class)
+ .eq(TProjectProposal::getTeamId, dto.getId()));
+ if(!CollectionUtils.isEmpty(projectProposals)){
+ for (TProjectProposal projectProposal : projectProposals) {
+ projectProposal.setAuditStatus(5);
+ }
+ projectProposalService.updateBatchById(projectProposals);
+ List<String> projectIds = projectProposals.stream().map(TProjectProposal::getId).collect(Collectors.toList());
+ // 封存实验调度
+ List<TExperimentDispatch> experimentDispatches = experimentDispatchService.list(Wrappers.lambdaQuery(TExperimentDispatch.class)
+ .in(TExperimentDispatch::getProposalId, projectIds));
+ if(!CollectionUtils.isEmpty(experimentDispatches)){
+ experimentDispatches.forEach(experimentDispatch -> {
+ experimentDispatch.setStatus(3);
+ });
+ experimentDispatchService.updateBatchById(experimentDispatches);
+
+ // 封存检验方法
+ List<String> dispatchIds = experimentDispatches.stream().map(TExperimentDispatch::getId).collect(Collectors.toList());
+ List<TTestMethodConfirmSheet> testMethodConfirmSheets = testMethodConfirmSheetService.list(Wrappers.lambdaQuery(TTestMethodConfirmSheet.class)
+ .in(TTestMethodConfirmSheet::getDispatchId, dispatchIds));
+ if(!CollectionUtils.isEmpty(testMethodConfirmSheets)){
+ testMethodConfirmSheets.forEach(testMethodConfirmSheet -> {
+ testMethodConfirmSheet.setAuditStatus(5);
+ });
+ testMethodConfirmSheetService.updateBatchById(testMethodConfirmSheets);
+ }
+
+ // 封存试验方案
+ List<TExperimentScheme> experimentSchemes = experimentSchemeService.list(Wrappers.lambdaQuery(TExperimentScheme.class)
+ .in(TExperimentScheme::getDispatchId, dispatchIds));
+ if(!CollectionUtils.isEmpty(experimentSchemes)){
+ experimentSchemes.forEach(experimentScheme -> {
+ experimentScheme.setStatus(5);
+ });
+ experimentSchemeService.updateBatchById(experimentSchemes);
+ }
+
+ // 封存取样记录
+ List<TSamplingRecord> samplingRecords = samplingRecordService.list(Wrappers.lambdaQuery(TSamplingRecord.class)
+ .in(TSamplingRecord::getDispatchId, dispatchIds));
+ if(!CollectionUtils.isEmpty(samplingRecords)){
+ samplingRecords.forEach(samplingRecord -> {
+ samplingRecord.setStatus(3);
+ });
+ samplingRecordService.updateBatchById(samplingRecords);
+ }
+
+ // 封存结果汇报
+ List<TExperimentResultReport> experimentResultReports = experimentResultReportService.list(Wrappers.lambdaQuery(TExperimentResultReport.class)
+ .in(TExperimentResultReport::getDispatchId, dispatchIds));
+ if(!CollectionUtils.isEmpty(experimentResultReports)){
+ experimentResultReports.forEach(experimentResultReport -> {
+ experimentResultReport.setStatus(4);
+ });
+ experimentResultReportService.updateBatchById(experimentResultReports);
+ }
+
+ }
+ }
+
+ // 封存检测项
+// List<TQaTestItem> qaTestItems = qaTestItemService.list(Wrappers.lambdaQuery(TQaTestItem.class)
+// .eq(TQaTestItem::getTeamId, dto.getId()));
+// if(!CollectionUtils.isEmpty(qaTestItems)){
+// qaTestItems.forEach(qaTestItem -> {
+// qaTestItem.setStatus(4);
+// });
+// qaTestItemService.updateBatchById(qaTestItems);
+// }
+
+ // 封存中试
+// List<TQaProduceReport> qaProduceReports = qaProduceReportService.list(Wrappers.lambdaQuery(TQaProduceReport.class)
+// .eq(TQaProduceReport::getTeamId, dto.getId()));
+// if(!CollectionUtils.isEmpty(qaProduceReports)){
+// qaProduceReports.forEach(qaProduceReport -> {
+// qaProduceReport.setStatus(4);
+// });
+// qaProduceReportService.updateBatchById(qaProduceReports);
+// }
+
+ // 封存可行等报告
+// List<TFeasibilityStudyReport> feasibilityStudyReports = feasibilityStudyReportService.list(Wrappers.lambdaQuery(TFeasibilityStudyReport.class)
+// .eq(TFeasibilityStudyReport::getTeamId, dto.getId()));
+// if(!CollectionUtils.isEmpty(feasibilityStudyReports)){
+// feasibilityStudyReports.forEach(feasibilityStudyReport -> {
+// feasibilityStudyReport.setStatus(4);
+// });
+// feasibilityStudyReportService.updateBatchById(feasibilityStudyReports);
+// }
+
+
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