From bdecacdc2d57c2e4f75c977e3fdb3980fdbdccd4 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期三, 21 八月 2024 09:07:34 +0800
Subject: [PATCH] #优化
---
src/main/java/com/zy/asrs/controller/ConsoleController.java | 46 +++++++++++++++++++----
src/main/java/com/zy/asrs/entity/LocChartPie.java | 42 +++++++++++++++++++-
2 files changed, 77 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ConsoleController.java b/src/main/java/com/zy/asrs/controller/ConsoleController.java
index 1458636..ba04863 100644
--- a/src/main/java/com/zy/asrs/controller/ConsoleController.java
+++ b/src/main/java/com/zy/asrs/controller/ConsoleController.java
@@ -31,15 +31,45 @@
LocChartPie locUseRate = reportQueryMapper.getLocUseRate();
if(locUseRate!=null) {
- ChartBean fqty = new ChartBean();
- fqty.setName("鍦ㄥ簱搴撲綅");
- fqty.setY(locUseRate.getFqty());
- list.add(fqty);
+// ChartBean fqty = new ChartBean();
+// fqty.setName("鍦ㄥ簱搴撲綅");
+// fqty.setY(locUseRate.getFqty());
+// list.add(fqty);
- ChartBean oqty = new ChartBean();
- oqty.setName("绌哄簱浣�");
- oqty.setY(locUseRate.getOqty());
- list.add(oqty);
+ ChartBean fqty1 = new ChartBean();
+ fqty1.setName("鍗曞搧鍦ㄥ簱");
+ fqty1.setY(locUseRate.getFqty1());
+ list.add(fqty1);
+
+ ChartBean fqty2 = new ChartBean();
+ fqty2.setName("楂橀鍦ㄥ簱");
+ fqty2.setY(locUseRate.getFqty2());
+ list.add(fqty2);
+
+ ChartBean fqty3 = new ChartBean();
+ fqty3.setName("浣庨鍦ㄥ簱");
+ fqty3.setY(locUseRate.getFqty3());
+ list.add(fqty3);
+
+// ChartBean oqty = new ChartBean();
+// oqty.setName("绌哄簱浣�");
+// oqty.setY(locUseRate.getOqty());
+// list.add(oqty);
+
+ ChartBean oqty1 = new ChartBean();
+ oqty1.setName("鍗曞搧绌哄簱浣�");
+ oqty1.setY(locUseRate.getOqty1());
+ list.add(oqty1);
+
+ ChartBean oqty2 = new ChartBean();
+ oqty2.setName("楂橀绌哄簱浣�");
+ oqty2.setY(locUseRate.getOqty2());
+ list.add(oqty2);
+
+ ChartBean oqty3 = new ChartBean();
+ oqty3.setName("浣庨绌哄簱浣�");
+ oqty3.setY(locUseRate.getOqty3());
+ list.add(oqty3);
ChartBean uqty = new ChartBean();
uqty.setName("浣跨敤搴撲綅");
diff --git a/src/main/java/com/zy/asrs/entity/LocChartPie.java b/src/main/java/com/zy/asrs/entity/LocChartPie.java
index 55b7109..1ea51d3 100644
--- a/src/main/java/com/zy/asrs/entity/LocChartPie.java
+++ b/src/main/java/com/zy/asrs/entity/LocChartPie.java
@@ -7,14 +7,30 @@
*/
public class LocChartPie {
private int fqty;
+ private int fqty1;
+ private int fqty2;
+ private int fqty3;
private int oqty;
+ private int oqty1;
+ private int oqty2;
+ private int oqty3;
private int uqty;
private int xqty;
- public int getFqty() {
- return fqty;
- }
+ public int getFqty() {return fqty;}
public void setFqty(int fqty) {
this.fqty = fqty;
+ }
+ public int getFqty1() {return fqty1;}
+ public void setFqty1(int fqty1) {
+ this.fqty1 = fqty1;
+ }
+ public int getFqty2() {return fqty2;}
+ public void setFqty2(int fqty2) {
+ this.fqty2 = fqty2;
+ }
+ public int getFqty3() {return fqty3;}
+ public void setFqty3(int fqty3) {
+ this.fqty3 = fqty3;
}
public int getOqty() {
return oqty;
@@ -22,6 +38,26 @@
public void setOqty(int oqty) {
this.oqty = oqty;
}
+
+ public int getOqty1() {
+ return oqty1;
+ }
+ public void setOqty1(int oqty1) {
+ this.oqty1 = oqty1;
+ }
+ public int getOqty2() {
+ return oqty2;
+ }
+ public void setOqty2(int oqty2) {
+ this.oqty2 = oqty2;
+ }
+ public int getOqty3() {
+ return oqty3;
+ }
+ public void setOqty3(int oqty3) {
+ this.oqty3 = oqty3;
+ }
+
public int getUqty() {
return uqty;
}
--
Gitblit v1.9.1