From 649a77a70100c63aefd8c73deff2d6b4d71af36f Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 04 二月 2026 19:18:53 +0800
Subject: [PATCH] 检测项修改，检验方法确认单修改
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TQaTestItemReportController.java | 257 ++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 252 insertions(+), 5 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TQaTestItemReportController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TQaTestItemReportController.java
index c70215e..e1da7e7 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TQaTestItemReportController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TQaTestItemReportController.java
@@ -1,22 +1,269 @@
package com.ruoyi.web.controller.api;
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+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.QATestItemReportStatusEnum;
+import com.ruoyi.common.enums.QaReportFileEnum;
+import com.ruoyi.common.enums.QaReportTypeEnum;
+import com.ruoyi.framework.web.service.TokenService;
+import com.ruoyi.system.dto.AuditStatusDTO;
+import com.ruoyi.system.dto.TQaTestItemReportDTO;
+import com.ruoyi.system.model.*;
+import com.ruoyi.system.query.TQaTestItemReportQuery;
+import com.ruoyi.system.service.*;
+import com.ruoyi.system.vo.TQaTestItemReportVO;
import io.swagger.annotations.Api;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
+import org.springframework.web.bind.annotation.*;
+
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
/**
* <p>
- * QA检测项报告 前端控制器
+ * QA检测项报告报告 前端控制器
* </p>
*
* @author xiaochen
* @since 2025-04-08
*/
-@Api(tags = "QA检测项报告管理")
+@Api(tags = "QA检测项报告报告管理")
@RestController
-@RequestMapping("/t-qa-test-item-report")
+@RequestMapping("")
public class TQaTestItemReportController {
+ private final TQaTestItemReportService qaTestItemReportService;
+ private final TQaReportFileService qaReportFileService;
+ private final TokenService tokenService;
+ private final TProjectTeamService projectTeamService;
+ private final TProjectTeamStaffService projectTeamStaffService;
+ private final ISysUserService sysUserService;
+ private final TQaTestItemService qaTestItemService;
+ private final TNoticeService noticeService;
+ @Autowired
+ public TQaTestItemReportController(TQaTestItemReportService qaTestItemReportService, TQaReportFileService qaReportFileService, TokenService tokenService, TProjectTeamService projectTeamService, TProjectTeamStaffService projectTeamStaffService, ISysUserService sysUserService, TQaTestItemService qaTestItemService, TNoticeService noticeService) {
+ this.qaTestItemReportService = qaTestItemReportService;
+ this.qaReportFileService = qaReportFileService;
+ this.tokenService = tokenService;
+ this.projectTeamService = projectTeamService;
+ this.projectTeamStaffService = projectTeamStaffService;
+ this.sysUserService = sysUserService;
+ this.qaTestItemService = qaTestItemService;
+ this.noticeService = noticeService;
+ }
+
+ /**
+ * 获取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);
+ 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.isEmpty()){
+ // 查询项目组id
+ List<String> teamIds = projectTeamStaffs.stream().map(TProjectTeamStaff::getTeamId).distinct().collect(Collectors.toList());
+ query.setTeamIds(teamIds);
+ }
+ }
+ return R.ok(qaTestItemReportService.pageList(query));
+ }
+
+ /**
+ * 获取QA检测项报告管理列表
+ */
+ @ApiOperation(value = "获取QA检测项报告管理下拉列表-化验师使用、评定使用")
+ @GetMapping(value = "/open/t-qa-test-item-report/getListByItemId")
+ public R<List<TQaTestItemReportVO>> getListByItemId(@RequestParam String itemId) {
+ List<TQaTestItemReportVO> list = qaTestItemReportService.getListByItemId(itemId);
+ if(!CollectionUtils.isEmpty(list)){
+ List<SysUser> sysUsers = sysUserService.selectList();
+ list.forEach(itemReport -> {
+ SysUser sysUser = sysUsers.stream().filter(user -> user.getUserId().equals(itemReport.getAuditPersonId())).findFirst().orElse(null);
+ if(Objects.nonNull(sysUser)){
+ itemReport.setAuditPersonName(sysUser.getNickName());
+ }
+ });
+ }
+ 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")
+ public R<Boolean> add(@RequestBody String param) {
+ TQaTestItemReportDTO dto = JSON.parseObject(param,TQaTestItemReportDTO.class);
+ // 查询项目组
+ TProjectTeam projectTeam = projectTeamService.getById(dto.getTeamId());
+ if(Objects.isNull(projectTeam)){
+ return R.fail("项目组不存在");
+ }
+ 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();
+ if(!CollectionUtils.isEmpty(qaReportFiles)){
+ for (TQaReportFile qaReportFile : qaReportFiles) {
+ qaReportFile.setReportId(dto.getId());
+ qaReportFile.setReportType(QaReportFileEnum.TEST_REPORT.getCode());
+ }
+ qaReportFileService.saveBatch(qaReportFiles);
+ }
+ 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")
+ 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();
+ if(!CollectionUtils.isEmpty(qaReportFiles)){
+ for (TQaReportFile qaReportFile : qaReportFiles) {
+ qaReportFile.setReportId(dto.getId());
+ qaReportFile.setReportType(QaReportFileEnum.TEST_REPORT.getCode());
+ }
+ qaReportFileService.saveBatch(qaReportFiles);
+ }
+ 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);
+ // 查询审批人姓名
+ SysUser sysUser = sysUserService.selectUserById(testItemReportVO.getAuditPersonId());
+ if(Objects.nonNull(sysUser)){
+ testItemReportVO.setAuditPersonName(sysUser.getNickName());
+ }
+ return R.ok(testItemReportVO);
+ }
+
+ /**
+ * 删除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")
+ 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));
+ }
+
+ /**
+ * 批量删除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")
+ 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));
+ }
+
+ /**
+ * 撤销QA检测项报告管理
+ */
+ //@PreAuthorize("@ss.hasPermi('system:qaTestItemReport:revokedReport')")
+ @Log(title = "QA检测项报告管理信息-撤销QA检测项报告管理状态", businessType = BusinessType.UPDATE)
+ @ApiOperation(value = "撤销QA检测项报告管理状态")
+ @PutMapping(value = "/open/t-qa-test-item-report/revokedReport")
+ public R<Boolean> revokedReport(@RequestParam String id) {
+ TQaTestItemReport testItemReport = qaTestItemReportService.getById(id);
+ testItemReport.setStatus(QATestItemReportStatusEnum.DRAFTS.getCode());
+ qaTestItemReportService.updateById(testItemReport);
+ return R.ok();
+ }
+
+ /**
+ * 审核QA检测项报告管理
+ */
+ //@PreAuthorize("@ss.hasPermi('system:qaTestItemReport:auditReport')")
+ @Log(title = "QA检测项报告管理信息-审核QA检测项报告管理状态", businessType = BusinessType.UPDATE)
+ @ApiOperation(value = "审核QA检测项报告管理状态")
+ @PostMapping(value = "/api/t-qa-test-item-report/auditReport")
+ public R<Boolean> auditReport(@RequestBody String param) {
+ Long userId = tokenService.getLoginUser().getUserId();
+ AuditStatusDTO dto = JSON.parseObject(param,AuditStatusDTO.class);
+ TQaTestItemReport testItemReport = qaTestItemReportService.getById(dto.getId());
+ testItemReport.setStatus(dto.getAuditStatus());
+ testItemReport.setAuditRemark(dto.getAuditRemark());
+ testItemReport.setAuditPersonId(userId);
+ testItemReport.setAuditTime(LocalDateTime.now());
+ qaTestItemReportService.updateById(testItemReport);
+
+ // 查询检测项
+ TQaTestItem testItem = qaTestItemService.getById(testItemReport.getItemId());
+ // 查询项目组
+ TProjectTeam projectTeam = projectTeamService.getById(testItem.getTeamId());
+ // MESSAGE 添加消息
+ TProjectTeamStaff teamStaff = projectTeamStaffService.getOne(Wrappers.lambdaQuery(TProjectTeamStaff.class)
+ .eq(TProjectTeamStaff::getTeamId, projectTeam.getId())
+ .eq(TProjectTeamStaff::getRoleType, 3)
+ .last("LIMIT 1"));
+ noticeService.saveNotice(teamStaff.getUserId(), "您有【1】条【项目检测项、检验包列表】等待评定", tokenService.getLoginUser().getUser().getNickName(),5);
+
+
+ return R.ok();
+ }
+
}
--
Gitblit v1.7.1