From 638ea5df947afa0d14b2f27ae65d85f259b70297 Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: Wed, 09 Dec 2020 15:30:27 +0800
Subject: [PATCH] 模块:主控设备管理 新增：导入 提出：秦老师
---
src/main/java/com/nanometer/smartlab/controller/ApplyMngController.java | 58 +++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 43 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/controller/ApplyMngController.java b/src/main/java/com/nanometer/smartlab/controller/ApplyMngController.java
index 948123a..2e528db 100644
--- a/src/main/java/com/nanometer/smartlab/controller/ApplyMngController.java
+++ b/src/main/java/com/nanometer/smartlab/controller/ApplyMngController.java
@@ -69,22 +69,17 @@
private Timestamp endDeadline;
private Integer status;
private Integer favor;
- private boolean favorFlag;
private List<ApplyStatus> statusSelectList;
private LazyDataModel<SysReagent> reagentDataModel;
+ private LazyDataModel<SysReagent> reagentFavorDataModel;
private String applyNewReagentName;
private String applyNewCas;
private String applyNewSn;
private SysReagent selectReagent;
- public boolean isFavorFlag() {
- return favorFlag;
- }
- public void setFavorFlag(boolean favorFlag) {
- this.favorFlag = favorFlag;
- }
+
public SysReagent getSelectReagent() {
return selectReagent;
@@ -519,10 +514,10 @@
public List<SysReagent> load(int first, int pageSize, String sortField, SortOrder sortOrder, Map<String, Object> filters) {
List<SysReagent> list = null;
try {
- int count = sysReagentService.getSysReagentTotalCount2(getUser(),favorFlag ? 1 :null,applyNewReagentName, applyNewCas, applyNewSn,null);
+ int count = sysReagentService.reagentCount(getUser(), applyNewReagentName, applyNewCas, null, applyNewSn);
this.setRowCount(count);
if (count > 0) {
- list = sysReagentService.getSysReagentList2(getUser(),favorFlag ? 1 : null,applyNewReagentName, applyNewCas, applyNewSn,null, first, pageSize);
+ list = sysReagentService.reagentList(getUser(), applyNewReagentName, applyNewCas, null, applyNewSn, first, pageSize);
}
} catch (Exception e) {
logger.error(e);
@@ -548,6 +543,45 @@
}
return reagentDataModel;
+ }
+
+
+ public LazyDataModel<SysReagent> getReagentFavorDataModel() {
+ if (this.reagentFavorDataModel == null) {
+ this.reagentFavorDataModel = new LazyDataModel<SysReagent>() {
+ @Override
+ public List<SysReagent> load(int first, int pageSize, String sortField, SortOrder sortOrder, Map<String, Object> filters) {
+ List<SysReagent> list = null;
+ try {
+ int count = sysReagentService.favorCount(getUser(), null, null, null,null,1);
+ this.setRowCount(count);
+ if (count > 0) {
+ list = sysReagentService.favorList(getUser(),null, null,null, null,1, first, pageSize);
+ }
+ } catch (Exception e) {
+ logger.error(e);
+ }
+ return list;
+ }
+
+ @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;
+ }
+ };
+ }
+
+ return reagentFavorDataModel;
}
public LazyDataModel<OpeApply> getApplyHistoryDataModel() {
@@ -915,11 +949,5 @@
}
- public Integer getFavor() {
- return favor;
- }
- public void setFavor(Integer favor) {
- this.favor = favor;
- }
}
--
Gitblit v1.9.2