From e776dcaa5aa2416634644c2c7ac333ee95738b95 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期一, 17 三月 2025 15:57:31 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/tx-lims-after
---
inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTemplateController.java | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTemplateController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTemplateController.java
index fe42eac..7181575 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTemplateController.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTemplateController.java
@@ -8,7 +8,6 @@
import com.yuanchu.mom.utils.JackSonUtil;
import com.yuanchu.mom.vo.Result;
import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
@@ -18,11 +17,11 @@
@RequestMapping("/StandardTemplate")
@RestController
@AllArgsConstructor
-@Api("鍘熷璁板綍妯℃澘")
+@Api(tags = "鍘熷璁板綍妯℃澘")
public class StandardTemplateController {
private StandardTemplateService standardTemplateService;
- @ValueAuth
+ @ValueClassify("鏍囧噯搴�")
@ApiOperation(value = "鑾峰彇鍘熷璁板綍妯℃澘鍒楄〃")
@PostMapping("/selectStandardTemplatePageList")
public Result selectStandardTemplatePageList(@RequestBody Map<String, Object> data) throws Exception {
@@ -30,19 +29,19 @@
StandardTemplate standardTemplate = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), StandardTemplate.class);
return Result.success(standardTemplateService.selectStandardTemplatePageList(page, standardTemplate));
}
- @ValueClassify("鍘熷璁板綍妯℃澘")
+ @ValueClassify("鏍囧噯搴�")
@ApiOperation(value = "娣诲姞鍘熷璁板綍妯℃澘")
@PostMapping("/addStandardTemplate")
public Result addStandardTemplate(@RequestBody StandardTemplate standardTemplate) {
return Result.success(standardTemplateService.addStandardTemplate(standardTemplate));
}
- @ValueClassify("鍘熷璁板綍妯℃澘")
+ @ValueClassify("鏍囧噯搴�")
@ApiOperation(value = "淇敼鍘熷璁板綍妯℃澘")
@PostMapping("/upStandardTemplate")
public Result<?> upStandardTemplate(@RequestBody StandardTemplate standardTemplate) {
return Result.success(standardTemplateService.upStandardTemplate(standardTemplate));
}
- @ValueClassify("鍘熷璁板綍妯℃澘")
+ @ValueClassify("鏍囧噯搴�")
@ApiOperation(value = "鍒犻櫎鍘熷璁板綍妯℃澘")
@PostMapping("/delStandardTemplate")
public Result<?> delStandardTemplate(Integer id) {
@@ -63,4 +62,11 @@
return Result.success(standardTemplateService.getStandTempThingById(id));
}
+ @ValueAuth
+ @ApiOperation(value = "缂栬緫妯℃澘缂栧埗")
+ @GetMapping("/getEditTemplatePreparation")
+ public Result<?> getEditTemplatePreparation(@RequestParam("id") Integer id) {
+ StandardTemplate byId = standardTemplateService.getById(id);
+ return Result.success("OK", byId.getThing());
+ }
}
--
Gitblit v1.9.3