From b3865c42e78dd87a7ff00404089ad78996629b4e Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期二, 06 十二月 2022 02:38:17 +0800
Subject: [PATCH] 优化代码
---
java110-db/src/main/resources/mapper/store/PurchaseApplyServiceDaoImplMapper.xml | 42 ++++++++++++++++++++++++++++++++++++++++--
1 files changed, 40 insertions(+), 2 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/store/PurchaseApplyServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/store/PurchaseApplyServiceDaoImplMapper.xml
index 5d4c0e9..5ebf526 100755
--- a/java110-db/src/main/resources/mapper/store/PurchaseApplyServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/store/PurchaseApplyServiceDaoImplMapper.xml
@@ -326,11 +326,17 @@
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.price standardPrice,r.stock,rst.name rstName,rss.spec_name specName,rs.supplier_name supplierName
+ r.price,r.price standardPrice,r.stock,rst.name rstName,rst1.name parentRstName,rss.spec_name specName,rs.supplier_name supplierName,
+ td1.name unitCodeName,
+ td2.name miniUnitCodeName
from
- purchase_apply_detail p inner join resource_store r on p.res_id = r.res_id and r.status_cd = '0'
+ purchase_apply_detail p
+ inner join resource_store r on p.res_id = r.res_id and r.status_cd = '0'
+ left join t_dict td1 on r.unit_code = td1.status_cd and td1.table_name = 'resource_store' and td1.table_columns = 'unit_code'
+ left join t_dict td2 on r.mini_unit_code = td2.status_cd and td2.table_name = 'resource_store' and td2.table_columns = 'unit_code'
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_type rst1 on r.parent_rst_id=rst1.rst_id
LEFT JOIN resource_store_specification rss on r.rss_id=rss.rss_id
where 1=1
and p.status_cd = '0'
@@ -407,6 +413,16 @@
<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=")"
+ separator="," collection="applyOrderIds" item="item">
+ #{item}
+ </foreach>
+ </if>
+ <if test="userName !=null and userName != ''">
+ and t.user_name like concat('%',#{userName},'%')
+ </if>
<if test="statusCd !=null and statusCd != ''">
and t.status_cd= #{statusCd}
</if>
@@ -465,4 +481,26 @@
and ahp.BUSINESS_KEY_ = #{businessKey}
</if>
</select>
+
+ <!--鑾峰緱鑾峰彇娴佺▼浠诲姟id-->
+ <select id="getActRuTaskId" parameterType="Map" resultType="Map">
+ SELECT art.ID_ actRuTaskId FROM act_ru_execution are
+ LEFT JOIN act_ru_task art ON are.PROC_INST_ID_=art.PROC_INST_ID_
+ where 1 = 1
+ <if test="businessKey !=null and businessKey != ''">
+ and are.BUSINESS_KEY_ = #{businessKey}
+ </if>
+ </select>
+
+ <!-- 淇敼娴佺▼浠诲姟淇℃伅 -->
+ <update id="updateActRuTaskById" parameterType="Map">
+ update act_ru_task t set SUSPENSION_STATE_=1
+ <if test="assigneeUser != null and assigneeUser != ''">
+ ,t.ASSIGNEE_ = #{assigneeUser}
+ </if>
+ where 1=1
+ <if test="actRuTaskId !=null and actRuTaskId != ''">
+ and t.ID_= #{actRuTaskId}
+ </if>
+ </update>
</mapper>
--
Gitblit v1.8.0