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/AllocationUserStorehouseServiceDaoImplMapper.xml | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/store/AllocationUserStorehouseServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/store/AllocationUserStorehouseServiceDaoImplMapper.xml
index db61ce1..aa4c9a6 100644
--- a/java110-db/src/main/resources/mapper/store/AllocationUserStorehouseServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/store/AllocationUserStorehouseServiceDaoImplMapper.xml
@@ -119,11 +119,13 @@
resId,t.res_name,t.res_name resName,t.start_user_id,t.start_user_id startUserId,t.start_user_name,
t.start_user_name startUserName,t.aus_id,t.aus_id ausId,t.b_id,t.b_id
bId,t.stock,t.give_quantity,t.give_quantity giveQuantity,t.create_time createTime,rst.name rstName,rss.spec_name
- specName
+ specName,td1.name unitCodeName,td2.name miniUnitCodeName
from allocation_user_storehouse t
left join resource_store rs on t.res_id = rs.res_id and rs.status_cd = '0'
left join resource_store_type rst on rs.rst_id = rst.rst_id and rst.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 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="acceptUserId !=null and acceptUserId != ''">
and t.accept_user_id= #{acceptUserId}
@@ -229,6 +231,8 @@
left join resource_store rs on t.res_id = rs.res_id and rs.status_cd = '0'
left join resource_store_type rst on rs.rst_id = rst.rst_id and rst.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 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="acceptUserId !=null and acceptUserId != ''">
and t.accept_user_id= #{acceptUserId}
--
Gitblit v1.8.0