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/TTestMethodConfirmSheetOriginalController.java | 87 ++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 84 insertions(+), 3 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 56bd24e..b4f0732 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
@@ -1,9 +1,31 @@
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.enums.BusinessType;
+import com.ruoyi.framework.web.service.TokenService;
+import com.ruoyi.system.dto.TTestMethodConfirmSheetOriginalDTO;
+import com.ruoyi.system.mapper.SysUserMapper;
+import com.ruoyi.system.model.TTestMethodConfirmSheetOriginal;
+import com.ruoyi.system.model.TTestMethodConfirmSheetOriginalData;
+import com.ruoyi.system.model.TTestMethodConfirmSheetTerm;
+import com.ruoyi.system.query.TTestMethodConfirmSheetOriginalQuery;
+import com.ruoyi.system.service.ISysUserService;
+import com.ruoyi.system.service.TTestMethodConfirmSheetOriginalDataService;
+import com.ruoyi.system.service.TTestMethodConfirmSheetOriginalService;
+import com.ruoyi.system.vo.TTestMethodConfirmSheetOriginalVO;
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.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
/**
* <p>
@@ -15,10 +37,69 @@
*/
@Api(tags = "原始检测项管理")
@RestController
-@RequestMapping("/t-test-method-confirm-sheet-term")
+@RequestMapping("")
public class TTestMethodConfirmSheetOriginalController {
+ private final TokenService tokenService;
+ private final ISysUserService sysUserService;
+ private final SysUserMapper sysUserMapper;
+ private final TTestMethodConfirmSheetOriginalService testMethodConfirmSheetOriginalService;
+ private final TTestMethodConfirmSheetOriginalDataService testMethodConfirmSheetOriginalDataService;
+ @Autowired
+ public TTestMethodConfirmSheetOriginalController(TokenService tokenService, ISysUserService sysUserService, SysUserMapper sysUserMapper, TTestMethodConfirmSheetOriginalService testMethodConfirmSheetOriginalService, TTestMethodConfirmSheetOriginalDataService testMethodConfirmSheetOriginalDataService) {
+ this.tokenService = tokenService;
+ this.sysUserService = sysUserService;
+ this.sysUserMapper = sysUserMapper;
+ this.testMethodConfirmSheetOriginalService = testMethodConfirmSheetOriginalService;
+ this.testMethodConfirmSheetOriginalDataService = testMethodConfirmSheetOriginalDataService;
+ }
+ /**
+ * 获取检验方法确认单管理列表
+ */
+ //@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) {
+ TTestMethodConfirmSheetOriginalQuery query = JSON.parseObject(param, TTestMethodConfirmSheetOriginalQuery.class);
+ return R.ok(testMethodConfirmSheetOriginalService.pageList(query));
+ }
+
+ /**
+ * 修改检验方法确认单
+ */
+ //@PreAuthorize("@ss.hasPermi('system:testMethodConfirmSheetOriginal:edit')")
+ @Log(title = "检验方法确认单信息-修改检验方法确认单", businessType = BusinessType.UPDATE)
+ @ApiOperation(value = "修改检验方法确认单")
+ @PostMapping(value = "/api/t-test-method-confirm-sheet-original/update")
+ public R<Boolean> update(@RequestBody String param) {
+ TTestMethodConfirmSheetOriginalDTO dto = JSON.parseObject(param, TTestMethodConfirmSheetOriginalDTO.class);
+ testMethodConfirmSheetOriginalService.updateById(dto);
+ testMethodConfirmSheetOriginalDataService.remove(Wrappers.lambdaQuery(TTestMethodConfirmSheetOriginalData.class).eq(TTestMethodConfirmSheetOriginalData::getOriginalId, dto.getId()));
+ List<TTestMethodConfirmSheetOriginalData> testMethodConfirmSheetOriginalDataList = dto.getTestMethodConfirmSheetOriginalDataList();
+ testMethodConfirmSheetOriginalDataList.forEach(testMethodConfirmSheetOriginalData -> {
+ testMethodConfirmSheetOriginalData.setOriginalId(dto.getId());
+ });
+ testMethodConfirmSheetOriginalDataService.saveBatch(testMethodConfirmSheetOriginalDataList);
+ return R.ok();
+ }
+
+ /**
+ * 查看检验方法确认单详情
+ */
+ //@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);
+
+ // 查询检测数据
+ List<TTestMethodConfirmSheetOriginalData> testMethodConfirmSheetOriginalDataList = testMethodConfirmSheetOriginalDataService.list(Wrappers.lambdaQuery(TTestMethodConfirmSheetOriginalData.class).eq(TTestMethodConfirmSheetOriginalData::getOriginalId, id));
+ testMethodConfirmSheetVO.setTestMethodConfirmSheetOriginalDataList(testMethodConfirmSheetOriginalDataList);
+ return R.ok(testMethodConfirmSheetVO);
+ }
}
--
Gitblit v1.7.1