From bb9499352faae20bb2c898f3f6078f7a4e9ceef2 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期五, 19 四月 2024 10:17:19 +0800
Subject: [PATCH] 检验项目数据导入；检验模板调整
---
cnas-server/src/main/java/com/yuanchu/mom/controller/LaboratoryController.java | 16 +++++++---------
1 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/controller/LaboratoryController.java b/cnas-server/src/main/java/com/yuanchu/mom/controller/LaboratoryController.java
index 21982ae..e508f55 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/controller/LaboratoryController.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/controller/LaboratoryController.java
@@ -2,6 +2,8 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yuanchu.mom.annotation.ValueAuth;
+import com.yuanchu.mom.annotation.ValueTableShow;
import com.yuanchu.mom.pojo.Laboratory;
import com.yuanchu.mom.service.LaboratoryService;
import com.yuanchu.mom.utils.JackSonUtil;
@@ -9,10 +11,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import java.util.Map;
@@ -54,11 +53,10 @@
}
@ApiOperation(value = "鑾峰彇瀹為獙瀹ゅ悕绉�")
- @PostMapping("/obtainItemParameterList")
- public Result obtainItemParameterList(@RequestBody Map<String, Object> data) throws Exception {
- Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
- Laboratory itemParameter = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), Laboratory.class);
- return Result.success(laboratoryService.obtainItemParameterList(page, itemParameter));
+ @GetMapping("/obtainItemParameterList")
+ @ValueAuth
+ public Result obtainItemParameterList() {
+ return Result.success(laboratoryService.obtainItemParameterList());
}
}
--
Gitblit v1.9.3