From 2e3dcb881eac5005d9e83f2f255ce5d67f19f298 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期二, 30 四月 2024 09:32:38 +0800
Subject: [PATCH] 标准库修复
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardMethodListServiceImpl.java | 2 +-
inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardProductListServiceImpl.java | 1 +
inspect-server/src/main/resources/mapper/StandardMethodListMapper.xml | 5 +++++
user-server/src/main/java/com/yuanchu/mom/pojo/User.java | 6 ------
inspect-server/src/main/java/com/yuanchu/mom/mapper/StandardMethodListMapper.java | 2 ++
5 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/mapper/StandardMethodListMapper.java b/inspect-server/src/main/java/com/yuanchu/mom/mapper/StandardMethodListMapper.java
index 59fdd55..3f94d89 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/mapper/StandardMethodListMapper.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/mapper/StandardMethodListMapper.java
@@ -27,6 +27,8 @@
List<StandardProductList> selectParameterList(String code);
+ List<StandardMethodList> selectListEnum();
+
}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardMethodListServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardMethodListServiceImpl.java
index b4efc3c..1e4de45 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardMethodListServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardMethodListServiceImpl.java
@@ -136,7 +136,7 @@
}
@Override
public List<StandardMethodList> selectStandardMethodEnum() {
- return standardMethodListMapper.selectList(Wrappers.<StandardMethodList>lambdaQuery().select(StandardMethodList::getId,StandardMethodList::getCode,StandardMethodList::getName));
+ return standardMethodListMapper.selectListEnum();
}
}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardProductListServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardProductListServiceImpl.java
index 8de102a..521b17d 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardProductListServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardProductListServiceImpl.java
@@ -104,6 +104,7 @@
pl.setSample(sp.getSample());
pl.setModel(sp.getModel());
pl.setMethodS(sp.getMethodS());
+ pl.setTemplateId(sp.getTemplateId());
if(sp.getAsk()!=null&&!sp.getAsk().equals("")){
pl.setAsk(sp.getAsk());
}
diff --git a/inspect-server/src/main/resources/mapper/StandardMethodListMapper.xml b/inspect-server/src/main/resources/mapper/StandardMethodListMapper.xml
index b0f5bc6..4c9c61f 100644
--- a/inspect-server/src/main/resources/mapper/StandardMethodListMapper.xml
+++ b/inspect-server/src/main/resources/mapper/StandardMethodListMapper.xml
@@ -87,4 +87,9 @@
or structure_test_object_id LIKE CONCAT('%', #{tree}, '%')
)
</select>
+ <select id="selectListEnum" resultType="com.yuanchu.mom.pojo.StandardMethodList">
+ select id,code,name from standard_method
+ where is_product = 1
+ and is_use = 1
+ </select>
</mapper>
diff --git a/user-server/src/main/java/com/yuanchu/mom/pojo/User.java b/user-server/src/main/java/com/yuanchu/mom/pojo/User.java
index 01d4637..1a555c1 100644
--- a/user-server/src/main/java/com/yuanchu/mom/pojo/User.java
+++ b/user-server/src/main/java/com/yuanchu/mom/pojo/User.java
@@ -4,7 +4,6 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yuanchu.mom.annotation.ValueTableShow;
import com.yuanchu.mom.common.OrderBy;
-import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
@@ -12,11 +11,7 @@
import lombok.NoArgsConstructor;
import java.io.Serializable;
-import java.lang.reflect.Field;
import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
@Data
@Builder
@@ -56,7 +51,6 @@
@ApiModelProperty(value = "鐢佃瘽鍙风爜")
private String phone;
- @ValueTableShow(7)
@ApiModelProperty(value = "閮ㄩ棬")
private String department;
--
Gitblit v1.9.3