From c3510da29a7974c6af7ff3de1ade3db429d6f848 Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: 星期三, 18 八月 2021 14:27:59 +0800
Subject: [PATCH] 申购管理申请履历显示所有历史单据，提交时如有无效试剂耗材报错
---
src/main/java/com/nanometer/smartlab/controller/SysWarningsController.java | 36 +++++++++++++++++++-----------------
1 files changed, 19 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/controller/SysWarningsController.java b/src/main/java/com/nanometer/smartlab/controller/SysWarningsController.java
index fcda5a8..5d421b8 100644
--- a/src/main/java/com/nanometer/smartlab/controller/SysWarningsController.java
+++ b/src/main/java/com/nanometer/smartlab/controller/SysWarningsController.java
@@ -1,6 +1,7 @@
package com.nanometer.smartlab.controller;
import java.sql.Timestamp;
+import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -25,14 +26,14 @@
@Controller
@Scope("session")
public class SysWarningsController extends BaseController {
-
+
/**
- *
+ *
*/
private static final long serialVersionUID = 8009757365735077055L;
private static Logger logger = Logger.getLogger(SysWarningsController.class);
-
+
@Resource
private SysWarningService sysWarningService;
@Resource
@@ -43,13 +44,13 @@
private String containerCode;
private Timestamp startTime;
private Timestamp endTime;
-
-
+
+
public LazyDataModel<SysWarning> getDataModel() {
if (this.dataModel == null) {
this.dataModel = new LazyDataModel<SysWarning>() {
/**
- *
+ *
*/
private static final long serialVersionUID = 1L;
@@ -62,6 +63,7 @@
if (count > 0) {
list = sysWarningService.getSysWarningList(containerCode, startTime, endTime, first, pageSize);
}
+ selectedList = new ArrayList<>();
} catch (Exception e) {
logger.error(e);
}
@@ -70,17 +72,17 @@
@Override
public SysWarning getRowData(String rowKey) {
- Iterator<SysWarning> iterator = this.iterator();
- if (iterator != null) {
- SysWarning oa = null;
- while (iterator.hasNext()) {
- oa = iterator.next();
- if (rowKey.equals(oa.getId())) {
- return oa;
- }
- }
- }
- return null;
+// Iterator<SysWarning> iterator = this.iterator();
+// if (iterator != null) {
+// SysWarning oa = null;
+// while (iterator.hasNext()) {
+// oa = iterator.next();
+// if (rowKey.equals(oa.getId())) {
+// return oa;
+// }
+// }
+// }
+ return sysWarningService.getSysWarning(rowKey);
}
};
}
--
Gitblit v1.9.2