From 20739d95d85d5d6744690093a061292325ce4a9b Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 19 五月 2025 14:10:27 +0800
Subject: [PATCH] 项目总积分
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSamplingRecordController.java | 76 ++++++++++++++++++++++++++++++-------
1 files changed, 61 insertions(+), 15 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSamplingRecordController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSamplingRecordController.java
index bb9ed44..b743a66 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSamplingRecordController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSamplingRecordController.java
@@ -7,6 +7,7 @@
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.enums.QaReportTypeEnum;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.dto.*;
@@ -22,7 +23,9 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
+import java.text.SimpleDateFormat;
import java.time.LocalDateTime;
+import java.util.Date;
import java.util.List;
import java.util.Objects;
@@ -36,7 +39,7 @@
*/
@Api(tags = "取样记录管理")
@RestController
-@RequestMapping("/t-sampling-record")
+@RequestMapping("")
public class TSamplingRecordController {
private final TSamplingRecordService samplingRecordService;
@@ -44,20 +47,28 @@
private final ISysUserService sysUserService;
private final SysUserMapper sysUserMapper;
private final TSamplingRecordOperationService samplingRecordOperationService;
+ private final TExperimentDispatchService experimentDispatchService;
+ private final TProjectProposalService projectProposalService;
+ private final TProjectTeamService projectTeamService;
+ private final TProjectTeamStaffService projectTeamStaffService;
@Autowired
- public TSamplingRecordController(TSamplingRecordService samplingRecordService, TokenService tokenService, ISysUserService sysUserService, SysUserMapper sysUserMapper, TSamplingRecordOperationService samplingRecordOperationService) {
+ public TSamplingRecordController(TSamplingRecordService samplingRecordService, TokenService tokenService, ISysUserService sysUserService, SysUserMapper sysUserMapper, TSamplingRecordOperationService samplingRecordOperationService, TExperimentDispatchService experimentDispatchService, TProjectProposalService projectProposalService, TProjectTeamService projectTeamService, TProjectTeamStaffService projectTeamStaffService) {
this.samplingRecordService = samplingRecordService;
this.tokenService = tokenService;
this.sysUserService = sysUserService;
this.sysUserMapper = sysUserMapper;
this.samplingRecordOperationService = samplingRecordOperationService;
+ this.experimentDispatchService = experimentDispatchService;
+ this.projectProposalService = projectProposalService;
+ this.projectTeamService = projectTeamService;
+ this.projectTeamStaffService = projectTeamStaffService;
}
/**
* 获取取样记录管理列表
*/
- @PreAuthorize("@ss.hasPermi('system:samplingRecord:list')")
- @ApiOperation(value = "获取取样记录分页列表")
+ //@PreAuthorize("@ss.hasPermi('system:samplingRecord:list')")
+ @ApiOperation(value = "获取取样记录分页列表", response = TSamplingRecordQuery.class)
@PostMapping(value = "/api/t-sampling-record/pageList")
public R<PageInfo<TSamplingRecordVO>> pageList(@RequestBody String param) {
TSamplingRecordQuery query = JSON.parseObject(param, TSamplingRecordQuery.class);
@@ -67,13 +78,39 @@
/**
* 添加取样记录管理
*/
- @PreAuthorize("@ss.hasPermi('system:samplingRecord:add')")
+ //@PreAuthorize("@ss.hasPermi('system:samplingRecord:add')")
@Log(title = "取样记录信息-新增取样记录", businessType = BusinessType.INSERT)
@ApiOperation(value = "添加取样记录",response = TSamplingRecordDTO.class)
@PostMapping(value = "/api/t-sampling-record/add")
public R<Boolean> add(@RequestBody String param) {
TSamplingRecordDTO dto = JSON.parseObject(param,TSamplingRecordDTO.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 format = new SimpleDateFormat("yyyyMMdd").format(new Date());
+ String samplingCode = projectTeam.getTeamName() + "-" + format.substring(2) + "S";
+
+ // 查询上个项目课题方案的序号
+ long count = samplingRecordService.count(Wrappers.lambdaQuery(TSamplingRecord.class)
+ .like(TSamplingRecord::getSamplingCode, samplingCode));
+ samplingCode = samplingCode + String.format("%02d", count+1);
+ dto.setSamplingCode(samplingCode);
+
samplingRecordService.save(dto);
List<TSamplingRecordOperation> samplingRecordOperations = dto.getSamplingRecordOperations();
samplingRecordOperations.forEach(samplingRecordOperation -> {
@@ -86,7 +123,7 @@
/**
* 修改取样记录
*/
- @PreAuthorize("@ss.hasPermi('system:samplingRecord:edit')")
+ //@PreAuthorize("@ss.hasPermi('system:samplingRecord:edit')")
@Log(title = "取样记录信息-修改取样记录", businessType = BusinessType.UPDATE)
@ApiOperation(value = "修改取样记录")
@PostMapping(value = "/api/t-sampling-record/update")
@@ -105,7 +142,7 @@
/**
* 修改取样操作记录
*/
- @PreAuthorize("@ss.hasPermi('system:samplingRecordOperation:edit')")
+ //@PreAuthorize("@ss.hasPermi('system:samplingRecordOperation:edit')")
@Log(title = "取样记录信息-修改取样操作记录", businessType = BusinessType.UPDATE)
@ApiOperation(value = "修改取样操作记录")
@PostMapping(value = "/api/t-sampling-record/updateRecordOperation")
@@ -120,7 +157,7 @@
/**
* 修改取样操作记录
*/
- @PreAuthorize("@ss.hasPermi('system:samplingRecordOperation:edit')")
+ //@PreAuthorize("@ss.hasPermi('system:samplingRecordOperation:edit')")
@Log(title = "取样记录信息-实验员提交取样记录", businessType = BusinessType.UPDATE)
@ApiOperation(value = "实验员提交取样记录")
@PostMapping(value = "/api/t-sampling-record/commitRecord")
@@ -140,7 +177,7 @@
/**
* 查看取样记录详情
*/
- @PreAuthorize("@ss.hasPermi('system:samplingRecord:detail')")
+ //@PreAuthorize("@ss.hasPermi('system:samplingRecord:detail')")
@ApiOperation(value = "查看取样记录详情")
@GetMapping(value = "/open/t-sampling-record/getDetailById")
public R<TSamplingRecordVO> getDetailById(@RequestParam String id) {
@@ -150,14 +187,23 @@
// 查询取样操作记录
samplingRecordVO.setSamplingRecordOperations(samplingRecordOperationService.list(Wrappers.lambdaQuery(TSamplingRecordOperation.class).eq(TSamplingRecordOperation::getSamplingId, id)));
-
+ // 查询实验调度信息
+ TExperimentDispatch experimentDispatch = experimentDispatchService.getById(samplingRecordVO.getDispatchId());
+ if(Objects.nonNull(experimentDispatch)){
+ // 查询课题方案名称
+ TProjectProposal projectProposal = projectProposalService.getById(experimentDispatch.getProposalId());
+ if(Objects.nonNull(projectProposal)){
+ experimentDispatch.setProjectName(projectProposal.getProjectName());
+ }
+ }
+ samplingRecordVO.setExperimentDispatch(experimentDispatch);
return R.ok(samplingRecordVO);
}
/**
* 删除取样记录
*/
- @PreAuthorize("@ss.hasPermi('system:samplingRecord:delete')")
+ //@PreAuthorize("@ss.hasPermi('system:samplingRecord:delete')")
@Log(title = "取样记录信息-删除取样记录", businessType = BusinessType.DELETE)
@ApiOperation(value = "删除取样记录")
@DeleteMapping(value = "/open/t-sampling-record/deleteById")
@@ -170,7 +216,7 @@
/**
* 批量删除取样记录
*/
- @PreAuthorize("@ss.hasPermi('system:samplingRecord:delete')")
+ //@PreAuthorize("@ss.hasPermi('system:samplingRecord:delete')")
@Log(title = "取样记录信息-删除取样记录", businessType = BusinessType.DELETE)
@ApiOperation(value = "批量删除取样记录")
@DeleteMapping(value = "/open/t-sampling-record/deleteByIds")
@@ -183,7 +229,7 @@
/**
* 批量送样
*/
- @PreAuthorize("@ss.hasPermi('system:samplingRecord:sendSamples')")
+ //@PreAuthorize("@ss.hasPermi('system:samplingRecord:sendSamples')")
@Log(title = "取样记录信息-批量送样", businessType = BusinessType.UPDATE)
@ApiOperation(value = "批量送样")
@PostMapping(value = "/open/t-sampling-record/batchSendSamples")
@@ -203,7 +249,7 @@
/**
* 批量删除取样记录
*/
- @PreAuthorize("@ss.hasPermi('system:samplingRecord:collectSamples')")
+ //@PreAuthorize("@ss.hasPermi('system:samplingRecord:collectSamples')")
@Log(title = "取样记录信息-批量收样", businessType = BusinessType.UPDATE)
@ApiOperation(value = "批量收样")
@PostMapping(value = "/open/t-sampling-record/batchCollectSamples")
--
Gitblit v1.7.1