From ba5210dc8c6c537cacc59c18d58baa9744cd2b9d Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 10 五月 2022 11:14:39 +0800
Subject: [PATCH] 优化报修单推送bug
---
java110-db/src/main/resources/mapper/store/PurchaseApplyDetailServiceDaoImplMapper.xml | 52 ++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 42 insertions(+), 10 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/store/PurchaseApplyDetailServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/store/PurchaseApplyDetailServiceDaoImplMapper.xml
index 2a281ed..51a7e38 100755
--- a/java110-db/src/main/resources/mapper/store/PurchaseApplyDetailServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/store/PurchaseApplyDetailServiceDaoImplMapper.xml
@@ -81,10 +81,20 @@
td2.name stateName,
td3.name warehousingWayName,
rst.name rstName,
- rss.spec_name specName
+ rst1.name parentRstName,
+ rss.spec_name specName,
+ rs.sh_id shId,
+ td4.name unitCodeName,
+ td5.name miniUnitCodeName,
+ sh.sh_name shName,
+ rs.is_fixed isFixed,
+ td6.name isFixedName
from purchase_apply_detail t
- left 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
+ inner join purchase_apply pa on t.apply_order_id = pa.apply_order_id and pa.status_cd = '0'
+ left join resource_store rs on rs.res_id = t.res_id and rs.status_cd = '0'
+ left join t_dict td4 on rs.unit_code = td4.status_cd and td4.table_name = 'resource_store' and td4.table_columns = 'unit_code'
+ left join t_dict td5 on rs.mini_unit_code = td5.status_cd and td5.table_name = 'resource_store' and td5.table_columns = 'unit_code'
+ left join storehouse sh on rs.sh_id = sh.sh_id and sh.status_cd = '0'
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'
@@ -92,8 +102,10 @@
'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
+ LEFT JOIN resource_store_type rst on rs.rst_id=rst.rst_id and rst.status_cd = '0'
+ LEFT JOIN resource_store_type rst1 on rs.parent_rst_id=rst1.rst_id and rst1.status_cd = '0'
+ LEFT JOIN resource_store_specification rss on rs.rss_id=rss.rss_id and rss.status_cd = '0'
+ left join t_dict td6 on rs.is_fixed = td6.status_cd and td6.table_name = 'resource_store' and td6.table_columns = 'is_fixed'
where 1 = 1
<if test="applyOrderId !=null and applyOrderId != ''">
and t.apply_order_id= #{applyOrderId}
@@ -158,11 +170,17 @@
<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="parentRstId !=null and parentRstId != ''">
+ and rs.parent_rst_id= #{parentRstId}
</if>
<if test="supplierName !=null and supplierName != ''">
and rsp.supplier_name= #{supplierName}
@@ -172,6 +190,9 @@
</if>
<if test="endTime !=null and endTime != ''">
and pa.create_time <= #{endTime}
+ </if>
+ <if test="shId !=null and shId != ''">
+ and rs.sh_id = #{shId}
</if>
order by pa.create_time desc
<if test="page != -1 and page != null ">
@@ -218,17 +239,19 @@
<select id="queryPurchaseApplyDetailsCount" parameterType="Map" resultType="Map">
select count(1) count
from purchase_apply_detail t
- left 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
+ inner join purchase_apply pa on t.apply_order_id = pa.apply_order_id and pa.status_cd = '0'
+ left join resource_store rs on rs.res_id = t.res_id and rs.status_cd = '0'
+ left join storehouse sh on rs.sh_id = sh.sh_id and sh.status_cd = '0'
+ left join resource_supplier rsp on rsp.rs_id = t.rs_id and rsp.status_cd = '0'
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
+ LEFT JOIN resource_store_type rst on rs.rst_id=rst.rst_id and rst.status_cd = '0'
+ LEFT JOIN resource_store_type rst1 on rs.parent_rst_id=rst1.rst_id and rst1.status_cd = '0'
+ LEFT JOIN resource_store_specification rss on rs.rss_id=rss.rss_id and rss.status_cd = '0'
where 1 = 1
<if test="applyOrderId !=null and applyOrderId != ''">
and t.apply_order_id= #{applyOrderId}
@@ -296,17 +319,26 @@
<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="parentRstId !=null and parentRstId != ''">
+ and rs.parent_rst_id= #{parentRstId}
+ </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>
+ <if test="shId !=null and shId != ''">
+ and rs.sh_id = #{shId}
+ </if>
</select>
</mapper>
--
Gitblit v1.8.0