purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

解决首页重复统计数据的bug

Browse Source
This commit is contained in:
季圣华
2023-03-02 21:10:53 +08:00
parent 683538dadd
commit d70be28df7
2 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapperEx.xml
View File

@@ -859,10 +859,12 @@
</select> </select>
<select id="getBuyAndSaleBasicStatistics" resultType="java.math.BigDecimal"> <select id="getBuyAndSaleBasicStatistics" resultType="java.math.BigDecimal">
SELECT select
ifnull(sum(dh.discount_last_money),0) ifnull(sum(discount_last_money),0) from
FROM jsh_depot_head dh left join jsh_depot_item di on dh.id = di.header_id (select distinct dh.id, dh.discount_last_money
WHERE 1=1 from jsh_depot_head dh
left join jsh_depot_item di on dh.id = di.header_id
where 1=1
and di.id is not null and di.id is not null
<if test="type != null"> <if test="type != null">
and dh.type=#{type} and dh.type=#{type}
@@ -890,14 +892,16 @@
) )
</if> </if>
and ifnull(dh.delete_flag,'0') !='1' and ifnull(dh.delete_flag,'0') !='1'
and ifnull(di.delete_flag,'0') !='1' and ifnull(di.delete_flag,'0') !='1') tb
</select> </select>
<select id="getBuyAndSaleRetailStatistics" resultType="java.math.BigDecimal"> <select id="getBuyAndSaleRetailStatistics" resultType="java.math.BigDecimal">
SELECT select
ifnull(sum(dh.total_price),0) ifnull(sum(total_price),0) from
FROM jsh_depot_head dh left join jsh_depot_item di on dh.id = di.header_id (select distinct dh.id, dh.total_price
WHERE 1=1 from jsh_depot_head dh
left join jsh_depot_item di on dh.id = di.header_id
where 1=1
and di.id is not null and di.id is not null
<if test="type != null"> <if test="type != null">
and dh.type=#{type} and dh.type=#{type}
@@ -919,7 +923,7 @@
) )
</if> </if>
and ifnull(dh.delete_flag,'0') !='1' and ifnull(dh.delete_flag,'0') !='1'
and ifnull(di.delete_flag,'0') !='1' and ifnull(di.delete_flag,'0') !='1') tb
</select> </select>
<select id="debtList" parameterType="com.jsh.erp.datasource.entities.DepotHeadExample" resultMap="ResultMapEx"> <select id="debtList" parameterType="com.jsh.erp.datasource.entities.DepotHeadExample" resultMap="ResultMapEx">

12
jshERP-boot/src/main/resources/mapper_xml/DepotItemMapperEx.xml
View File

@@ -455,7 +455,9 @@
</select> </select>
<select id="inOrOutPrice" resultType="java.math.BigDecimal"> <select id="inOrOutPrice" resultType="java.math.BigDecimal">
select ifnull(sum(discount_last_money),0) as allMoney from jsh_depot_head dh select ifnull(sum(discount_last_money),0) as allMoney from
(select distinct dh.id, dh.discount_last_money
from jsh_depot_head dh
left join jsh_depot_item di on dh.id = di.header_id left join jsh_depot_item di on dh.id = di.header_id
where 1=1 where 1=1
and di.id is not null and di.id is not null
@@ -470,11 +472,13 @@
) )
</if> </if>
and ifnull(dh.delete_flag,'0') !='1' and ifnull(dh.delete_flag,'0') !='1'
and ifnull(di.delete_flag, '0') != '1' and ifnull(di.delete_flag, '0') != '1') tb
</select> </select>
<select id="inOrOutRetailPrice" resultType="java.math.BigDecimal"> <select id="inOrOutRetailPrice" resultType="java.math.BigDecimal">
select ifnull(sum(total_price),0) as allMoney from jsh_depot_head dh select ifnull(sum(total_price),0) as allMoney from
(select distinct dh.id, dh.total_price
from jsh_depot_head dh
left join jsh_depot_item di on dh.id = di.header_id left join jsh_depot_item di on dh.id = di.header_id
where 1=1 where 1=1
and di.id is not null and di.id is not null
@@ -489,7 +493,7 @@
) )
</if> </if>
and ifnull(dh.delete_flag,'0') !='1' and ifnull(dh.delete_flag,'0') !='1'
and ifnull(di.delete_flag, '0') != '1' and ifnull(di.delete_flag, '0') != '1') tb
</select> </select>
<select id="getStockCheckSumByDepotList" resultType="java.math.BigDecimal"> <select id="getStockCheckSumByDepotList" resultType="java.math.BigDecimal">