From 1b0cec788ca49a6c641f84c2bf0e616049c22e70 Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: 星期五, 25 六月 2021 14:22:40 +0800
Subject: [PATCH] 导入申购修改导入字段
---
src/main/java/com/nanometer/smartlab/controller/LaboratoryMngController.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/controller/LaboratoryMngController.java b/src/main/java/com/nanometer/smartlab/controller/LaboratoryMngController.java
index ca378ad..a484ce3 100644
--- a/src/main/java/com/nanometer/smartlab/controller/LaboratoryMngController.java
+++ b/src/main/java/com/nanometer/smartlab/controller/LaboratoryMngController.java
@@ -9,6 +9,7 @@
import com.nanometer.smartlab.entity.BaseMeta;
import com.nanometer.smartlab.entity.SysReagent;
import com.nanometer.smartlab.service.BaseMetaService;
+import com.nanometer.smartlab.service.SysLaboratoryContainerService;
import com.nanometer.smartlab.service.SysProjectService;
import org.apache.log4j.Logger;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
@@ -42,6 +43,8 @@
@Resource
private SysLaboratoryService sysLaboratoryService;
+ @Resource
+ private SysLaboratoryContainerService sysLaboratoryContainerService;
@Resource
private BaseMetaService baseMetaService;
@Resource
@@ -85,7 +88,7 @@
public void exportLab2Excel(){
try {
- List<Map> list = sysLaboratoryService.exportLabList(type, name);
+ List<Map> list = sysLaboratoryService.exportLabList(type, name,project);
sysLaboratoryService.exportLab2Excel(list);
FacesUtils.info("导出成功");
}catch (Exception e){
@@ -151,8 +154,9 @@
}
valuesList.add(cellInfo);
-
-
+ }
+ if (valuesList.size() != 8){
+ break;
}
System.out.println("value : "+valuesList);
SysLaboratory laboratory=new SysLaboratory();
@@ -263,6 +267,7 @@
}
this.sysLaboratoryService.deleteSysLaboratory(this.selectedList);
+ this.sysLaboratoryContainerService.delBySlcIds(this.selectedList);
FacesUtils.info("删除成功。");
} catch (Exception e) {
--
Gitblit v1.9.2