From 3185b67ca8aa6e9fcda1ae176be1ca6efa2b0cb7 Mon Sep 17 00:00:00 2001
From: gaoaoy <1042166043@qq.com>
Date: 星期四, 29 二月 2024 14:35:03 +0800
Subject: [PATCH] 实验室列表
---
cnas-server/src/main/java/com/yuanchu/mom/service/impl/LaboratoryServiceImpl.java | 11 ++++-------
cnas-server/src/main/java/com/yuanchu/mom/service/LaboratoryService.java | 4 +++-
cnas-server/src/main/java/com/yuanchu/mom/controller/LaboratoryController.java | 6 ++----
3 files changed, 9 insertions(+), 12 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..23a3c0c 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
@@ -55,10 +55,8 @@
@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));
+ public Result obtainItemParameterList() {
+ return Result.success(laboratoryService.obtainItemParameterList());
}
}
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/service/LaboratoryService.java b/cnas-server/src/main/java/com/yuanchu/mom/service/LaboratoryService.java
index a386e9d..2dcf3ed 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/service/LaboratoryService.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/service/LaboratoryService.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.yuanchu.mom.pojo.Laboratory;
+import java.util.List;
import java.util.Map;
/**
@@ -19,6 +20,7 @@
int upParameter(Laboratory itemParameter);
- Map<String, Object> obtainItemParameterList(Page page, Laboratory itemParameter);
+ List<Laboratory> obtainItemParameterList();
+
}
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/service/impl/LaboratoryServiceImpl.java b/cnas-server/src/main/java/com/yuanchu/mom/service/impl/LaboratoryServiceImpl.java
index 086b6b2..d1c00d8 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/service/impl/LaboratoryServiceImpl.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/service/impl/LaboratoryServiceImpl.java
@@ -1,5 +1,6 @@
package com.yuanchu.mom.service.impl;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yuanchu.mom.common.GetLook;
@@ -12,6 +13,7 @@
import org.springframework.stereotype.Service;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
/**
@@ -51,13 +53,8 @@
}
@Override
- public Map<String, Object> obtainItemParameterList(Page page, Laboratory itemParameter) {
- Map<String, Object> map = new HashMap<>();
- map.put("head", PrintChina.printChina(Laboratory.class));
- Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId("obtainItemParameterList");
- if(map1.get("look")==1) itemParameter.setCreateUser(map1.get("userId"));
- map.put("body", laboratoryMapper.obtainItemParameterList(page, QueryWrappers.queryWrappers(itemParameter)));
- return map;
+ public List<Laboratory> obtainItemParameterList() {
+ return laboratoryMapper.selectList(Wrappers.<Laboratory>lambdaQuery().select(Laboratory::getLaboratoryName));
}
}
--
Gitblit v1.9.3