From 65763d38cf9b6b8067a293d9c99297efea0de3e3 Mon Sep 17 00:00:00 2001
From: 928255095 <928255095@qq.com>
Date: 星期二, 07 九月 2021 22:04:15 +0800
Subject: [PATCH] Merge branch 'xinghong-dev' into 'master'
---
java110-db/src/main/resources/mapper/store/ResourceStoreUseRecordServiceDaoImplMapper.xml | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/store/ResourceStoreUseRecordServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/store/ResourceStoreUseRecordServiceDaoImplMapper.xml
index 8290a67..5d1f20c 100644
--- a/java110-db/src/main/resources/mapper/store/ResourceStoreUseRecordServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/store/ResourceStoreUseRecordServiceDaoImplMapper.xml
@@ -117,11 +117,13 @@
statusCd,t.remark,t.store_id,t.store_id storeId,t.res_id,t.res_id
resId,t.resource_store_name,t.resource_store_name resourceStoreName,rs.res_name resName,
t.b_id,t.b_id bId,t.community_id,t.community_id communityId,t.create_time createTime, rst.name
- rstName,rss.spec_name specName
+ rstName,rss.spec_name specName,td1.name unitCodeName,td2.name miniUnitCodeName
from resource_store_use_record t
left join resource_store rs on rs.res_id = t.res_id
left join resource_store_type rst on rs.rst_id = rst.rst_id
left join resource_store_specification rss on rs.rss_id = rss.rss_id
+ left join t_dict td1 on rs.unit_code = td1.status_cd and td1.table_name = 'resource_store' and td1.table_columns = 'unit_code'
+ left join t_dict td2 on rs.mini_unit_code = td2.status_cd and td2.table_name = 'resource_store' and td2.table_columns = 'unit_code'
where 1 = 1
<if test="unitPrice !=null and unitPrice != ''">
and t.unit_price= #{unitPrice}
@@ -235,6 +237,8 @@
left join resource_store rs on rs.res_id = t.res_id
left join resource_store_type rst on rs.rst_id = rst.rst_id
left join resource_store_specification rss on rs.rss_id = rss.rss_id
+ left join t_dict td1 on rs.unit_code = td1.status_cd and td1.table_name = 'resource_store' and td1.table_columns = 'unit_code'
+ left join t_dict td2 on rs.mini_unit_code = td2.status_cd and td2.table_name = 'resource_store' and td2.table_columns = 'unit_code'
where 1 =1
<if test="unitPrice !=null and unitPrice != ''">
and t.unit_price= #{unitPrice}
--
Gitblit v1.8.0