From e7e4c9460a261931a33126a42a62bac75f7bc969 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 06 三月 2021 14:39:11 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/manager/controller/ConsoleController.java | 13 ++++++++++++-
1 files changed, 12 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 ac158ae..1fd5337 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/ConsoleController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/ConsoleController.java
@@ -68,7 +68,7 @@
List<Map<String, Object>> combList = jdbcTemplate.queryForList("select top 10 * from man_comb where 1=1 order by create_time desc");
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(11, 16));
+ combList.get(i).put("time", String.valueOf(create_time).substring(5, 16));
combList.get(i).put("active", i<3?"active":"");
}
// 鎷ｈ揣鍗�
@@ -112,12 +112,23 @@
"order by (mp.safe_qua - mld.anfme) desc");
for (int i=0;i<safeQuaList.size();i++) {
safeQuaList.get(i).put("no", i+1);
+ if (Cools.isEmpty(safeQuaList.get(i).get("dValue"))){
+ safeQuaList.get(i).put("dValue", safeQuaList.get(i).get("safe_qua"));
+ }
+ }
+ // 搴撳瓨婊炵暀
+ List<Map<String, Object>> retentionList = jdbcTemplate.queryForList("select top 6 CONVERT(decimal, DATEDIFF(second, man_loc_detl.create_time, GETDATE()) / 86400.0, 9) AS stayDays, * from man_loc_detl order by create_time desc");
+ for (int i=0;i<retentionList.size();i++) {
+ retentionList.get(i).put("no", i+1);
+ Object create_time = combList.get(i).get("create_time");
+ retentionList.get(i).put("createTime", String.valueOf(create_time).substring(0, 11));
}
return R.ok().add(Cools
.add("combList", combList) // 缁勬墭鏈�鏂板姩鎬�
.add("pakoutList", pakoutList) // 鏈�鏂版嫞璐у崟
.add("safeQuaList", safeQuaList) // 瀹夊叏搴撳瓨璀﹀憡
+ .add("retentionList", retentionList) // 搴撳瓨婊炵暀鏁版嵁
);
}
--
Gitblit v1.9.1