From 7a9fd36cadbd5f0d8737955f0edd79e38ef19eaf Mon Sep 17 00:00:00 2001
From: 郑永安 <zyazyz250@sina.com>
Date: 星期二, 20 六月 2023 14:48:59 +0800
Subject: [PATCH] SQL异常修复
---
src/main/java/com/nanometer/smartlab/controller/ReagentMngController.java | 80 ++++++++++++++++++++++++++++++++--------
1 files changed, 64 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/controller/ReagentMngController.java b/src/main/java/com/nanometer/smartlab/controller/ReagentMngController.java
index 66eeb1d..16979fd 100644
--- a/src/main/java/com/nanometer/smartlab/controller/ReagentMngController.java
+++ b/src/main/java/com/nanometer/smartlab/controller/ReagentMngController.java
@@ -7,6 +7,7 @@
import com.nanometer.smartlab.util.Constants;
import com.nanometer.smartlab.util.FacesUtils;
import com.nanometer.smartlab.util.IDUtils;
+import org.apache.commons.lang.StringUtils;
import org.apache.log4j.Logger;
import org.apache.poi.hssf.usermodel.HSSFRow;
import org.apache.poi.hssf.usermodel.HSSFSheet;
@@ -25,6 +26,7 @@
import javax.annotation.Resource;
import javax.faces.context.FacesContext;
+import javax.faces.event.ActionListener;
import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
@@ -127,7 +129,6 @@
public void query(){
- System.out.println("start====================");
List<SysReagent> list=this.sysReagentService.query();
Map<String,SysReagent> map=new HashMap<>();
List<SysReagent> list2 =new ArrayList<>();
@@ -598,6 +599,9 @@
}
}
+ if (valuesList.size() != 6){
+ break;
+ }
System.out.println("value : "+valuesList);
sysReagent.setName(valuesList.get(0));//试剂名称
sysReagent.setProductHome(valuesList.get(1));//厂家
@@ -617,7 +621,6 @@
sysReagentsList.add(sysReagent);
}
sysReagentService.insertSysReagentList2(sysReagentsList);
- System.out.println("=========导入结束=====");
FacesUtils.info("导入成功。");
} catch (Exception ex) {
ex.printStackTrace();
@@ -626,7 +629,6 @@
}
//导入
public void uploadFile(FileUploadEvent event) {
- System.out.println("=========导入开始=====");
this.codeList=baseMetaService.getAllBaseMeta();
this.sysSupplierList=sysSupplierService.getSysSupplierList();
try{
@@ -751,8 +753,10 @@
valuesList.add(cellInfo);
}
}
+ if (valuesList.size() != 13){
+ break;
+ }
- System.out.println("value : "+valuesList);
sysReagent.setProductSn(valuesList.get(0));//产品编号
sysReagent.setName(valuesList.get(1));//试剂名称
sysReagent.setControlProducts(valuesList.get(2));//管制品
@@ -783,7 +787,6 @@
sysReagentsList.add(sysReagent);
}
sysReagentService.insertSysReagentList(sysReagentsList);
- System.out.println("=========导入结束=====");
FacesUtils.info("导入成功。");
} catch (Exception ex) {
ex.printStackTrace();
@@ -804,6 +807,7 @@
if (count > 0) {
list = sysReagentService.getSysReagentListNew(name, cas, supplierId,getType(), first, pageSize,productSn);
}
+ selectedList = new ArrayList<> ();
} catch (Exception e) {
logger.error(e);
}
@@ -812,22 +816,37 @@
@Override
public SysReagent getRowData(String rowKey) {
- Iterator<SysReagent> iterator = this.iterator();
- if (iterator != null) {
- SysReagent sr = null;
- while (iterator.hasNext()) {
- sr = iterator.next();
- if (rowKey.equals(sr.getId())) {
- return sr;
- }
- }
- }
- return null;
+// Iterator<SysReagent> iterator = this.iterator();
+// if (iterator != null) {
+// SysReagent sr = null;
+// while (iterator.hasNext()) {
+// sr = iterator.next();
+// if (rowKey.equals(sr.getId())) {
+// return sr;
+// }
+// }
+// }
+
+ return sysReagentService.getSysReagent(rowKey);
}
};
}
return dataModel;
+ }
+
+ public void export2Excel() {
+
+ List<Map> list = sysReagentService.selectAll(name, cas, supplierId,getType(), productSn);
+ try{
+ boolean isexport = sysReagentService.export2Excel(list,getType());
+ if (isexport){
+
+ }
+ }catch (Exception e){
+ e.printStackTrace();
+ FacesUtils.warn("导出失败");
+ }
}
public SysReagent getSysReagent() {
@@ -906,4 +925,33 @@
public void setProductSn(String productSn) {
this.productSn = productSn;
}
+
+ public void openUpdateSafetyNumDialog() {
+ if (this.selectedList == null
+ || this.selectedList.size() == 0) {
+ FacesUtils.warn("请选择数据。");
+ return;
+ }
+ if (this.selectedList.size() > 1) {
+ FacesUtils.warn("只能选择一个数据进行修改。");
+ return;
+ }
+ this.sysReagent = this.sysReagentService.getSysReagent(this.selectedList.get(0).getId());
+ if (this.sysReagent.getType() != 1) {
+ FacesUtils.warn("只能选择试剂设置安全库存。");
+ return;
+ }
+ RequestContext.getCurrentInstance().execute("PF('dialog-setSafetynum').show()");
+ }
+
+ public void updateSafetyNum(){
+ if (this.sysReagent.getSafetynum() == null) {
+ FacesUtils.warn("请输入安全库存。");
+ return;
+ }
+ sysReagentService.updateSafetyNum(this.sysReagent);
+ FacesUtils.warn("修改成功。");
+ RequestContext.getCurrentInstance().execute("PF('dialog-setSafetynum').hide()");
+
+ }
}
--
Gitblit v1.9.2