From ce0651907f18a57dae80065e01589e975530f53e Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 20 五月 2025 18:52:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTesterOtherTaskController.java | 194 ++++++++++++++++++++++--------------------------
1 files changed, 88 insertions(+), 106 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTesterOtherTaskController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTesterOtherTaskController.java
index f97936a..63b10e1 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTesterOtherTaskController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTesterOtherTaskController.java
@@ -6,21 +6,20 @@
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.enums.BusinessType;
-import com.ruoyi.common.enums.QaReportFileEnum;
-import com.ruoyi.common.enums.QaReportTypeEnum;
import com.ruoyi.framework.web.service.TokenService;
-import com.ruoyi.system.dto.TQaTestItemReportDTO;
+import com.ruoyi.system.dto.TTesterOtherTaskDTO;
+import com.ruoyi.system.mapper.SysUserMapper;
import com.ruoyi.system.model.TProjectTeam;
import com.ruoyi.system.model.TProjectTeamStaff;
-import com.ruoyi.system.model.TQaReportFile;
-import com.ruoyi.system.model.TQaTestItemReport;
-import com.ruoyi.system.query.TQaTestItemReportQuery;
+import com.ruoyi.system.model.TTesterOtherTask;
+import com.ruoyi.system.query.TTesterOtherTaskQuery;
import com.ruoyi.system.service.TProjectTeamService;
import com.ruoyi.system.service.TProjectTeamStaffService;
-import com.ruoyi.system.service.TQaReportFileService;
-import com.ruoyi.system.service.TQaTestItemReportService;
-import com.ruoyi.system.vo.TQaTestItemReportVO;
+import com.ruoyi.system.service.TTesterOtherTaskService;
+import com.ruoyi.system.vo.TProjectTeamVO;
+import com.ruoyi.system.vo.TTesterOtherTaskVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.BeanUtils;
@@ -29,6 +28,7 @@
import java.util.List;
import java.util.Objects;
+import java.util.stream.Collectors;
/**
* <p>
@@ -40,62 +40,62 @@
*/
@Api(tags = "实验员其他任务管理")
@RestController
-@RequestMapping("/t-tester-other-task")
+@RequestMapping("")
public class TTesterOtherTaskController {
- private final TQaTestItemReportService qaTestItemReportService;
- private final TQaReportFileService qaReportFileService;
+ private final TTesterOtherTaskService testerOtherTaskService;
private final TokenService tokenService;
private final TProjectTeamService projectTeamService;
private final TProjectTeamStaffService projectTeamStaffService;
+ private final SysUserMapper sysUserMapper;
@Autowired
- public TTesterOtherTaskController(TQaTestItemReportService qaTestItemReportService, TQaReportFileService qaReportFileService, TokenService tokenService, TProjectTeamService projectTeamService, TProjectTeamStaffService projectTeamStaffService) {
- this.qaTestItemReportService = qaTestItemReportService;
- this.qaReportFileService = qaReportFileService;
+ public TTesterOtherTaskController(TTesterOtherTaskService testerOtherTaskService, TokenService tokenService, TProjectTeamService projectTeamService, TProjectTeamStaffService projectTeamStaffService, SysUserMapper sysUserMapper) {
+ this.testerOtherTaskService = testerOtherTaskService;
this.tokenService = tokenService;
this.projectTeamService = projectTeamService;
this.projectTeamStaffService = projectTeamStaffService;
+ this.sysUserMapper = sysUserMapper;
}
/**
- * 获取QA检测项报告管理列表
+ * 实验员其他任务管理列表
*/
- //@PreAuthorize("@ss.hasPermi('system:qaTestItemReport:list')")
- @ApiOperation(value = "获取QA检测项报告管理分页列表-工艺工程师使用", response = TQaTestItemReportQuery.class)
- @PostMapping(value = "/api/t-qa-test-item-report/pageList")
- public R<PageInfo<TQaTestItemReportVO>> pageList(@RequestBody String param) {
- TQaTestItemReportQuery query = JSON.parseObject(param, TQaTestItemReportQuery.class);
-
- return R.ok(qaTestItemReportService.pageList(query));
+ //@PreAuthorize("@ss.hasPermi('system:testerOtherTask:list')")
+ @ApiOperation(value = "实验员其他任务管理分页列表", response = TTesterOtherTaskQuery.class)
+ @PostMapping(value = "/api/t-tester-other-task/pageList")
+ public R<PageInfo<TTesterOtherTaskVO>> pageList(@RequestBody String param) {
+ TTesterOtherTaskQuery query = JSON.parseObject(param, TTesterOtherTaskQuery.class);
+ Long userId = tokenService.getLoginUser().getUserId();
+ Integer roleType = tokenService.getLoginUser().getUser().getRoleType();
+ if(roleType != 1){
+ // 查询用户所在项目组
+ List<TProjectTeamStaff> projectTeamStaffs = projectTeamStaffService.list(Wrappers.lambdaQuery(TProjectTeamStaff.class)
+ .eq(TProjectTeamStaff::getUserId, userId));
+ if(projectTeamStaffs.size() > 0){
+ // 查询项目组id
+ List<String> teamIds = projectTeamStaffs.stream().map(TProjectTeamStaff::getTeamId).distinct().collect(Collectors.toList());
+ query.setTeamIds(teamIds);
+ }
+ }
+ return R.ok(testerOtherTaskService.pageList(query));
}
/**
- * 获取QA检测项报告管理列表
+ * 添加实验员其他任务管理管理
*/
- @ApiOperation(value = "获取QA检测项报告管理下拉列表-化验师使用")
- @GetMapping(value = "/open/t-qa-test-item-report/getListByItemId")
- public R<List<TQaTestItemReport>> getListByItemId(@RequestParam String itemId) {
- List<TQaTestItemReport> list = qaTestItemReportService.list(Wrappers.lambdaQuery(TQaTestItemReport.class)
- .eq(TQaTestItemReport::getItemId, itemId));
- return R.ok(list);
- }
-
- /**
- * 添加QA检测项报告管理管理
- */
- //@PreAuthorize("@ss.hasPermi('system:qaTestItemReport:add')")
- @Log(title = "QA检测项报告管理信息-新增QA检测项报告管理", businessType = BusinessType.INSERT)
- @ApiOperation(value = "添加QA检测项报告管理",response = TQaTestItemReportDTO.class)
- @PostMapping(value = "/api/t-qa-test-item-report/add")
+ //@PreAuthorize("@ss.hasPermi('system:testerOtherTask:add')")
+ @Log(title = "实验员其他任务管理信息-新增实验员其他任务管理", businessType = BusinessType.INSERT)
+ @ApiOperation(value = "添加实验员其他任务管理",response = TTesterOtherTaskDTO.class)
+ @PostMapping(value = "/api/t-tester-other-task/add")
public R<Boolean> add(@RequestBody String param) {
- TQaTestItemReportDTO dto = JSON.parseObject(param,TQaTestItemReportDTO.class);
+ TTesterOtherTaskDTO dto = JSON.parseObject(param,TTesterOtherTaskDTO.class);
// 通过当前用户查询项目组
Long userId = tokenService.getLoginUser().getUserId();
TProjectTeamStaff projectTeamStaff = projectTeamStaffService.getOne(Wrappers.lambdaQuery(TProjectTeamStaff.class)
.eq(TProjectTeamStaff::getUserId, userId)
.last("LIMIT 1"));
if(Objects.isNull(projectTeamStaff)){
- return R.fail("当前用户未分配项目组,无法创建项目课题方案");
+ return R.fail("当前用户未分配项目组,无法创建实验员其他任务");
}
// 查询项目组
TProjectTeam projectTeam = projectTeamService.getById(projectTeamStaff.getTeamId());
@@ -105,92 +105,74 @@
if(projectTeam.getStatus() == 2){
return R.fail("项目组已封存,无法创建项目课题方案");
}
- // 生成中试、生产验证编号
- String reportCode = projectTeam.getTeamName() + "-" + QaReportTypeEnum.TEST_REPORT.getCode();
-
- // 查询上个项目课题方案的序号
- long count = qaTestItemReportService.count(Wrappers.lambdaQuery(TQaTestItemReport.class)
- .like(TQaTestItemReport::getReportCode, reportCode));
- reportCode = reportCode + "-" + String.format("%03d", count+1);
- dto.setReportCode(reportCode);
-
- qaTestItemReportService.save(dto);
- // 添加检测报告文件
- List<TQaReportFile> qaReportFiles = dto.getQaReportFiles();
- for (TQaReportFile qaReportFile : qaReportFiles) {
- qaReportFile.setReportId(dto.getId());
- qaReportFile.setReportType(QaReportFileEnum.TEST_REPORT.getCode());
- }
- qaReportFileService.saveBatch(qaReportFiles);
+ testerOtherTaskService.save(dto);
return R.ok();
}
/**
- * 修改QA检测项报告管理
+ * 修改实验员其他任务管理
*/
- //@PreAuthorize("@ss.hasPermi('system:qaTestItemReport:edit')")
- @Log(title = "QA检测项报告管理信息-修改QA检测项报告管理", businessType = BusinessType.UPDATE)
- @ApiOperation(value = "修改QA检测项报告管理")
- @PostMapping(value = "/api/t-qa-test-item-report/update")
+ //@PreAuthorize("@ss.hasPermi('system:testerOtherTask:edit')")
+ @Log(title = "实验员其他任务管理信息-修改实验员其他任务管理", businessType = BusinessType.UPDATE)
+ @ApiOperation(value = "修改实验员其他任务管理")
+ @PostMapping(value = "/api/t-tester-other-task/update")
public R<Boolean> update(@RequestBody String param) {
- TQaTestItemReportDTO dto = JSON.parseObject(param,TQaTestItemReportDTO.class);
- qaTestItemReportService.updateById(dto);
- qaReportFileService.remove(Wrappers.lambdaQuery(TQaReportFile.class)
- .eq(TQaReportFile::getReportId, dto.getId()));
- // 添加检测报告文件
- List<TQaReportFile> qaReportFiles = dto.getQaReportFiles();
- for (TQaReportFile qaReportFile : qaReportFiles) {
- qaReportFile.setReportId(dto.getId());
- qaReportFile.setReportType(QaReportFileEnum.TEST_REPORT.getCode());
- }
- qaReportFileService.saveBatch(qaReportFiles);
+ TTesterOtherTaskDTO dto = JSON.parseObject(param,TTesterOtherTaskDTO.class);
+ testerOtherTaskService.updateById(dto);
return R.ok();
}
/**
- * 查看QA检测项报告管理详情
+ * 查看实验员其他任务管理详情
*/
- //@PreAuthorize("@ss.hasPermi('system:qaTestItemReport:detail')")
- @ApiOperation(value = "查看QA检测项报告管理详情")
- @GetMapping(value = "/open/t-qa-test-item-report/getDetailById")
- public R<TQaTestItemReportVO> getDetailById(@RequestParam String id) {
- TQaTestItemReport testItemReport = qaTestItemReportService.getById(id);
- TQaTestItemReportVO testItemReportVO = new TQaTestItemReportVO();
- BeanUtils.copyProperties(testItemReport, testItemReportVO);
- // 查询检测报告文件
- List<TQaReportFile> qaReportFiles = qaReportFileService.list(Wrappers.lambdaQuery(TQaReportFile.class)
- .eq(TQaReportFile::getReportId, id)
- .eq(TQaReportFile::getReportType, QaReportFileEnum.TEST_REPORT.getCode()));
- testItemReportVO.setQaReportFileList(qaReportFiles);
- return R.ok(testItemReportVO);
+ //@PreAuthorize("@ss.hasPermi('system:testerOtherTask:detail')")
+ @ApiOperation(value = "查看实验员其他任务管理详情")
+ @GetMapping(value = "/open/t-tester-other-task/getDetailById")
+ public R<TTesterOtherTaskVO> getDetailById(@RequestParam String id) {
+ TTesterOtherTask testerOtherTask = testerOtherTaskService.getById(id);
+ TTesterOtherTaskVO testerOtherTaskVO = new TTesterOtherTaskVO();
+ BeanUtils.copyProperties(testerOtherTask, testerOtherTaskVO);
+ // 查询项目组信息
+ TProjectTeam projectTeam = projectTeamService.getById(testerOtherTask.getTeamId());
+ TProjectTeamVO projectTeamVO = new TProjectTeamVO();
+ BeanUtils.copyProperties(projectTeam, projectTeamVO);
+ // 查询项目组成员
+ List<TProjectTeamStaff> projectTeamStaffs = projectTeamStaffService.list(Wrappers.lambdaQuery(TProjectTeamStaff.class)
+ .eq(TProjectTeamStaff::getTeamId, projectTeam.getId()));
+ List<Long> userIds = projectTeamStaffs.stream().map(TProjectTeamStaff::getUserId).collect(Collectors.toList());
+ userIds = userIds.stream().distinct().collect(Collectors.toList());
+ List<SysUser> sysUsers = sysUserMapper.selectUserByIds(userIds);
+ // 拼接项目组成员名称
+ projectTeamVO.setStaffName(sysUsers.stream().map(SysUser::getNickName).collect(Collectors.joining(",")));
+ testerOtherTaskVO.setProjectTeam(projectTeamVO);
+ // 查询是演员信息
+ SysUser sysUser = sysUserMapper.selectUserById(testerOtherTaskVO.getTesterId());
+ if(Objects.nonNull(sysUser)){
+ testerOtherTaskVO.setTesterName(sysUser.getNickName());
+ }
+ return R.ok(testerOtherTaskVO);
}
/**
- * 删除QA检测项报告管理
+ * 删除实验员其他任务管理
*/
- //@PreAuthorize("@ss.hasPermi('system:qaTestItemReport:delete')")
- @Log(title = "QA检测项报告管理信息-删除QA检测项报告管理", businessType = BusinessType.DELETE)
- @ApiOperation(value = "删除QA检测项报告管理")
- @DeleteMapping(value = "/open/t-qa-test-item-report/deleteById")
+ //@PreAuthorize("@ss.hasPermi('system:testerOtherTask:delete')")
+ @Log(title = "实验员其他任务管理信息-删除实验员其他任务管理", businessType = BusinessType.DELETE)
+ @ApiOperation(value = "删除实验员其他任务管理")
+ @DeleteMapping(value = "/open/t-tester-other-task/deleteById")
public R<Boolean> deleteById(@RequestParam String id) {
- // 删除QA检测项报告文件
- qaReportFileService.remove(Wrappers.lambdaQuery(TQaReportFile.class).eq(TQaReportFile::getReportId, id)
- .in(TQaReportFile::getReportType, QaReportFileEnum.TEST_REPORT.getCode()));
- return R.ok(qaTestItemReportService.removeById(id));
+ return R.ok(testerOtherTaskService.removeById(id));
}
/**
- * 批量删除QA检测项报告管理
+ * 批量删除实验员其他任务管理
*/
- //@PreAuthorize("@ss.hasPermi('system:qaTestItemReport:delete')")
- @Log(title = "QA检测项报告管理信息-删除QA检测项报告管理", businessType = BusinessType.DELETE)
- @ApiOperation(value = "批量删除QA检测项报告管理")
- @DeleteMapping(value = "/open/t-qa-test-item-report/deleteByIds")
+ //@PreAuthorize("@ss.hasPermi('system:testerOtherTask:delete')")
+ @Log(title = "实验员其他任务管理信息-删除实验员其他任务管理", businessType = BusinessType.DELETE)
+ @ApiOperation(value = "批量删除实验员其他任务管理")
+ @DeleteMapping(value = "/open/t-tester-other-task/deleteByIds")
public R<Boolean> deleteByIds(@RequestBody List<String> ids) {
- // 删除QA检测项报告检测报告文件
- qaReportFileService.remove(Wrappers.lambdaQuery(TQaReportFile.class).in(TQaReportFile::getReportId, ids)
- .in(TQaReportFile::getReportType, QaReportFileEnum.TEST_REPORT.getCode()));
- return R.ok(qaTestItemReportService.removeByIds(ids));
+ return R.ok(testerOtherTaskService.removeByIds(ids));
}
}
--
Gitblit v1.7.1