From d80dd0abcb56aacf30bc32e424ff398f7ccce730 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 26 三月 2021 13:17:00 +0800
Subject: [PATCH] #
---
src/main/resources/mapper/PriorMapper.xml | 27 ++++++++++++++-------------
1 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/src/main/resources/mapper/PriorMapper.xml b/src/main/resources/mapper/PriorMapper.xml
index 6a857bc..1a8958b 100644
--- a/src/main/resources/mapper/PriorMapper.xml
+++ b/src/main/resources/mapper/PriorMapper.xml
@@ -26,17 +26,11 @@
<sql id="pageCondition">
- <if test="loc_no != null and loc_no != ''">
- and mld.loc_no like concat('%',#{loc_no},'%')
- </if>
<if test="matnr != null and matnr != ''">
- and mld.matnr like concat('%',#{matnr},'%')
+ and mp.matnr like concat('%',#{matnr},'%')
</if>
- <if test="maktx != null and maktx != ''">
- and mld.maktx like concat('%',#{maktx},'%')
- </if>
- <if test="startTime!=null and endTime!=null">
- and mld.update_time between #{startTime} and #{endTime}
+ <if test="node_id != null and node_id != ''">
+ and mp.node_id like concat('%',#{node_id},'%')
</if>
</sql>
@@ -46,12 +40,19 @@
select
ROW_NUMBER() over (order by mp.create_time desc) as row,
mp.node_id,
+ mp.node_name,
mp.matnr,
+ mp.maktx,
mp.safe_qua,
- ls.amount,
- (cast(round((ls.amount/(mp.safe_qua*1.0))*100,2) as varchar)+'%') as progress
+ ISNULL(ls.amount, 0) as amount,
+ ISNULL((cast(round((ls.amount/(mp.safe_qua*1.0))*100,2) as varchar)+'%'), '0.00%') as progress,
+ case
+ when isnull(round((ls.amount/mp.safe_qua),2),0) > 1 then 1
+ when isnull(round((ls.amount/mp.safe_qua),2),0) > 0.75 then 2
+ else 3
+ end as status
from man_prior mp
- inner join
+ left join
(
select
node_id,
@@ -69,7 +70,7 @@
select
count(1) as count
from man_prior mp
- inner join
+ left join
(
select
node_id,
--
Gitblit v1.9.1