diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml index 916556c3..f67e622b 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml @@ -1442,6 +1442,9 @@ AND payStatue = #{principalPeopleDetailSearch.inAccountStatue} + + AND pack = #{principalPeopleDetailSearch.pack} + AND allMoney >= #{principalPeopleDetailSearch.allMoney} @@ -1457,14 +1460,6 @@ - @@ -1542,6 +1537,9 @@ AND payStatue = #{principalPeopleDetailSearch.inAccountStatue} + + AND pack = #{principalPeopleDetailSearch.pack} + AND allMoney >= #{principalPeopleDetailSearch.allMoney} @@ -2040,7 +2038,9 @@ AND chargeUse=#{CompanyComeMoneyDetailSearch.chargeUse} - + + AND pack =#{CompanyComeMoneyDetailSearch.pack} + AND allMoney >= #{CompanyComeMoneyDetailSearch.allMoney} and allMoney = @@ -2055,14 +2055,6 @@ - ) p @@ -2154,6 +2146,10 @@ AND chargeUse = #{CompanyComeMoneyDetailSearch.chargeUse} + + AND pack =#{CompanyComeMoneyDetailSearch.pack} + + AND allMoney >= #{CompanyComeMoneyDetailSearch.allMoney} @@ -2169,14 +2165,6 @@ - ) pp diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/CompanyComeMoneyDetailSearch.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/CompanyComeMoneyDetailSearch.java index 6d6e83be..01f8931b 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/CompanyComeMoneyDetailSearch.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/CompanyComeMoneyDetailSearch.java @@ -52,4 +52,7 @@ public class CompanyComeMoneyDetailSearch { @ApiModelProperty(value = "排序规则") private String order; + + @ApiModelProperty(value = "打包") + private String pack; } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/PrincipalPeopleDetailSearch.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/PrincipalPeopleDetailSearch.java index 9b310b31..dac48b9d 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/PrincipalPeopleDetailSearch.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/PrincipalPeopleDetailSearch.java @@ -53,4 +53,7 @@ public class PrincipalPeopleDetailSearch { @ApiModelProperty(value = "排序规则") private String order; + @ApiModelProperty(value = "打包") + private String pack; + }