From cddcf22a61489ee9c2dfee169d817ccd66f95430 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期五, 03 九月 2021 02:23:43 +0800
Subject: [PATCH] 优化代码
---
java110-db/src/main/resources/mapper/store/PurchaseApplyServiceDaoImplMapper.xml | 85 ++++++++++++++++++++++++++++++++++--------
1 files changed, 69 insertions(+), 16 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/store/PurchaseApplyServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/store/PurchaseApplyServiceDaoImplMapper.xml
index 706d524..5d4c0e9 100755
--- a/java110-db/src/main/resources/mapper/store/PurchaseApplyServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/store/PurchaseApplyServiceDaoImplMapper.xml
@@ -17,6 +17,7 @@
<result column="stateName" property="stateName"/>
<result column="endUserName" property="endUserName"/>
<result column="endUserTel" property="endUserTel"/>
+ <result column="communityId" property="communityId"/>
<!-- 涓�瀵瑰鍏崇郴 -->
<collection property="purchaseApplyDetailVo" ofType="com.java110.vo.api.purchaseApply.PurchaseApplyDetailVo"
javaType="java.util.ArrayList">
@@ -37,9 +38,9 @@
<!-- 淇濆瓨閲囪喘鐢宠淇℃伅 add by wuxw 2018-07-03 -->
<insert id="saveBusinessPurchaseApplyInfo" parameterType="Map">
insert into business_purchase_apply
- (operate,res_order_type,description,apply_order_id,state,store_id,user_id,user_name,b_id,end_user_name,end_user_tel)
+ (operate,res_order_type,description,apply_order_id,state,store_id,user_id,user_name,b_id,end_user_name,end_user_tel,community_id)
values
- (#{operate},#{resOrderType},#{description},#{applyOrderId},#{state},#{storeId},#{userId},#{userName},#{bId},#{endUserName},#{endUserTel})
+ (#{operate},#{resOrderType},#{description},#{applyOrderId},#{state},#{storeId},#{userId},#{userName},#{bId},#{endUserName},#{endUserTel},#{communityId})
</insert>
<!-- 淇濆瓨閲囪喘鏄庣粏琛ㄥ浠借〃 -->
@@ -61,7 +62,8 @@
<!-- 淇濆瓨閲囪喘鏄庣粏琛�-->
<insert id="savePurchaseApplyDetailInfo" parameterType="List">
- insert into purchase_apply_detail (id,rs_id,apply_order_id,res_id,quantity,remark,b_id,operate,status_cd,price,purchase_quantity,purchase_remark)
+ insert into purchase_apply_detail
+ (id,rs_id,apply_order_id,res_id,quantity,remark,b_id,operate,status_cd,price,purchase_quantity,purchase_remark,original_stock)
values
<foreach collection="list" item="item" index="index" separator=",">
(
@@ -76,7 +78,8 @@
'0',
#{item.price},
#{item.purchaseQuantity},
- #{item.purchaseRemark}
+ #{item.purchaseRemark},
+ #{item.originalStock}
)
</foreach>
</insert>
@@ -102,7 +105,8 @@
t.end_user_name,
t.end_user_tel,
t.end_user_name endUserName,
- t.end_user_tel endUserTel
+ t.end_user_tel endUserTel,
+ t.community_id communityId
from business_purchase_apply t
where 1 =1
<if test="operate !=null and operate != ''">
@@ -135,6 +139,9 @@
<if test="endUserTel !=null and endUserTel != ''">
and t.end_user_tel= #{endUserTel}
</if>
+ <if test="communityId !=null and communityId != ''">
+ and t.community_id= #{communityId}
+ </if>
</select>
<select id="getBusinessPurchaseApplyDetailInfo" parameterType="Map" resultType="Map">
@@ -160,9 +167,10 @@
<!-- 淇濆瓨閲囪喘鐢宠淇℃伅鑷� instance琛ㄤ腑 add by wuxw 2018-07-03 -->
<insert id="savePurchaseApplyInfoInstance" parameterType="Map">
insert into purchase_apply
- (res_order_type,description,apply_order_id,status_cd,state,store_id,user_name,b_id,user_id,end_user_name,end_user_tel)
+ (res_order_type,description,apply_order_id,status_cd,state,store_id,user_name,b_id,user_id,end_user_name,end_user_tel,community_id)
select
- t.res_order_type,t.description,t.apply_order_id,'0',t.state,t.store_id,t.user_name,t.b_id,t.user_id,t.end_user_name,t.end_user_tel
+ t.res_order_type,t.description,t.apply_order_id,'0',t.state,t.store_id,t.user_name,t.b_id,t.user_id,t.end_user_name,t.end_user_tel,
+ t.community_id
from business_purchase_apply t where 1=1
and t.operate= 'ADD'
<if test="resOrderType !=null and resOrderType != ''">
@@ -186,6 +194,9 @@
<if test="userId !=null and userId != ''">
and t.user_id= #{userId}
</if>
+ <if test="communityId !=null and communityId != ''">
+ and t.community_id= #{communityId}
+ </if>
</insert>
<!-- 鏌ヨ閲囪喘鐢宠淇℃伅 add by wuxw 2018-07-03 -->
@@ -202,7 +213,8 @@
t.description,
t.create_user_id createUserId,
t.create_user_name createUserName,
- t.warehousing_way warehousingWay
+ t.warehousing_way warehousingWay,
+ t.community_id communityId
from purchase_apply t
inner join t_dict d on t.state = d.status_cd and d.table_name = 'purchase_apply' and d.table_columns = 'state'
where 1 = 1
@@ -215,7 +227,6 @@
<if test="applyOrderId !=null and applyOrderId != ''">
and t.apply_order_id= #{applyOrderId}
</if>
-
<if test="applyOrderIds !=null ">
and t.apply_order_id in
<foreach open="(" close=")"
@@ -247,6 +258,9 @@
<if test="userId !=null and userId != ''">
and t.user_id= #{userId}
</if>
+ <if test="communityId !=null and communityId != ''">
+ and t.community_id= #{communityId}
+ </if>
order by t.create_time desc
<if test="page != -1 and page != null ">
limit #{page}, #{row}
@@ -264,7 +278,8 @@
t.end_user_name,
t.end_user_tel,
t.end_user_name endUserName,
- t.end_user_tel endUserTel
+ t.end_user_tel endUserTel,
+ t.community_id communityId
from purchase_apply t
inner join t_dict d on t.state = d.status_cd and d.table_name = 'purchase_apply' and d.table_columns = 'state'
inner join purchase_apply_detail de on de.apply_order_id = t.apply_order_id
@@ -294,22 +309,29 @@
<if test="endUserTel !=null and endUserTel != ''">
and t.end_user_tel= #{endUserTel}
</if>
+ <if test="communityId !=null and communityId != ''">
+ and t.community_id= #{communityId}
+ </if>
order by t.create_time desc
<if test="page != -1 and page != null ">
limit #{page}, #{row}
</if>
-
</select>
+
<!-- 鏌ヨ閲囪喘鏄庣粏 -->
<select id="getPurchaseApplyDetailInfo" parameterType="Map" resultType="Map">
select
p.id,
p.apply_order_id applyOrderId,
- p.res_id resId,p.quantity,p.remark,p.purchase_quantity purchaseQuantity,p.purchase_remark purchaseRemark,p.price purchasePrice,
+ p.res_id resId,p.quantity,p.remark,p.purchase_quantity purchaseQuantity,p.purchase_remark purchaseRemark,p.price
+ purchasePrice,p.original_stock originalStock,
r.res_name resName,r.res_code resCode,
- r.price,r.stock
+ r.price,r.price standardPrice,r.stock,rst.name rstName,rss.spec_name specName,rs.supplier_name supplierName
from
purchase_apply_detail p inner join resource_store r on p.res_id = r.res_id and r.status_cd = '0'
+ LEFT JOIN resource_supplier rs on p.rs_id=rs.rs_id
+ LEFT JOIN resource_store_type rst on r.rst_id=rst.rst_id
+ LEFT JOIN resource_store_specification rss on r.rss_id=rss.rss_id
where 1=1
and p.status_cd = '0'
<if test="applyOrderIds !=null">
@@ -359,6 +381,9 @@
<if test="endUserTel !=null and endUserTel != ''">
, t.end_user_tel= #{endUserTel}
</if>
+ <if test="communityId !=null and communityId != ''">
+ , t.community_id= #{communityId}
+ </if>
where 1=1
<if test="applyOrderId !=null and applyOrderId != ''">
and t.apply_order_id= #{applyOrderId}
@@ -372,7 +397,7 @@
<select id="queryPurchaseApplysCount" parameterType="Map" resultType="Map">
select count(1) count
from purchase_apply t
- where 1 =1
+ where 1 = 1
<if test="resOrderType !=null and resOrderType != ''">
and t.res_order_type= #{resOrderType}
</if>
@@ -384,6 +409,9 @@
</if>
<if test="statusCd !=null and statusCd != ''">
and t.status_cd= #{statusCd}
+ </if>
+ <if test="warehousingWay !=null and warehousingWay != ''">
+ and t.warehousing_way= #{warehousingWay}
</if>
<if test="state !=null and state != ''">
and t.state= #{state}
@@ -403,13 +431,38 @@
<if test="userId !=null and userId != ''">
and t.user_id= #{userId}
</if>
+ <if test="communityId !=null and communityId != ''">
+ and t.community_id = #{communityId}
+ </if>
+ <if test='urgentFlag !=null and urgentFlag == "1"'>
+ and date_format(t.create_time,'%Y-%m') = date_format(now(),'%Y-%m')
+ </if>
</select>
<!-- 淇濆瓨閲囪喘鐢宠淇℃伅 add by wuxw 2018-07-03 -->
<insert id="savePurchaseApply" parameterType="Map">
insert into purchase_apply
- (status_cd,res_order_type,description,apply_order_id,state,store_id,user_id,user_name,b_id,end_user_name,end_user_tel,create_time,create_user_id,create_user_name,warehousing_way)
+ (status_cd,res_order_type,description,apply_order_id,state,store_id,user_id,user_name,b_id,end_user_name,end_user_tel,
+ create_time,create_user_id,create_user_name,warehousing_way,community_id)
values
- ('0',#{resOrderType},#{description},#{applyOrderId},#{state},#{storeId},#{userId},#{userName},'-1',#{endUserName},#{endUserTel},#{createTime},#{createUserId},#{createUserName},#{warehousingWay})
+ ('0',#{resOrderType},#{description},#{applyOrderId},#{state},#{storeId},#{userId},#{userName},'-1',#{endUserName},#{endUserTel},
+ #{createTime},#{createUserId},#{createUserName},#{warehousingWay},#{communityId})
</insert>
+
+ <!--鏌ヨ涓嬬骇鐢ㄦ埛id-->
+ <select id="getActRuTaskUserId" parameterType="Map" resultType="Map">
+ SELECT ASSIGNEE_ taskUserId FROM act_ru_task t
+ LEFT JOIN act_hi_procinst ahp on t.PROC_INST_ID_=ahp.ID_
+ LEFT JOIN act_ru_execution are on t.EXECUTION_ID_=are.ID_
+ where 1 = 1
+ <if test="actRuTaskId !=null and actRuTaskId != ''">
+ and ahp.ID_ = #{actRuTaskId}
+ </if>
+ <if test="procDefId !=null and procDefId != ''">
+ and t.PROC_DEF_ID_ = #{procDefId}
+ </if>
+ <if test="businessKey !=null and businessKey != ''">
+ and ahp.BUSINESS_KEY_ = #{businessKey}
+ </if>
+ </select>
</mapper>
--
Gitblit v1.8.0