From 576c52d8d8e6fb1e738380cc5fc101a6a2b0b3a8 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期六, 04 九月 2021 16:00:57 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-db/src/main/resources/mapper/store/UserStorehouseServiceDaoImplMapper.xml | 49 ++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 40 insertions(+), 9 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/store/UserStorehouseServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/store/UserStorehouseServiceDaoImplMapper.xml
index a9eabb7..e49bb38 100644
--- a/java110-db/src/main/resources/mapper/store/UserStorehouseServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/store/UserStorehouseServiceDaoImplMapper.xml
@@ -7,24 +7,25 @@
<!-- 淇濆瓨涓汉鐗╁搧淇℃伅 add by wuxw 2018-07-03 -->
<insert id="saveBusinessUserStorehouseInfo" parameterType="Map">
insert into business_user_storehouse(
- res_name,operate,b_id,store_id,stock,res_id,user_id,us_id
+ res_name,operate,b_id,store_id,stock,res_id,user_id,us_id,mini_stock
) values (
- #{resName},#{operate},#{bId},#{storeId},#{stock},#{resId},#{userId},#{usId}
+ #{resName},#{operate},#{bId},#{storeId},#{stock},#{resId},#{userId},#{usId},#{miniStock}
)
</insert>
<insert id="saveUserStorehouses" parameterType="Map">
insert into user_storehouse(
- res_name,b_id,store_id,stock,res_id,user_id,us_id
+ res_name,b_id,store_id,stock,res_id,user_id,us_id,mini_stock
) values (
- #{resName},'-1',#{storeId},#{stock},#{resId},#{userId},#{usId}
+ #{resName},'-1',#{storeId},#{stock},#{resId},#{userId},#{usId},#{miniStock}
)
</insert>
<!-- 鏌ヨ涓汉鐗╁搧淇℃伅锛圔usiness锛� add by wuxw 2018-07-03 -->
<select id="getBusinessUserStorehouseInfo" parameterType="Map" resultType="Map">
select t.res_name,t.res_name resName,t.operate,t.b_id,t.b_id bId,t.store_id,t.store_id
- storeId,t.stock,t.res_id,t.res_id resId,t.user_id,t.user_id userId,t.us_id,t.us_id usId
+ storeId,t.stock,t.res_id,t.res_id resId,t.user_id,t.user_id userId,t.us_id,t.us_id usId,
+ t.mini_stock,t.mini_stock miniStock
from business_user_storehouse t
where 1 =1
<if test="resName !=null and resName != ''">
@@ -51,13 +52,16 @@
<if test="usId !=null and usId != ''">
and t.us_id= #{usId}
</if>
+ <if test="miniStock !=null and miniStock != ''">
+ and t.mini_stock= #{miniStock}
+ </if>
</select>
<!-- 淇濆瓨涓汉鐗╁搧淇℃伅鑷� instance琛ㄤ腑 add by wuxw 2018-07-03 -->
<insert id="saveUserStorehouseInfoInstance" parameterType="Map">
insert into user_storehouse(
- res_name,status_cd,b_id,store_id,stock,res_id,user_id,us_id
- ) select t.res_name,'0',t.b_id,t.store_id,t.stock,t.res_id,t.user_id,t.us_id from business_user_storehouse t
+ res_name,status_cd,b_id,store_id,stock,res_id,user_id,us_id,mini_stock
+ ) select t.res_name,'0',t.b_id,t.store_id,t.stock,t.res_id,t.user_id,t.us_id,t.mini_stock from business_user_storehouse t
where 1=1
<if test="resName !=null and resName != ''">
and t.res_name= #{resName}
@@ -81,17 +85,25 @@
<if test="usId !=null and usId != ''">
and t.us_id= #{usId}
</if>
+ <if test="miniStock !=null and miniStock != ''">
+ and t.mini_stock= #{miniStock}
+ </if>
</insert>
<!-- 鏌ヨ涓汉鐗╁搧淇℃伅 add by wuxw 2018-07-03 -->
<select id="getUserStorehouseInfo" parameterType="Map" resultType="Map">
select t.res_name,t.res_name resName,t.status_cd,t.status_cd statusCd,t.b_id,t.b_id bId,t.store_id,t.store_id
storeId,t.stock,t.res_id,t.res_id resId,t.user_id,t.user_id userId,t.us_id,t.us_id usId,rs.res_code resCode,
- rs.out_low_price outLowPrice,rs.out_high_price outHighPrice,rst.name rstName,rss.spec_name specName from
- user_storehouse t
+ rs.out_low_price outLowPrice,rs.out_high_price outHighPrice,rst.name rstName,rss.spec_name specName,t.mini_stock miniStock,
+ rs.unit_code unitCode,rs.mini_unit_code miniUnitCode,rs.mini_unit_stock miniUnitStock,
+ td.name unitCodeName,td1.name miniUnitCodeName,u.name userName
+ from 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
left join resource_store_specification rss on rs.rss_id = rss.rss_id
+ left join t_dict td on rs.unit_code = td.status_cd and td.table_name = 'resource_store' and td.table_columns = 'unit_code'
+ left join t_dict td1 on rs.mini_unit_code = td1.status_cd and td1.table_name = 'resource_store' and td1.table_columns = 'unit_code'
+ left join u_user u on t.user_id = u.user_id
where t.stock > 0
<if test="resName !=null and resName != ''">
and t.res_name like '%${resName}%'
@@ -126,6 +138,12 @@
<if test="usId !=null and usId != ''">
and t.us_id= #{usId}
</if>
+ <if test="userId !=null and userId != ''">
+ and t.user_id= #{userId}
+ </if>
+ <if test="userName !=null and userName != ''">
+ and u.name= #{userName}
+ </if>
order by t.create_time desc
<if test="page != -1 and page != null ">
limit #{page}, #{row}
@@ -151,6 +169,9 @@
<if test="userId !=null and userId != ''">
, t.user_id= #{userId}
</if>
+ <if test="miniStock !=null and miniStock != ''">
+ , t.mini_stock= #{miniStock}
+ </if>
where 1=1
<if test="bId !=null and bId != ''">
and t.b_id= #{bId}
@@ -166,6 +187,7 @@
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
+ left join u_user u on t.user_id = u.user_id
where 1 = 1 and t.stock > 0
<if test="resName !=null and resName != ''">
and t.res_name like '%${resName}%'
@@ -200,5 +222,14 @@
<if test="usId !=null and usId != ''">
and t.us_id= #{usId}
</if>
+ <if test="userId !=null and userId != ''">
+ and t.user_id= #{userId}
+ </if>
+ <if test="userName !=null and userName != ''">
+ and u.name= #{userName}
+ </if>
+ <if test="miniStock !=null and miniStock != ''">
+ and t.mini_stock= #{miniStock}
+ </if>
</select>
</mapper>
--
Gitblit v1.8.0