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/ContainerStatusMngController.java | 43 ++++++++++++++++++++++++-------------------
1 files changed, 24 insertions(+), 19 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/controller/ContainerStatusMngController.java b/src/main/java/com/nanometer/smartlab/controller/ContainerStatusMngController.java
index 018be90..4361ea5 100644
--- a/src/main/java/com/nanometer/smartlab/controller/ContainerStatusMngController.java
+++ b/src/main/java/com/nanometer/smartlab/controller/ContainerStatusMngController.java
@@ -85,22 +85,23 @@
} catch (Exception e) {
logger.error("error occured.", e);
}
+ selectContainerList = null;
return list;
}
@Override
public ContainerStatusMngDto getRowData(String rowKey) {
- Iterator<ContainerStatusMngDto> iterator = this.iterator();
- if (iterator != null) {
- ContainerStatusMngDto su = null;
- while (iterator.hasNext()) {
- su = iterator.next();
- if (rowKey.equals(su.getId())) {
- return su;
- }
- }
- }
- return null;
+// Iterator<ContainerStatusMngDto> iterator = this.iterator();
+// if (iterator != null) {
+// ContainerStatusMngDto su = null;
+// while (iterator.hasNext()) {
+// su = iterator.next();
+// if (rowKey.equals(su.getId())) {
+// return su;
+// }
+// }
+// }
+ return sysContainerSensorsService.getRowData(rowKey);
}
};
}
@@ -263,16 +264,20 @@
// DateAxis axis = new DateAxis("Dates");
// Axis xAxis = lineModel.getAxis(AxisType.X);
- Axis xAxis = new CategoryAxis();
- xAxis.setTickAngle(-50);
- if(chartSensorsList.size()>30 && chartSensorsList.size()<240) {
- xAxis.setTickCount(200);
- }else if(chartSensorsList.size()>=240) {
- xAxis.setTickCount(240);
- }
+ Axis xAxis = new DateAxis();
+
lineModel.getAxes().put(AxisType.X, xAxis);
lineModel.setShowDatatip(true);
-// axis.setTickFormat("%b %d, %Y");
+ if (periodType == 1) {
+ xAxis.setTickFormat("%m-%d:%H");
+ }
+ if (periodType == 2) {
+ xAxis.setTickFormat("%m-%d");
+ }
+ if (periodType == 3) {
+ xAxis.setTickFormat("%m-%d");
+ }
+ xAxis.setTickAngle(-50);
// axis.setMax(DateFormatUtils.format(new Date(),"yyyy-MM-dd HH:mm"));
// axis.setMin(minDate);
// axis.setTickFormat("%Y-%m-%d %H:%M");
--
Gitblit v1.9.2