From 1afdf3622484b9a54c4cc4642e38bbf5c815884f Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: 星期四, 04 二月 2021 17:48:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/nanometer/smartlab/service/DangerousEncodeService.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/service/DangerousEncodeService.java b/src/main/java/com/nanometer/smartlab/service/DangerousEncodeService.java
index eb0d5b6..a402598 100644
--- a/src/main/java/com/nanometer/smartlab/service/DangerousEncodeService.java
+++ b/src/main/java/com/nanometer/smartlab/service/DangerousEncodeService.java
@@ -1,6 +1,7 @@
package com.nanometer.smartlab.service;
import com.nanometer.smartlab.entity.DangerousEncode;
+import com.nanometer.smartlab.entity.DangerousEncodeVo;
import com.nanometer.smartlab.entity.SysUser;
import org.primefaces.event.FileUploadEvent;
@@ -13,7 +14,7 @@
int countAll(DangerousEncode dangerousEncodeFilter);
- void deleteOne(String id);
+ void deleteOne(Long id);
void insertOne(DangerousEncode dangerousEncode);
@@ -24,4 +25,10 @@
void export2Excel(List<Map> list) throws Exception;
List<Map> exportList(DangerousEncode dangerousEncodeFilter);
+
+ List<DangerousEncode> selectByCodeAndName(String reagentcode, String reagentname,String cas,String code);
+
+ List<DangerousEncodeVo> selectByReagentName(String reagentname, String cas);
+
+ DangerousEncode selectByName(String reagentname);
}
--
Gitblit v1.9.2