LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix 87980 企业来款详情&个人来款详情--建议加上是否打包的条件

Browse Source
This commit is contained in:
lijiarao
2024-08-02 15:22:40 +08:00
parent 2080423a29
commit 2b9fe5a534
3 changed files with 19 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml
+13 -25
View File
@@ -1442,6 +1442,9 @@
<if test="principalPeopleDetailSearch.inAccountStatue != null and principalPeopleDetailSearch.inAccountStatue != ''">
AND payStatue = #{principalPeopleDetailSearch.inAccountStatue}
</if>
<if test="principalPeopleDetailSearch.pack != null and principalPeopleDetailSearch.pack != ''">
AND pack = #{principalPeopleDetailSearch.pack}
</if>
<choose>
<when test="principalPeopleDetailSearch.allMoney != null and principalPeopleDetailSearch.allMoney != '' and principalPeopleDetailSearch.allMoneyTwo != null and principalPeopleDetailSearch.allMoneyTwo != ''">
AND allMoney >= #{principalPeopleDetailSearch.allMoney}
@@ -1457,14 +1460,6 @@
</if>
</otherwise>
</choose>
<!--<choose>
<when test="principalPeopleDetailSearch.paymentMonth != null and principalPeopleDetailSearch.paymentMonth != ''">
and confirmDate like concat('%',#{principalPeopleDetailSearch.paymentYear},'-',#{principalPeopleDetailSearch.paymentMonth},'%')
</when>
<when test="principalPeopleDetailSearch.paymentYear != null and principalPeopleDetailSearch.paymentYear != ''">
and confirmDate like concat('%',#{principalPeopleDetailSearch.paymentYear},'%')
</when>
</choose>-->
</where>
<if test="principalPeopleDetailSearch.column != null and principalPeopleDetailSearch.column != ''">
<if test="principalPeopleDetailSearch.column == 'allMoney' and principalPeopleDetailSearch.order == 'desc'">
@@ -1542,6 +1537,9 @@
<if test="principalPeopleDetailSearch.inAccountStatue != null and principalPeopleDetailSearch.inAccountStatue != ''">
AND payStatue = #{principalPeopleDetailSearch.inAccountStatue}
</if>
<if test="principalPeopleDetailSearch.pack != null and principalPeopleDetailSearch.pack != ''">
AND pack = #{principalPeopleDetailSearch.pack}
</if>
<choose>
<when test="principalPeopleDetailSearch.allMoney != null and principalPeopleDetailSearch.allMoney != '' and principalPeopleDetailSearch.allMoneyTwo != null and principalPeopleDetailSearch.allMoneyTwo != ''">
AND allMoney >= #{principalPeopleDetailSearch.allMoney}
@@ -2040,7 +2038,9 @@
<if test="CompanyComeMoneyDetailSearch.chargeUse != null and CompanyComeMoneyDetailSearch.chargeUse != ''">
AND chargeUse=#{CompanyComeMoneyDetailSearch.chargeUse}
</if>
<if test="CompanyComeMoneyDetailSearch.pack != null and CompanyComeMoneyDetailSearch.pack != ''">
AND pack =#{CompanyComeMoneyDetailSearch.pack}
</if>
<choose>
<when test="CompanyComeMoneyDetailSearch.allMoney != null and CompanyComeMoneyDetailSearch.allMoney != '' and CompanyComeMoneyDetailSearch.allMoneyTwo != null and CompanyComeMoneyDetailSearch.allMoneyTwo != ''">
AND allMoney >= #{CompanyComeMoneyDetailSearch.allMoney} and allMoney <![CDATA[<]]>=
@@ -2055,14 +2055,6 @@
</if>
</otherwise>
</choose>
<!--<choose>
<when test="CompanyComeMoneyDetailSearch.paymentMonth != null and CompanyComeMoneyDetailSearch.paymentMonth != ''">
and confirmDate like concat('%',#{CompanyComeMoneyDetailSearch.paymentYear},'-',#{CompanyComeMoneyDetailSearch.paymentMonth},'%')
</when>
<when test="CompanyComeMoneyDetailSearch.paymentYear != null and CompanyComeMoneyDetailSearch.paymentYear != ''">
and confirmDate like concat('%',#{CompanyComeMoneyDetailSearch.paymentYear},'%')
</when>
</choose>-->
</where>
) p
<if test="CompanyComeMoneyDetailSearch.column != null and CompanyComeMoneyDetailSearch.column != ''">
@@ -2154,6 +2146,10 @@
AND chargeUse = #{CompanyComeMoneyDetailSearch.chargeUse}
</if>
<if test="CompanyComeMoneyDetailSearch.pack != null and CompanyComeMoneyDetailSearch.pack != ''">
AND pack =#{CompanyComeMoneyDetailSearch.pack}
</if>
<choose>
<when test="CompanyComeMoneyDetailSearch.allMoney != null and CompanyComeMoneyDetailSearch.allMoney != '' and CompanyComeMoneyDetailSearch.allMoneyTwo != null and CompanyComeMoneyDetailSearch.allMoneyTwo != ''">
AND allMoney >= #{CompanyComeMoneyDetailSearch.allMoney}
@@ -2169,14 +2165,6 @@
</if>
</otherwise>
</choose>
<!--<choose>
<when test="CompanyComeMoneyDetailSearch.paymentMonth != null and CompanyComeMoneyDetailSearch.paymentMonth != ''">
and confirmDate like concat('%',#{CompanyComeMoneyDetailSearch.paymentYear},'-',#{CompanyComeMoneyDetailSearch.paymentMonth},'%')
</when>
<when test="CompanyComeMoneyDetailSearch.paymentYear != null and CompanyComeMoneyDetailSearch.paymentYear != ''">
and confirmDate like concat('%',#{CompanyComeMoneyDetailSearch.paymentYear},'%')
</when>
</choose>-->
</where>
) pp
</select>
jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/CompanyComeMoneyDetailSearch.java
+3
View File
@@ -52,4 +52,7 @@ public class CompanyComeMoneyDetailSearch {
@ApiModelProperty(value = "排序规则")
private String order;
@ApiModelProperty(value = "打包")
private String pack;
}
jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/PrincipalPeopleDetailSearch.java
+3
View File
@@ -53,4 +53,7 @@ public class PrincipalPeopleDetailSearch {
@ApiModelProperty(value = "排序规则")
private String order;
@ApiModelProperty(value = "打包")
private String pack;
}