From 1a2e22a27627b40689257442cc5a46598c634f8e Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 23 五月 2025 14:16:28 +0800
Subject: [PATCH] 测评接口完成，添加数据权限
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTestMethodConfirmSheetOriginalController.java | 28 +++++++++++++++++-----------
1 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTestMethodConfirmSheetOriginalController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTestMethodConfirmSheetOriginalController.java
index f6d32b3..9a119aa 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTestMethodConfirmSheetOriginalController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTestMethodConfirmSheetOriginalController.java
@@ -17,12 +17,12 @@
import com.ruoyi.system.service.ISysUserService;
import com.ruoyi.system.service.TTestMethodConfirmSheetOriginalDataService;
import com.ruoyi.system.service.TTestMethodConfirmSheetOriginalService;
+import com.ruoyi.system.service.TTestMethodConfirmSheetTermService;
import com.ruoyi.system.vo.TTestMethodConfirmSheetOriginalVO;
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.web.bind.annotation.*;
import java.util.List;
@@ -37,7 +37,7 @@
*/
@Api(tags = "原始检测项管理")
@RestController
-@RequestMapping("/t-test-method-confirm-sheet-original")
+@RequestMapping("")
public class TTestMethodConfirmSheetOriginalController {
private final TokenService tokenService;
@@ -45,19 +45,21 @@
private final SysUserMapper sysUserMapper;
private final TTestMethodConfirmSheetOriginalService testMethodConfirmSheetOriginalService;
private final TTestMethodConfirmSheetOriginalDataService testMethodConfirmSheetOriginalDataService;
+ private final TTestMethodConfirmSheetTermService testMethodConfirmSheetTermService;
@Autowired
- public TTestMethodConfirmSheetOriginalController(TokenService tokenService, ISysUserService sysUserService, SysUserMapper sysUserMapper, TTestMethodConfirmSheetOriginalService testMethodConfirmSheetOriginalService, TTestMethodConfirmSheetOriginalDataService testMethodConfirmSheetOriginalDataService) {
+ public TTestMethodConfirmSheetOriginalController(TokenService tokenService, ISysUserService sysUserService, SysUserMapper sysUserMapper, TTestMethodConfirmSheetOriginalService testMethodConfirmSheetOriginalService, TTestMethodConfirmSheetOriginalDataService testMethodConfirmSheetOriginalDataService, TTestMethodConfirmSheetTermService testMethodConfirmSheetTermService) {
this.tokenService = tokenService;
this.sysUserService = sysUserService;
this.sysUserMapper = sysUserMapper;
this.testMethodConfirmSheetOriginalService = testMethodConfirmSheetOriginalService;
this.testMethodConfirmSheetOriginalDataService = testMethodConfirmSheetOriginalDataService;
+ this.testMethodConfirmSheetTermService = testMethodConfirmSheetTermService;
}
/**
* 获取检验方法确认单管理列表
*/
- @PreAuthorize("@ss.hasPermi('system:testMethodConfirmSheetOriginal:list')")
+ //@PreAuthorize("@ss.hasPermi('system:testMethodConfirmSheetOriginal:list')")
@ApiOperation(value = "获取检验方法确认单分页列表", notes = "获取检验方法确认单分页列表",response = TTestMethodConfirmSheetOriginalQuery.class)
@PostMapping(value = "/api/t-test-method-confirm-sheet-original/pageList")
public R<PageInfo<TTestMethodConfirmSheetOriginalVO>> pageList(@RequestBody String param) {
@@ -68,7 +70,7 @@
/**
* 修改检验方法确认单
*/
- @PreAuthorize("@ss.hasPermi('system:testMethodConfirmSheetOriginal:edit')")
+ //@PreAuthorize("@ss.hasPermi('system:testMethodConfirmSheetOriginal:edit')")
@Log(title = "检验方法确认单信息-修改检验方法确认单", businessType = BusinessType.UPDATE)
@ApiOperation(value = "修改检验方法确认单")
@PostMapping(value = "/api/t-test-method-confirm-sheet-original/update")
@@ -87,18 +89,22 @@
/**
* 查看检验方法确认单详情
*/
- @PreAuthorize("@ss.hasPermi('system:testMethodConfirmSheetOriginal:detail')")
+ //@PreAuthorize("@ss.hasPermi('system:testMethodConfirmSheetOriginal:detail')")
@ApiOperation(value = "查看检验方法确认单详情")
@GetMapping(value = "/open/t-test-method-confirm-sheet-original/getDetailById")
public R<TTestMethodConfirmSheetOriginalVO> getDetailById(@RequestParam String id) {
- TTestMethodConfirmSheetOriginal testMethodConfirmSheet = testMethodConfirmSheetOriginalService.getById(id);
- TTestMethodConfirmSheetOriginalVO testMethodConfirmSheetVO = new TTestMethodConfirmSheetOriginalVO();
- BeanUtils.copyProperties(testMethodConfirmSheet, testMethodConfirmSheetVO);
+ TTestMethodConfirmSheetOriginal testMethodConfirmSheetOriginal = testMethodConfirmSheetOriginalService.getById(id);
+ TTestMethodConfirmSheetOriginalVO testMethodConfirmSheetOriginalVO = new TTestMethodConfirmSheetOriginalVO();
+ BeanUtils.copyProperties(testMethodConfirmSheetOriginal, testMethodConfirmSheetOriginalVO);
+
+ // 查询检测项数据
+ TTestMethodConfirmSheetTerm testMethodConfirmSheetTerm = testMethodConfirmSheetTermService.getById(testMethodConfirmSheetOriginal.getTermId());
+ testMethodConfirmSheetOriginalVO.setTestMethodConfirmSheetTerm(testMethodConfirmSheetTerm);
// 查询检测数据
List<TTestMethodConfirmSheetOriginalData> testMethodConfirmSheetOriginalDataList = testMethodConfirmSheetOriginalDataService.list(Wrappers.lambdaQuery(TTestMethodConfirmSheetOriginalData.class).eq(TTestMethodConfirmSheetOriginalData::getOriginalId, id));
- testMethodConfirmSheetVO.setTestMethodConfirmSheetOriginalDataList(testMethodConfirmSheetOriginalDataList);
- return R.ok(testMethodConfirmSheetVO);
+ testMethodConfirmSheetOriginalVO.setTestMethodConfirmSheetOriginalDataList(testMethodConfirmSheetOriginalDataList);
+ return R.ok(testMethodConfirmSheetOriginalVO);
}
}
--
Gitblit v1.7.1