diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupStatistics.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupStatistics.java index 2b3585c5..dce6cfd8 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupStatistics.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupStatistics.java @@ -16,7 +16,7 @@ import java.math.BigDecimal; public class PayWorkingGroupStatistics { @ApiModelProperty(value = "主键") private String id; - @Excel(name = "负责人", width = 15) + @Excel(name = "工作组", width = 15) @ApiModelProperty(value = "工作组") private String workGroup; @Excel(name = "应收总金额", width = 15) 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 aeb3ed9a..1ed351f6 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 @@ -141,35 +141,34 @@ ) pwgs on(pwg.id=pwgs.working_group_id) - pwgs.comeAllMoney is not null - - and pwg.principal_id_a in - - #{item} - - - - and pwg.working_group_project LIKE concat('%',concat(#{payWorkingGroupSearch.workGroup},'%')) - - - - AND if(pwgs.allMoney IS NULL OR pwgs.allMoney = '', 0, pwgs.allMoney ) >= #{payWorkingGroupSearch.allMoney} and if(pwgs.allMoney IS NULL OR pwgs.allMoney = '', 0, pwgs.allMoney ) = - #{payWorkingGroupSearch.allMoneyTwo} - - - - AND if(pwgs.allMoney IS NULL OR pwgs.allMoney = '', 0, pwgs.allMoney ) >= #{payWorkingGroupSearch.allMoney} - - - AND if(pwgs.allMoney IS NULL OR pwgs.allMoney = '', 0, pwgs.allMoney ) = #{payWorkingGroupSearch.allMoneyTwo} - - - - + + and pwg.principal_id_a in + + #{item} + + + and pwgs.comeAllMoney is not null + + and pwg.working_group_project LIKE concat('%',concat(#{payWorkingGroupSearch.workGroup},'%')) + + + + AND if(pwgs.allMoney IS NULL OR pwgs.allMoney = '', 0, pwgs.allMoney ) >= #{payWorkingGroupSearch.allMoney} and if(pwgs.allMoney IS NULL OR pwgs.allMoney = '', 0, pwgs.allMoney ) = + #{payWorkingGroupSearch.allMoneyTwo} + + + + AND if(pwgs.allMoney IS NULL OR pwgs.allMoney = '', 0, pwgs.allMoney ) >= #{payWorkingGroupSearch.allMoney} + + + AND if(pwgs.allMoney IS NULL OR pwgs.allMoney = '', 0, pwgs.allMoney ) = #{payWorkingGroupSearch.allMoneyTwo} + + + ) ppp order by ppp.payment_date desc - + - +