From b497ff41e47f4ebe69b86f13f6972f34f33f4884 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 01 六月 2021 09:35:46 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-db/src/main/resources/mapper/store/PurchaseApplyDetailServiceDaoImplMapper.xml | 204 ++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 186 insertions(+), 18 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/store/PurchaseApplyDetailServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/store/PurchaseApplyDetailServiceDaoImplMapper.xml
old mode 100644
new mode 100755
index eacad58..d996953
--- a/java110-db/src/main/resources/mapper/store/PurchaseApplyDetailServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/store/PurchaseApplyDetailServiceDaoImplMapper.xml
@@ -7,18 +7,17 @@
<!-- 淇濆瓨璁㈠崟鏄庣粏淇℃伅 add by wuxw 2018-07-03 -->
<insert id="saveBusinessPurchaseApplyDetailInfo" parameterType="Map">
insert into business_purchase_apply_detail
- (operate,apply_order_id,b_id,res_id,quantity,remark,status_cd) values
- (#{operate},#{applyOrderId},#{bId},#{resId},#{quantity},#{remark},#{statusCd})
+ (id,operate,apply_order_id,b_id,res_id,quantity,remark,status_cd) values
+ (#{id},#{operate},#{applyOrderId},#{bId},#{resId},#{quantity},#{remark},#{statusCd})
</insert>
-
<!-- 鏌ヨ璁㈠崟鏄庣粏淇℃伅锛圔usiness锛� add by wuxw 2018-07-03 -->
<select id="getBusinessPurchaseApplyDetailInfo" parameterType="Map" resultType="Map">
select
t.operate,t.apply_order_id,t.apply_order_id applyOrderId,
- t.b_id,t.b_id bId,t.res_id,t.res_id resId
+ t.b_id,t.b_id bId,t.res_id,t.res_id resId,t.id,t.price
from business_purchase_apply_detail t
- where 1 =1
+ where 1 = 1
<if test="operate !=null and operate != ''">
and t.operate= #{operate}
</if>
@@ -31,9 +30,7 @@
<if test="resId !=null and resId != ''">
and t.res_id= #{resId}
</if>
-
</select>
-
<!-- 淇濆瓨璁㈠崟鏄庣粏淇℃伅鑷� instance琛ㄤ腑 add by wuxw 2018-07-03 -->
<insert id="savePurchaseApplyDetailInfoInstance" parameterType="Map">
@@ -53,23 +50,101 @@
<if test="resId !=null and resId != ''">
and t.res_id= #{resId}
</if>
-
</insert>
-
<!-- 鏌ヨ璁㈠崟鏄庣粏淇℃伅 add by wuxw 2018-07-03 -->
<select id="getPurchaseApplyDetailInfo" parameterType="Map" resultType="Map">
select
+ t.id,
t.apply_order_id applyOrderId,
t.status_cd statusCd,
t.b_id bId,
t.res_id resId,
+ t.rs_id rsId,
+ rs.res_name resName,
t.remark remark,
- t.quantity quantity
+ t.quantity quantity,
+ t.purchase_quantity purchaseQuantity,
+ t.purchase_remark purchaseRemark,
+ t.price,
+ pa.res_order_type resOrderType,
+ pa.user_id userId,
+ pa.user_name userName,
+ pa.description,
+ pa.state,
+ pa.end_user_name endUserName,
+ pa.end_user_tel endUserTel,
+ pa.warehousing_way warehousingWay,
+ pa.create_time createTime,
+ rsp.supplier_name supplierName,
+ td1.name resOrderTypeName,
+ td2.name stateName,
+ td3.name warehousingWayName,
+ rst.name rstName,
+ rss.spec_name specName
from purchase_apply_detail t
- where 1 =1
+ inner join purchase_apply pa on t.apply_order_id = pa.apply_order_id
+ left join resource_store rs on rs.res_id = t.res_id
+ left join resource_supplier rsp on rsp.rs_id = t.rs_id
+ left join t_dict td1 on pa.res_order_type = td1.status_cd and td1.table_name = 'purchase_apply' and
+ td1.table_columns = 'res_order_type'
+ left join t_dict td2 on pa.state = td2.status_cd and td2.table_name = 'purchase_apply' and td2.table_columns =
+ 'state'
+ left join t_dict td3 on pa.warehousing_way = td3.status_cd and td3.table_name = 'purchase_apply' and
+ td3.table_columns = 'warehousing_way'
+ 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
+ where 1 = 1
<if test="applyOrderId !=null and applyOrderId != ''">
and t.apply_order_id= #{applyOrderId}
+ </if>
+ <if test="resName !=null and resName != ''">
+ and rs.res_name like '%${resName}%'
+ </if>
+ <if test="rsId !=null and rsId != ''">
+ and t.rs_id = #{rsId}
+ </if>
+ <if test="remark !=null and remark != ''">
+ and t.remark= #{remark}
+ </if>
+ <if test="quantity !=null and quantity != ''">
+ and t.quantity= #{quantity}
+ </if>
+ <if test="purchaseQuantity !=null and purchaseQuantity != ''">
+ and t.purchase_quantity= #{purchaseQuantity}
+ </if>
+ <if test="purchaseRemark !=null and purchaseRemark != ''">
+ and t.purchase_remark= #{purchaseRemark}
+ </if>
+ <if test="price !=null and price != ''">
+ and t.price= #{price}
+ </if>
+ <if test="resOrderType !=null and resOrderType != ''">
+ and pa.res_order_type= #{resOrderType}
+ </if>
+ <if test="userId !=null and userId != ''">
+ and pa.user_id= #{userId}
+ </if>
+ <if test="createUserId !=null and createUserId != ''">
+ and pa.create_user_id= #{createUserId}
+ </if>
+ <if test="userName !=null and userName != ''">
+ and pa.user_name like '%${userName}%'
+ </if>
+ <if test="description !=null and description != ''">
+ and pa.description= #{description}
+ </if>
+ <if test="state !=null and state != ''">
+ and pa.state= #{state}
+ </if>
+ <if test="endUserName !=null and endUserName != ''">
+ and pa.end_user_name like '%${endUserName}%'
+ </if>
+ <if test="endUserTel !=null and endUserTel != ''">
+ and pa.end_user_tel= #{endUserTel}
+ </if>
+ <if test="warehousingWay !=null and warehousingWay != ''">
+ and pa.warehousing_way= #{warehousingWay}
</if>
<if test="statusCd !=null and statusCd != ''">
and t.status_cd= #{statusCd}
@@ -83,12 +158,29 @@
<if test="resId !=null and resId != ''">
and t.res_id= #{resId}
</if>
+ <if test="storeId !=null and storeId != ''">
+ and pa.store_id= #{storeId}
+ </if>
+ <if test="rssId !=null and rssId != ''">
+ and rs.rss_id= #{rssId}
+ </if>
+ <if test="rstId !=null and rstId != ''">
+ and rs.rst_id= #{rstId}
+ </if>
+ <if test="supplierName !=null and supplierName != ''">
+ and rsp.supplier_name= #{supplierName}
+ </if>
+ <if test="startTime !=null and startTime != ''">
+ and pa.create_time >= #{startTime}
+ </if>
+ <if test="endTime !=null and endTime != ''">
+ and pa.create_time <= #{endTime}
+ </if>
+ order by pa.create_time desc
<if test="page != -1 and page != null ">
limit #{page}, #{row}
</if>
-
</select>
-
<!-- 淇敼璁㈠崟鏄庣粏淇℃伅 add by wuxw 2018-07-03 -->
<update id="updatePurchaseApplyDetailInfoInstance" parameterType="Map">
@@ -99,6 +191,9 @@
</if>
<if test="newBId != null and newBId != ''">
t.b_id = #{newBId},
+ </if>
+ <if test="rsId != null and rsId != ''">
+ t.rs_id = #{rsId},
</if>
<if test="resId !=null and resId != ''">
t.res_id= #{resId},
@@ -120,16 +215,77 @@
<if test="bId !=null and bId != ''">
and t.b_id= #{bId}
</if>
-
</update>
<!-- 鏌ヨ璁㈠崟鏄庣粏鏁伴噺 add by wuxw 2018-07-03 -->
<select id="queryPurchaseApplyDetailsCount" parameterType="Map" resultType="Map">
select count(1) count
from purchase_apply_detail t
- where 1 =1
+ inner join purchase_apply pa on t.apply_order_id = pa.apply_order_id
+ left join resource_store rs on rs.res_id = t.res_id
+ left join resource_supplier rsp on rsp.rs_id = t.rs_id
+ left join t_dict td1 on pa.res_order_type = td1.status_cd and td1.table_name = 'purchase_apply' and
+ td1.table_columns = 'res_order_type'
+ left join t_dict td2 on pa.state = td2.status_cd and td2.table_name = 'purchase_apply' and td2.table_columns =
+ 'state'
+ left join t_dict td3 on pa.warehousing_way = td3.status_cd and td3.table_name = 'purchase_apply' and
+ td3.table_columns = 'warehousing_way'
+ 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
+ where 1 = 1
<if test="applyOrderId !=null and applyOrderId != ''">
and t.apply_order_id= #{applyOrderId}
+ </if>
+ <if test="resName !=null and resName != ''">
+ and rs.res_name like '%${resName}%'
+ </if>
+ <if test="rsId !=null and rsId != ''">
+ and t.rs_id = #{rsId}
+ </if>
+ <if test="remark !=null and remark != ''">
+ and t.remark= #{remark}
+ </if>
+ <if test="quantity !=null and quantity != ''">
+ and t.quantity= #{quantity}
+ </if>
+ <if test="purchaseQuantity !=null and purchaseQuantity != ''">
+ and t.purchase_quantity= #{purchaseQuantity}
+ </if>
+ <if test="purchaseRemark !=null and purchaseRemark != ''">
+ and t.purchase_remark= #{purchaseRemark}
+ </if>
+ <if test="price !=null and price != ''">
+ and t.price= #{price}
+ </if>
+ <if test="resOrderType !=null and resOrderType != ''">
+ and pa.res_order_type= #{resOrderType}
+ </if>
+ <if test="userId !=null and userId != ''">
+ and pa.user_id= #{userId}
+ </if>
+ <if test="createUserId !=null and createUserId != ''">
+ and pa.create_user_id= #{createUserId}
+ </if>
+ <if test="userName !=null and userName != ''">
+ and pa.user_name like '%${userName}%'
+ </if>
+ <if test="description !=null and description != ''">
+ and pa.description= #{description}
+ </if>
+ <if test="state !=null and state != ''">
+ and pa.state= #{state}
+ </if>
+ <if test="endUserName !=null and endUserName != ''">
+ and pa.end_user_name like '%${endUserName}%'
+ </if>
+ <if test="endUserTel !=null and endUserTel != ''">
+ and pa.end_user_tel= #{endUserTel}
+ </if>
+ <if test="warehousingWay !=null and warehousingWay != ''">
+ and pa.warehousing_way= #{warehousingWay}
+ </if>
+ <if test="supplierName !=null and supplierName != ''">
+ and rsp.supplier_name= #{supplierName}
</if>
<if test="statusCd !=null and statusCd != ''">
and t.status_cd= #{statusCd}
@@ -143,8 +299,20 @@
<if test="resId !=null and resId != ''">
and t.res_id= #{resId}
</if>
-
-
+ <if test="storeId !=null and storeId != ''">
+ and pa.store_id= #{storeId}
+ </if>
+ <if test="rssId !=null and rssId != ''">
+ and rs.rss_id= #{rssId}
+ </if>
+ <if test="rstId !=null and rstId != ''">
+ and rs.rst_id= #{rstId}
+ </if>
+ <if test="startTime !=null and startTime != ''">
+ and pa.create_time >= #{startTime}
+ </if>
+ <if test="endTime !=null and endTime != ''">
+ and pa.create_time <= #{endTime}
+ </if>
</select>
-
</mapper>
--
Gitblit v1.8.0