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-01 22:28:12 +08:00
parent f8122a57ce
commit 561d3ea402
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -456,7 +456,9 @@
<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 jsh_depot_head dh
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 dh.type=#{type} and dh.sub_type=#{subType} and dh.type=#{type} and dh.sub_type=#{subType}
and dh.oper_time &gt;= #{beginTime} and dh.oper_time &gt;= #{beginTime}
and dh.oper_time &lt;= #{endTime} and dh.oper_time &lt;= #{endTime}
@@ -468,11 +470,14 @@
) )
</if> </if>
and ifnull(dh.delete_flag,'0') !='1' and ifnull(dh.delete_flag,'0') !='1'
and ifnull(di.delete_flag, '0') != '1'
</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 jsh_depot_head dh
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 dh.type=#{type} and dh.sub_type=#{subType} and dh.type=#{type} and dh.sub_type=#{subType}
and dh.oper_time &gt;= #{beginTime} and dh.oper_time &gt;= #{beginTime}
and dh.oper_time &lt;= #{endTime} and dh.oper_time &lt;= #{endTime}
@@ -484,6 +489,7 @@
) )
</if> </if>
and ifnull(dh.delete_flag,'0') !='1' and ifnull(dh.delete_flag,'0') !='1'
and ifnull(di.delete_flag, '0') != '1'
</select> </select>
<select id="getStockCheckSumByDepotList" resultType="java.math.BigDecimal"> <select id="getStockCheckSumByDepotList" resultType="java.math.BigDecimal">