From ee4dc5d6c9d3bc8ae8e704f93fa6b233e8b42e8f Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期五, 31 五月 2024 11:49:55 +0800
Subject: [PATCH] 首页分成两张表格
---
north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml | 25 +++++++++++++++++++++----
1 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml b/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
index c81c85b..da75f56 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
@@ -81,7 +81,15 @@
<if test="flowCard.order.project != null and flowCard.order.project!= ''">
and b.project regexp #{flowCard.order.project}
</if>
-
+ <if test="flowCard.layoutStatus != null and flowCard.layoutStatus != '' and flowCard.layoutStatus == '涓嶅彲鎺掔増'">
+ and a.layout_status regexp 0
+ </if>
+ <if test="flowCard.layoutStatus != null and flowCard.layoutStatus != '' and flowCard.layoutStatus == '鍙帓鐗�'">
+ and a.layout_status regexp 1
+ </if>
+ <if test="flowCard.layoutStatus != null and flowCard.layoutStatus != '' and flowCard.layoutStatus == '宸叉帓鐗�'">
+ and a.layout_status regexp 2
+ </if>
group by a.process_Id
ORDER BY a.id desc
@@ -99,8 +107,8 @@
<if test="flowCard.orderId != null and flowCard.orderId != ''">
and a.order_id regexp #{flowCard.orderId}
</if>
- <if test="flowCard.productionId != null and flowCard.productionId != ''">
- and a.process_Id regexp #{flowCard.productionId}
+ <if test="flowCard.processId != null and flowCard.processId != ''">
+ and a.process_Id regexp #{flowCard.processId}
</if>
<if test="flowCard.orderDetail.productId != null and flowCard.orderDetail.productId != ''">
and c.product_id regexp #{flowCard.orderDetail.productId}
@@ -111,6 +119,15 @@
<if test="flowCard.order.project != null and flowCard.order.project!= ''">
and b.project regexp #{flowCard.order.project}
+ </if>
+ <if test="flowCard.layoutStatus != null and flowCard.layoutStatus != '' and flowCard.layoutStatus == '涓嶅彲鎺掔増'">
+ and a.layout_status regexp 0
+ </if>
+ <if test="flowCard.layoutStatus != null and flowCard.layoutStatus != '' and flowCard.layoutStatus == '鍙帓鐗�'">
+ and a.layout_status regexp 1
+ </if>
+ <if test="flowCard.layoutStatus != null and flowCard.layoutStatus != '' and flowCard.layoutStatus == '宸叉帓鐗�'">
+ and a.layout_status regexp 2
</if>
ORDER BY a.id desc
@@ -495,7 +512,7 @@
<!-- 澶嶉�夋淇敼鎺掔増鐘舵��-->
<update id="updateComposing">
update flow_card as fc
- set fc.layout_status=2
+ set fc.layout_status=1
where fc.process_id = #{processId}
</update>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0