From 94714af765326bc0567a336952b0811667b7be92 Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: 星期三, 27 十月 2021 16:59:27 +0800
Subject: [PATCH] 货柜预警接口:alarm 字典:alarm_type 01 主电掉电，备电工作 显示:名称+地点+柜号+内容
---
src/main/java/com/nanometer/smartlab/controller/HazardousWasteController.java | 66 +++++++++++++++++++++-----------
1 files changed, 43 insertions(+), 23 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/controller/HazardousWasteController.java b/src/main/java/com/nanometer/smartlab/controller/HazardousWasteController.java
index 937d179..92b6237 100644
--- a/src/main/java/com/nanometer/smartlab/controller/HazardousWasteController.java
+++ b/src/main/java/com/nanometer/smartlab/controller/HazardousWasteController.java
@@ -62,11 +62,14 @@
if (pageCount > 0)
list = hazardousWasteService.selectAll(startTime,endTime,status,applyPerson,getUser().getProject(),department,tid,first, pageSize);
}
+ }else {
+ this.setRowCount(0);
}
//查询更换模式
if (isSearch) {
isSearch = false;
}
+ selectedOne = null;
} catch (Exception e) {
logger.error("error occured.", e);
}
@@ -75,15 +78,15 @@
@Override
public HazardousWaste getRowData(String rowKey) {
- Iterator<HazardousWaste> iterator = this.iterator();
- HazardousWaste su = null;
- while (iterator.hasNext()) {
- su = iterator.next();
- if ( su.getId().equals(Long.parseLong(rowKey))) {
- return su;
- }
- }
- return null;
+// Iterator<HazardousWaste> iterator = this.iterator();
+// HazardousWaste su = null;
+// while (iterator.hasNext()) {
+// su = iterator.next();
+// if ( su.getId().equals(Long.parseLong(rowKey))) {
+// return su;
+// }
+// }
+ return hazardousWasteService.selectById(Long.parseLong(rowKey));
}
};
}
@@ -107,11 +110,21 @@
List<HazardousWaste> list = null;
try {
- int pageCount = hazardousWasteService.countStatistics(startTime,endTime,status,applyPerson,project,department);
-
- this.setRowCount(pageCount);
- if (pageCount > 0)
- list = hazardousWasteService.selectStatistics(startTime,endTime,status,applyPerson,project,department,first, pageSize);
+ if (getUser().getWaster() != null){
+ if (getUser().getWaster().equals(Waster.MANAGE)){
+ int pageCount = hazardousWasteService.countStatistics(startTime,endTime,status,applyPerson,project,department);
+ this.setRowCount(pageCount);
+ if (pageCount > 0)
+ list = hazardousWasteService.selectStatistics(startTime,endTime,status,applyPerson,project,department,first, pageSize);
+ }else if (StringUtils.isNotBlank(getUser().getProject())){
+ int pageCount = hazardousWasteService.countStatistics(startTime,endTime,status,applyPerson,getUser().getProject(),department);
+ this.setRowCount(pageCount);
+ if (pageCount > 0)
+ list = hazardousWasteService.selectStatistics(startTime,endTime,status,applyPerson,getUser().getProject(),department,first, pageSize);
+ }
+ }else {
+ this.setRowCount(0);
+ }
//查询更换模式
if (isAnalysSearch) {
@@ -125,14 +138,14 @@
@Override
public HazardousWaste getRowData(String rowKey) {
- Iterator<HazardousWaste> iterator = this.iterator();
- HazardousWaste su = null;
- while (iterator.hasNext()) {
- su = iterator.next();
- if ( su.getId().equals(Long.parseLong(rowKey))) {
- return su;
- }
- }
+// Iterator<HazardousWaste> iterator = this.iterator();
+// HazardousWaste su = null;
+// while (iterator.hasNext()) {
+// su = iterator.next();
+// if ( su.getId().equals(Long.parseLong(rowKey))) {
+// return su;
+// }
+// }
return null;
}
};
@@ -234,7 +247,14 @@
}
public void exportStatistics2Excel(){
- List<Map> list = hazardousWasteService.exportStatisticsList(startTime,endTime,status,applyPerson,project,department);
+ List<Map> list = new ArrayList<>();
+ if (getUser().getWaster() != null){
+ if (getUser().getWaster().equals(Waster.MANAGE)){
+ list = hazardousWasteService.exportStatisticsList(startTime,endTime,status,applyPerson,project,department);
+ }else if (StringUtils.isNotBlank(getUser().getProject())){
+ list = hazardousWasteService.exportStatisticsList(startTime,endTime,status,applyPerson,getUser().getProject(),department);
+ }
+ }
try{
hazardousWasteService.exportStatistics2Excel(list);
}catch (Exception e){
--
Gitblit v1.9.2