From e57e32fc43da31917912eebb4e47d4e50df1a9e9 Mon Sep 17 00:00:00 2001
From: shiyj1101 <1098226878@qq.com>
Date: 星期四, 05 八月 2021 22:56:15 +0800
Subject: [PATCH] 完善格式化功能
---
java110-db/src/main/resources/mapper/store/ResourceStoreServiceDaoImplMapper.xml | 155 ++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 122 insertions(+), 33 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/store/ResourceStoreServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/store/ResourceStoreServiceDaoImplMapper.xml
old mode 100644
new mode 100755
index b8f69c2..09f70b5
--- a/java110-db/src/main/resources/mapper/store/ResourceStoreServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/store/ResourceStoreServiceDaoImplMapper.xml
@@ -7,11 +7,25 @@
<!-- 淇濆瓨璧勬簮淇℃伅 add by wuxw 2018-07-03 -->
<insert id="saveBusinessResourceStoreInfo" parameterType="Map">
insert into business_resource_store(
- res_name,operate,price,res_code,description,store_id,stock,warning_stock,b_id,res_id,goods_type,
- unit_code,remark,out_low_price,out_high_price,show_mobile,create_time,sh_id,average_price
+ res_name,operate,price,res_code,description,store_id,stock,warning_stock,b_id,res_id,
+ unit_code,remark,out_low_price,out_high_price,show_mobile,create_time,sh_id,average_price,rst_id,rss_id,
+ mini_unit_code,mini_unit_stock,mini_stock
) values (
#{resName},#{operate},#{price},#{resCode},#{description},#{storeId},#{stock},#{warningStock},#{bId},#{resId},
- #{goodsType},#{unitCode},#{remark},#{outLowPrice},#{outHighPrice},#{showMobile},#{createTime},#{shId},#{averagePrice}
+ #{unitCode},#{remark},#{outLowPrice},#{outHighPrice},#{showMobile},#{createTime},#{shId},
+ #{averagePrice},#{rstId},#{rssId},#{miniUnitCode},#{miniUnitStock},#{miniStock}
+ )
+ </insert>
+
+ <!-- 淇濆瓨鐗╁搧淇℃伅-->
+ <insert id="saveResourceStoreInfo" parameterType="Map">
+ insert into resource_store(
+ res_id,b_id,store_id,res_name,res_code,unit_code,remark,out_low_price,out_high_price,show_mobile,description,
+ price,stock,create_time,sh_id,warning_stock,average_price,rss_id,rst_id,mini_unit_code,mini_unit_stock,mini_stock
+ ) values (
+ #{resId},#{bId},#{storeId},#{resName},#{resCode},#{unitCode},#{remark},#{outLowPrice},#{outHighPrice},
+ #{showMobile},#{description},#{price},#{stock},#{createTime},#{shId},#{warningStock},
+ #{averagePrice},#{rssId},#{rstId},#{miniUnitCode},#{miniUnitStock},#{miniStock}
)
</insert>
@@ -19,11 +33,12 @@
<select id="getBusinessResourceStoreInfo" parameterType="Map" resultType="Map">
select t.res_name,t.res_name resName,t.operate,t.price,t.res_code,t.res_code
resCode,t.description,t.store_id,t.store_id storeId,t.stock,t.warning_stock,t.warning_stock
- warningStock,t.b_id,t.b_id bId,t.res_id,t.res_id resId,
- t.goods_type,t.goods_type goodsType,t.unit_code,t.unit_code unitCode,t.remark,
- t.out_low_price,t.out_low_price outLowPrice,t.out_high_price,t.out_high_price outHighPrice,
- t.show_mobile,t.show_mobile showMobile,t.create_time,t.create_time createTime,t.sh_id,t.sh_id shId,
- t.average_price,t.average_price averagePrice
+ warningStock,t.b_id,t.b_id bId,t.res_id,t.res_id resId,t.rst_id,t.rst_id rstId,t.rss_id,t.rss_id rssId,
+ t.unit_code,t.unit_code unitCode,t.remark,t.out_low_price,t.out_low_price outLowPrice,
+ t.out_high_price,t.out_high_price outHighPrice,t.show_mobile,t.show_mobile showMobile,
+ t.create_time,t.create_time createTime,t.sh_id,t.sh_id shId,t.mini_unit_code,t.mini_unit_code miniUnitCode,
+ t.mini_unit_stock,t.mini_unit_stock miniUnitStock,t.average_price,t.average_price averagePrice,t.mini_stock,
+ t.mini_stock miniStock
from business_resource_store t
where 1 =1
<if test="resName !=null and resName != ''">
@@ -38,6 +53,12 @@
<if test="resCode !=null and resCode != ''">
and t.res_code= #{resCode}
</if>
+ <if test="rstId !=null and rstId != ''">
+ and t.rst_id= #{rstId}
+ </if>
+ <if test="rssId !=null and rssId != ''">
+ and t.rss_id= #{rssId}
+ </if>
<if test="description !=null and description != ''">
and t.description= #{description}
</if>
@@ -55,9 +76,6 @@
</if>
<if test="resId !=null and resId != ''">
and t.res_id= #{resId}
- </if>
- <if test="goodsType !=null and goodsType != ''">
- and t.goods_type= #{goodsType}
</if>
<if test="unitCode !=null and unitCode != ''">
and t.unit_code= #{unitCode}
@@ -77,6 +95,15 @@
<if test="averagePrice !=null and averagePrice != ''">
and t.average_price= #{averagePrice}
</if>
+ <if test="miniUnitCode !=null and miniUnitCode != ''">
+ and t.mini_unit_code= #{miniUnitCode}
+ </if>
+ <if test="miniUnitStock !=null and miniUnitStock != ''">
+ and t.mini_unit_stock= #{miniUnitStock}
+ </if>
+ <if test="miniStock !=null and miniStock != ''">
+ and t.mini_stock= #{miniStock}
+ </if>
<if test="createTime !=null and createTime != ''">
and t.create_time= #{createTime}
</if>
@@ -85,11 +112,13 @@
<!-- 淇濆瓨璧勬簮淇℃伅鑷� instance琛ㄤ腑 add by wuxw 2018-07-03 -->
<insert id="saveResourceStoreInfoInstance" parameterType="Map">
insert into resource_store(
- res_name,price,res_code,description,status_cd,store_id,stock,warning_stock,b_id,res_id,goods_type,unit_code,remark,
- out_low_price,out_high_price,show_mobile,create_time,sh_id,average_price
+ res_name,price,res_code,description,status_cd,store_id,stock,warning_stock,b_id,res_id,unit_code,remark,
+ out_low_price,out_high_price,show_mobile,create_time,sh_id,average_price,rst_id,rss_id,mini_unit_code,mini_unit_stock,
+ mini_stock
) select
- t.res_name,t.price,t.res_code,t.description,'0',t.store_id,t.stock,t.warning_stock,t.b_id,t.res_id,t.goods_type,
- t.unit_code,t.remark,t.out_low_price,t.out_high_price,t.show_mobile,t.create_time,t.sh_id,t.average_price
+ t.res_name,t.price,t.res_code,t.description,'0',t.store_id,t.stock,t.warning_stock,t.b_id,t.res_id,
+ t.unit_code,t.remark,t.out_low_price,t.out_high_price,t.show_mobile,t.create_time,t.sh_id,t.average_price,t.rst_id,t.rss_id,
+ t.mini_unit_code,t.mini_unit_stock,t.mini_stock
from business_resource_store t where 1=1
<if test="resName !=null and resName != ''">
and t.res_name= #{resName}
@@ -101,6 +130,12 @@
<if test="resCode !=null and resCode != ''">
and t.res_code= #{resCode}
</if>
+ <if test="rstId !=null and rstId != ''">
+ and t.rst_id= #{rstId}
+ </if>
+ <if test="rssId !=null and rssId != ''">
+ and t.rss_id= #{rssId}
+ </if>
<if test="description !=null and description != ''">
and t.description= #{description}
</if>
@@ -118,9 +153,6 @@
</if>
<if test="resId !=null and resId != ''">
and t.res_id= #{resId}
- </if>
- <if test="goodsType !=null and goodsType != ''">
- and t.goods_type= #{goodsType}
</if>
<if test="unitCode !=null and unitCode != ''">
and t.unit_code= #{unitCode}
@@ -140,7 +172,16 @@
<if test="averagePrice !=null and averagePrice != ''">
and t.average_price= #{averagePrice}
</if>
- <if test="createTime !=null and createTime != ''">
+ <if test="miniUnitCode !=null and miniUnitCode != ''">
+ and t.mini_unit_code= #{miniUnitCode}
+ </if>
+ <if test="miniUnitStock !=null and miniUnitStock != ''">
+ and t.mini_unit_stock= #{miniUnitStock}
+ </if>
+ <if test="miniStock !=null and miniStock != ''">
+ and t.mini_stock= #{miniStock}
+ </if>
+ <if test="createTime !=null">
and t.create_time= #{createTime}
</if>
</insert>
@@ -149,29 +190,41 @@
<select id="getResourceStoreInfo" parameterType="Map" resultType="Map">
select t.res_name,t.res_name resName,t.price,t.res_code,t.res_code resCode,t.description,t.status_cd,t.status_cd
statusCd,t.store_id,t.store_id storeId,t.stock,t.warning_stock,t.warning_stock warningStock,t.b_id,t.b_id
- bId,t.res_id,t.res_id resId,t.out_low_price,
- t.out_low_price outLowPrice,rst.name goodsTypeName,t.out_high_price,t.out_high_price outHighPrice,t.goods_type,
- t.goods_type goodsType,t.unit_code,t.unit_code unitCode,t.remark,t.show_mobile,t.show_mobile showMobile,
+ bId,t.res_id,t.res_id resId,t.out_low_price,t.rst_id,t.rst_id rstId,t.rss_id,t.rss_id rssId,
+ t.out_low_price outLowPrice,rst.name rstName,t.out_high_price,t.out_high_price outHighPrice,
+ t.unit_code,t.unit_code unitCode,t.remark,t.show_mobile,t.show_mobile showMobile,
t.create_time,t.create_time createTime,t.sh_id,t.sh_id shId,sh.sh_name shName,t.average_price,t.average_price
- averagePrice
+ averagePrice,rss.spec_name rssName,t.mini_unit_code,t.mini_unit_code miniUnitCode,t.mini_stock,t.mini_stock
+ miniStock,t.mini_unit_stock,t.mini_unit_stock miniUnitStock,td.name unitCodeName,td1.name miniUnitCodeName,sh.sh_type shType
from resource_store t
- left join resource_store_type rst on t.goods_type = rst.goods_type and rst.status_cd = '0'
+ left join resource_store_type rst on t.rst_id = rst.rst_id and rst.status_cd = '0'
+ left join resource_store_specification rss on t.rss_id = rss.rss_id and rss.status_cd = '0'
left join storehouse sh on t.sh_id = sh.sh_id and t.store_id = sh.store_id and sh.status_cd = '0'
+ left join t_dict td on t.unit_code = td.status_cd and td.table_name = 'resource_store' and td.table_columns =
+ 'unit_code'
+ left join t_dict td1 on t.mini_unit_code = td1.status_cd and td1.table_name = 'resource_store' and
+ td1.table_columns = 'unit_code'
where 1 = 1
<if test="resName !=null and resName != ''">
and t.res_name like concat('%',#{resName},'%')
</if>
+ <if test="name != null and name != ''">
+ and t.res_name = #{name}
+ </if>
<if test="price !=null and price != ''">
and t.price= #{price}
+ </if>
+ <if test="rstId !=null and rstId != ''">
+ and t.rst_id= #{rstId}
+ </if>
+ <if test="rssId !=null and rssId != ''">
+ and t.rss_id= #{rssId}
</if>
<if test="outLowPrice !=null and outLowPrice != ''">
and t.out_low_price = #{outLowPrice}
</if>
<if test="outHighPrice != null and outHighPrice != ''">
and t.out_high_price = #{outHighPrice}
- </if>
- <if test="goodsType != null and goodsType != ''">
- and t.goods_type = #{goodsType}
</if>
<if test="unitCode != null and unitCode != ''">
and t.unit_code = #{unitCode}
@@ -218,6 +271,15 @@
<if test="averagePrice != null and averagePrice != ''">
and t.average_price = #{averagePrice}
</if>
+ <if test="miniUnitCode !=null and miniUnitCode != ''">
+ and t.mini_unit_code= #{miniUnitCode}
+ </if>
+ <if test="miniUnitStock !=null and miniUnitStock != ''">
+ and t.mini_unit_stock= #{miniUnitStock}
+ </if>
+ <if test="miniStock !=null and miniStock != ''">
+ and t.mini_stock= #{miniStock}
+ </if>
<if test="resOrderType == '20000'">
and t.stock > 0
</if>
@@ -239,14 +301,17 @@
<if test="price !=null and price != ''">
, t.price= #{price}
</if>
+ <if test="rstId !=null and rstId != ''">
+ , t.rst_id= #{rstId}
+ </if>
+ <if test="rssId !=null and rssId != ''">
+ , t.rss_id= #{rssId}
+ </if>
<if test="outLowPrice !=null and outLowPrice != ''">
, t.out_low_price= #{outLowPrice}
</if>
<if test="outHighPrice !=null and outHighPrice != ''">
, t.out_high_price= #{outHighPrice}
- </if>
- <if test="goodsType !=null and goodsType != ''">
- , t.goods_type= #{goodsType}
</if>
<if test="unitCode !=null and unitCode != ''">
, t.unit_code= #{unitCode}
@@ -276,6 +341,15 @@
<if test="averagePrice !=null and averagePrice != ''">
, t.average_price= #{averagePrice}
</if>
+ <if test="miniUnitCode !=null and miniUnitCode != ''">
+ , t.mini_unit_code= #{miniUnitCode}
+ </if>
+ <if test="miniUnitStock !=null and miniUnitStock != ''">
+ , t.mini_unit_stock= #{miniUnitStock}
+ </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}
@@ -293,6 +367,15 @@
where 1 =1
<if test="resName !=null and resName != ''">
and t.res_name like concat('%',#{resName},'%')
+ </if>
+ <if test="name != null and name != ''">
+ and t.res_name = #{name}
+ </if>
+ <if test="rstId !=null and rstId != ''">
+ and t.rst_id= #{rstId}
+ </if>
+ <if test="rssId !=null and rssId != ''">
+ and t.rss_id= #{rssId}
</if>
<if test="price !=null and price != ''">
and t.price= #{price}
@@ -321,9 +404,6 @@
<if test="resId !=null and resId != ''">
and t.res_id= #{resId}
</if>
- <if test="goodsType !=null and goodsType != ''">
- and t.goods_type= #{goodsType}
- </if>
<if test="unitCode !=null and unitCode != ''">
and t.unit_code= #{unitCode}
</if>
@@ -351,6 +431,15 @@
<if test="averagePrice != null and averagePrice != ''">
and t.average_price = #{averagePrice}
</if>
+ <if test="miniUnitCode !=null and miniUnitCode != ''">
+ and t.mini_unit_code= #{miniUnitCode}
+ </if>
+ <if test="miniUnitStock !=null and miniUnitStock != ''">
+ and t.mini_unit_stock= #{miniUnitStock}
+ </if>
+ <if test="miniStock !=null and miniStock != ''">
+ and t.mini_stock= #{miniStock}
+ </if>
<if test="resOrderType == '20000'">
and t.stock > 0
</if>
--
Gitblit v1.8.0