From 202729432866117778bc1c20315a06aa84fee98e Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 09 五月 2025 15:47:47 +0800
Subject: [PATCH] 编号生成
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TQaProduceReportController.java | 54 ++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 46 insertions(+), 8 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TQaProduceReportController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TQaProduceReportController.java
index 7da0986..a4b217c 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TQaProduceReportController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TQaProduceReportController.java
@@ -6,15 +6,14 @@
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.enums.QAProduceReportStatusEnum;
-import com.ruoyi.common.enums.QaReportFileEnum;
+import com.ruoyi.common.enums.*;
import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.dto.AuditStatusDTO;
import com.ruoyi.system.dto.TQaProduceReportDTO;
-import com.ruoyi.system.model.TQaProduceReport;
-import com.ruoyi.system.model.TQaReportFile;
+import com.ruoyi.system.model.*;
import com.ruoyi.system.query.TQaProduceReportQuery;
+import com.ruoyi.system.service.TProjectTeamService;
+import com.ruoyi.system.service.TProjectTeamStaffService;
import com.ruoyi.system.service.TQaProduceReportService;
import com.ruoyi.system.service.TQaReportFileService;
import com.ruoyi.system.vo.TQaProduceReportVO;
@@ -27,6 +26,7 @@
import java.time.LocalDateTime;
import java.util.List;
+import java.util.Objects;
/**
* <p>
@@ -44,18 +44,22 @@
private final TQaProduceReportService qaProduceReportService;
private final TQaReportFileService qaReportFileService;
private final TokenService tokenService;
+ private final TProjectTeamService projectTeamService;
+ private final TProjectTeamStaffService projectTeamStaffService;
@Autowired
- public TQaProduceReportController(TQaProduceReportService qaProduceReportService, TQaReportFileService qaReportFileService, TokenService tokenService) {
+ public TQaProduceReportController(TQaProduceReportService qaProduceReportService, TQaReportFileService qaReportFileService, TokenService tokenService, TProjectTeamService projectTeamService, TProjectTeamStaffService projectTeamStaffService) {
this.qaProduceReportService = qaProduceReportService;
this.qaReportFileService = qaReportFileService;
this.tokenService = tokenService;
+ this.projectTeamService = projectTeamService;
+ this.projectTeamStaffService = projectTeamStaffService;
}
/**
* 获取中试、生产验证分析报告；辅料；产品报告管理列表
*/
@PreAuthorize("@ss.hasPermi('system:qaProduceReport:list')")
- @ApiOperation(value = "获取中试、生产验证分析报告；辅料；产品报告管理分页列表")
+ @ApiOperation(value = "获取中试、生产验证分析报告；辅料；产品报告管理分页列表", response = TQaProduceReportQuery.class)
@PostMapping(value = "/api/t-qa-produce-report/pageList")
public R<PageInfo<TQaProduceReportVO>> pageList(@RequestBody String param) {
TQaProduceReportQuery query = JSON.parseObject(param, TQaProduceReportQuery.class);
@@ -71,7 +75,41 @@
@PostMapping(value = "/api/t-qa-produce-report/add")
public R<Boolean> add(@RequestBody String param) {
TQaProduceReportDTO dto = JSON.parseObject(param,TQaProduceReportDTO.class);
- // TODO 生成编号
+ // 通过当前用户查询项目组
+ 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("当前用户未分配项目组,无法创建项目课题方案");
+ }
+ // 查询项目组
+ TProjectTeam projectTeam = projectTeamService.getById(projectTeamStaff.getTeamId());
+ if(Objects.isNull(projectTeam)){
+ return R.fail("项目组不存在");
+ }
+ if(projectTeam.getStatus() == 2){
+ return R.fail("项目组已封存,无法创建项目课题方案");
+ }
+ // 生成中试、生产验证编号
+ String reportCode = "";
+ switch (dto.getReportType()){
+ case 1:
+ reportCode = projectTeam.getTeamName() + "-" + QaReportTypeEnum.TEST_PILOT.getCode();
+ break;
+ case 2:
+ reportCode = projectTeam.getTeamName() + "-" + QaReportTypeEnum.PRODUCTION_VERIFICATION_ANALYSIS_REPORT.getCode();
+ break;
+ default:
+ reportCode = projectTeam.getTeamName() + "-" + QaReportTypeEnum.AUXILIARY_MATERIALS.getCode();
+ break;
+ }
+
+ // 查询上个项目课题方案的序号
+ long count = qaProduceReportService.count(Wrappers.lambdaQuery(TQaProduceReport.class)
+ .like(TQaProduceReport::getReportCode, reportCode));
+ reportCode = reportCode + "-" + String.format("%03d", count+1);
+ dto.setReportCode(reportCode);
qaProduceReportService.save(dto);
// 添加检测报告文件
List<TQaReportFile> qaReportFiles = dto.getQaReportFiles();
--
Gitblit v1.7.1