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

fix bug:41377

Browse Source
This commit is contained in:
zhangqinlin
2021-10-25 14:21:34 +08:00
parent 91ef458342
commit 145ff0c7e5
2 changed files with 27 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupStatistics.java
+1 -1
View File
@@ -16,7 +16,7 @@ import java.math.BigDecimal;
public class PayWorkingGroupStatistics { public class PayWorkingGroupStatistics {
@ApiModelProperty(value = "主键") @ApiModelProperty(value = "主键")
private String id; private String id;
@Excel(name = "负责人", width = 15) @Excel(name = "工作组", width = 15)
@ApiModelProperty(value = "工作组") @ApiModelProperty(value = "工作组")
private String workGroup; private String workGroup;
@Excel(name = "应收总金额", width = 15) @Excel(name = "应收总金额", width = 15)
jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml
+26 -27
View File
@@ -141,35 +141,34 @@
) )
pwgs on(pwg.id=pwgs.working_group_id) pwgs on(pwg.id=pwgs.working_group_id)
<where> <where>
pwgs.comeAllMoney is not null <if test="ids != null and ids != ''">
<if test="ids != null and ids != ''"> and pwg.principal_id_a in
and pwg.principal_id_a in <foreach item="item" open="(" separator="," close=")" collection="ids">
<foreach item="item" open="(" separator="," close=")" collection="ids"> #{item}
#{item} </foreach>
</foreach> </if>
</if> and pwgs.comeAllMoney is not null
<if test="payWorkingGroupSearch.workGroup != null and payWorkingGroupSearch.workGroup != ''"> <if test="payWorkingGroupSearch.workGroup != null and payWorkingGroupSearch.workGroup != ''">
and pwg.working_group_project LIKE concat('%',concat(#{payWorkingGroupSearch.workGroup},'%')) and pwg.working_group_project LIKE concat('%',concat(#{payWorkingGroupSearch.workGroup},'%'))
</if> </if>
<choose> <choose>
<when test="payWorkingGroupSearch.allMoney != null and payWorkingGroupSearch.allMoney != '' and payWorkingGroupSearch.allMoneyTwo != null and payWorkingGroupSearch.allMoneyTwo != ''"> <when test="payWorkingGroupSearch.allMoney != null and payWorkingGroupSearch.allMoney != '' and payWorkingGroupSearch.allMoneyTwo != null and 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 ) <![CDATA[<]]>= 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 ) <![CDATA[<]]>=
#{payWorkingGroupSearch.allMoneyTwo} #{payWorkingGroupSearch.allMoneyTwo}
</when> </when>
<otherwise> <otherwise>
<if test="payWorkingGroupSearch.allMoney != null and payWorkingGroupSearch.allMoney != ''"> <if test="payWorkingGroupSearch.allMoney != null and payWorkingGroupSearch.allMoney != ''">
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.allMoney}
</if> </if>
<if test="payWorkingGroupSearch.allMoneyTwo != null and payWorkingGroupSearch.allMoneyTwo != ''"> <if test="payWorkingGroupSearch.allMoneyTwo != null and payWorkingGroupSearch.allMoneyTwo != ''">
AND if(pwgs.allMoney IS NULL OR pwgs.allMoney = '', 0, pwgs.allMoney ) <![CDATA[<]]>= #{payWorkingGroupSearch.allMoneyTwo} AND if(pwgs.allMoney IS NULL OR pwgs.allMoney = '', 0, pwgs.allMoney ) <![CDATA[<]]>= #{payWorkingGroupSearch.allMoneyTwo}
</if> </if>
</otherwise> </otherwise>
</choose> </choose>
</where>) ppp order by ppp.payment_date desc </where>) ppp order by ppp.payment_date desc
</select> </select>
<!-- 工作组统计ids--> <!-- 工作组统计ids-->
<select id="queryPageListForStatisticsIds" resultType="com.jero.project.entity.PayWorkingGroupStatistics"> <select id="queryPageListForStatisticsIds" resultType="com.jero.project.entity.PayWorkingGroupStatistics">
select ppp.id,ppp.workGroup, ppp.allMoney,ppp.comeAllMoney,ppp.moneyRate from (SELECT select ppp.id,ppp.workGroup, ppp.allMoney,ppp.comeAllMoney,ppp.moneyRate from (SELECT
pwg.id, pwg.id,