From 7391ec15384def3cf84c7c33c9a4e3efc4498e2a Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 17 三月 2021 16:36:12 +0800
Subject: [PATCH] #

---
 src/main/java/zy/cloud/wms/manager/controller/ConsoleController.java |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/src/main/java/zy/cloud/wms/manager/controller/ConsoleController.java b/src/main/java/zy/cloud/wms/manager/controller/ConsoleController.java
index fad4062..3be7a28 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/ConsoleController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/ConsoleController.java
@@ -46,6 +46,7 @@
 
         Integer usersQty = jdbcTemplate.queryForObject("select count(*) from sys_user", Integer.class);
         Integer deptQty = jdbcTemplate.queryForObject("select count(*) from sys_dept", Integer.class);
+        Integer optQty = jdbcTemplate.queryForObject("select count(*) from sys_operate_log", Integer.class);
 
         return R.ok().add(Cools
                 .add("combQtyDay", Optional.ofNullable(combQtyDay).orElse(0)) // 缁勬墭鏁伴噺(褰撳ぉ锛�
@@ -59,6 +60,7 @@
 
                 .add("usersQty", Optional.ofNullable(usersQty).orElse(0)) // 鐢ㄦ埛鏁伴噺
                 .add("deptQty", Optional.ofNullable(deptQty).orElse(0)) // 閮ㄩ棬鏁伴噺
+                .add("optQty", Optional.ofNullable(optQty).orElse(0)) // 鎿嶄綔娆℃暟
         );
     }
 
@@ -69,7 +71,7 @@
         for (int i=0;i<combList.size();i++) {
             Object create_time = combList.get(i).get("create_time");
             combList.get(i).put("time", String.valueOf(create_time).substring(5, 16));
-            combList.get(i).put("active", i<3?"active":"");
+            combList.get(i).put("active", String.valueOf(combList.get(i).get("io_status")).equals("4")?"":"active");
         }
         // 鎷h揣鍗�
         List<Map<String, Object>> pakoutList = jdbcTemplate.queryForList("select top 5 * from man_pakout where 1=1 order by create_time desc");

--
Gitblit v1.9.1