From 07408a7c33390a66e383a8efa77273c39829e39f Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 06 三月 2021 16:15:51 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/manager/controller/ConsoleController.java | 7 ++++---
1 files changed, 4 insertions(+), 3 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 04d1e6e..d61f665 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":"");
}
// 鎷ｈ揣鍗�
@@ -104,12 +104,13 @@
"mp.maktx,\n" +
"mp.safe_qua,\n" +
"mld.anfme,\n" +
- "(mp.safe_qua - mld.anfme) as dValue\n" +
+ "(mp.safe_qua - isnull(mld.anfme, 0)) as dValue\n" +
"from man_prior mp\n" +
"left join \n" +
"(select SUM(anfme) as anfme, node_id from man_loc_detl where 1=1 group by node_id) mld on mp.node_id = mld.node_id\n" +
"where 1=1 \n" +
- "order by (mp.safe_qua - mld.anfme) desc");
+ "and mp.safe_qua > mld.anfme or mld.anfme is null\n" +
+ "order by (mp.safe_qua - isnull(mld.anfme, 0)) desc");
for (int i=0;i<safeQuaList.size();i++) {
safeQuaList.get(i).put("no", i+1);
if (Cools.isEmpty(safeQuaList.get(i).get("dValue"))){
--
Gitblit v1.9.1