From 032b976ab803a263e734dcdca3ceadaed48f1070 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期四, 27 七月 2023 16:51:08 +0800
Subject: [PATCH] LIMS管理系统框架-开发7-27下班合并代码
---
inspection-server/pom.xml | 6 ++++++
laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/impl/EquipmentPointServiceImpl.java | 1 +
sys/src/main/java/com/yuanchu/limslaboratory/CodeGenerator.java | 2 +-
inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/PlanController.java | 10 ----------
standard-server/src/main/java/com/yuanchu/limslaboratory/service/MaterialService.java | 2 +-
user-server/src/main/java/com/yuanchu/limslaboratory/service/UserService.java | 2 +-
6 files changed, 10 insertions(+), 13 deletions(-)
diff --git a/inspection-server/pom.xml b/inspection-server/pom.xml
index 591fb39..c78f93f 100644
--- a/inspection-server/pom.xml
+++ b/inspection-server/pom.xml
@@ -26,5 +26,11 @@
<artifactId>standard-server</artifactId>
<version>${project.parent.version}</version>
</dependency>
+
+ <dependency>
+ <groupId>com.yunchu.limslaboratory</groupId>
+ <artifactId>laboratory-server</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
</dependencies>
</project>
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/PlanController.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/PlanController.java
index 3d2fb9e..d6651db 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/PlanController.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/PlanController.java
@@ -52,16 +52,6 @@
return Result.success(productService.selectInstrumentByProname(name));
}
- @ApiOperation("閫夋嫨璇曢獙鏂规硶")
- @ApiImplicitParams(value = {
- @ApiImplicitParam(name = "id", value = "椤圭洰id", dataTypeClass = Integer.class, required = true),
- })
- @PostMapping("/selectProMethodById")
- public Result selectProMethodById(Integer id) {
- Product product = productService.getById(id);
- return Result.success(product.getMethod());
- }
-
@ApiOperation("鍒嗛厤妫�楠岃鍒掍腑鍒嗛厤椤圭洰")
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "id", value = "妫�楠屾牱鍝両D", dataTypeClass = Integer.class, required = true),
diff --git a/laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/impl/EquipmentPointServiceImpl.java b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/impl/EquipmentPointServiceImpl.java
index 93202cc..94dc21a 100644
--- a/laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/impl/EquipmentPointServiceImpl.java
+++ b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/impl/EquipmentPointServiceImpl.java
@@ -36,6 +36,7 @@
LambdaQueryWrapper<EquipmentPoint> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(EquipmentPoint::getEquipmentPoint, equipmentPoint.getEquipmentPoint());
wrapper.eq(EquipmentPoint::getState, 1);
+ wrapper.eq(EquipmentPoint::getInstrumentId, equipmentPoint.getInstrumentId());
wrapper.select(EquipmentPoint::getEquipmentPoint);
EquipmentPoint equipmentPoint1 = equipmentPointMapper.selectOne(wrapper);
if (ObjectUtils.isEmpty(equipmentPoint1)){
diff --git a/standard-server/src/main/java/com/yuanchu/limslaboratory/service/MaterialService.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/service/MaterialService.java
index 7e79daf..05e47dd 100644
--- a/standard-server/src/main/java/com/yuanchu/limslaboratory/service/MaterialService.java
+++ b/standard-server/src/main/java/com/yuanchu/limslaboratory/service/MaterialService.java
@@ -18,7 +18,7 @@
*/
public interface MaterialService extends IService<Material> {
- List<Material> selectMaterialLimit(int pageSize,int countSize, int type);
+ List<Map> selectMaterialLimit(int pageSize,int countSize, int type);
Map selectMaterialById(String materialId);
diff --git a/sys/src/main/java/com/yuanchu/limslaboratory/CodeGenerator.java b/sys/src/main/java/com/yuanchu/limslaboratory/CodeGenerator.java
index 683fb69..83b89ac 100644
--- a/sys/src/main/java/com/yuanchu/limslaboratory/CodeGenerator.java
+++ b/sys/src/main/java/com/yuanchu/limslaboratory/CodeGenerator.java
@@ -22,7 +22,7 @@
public static String database_username = "root";
public static String database_password= "123456";
public static String author = "姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃";
- public static String model_name = "/inspection-server"; // 濡傛灉涓哄垎甯冨紡濉瓙妯″潡鍚嶇О锛屽鏋滀笉鏄垎甯冨紡涓虹┖鍗冲彲
+ public static String model_name = "/laboratory-server"; // 濡傛灉涓哄垎甯冨紡濉瓙妯″潡鍚嶇О锛屽鏋滀笉鏄垎甯冨紡涓虹┖鍗冲彲
public static String setParent = "com.yuanchu.limslaboratory"; // 鍖呰矾寰�
public static Boolean Override = false; // 鏄惁瑕嗙洊鍘熸潵鐨勬枃浠讹紵
diff --git a/user-server/src/main/java/com/yuanchu/limslaboratory/service/UserService.java b/user-server/src/main/java/com/yuanchu/limslaboratory/service/UserService.java
index 8291c99..7128e26 100644
--- a/user-server/src/main/java/com/yuanchu/limslaboratory/service/UserService.java
+++ b/user-server/src/main/java/com/yuanchu/limslaboratory/service/UserService.java
@@ -75,7 +75,7 @@
* 鏌ヨ鎵�鏈夌敤鎴蜂俊鎭�
* @return
*/
- List<User> selectUser();
+ List<Map> selectUser();
/**
* 鑾峰彇鎵�鏈夌敤鎴风殑鍚嶇О涓嶪d
--
Gitblit v1.9.3