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

解决开启强审核之后账户流水计算的bug

Browse Source
This commit is contained in:
jishenghua
2024-06-12 00:22:15 +08:00
parent acd8429c81
commit 8ba07e02d1
4 changed files with 50 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
jshERP-boot/src/main/resources/mapper_xml/AccountMapperEx.xml
View File

@@ -87,7 +87,7 @@
and dh.oper_time <= #{endTime}
</if>
<if test="forceFlag">
and dh.status = '1'
and (dh.status = '1' or dh.status = '2' or dh.status = '3')
</if>
and ifnull(dh.delete_flag,'0') !='1'
</select>
@@ -143,7 +143,7 @@
and dh.oper_time &lt;= #{endTime}
</if>
<if test="forceFlag">
and dh.status = '1'
and (dh.status = '1' or dh.status = '2' or dh.status = '3')
</if>
and ifnull(dh.delete_flag,'0') !='1'
</select>
@@ -160,7 +160,7 @@
and dh.oper_time &lt;= #{endTime}
</if>
<if test="forceFlag">
and dh.status = '1'
and (dh.status = '1' or dh.status = '2' or dh.status = '3')
</if>
and ifnull(dh.delete_flag,'0') !='1') accountSum,
(select ifnull(sum(ah.change_amount),0) from jsh_account_head ah
@@ -217,7 +217,7 @@
and dh.oper_time &lt;= #{endTime}
</if>
<if test="forceFlag">
and dh.status = '1'
and (dh.status = '1' or dh.status = '2' or dh.status = '3')
</if>
and ifnull(dh.delete_flag,'0') !='1'
</select>
@@ -240,6 +240,9 @@
<if test="endTime != null and endTime !=''">
and dh.oper_time &lt;= #{endTime}
</if>
<if test="forceFlag">
and (dh.status = '1' or dh.status = '2' or dh.status = '3')
</if>
and ifnull(dh.change_amount, 0)!=0
and ifnull(dh.delete_flag,'0') !='1'
<!--主表收入和支出涉及的账户 -->
@@ -260,6 +263,9 @@
<if test="endTime != null and endTime !=''">
and ah.bill_time &lt;= #{endTime}
</if>
<if test="forceFlag">
and ah.status = '1'
</if>
and ifnull(ah.change_amount, 0)!=0
and ifnull(ah.delete_flag,'0') !='1'
<!--明细中涉及的账户（收款,付款,收预付款） -->
@@ -281,6 +287,9 @@
<if test="endTime != null and endTime !=''">
and ah.bill_time &lt;= #{endTime}
</if>
<if test="forceFlag">
and ah.status = '1'
</if>
and ifnull(ai.each_amount, 0)!=0
and ifnull(ah.delete_flag,'0') !='1'
<!--主表中转出的账户 -->
@@ -301,6 +310,9 @@
<if test="endTime != null and endTime !=''">
and ah.bill_time &lt;= #{endTime}
</if>
<if test="forceFlag">
and ah.status = '1'
</if>
and ifnull(ah.change_amount, 0)!=0
and ifnull(ah.delete_flag,'0') !='1'
<!--明细中被转入的账户 -->
@@ -321,6 +333,9 @@
<if test="endTime != null and endTime !=''">
and ah.bill_time &lt;= #{endTime}
</if>
<if test="forceFlag">
and ah.status = '1'
</if>
and ifnull(ai.each_amount, 0)!=0
and ifnull(ah.delete_flag,'0') !='1'
<!--多账户的情况 -->
@@ -343,6 +358,9 @@
<if test="endTime != null and endTime !=''">
and dh.oper_time &lt;= #{endTime}
</if>
<if test="forceFlag">
and (dh.status = '1' or dh.status = '2' or dh.status = '3')
</if>
and ifnull(dh.change_amount, 0)!=0
and ifnull(dh.delete_flag,'0') !='1'
ORDER BY oTime desc
@@ -371,6 +389,9 @@
<if test="endTime != null and endTime !=''">
and dh.oper_time &lt;= #{endTime}
</if>
<if test="forceFlag">
and (dh.status = '1' or dh.status = '2' or dh.status = '3')
</if>
and ifnull(dh.change_amount, 0)!=0
and ifnull(dh.delete_flag,'0') !='1'
<!--主表收入和支出涉及的账户 -->
@@ -391,6 +412,9 @@
<if test="endTime != null and endTime !=''">
and ah.bill_time &lt;= #{endTime}
</if>
<if test="forceFlag">
and ah.status = '1'
</if>
and ifnull(ah.change_amount, 0)!=0
and ifnull(ah.delete_flag,'0') !='1'
<!--明细中涉及的账户（收款,付款,收预付款） -->
@@ -412,6 +436,9 @@
<if test="endTime != null and endTime !=''">
and ah.bill_time &lt;= #{endTime}
</if>
<if test="forceFlag">
and ah.status = '1'
</if>
and ifnull(ai.each_amount, 0)!=0
and ifnull(ah.delete_flag,'0') !='1'
<!--主表中转出的账户 -->
@@ -432,6 +459,9 @@
<if test="endTime != null and endTime !=''">
and ah.bill_time &lt;= #{endTime}
</if>
<if test="forceFlag">
and ah.status = '1'
</if>
and ifnull(ah.change_amount, 0)!=0
and ifnull(ah.delete_flag,'0') !='1'
<!--明细中被转入的账户 -->
@@ -452,6 +482,9 @@
<if test="endTime != null and endTime !=''">
and ah.bill_time &lt;= #{endTime}
</if>
<if test="forceFlag">
and ah.status = '1'
</if>
and ifnull(ai.each_amount, 0)!=0
and ifnull(ah.delete_flag,'0') !='1'
<!--多账户的情况 -->
@@ -473,6 +506,9 @@
<if test="endTime != null and endTime !=''">
and dh.oper_time &lt;= #{endTime}
</if>
<if test="forceFlag">
and (dh.status = '1' or dh.status = '2' or dh.status = '3')
</if>
and ifnull(dh.change_amount, 0)!=0
and ifnull(dh.delete_flag,'0') !='1'
) cc