From 145ff0c7e57ac44dc714c89108c5b57c91a3bf55 Mon Sep 17 00:00:00 2001
From: zhangqinlin <1500920753@qq.com>
Date: Mon, 25 Oct 2021 14:21:34 +0800
Subject: [PATCH] fix bug:41377

---
 .../entity/PayWorkingGroupStatistics.java     |  2 +-
 .../mapper/xml/PayWorkingGroupMapper.xml      | 53 +++++++++----------
 2 files changed, 27 insertions(+), 28 deletions(-)

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)
         <where>
-            pwgs.comeAllMoney is not null
-            <if test="ids != null and ids != ''">
-               and  pwg.principal_id_a in
-                <foreach item="item" open="(" separator="," close=")" collection="ids">
-                    #{item}
-                </foreach>
-            </if>
-            <if test="payWorkingGroupSearch.workGroup != null and payWorkingGroupSearch.workGroup != ''">
-                and pwg.working_group_project LIKE concat('%',concat(#{payWorkingGroupSearch.workGroup},'%'))
-            </if>
-            <choose>
-                <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[<]]>=
-                    #{payWorkingGroupSearch.allMoneyTwo}
-                </when>
-                <otherwise>
-                    <if test="payWorkingGroupSearch.allMoney != null and payWorkingGroupSearch.allMoney != ''">
-                        AND if(pwgs.allMoney IS NULL OR pwgs.allMoney = '', 0, pwgs.allMoney ) >= #{payWorkingGroupSearch.allMoney}
-                    </if>
-                    <if test="payWorkingGroupSearch.allMoneyTwo != null and payWorkingGroupSearch.allMoneyTwo != ''">
-                        AND if(pwgs.allMoney IS NULL OR pwgs.allMoney = '', 0, pwgs.allMoney ) <![CDATA[<]]>= #{payWorkingGroupSearch.allMoneyTwo}
-                    </if>
-                </otherwise>
-            </choose>
-
+              <if test="ids != null and ids != ''">
+                 and  pwg.principal_id_a in
+                  <foreach item="item" open="(" separator="," close=")" collection="ids">
+                      #{item}
+                  </foreach>
+              </if>
+                    and  pwgs.comeAllMoney is not null
+              <if test="payWorkingGroupSearch.workGroup != null and payWorkingGroupSearch.workGroup != ''">
+                  and pwg.working_group_project LIKE concat('%',concat(#{payWorkingGroupSearch.workGroup},'%'))
+              </if>
+              <choose>
+                  <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[<]]>=
+                      #{payWorkingGroupSearch.allMoneyTwo}
+                  </when>
+                  <otherwise>
+                      <if test="payWorkingGroupSearch.allMoney != null and payWorkingGroupSearch.allMoney != ''">
+                          AND if(pwgs.allMoney IS NULL OR pwgs.allMoney = '', 0, pwgs.allMoney ) >= #{payWorkingGroupSearch.allMoney}
+                      </if>
+                      <if test="payWorkingGroupSearch.allMoneyTwo != null and payWorkingGroupSearch.allMoneyTwo != ''">
+                          AND if(pwgs.allMoney IS NULL OR pwgs.allMoney = '', 0, pwgs.allMoney ) <![CDATA[<]]>= #{payWorkingGroupSearch.allMoneyTwo}
+                      </if>
+                  </otherwise>
+              </choose>
         </where>) ppp order by  ppp.payment_date desc
-    </select>
+</select>
 
-    <!--    工作组统计ids-->
+<!--    工作组统计ids-->
     <select id="queryPageListForStatisticsIds" resultType="com.jero.project.entity.PayWorkingGroupStatistics">
         select ppp.id,ppp.workGroup, ppp.allMoney,ppp.comeAllMoney,ppp.moneyRate from (SELECT
         pwg.id,