From d7d9b601b2e4fdb663375993e2cfbdbd363df421 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期二, 11 七月 2023 22:17:37 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-db/src/main/resources/mapper/store/PurchaseApplyDetailServiceDaoImplMapper.xml | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/store/PurchaseApplyDetailServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/store/PurchaseApplyDetailServiceDaoImplMapper.xml
index 02c655b..51a7e38 100755
--- a/java110-db/src/main/resources/mapper/store/PurchaseApplyDetailServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/store/PurchaseApplyDetailServiceDaoImplMapper.xml
@@ -86,7 +86,9 @@
rs.sh_id shId,
td4.name unitCodeName,
td5.name miniUnitCodeName,
- sh.sh_name shName
+ sh.sh_name shName,
+ rs.is_fixed isFixed,
+ td6.name isFixedName
from purchase_apply_detail t
inner join purchase_apply pa on t.apply_order_id = pa.apply_order_id and pa.status_cd = '0'
left join resource_store rs on rs.res_id = t.res_id and rs.status_cd = '0'
@@ -103,6 +105,7 @@
LEFT JOIN resource_store_type rst on rs.rst_id=rst.rst_id and rst.status_cd = '0'
LEFT JOIN resource_store_type rst1 on rs.parent_rst_id=rst1.rst_id and rst1.status_cd = '0'
LEFT JOIN resource_store_specification rss on rs.rss_id=rss.rss_id and rss.status_cd = '0'
+ left join t_dict td6 on rs.is_fixed = td6.status_cd and td6.table_name = 'resource_store' and td6.table_columns = 'is_fixed'
where 1 = 1
<if test="applyOrderId !=null and applyOrderId != ''">
and t.apply_order_id= #{applyOrderId}
--
Gitblit v1.8.0