From 725b4ec3ed7bed2f9a69f2fee456c987df21e226 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Tue, 16 Jul 2024 14:24:38 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E4=BF=AE=E6=94=B9=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jero/index/service/IndexService.java  |   2 +-
 .../project/mapper/PayWorkingGroupMapper.java |  28 +-
 .../mapper/xml/PayWorkingGroupMapper.xml      | 374 +++++++++++++++++-
 .../service/IPayWorkingGroupService.java      |  13 +-
 .../impl/PayWorkingGroupServiceImpl.java      |  36 +-
 .../AllProjectStatisticsController.java       |   5 +-
 6 files changed, 441 insertions(+), 17 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/index/service/IndexService.java b/jero-boot-incoming-payment/src/main/java/com/jero/index/service/IndexService.java
index 24c162ba..b55aaa20 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/index/service/IndexService.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/index/service/IndexService.java
@@ -245,7 +245,7 @@ public class IndexService {
         companyComeMoneySearch.setYear(year);
         companyComeMoneySearch.setColumn("allMoney");
         companyComeMoneySearch.setOrder("desc");
-        IPage<CompanyComeMoneyList> pageList = payWorkingGroupService.queryPageListForCompany(page, companyComeMoneySearch, null);
+        IPage<CompanyComeMoneyList> pageList = payWorkingGroupService.queryPageListForCompanyIndex(page, companyComeMoneySearch, null);
         List<CompanyComeMoneyList> records = pageList.getRecords();
 
         return convertCompanyComeMoneyList(records);
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupMapper.java
index 19e09f0b..02722ec3 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupMapper.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupMapper.java
@@ -103,17 +103,22 @@ public interface PayWorkingGroupMapper extends BaseMapper<PayWorkingGroup> {
      * @Return
      * @Exception
      */
-    List<AllProjectStatistics> queryPageList3(@Param(value = "allProjectStatisticsSearch") AllProjectStatisticsSearch allProjectStatisticsSearch, @Param("idList") List<String> idList);
+    List<AllProjectStatistics> queryPageListPack3(@Param(value = "allProjectStatisticsSearch") AllProjectStatisticsSearch allProjectStatisticsSearch, @Param("idList") List<String> idList);
 
     /**
-     * @Description 企业来款查询和全所统计
+     * @Description 全所统计
      * @Author zql
      * @Date 2021/9/17
      * @Param
      * @Return
      * @Exception
      */
-    IPage<AllProjectStatistics> queryPageList3(Page<AllProjectStatistics> page, @Param(value = "allProjectStatisticsSearch") AllProjectStatisticsSearch allProjectStatisticsSearch, @Param("idList") List<String> idList);
+    IPage<AllProjectStatistics> queryPageListPack3(Page<AllProjectStatistics> page, @Param(value = "allProjectStatisticsSearch") AllProjectStatisticsSearch allProjectStatisticsSearch, @Param("idList") List<String> idList);
+
+    /**
+     * @Description 科室统计
+     */
+    IPage<AllProjectStatistics> queryPageListProject(Page<AllProjectStatistics> page, @Param(value = "allProjectStatisticsSearch") AllProjectStatisticsSearch allProjectStatisticsSearch, @Param("idList") List<String> idList);
 
     /**
      * 个人来款统计
@@ -149,6 +154,15 @@ public interface PayWorkingGroupMapper extends BaseMapper<PayWorkingGroup> {
      */
     IPage<PrincipalPeopleDetail> queryPageListForPrincipalDetail(Page<PrincipalPeopleDetail> page, @Param("principalPeopleDetailSearch") PrincipalPeopleDetailSearch principalPeopleDetailSearch);
 
+    /**
+     * 企业来款统计
+     *
+     * @param page
+     * @param companyComeMoneySearch
+     * @param idList
+     * @return
+     */
+    IPage<CompanyComeMoneyList> queryPageListForCompanyIndex(Page<CompanyComeMoneyList> page, @Param("companyComeMoneySearch") CompanyComeMoneySearch companyComeMoneySearch, @Param("idList") List<String> idList);
     /**
      * 企业来款统计
      *
@@ -197,8 +211,16 @@ public interface PayWorkingGroupMapper extends BaseMapper<PayWorkingGroup> {
 
     List<DepartStatistics> queryPageListForDepartFirstPage();
 
+    /**
+     * 全所统计总计
+     */
     AllMoney queryPageList33(@Param("allProjectStatisticsSearch") AllProjectStatisticsSearch allProjectStatisticsSearch, @Param("idList") List<String> idList);
 
+    /**
+     * 科室统计总计
+     */
+    AllMoney queryPageListProjectTotal(@Param("allProjectStatisticsSearch") AllProjectStatisticsSearch allProjectStatisticsSearch, @Param("idList") List<String> idList);
+
     AllMoney queryPageListForCompany33(@Param("companyComeMoneySearch") CompanyComeMoneySearch companyComeMoneySearch, @Param("idList") List<String> idList);
 
     AllMoney queryPageListForCompanyDetail33(@Param("CompanyComeMoneyDetailSearch") CompanyComeMoneyDetailSearch companyComeMoneyDetailSearch, @Param("idList") List<String> idList);
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 64f5358b..0d0f7d37 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
@@ -444,7 +444,7 @@
     </select>
 
     <!--    全所统计-->
-    <select id="queryPageList3" resultType="com.jero.statistics.entity.AllProjectStatistics">
+    <select id="queryPageListPack3" resultType="com.jero.statistics.entity.AllProjectStatistics">
         select * from
         (select projectId,
         projectName,
@@ -588,7 +588,7 @@
         </if>
     </select>
 
-    <!--    全所统计总金额统计-->
+    <!--    全所统计总计-->
     <select id="queryPageList33" resultType="com.jero.statistics.entity.AllMoney">
         select sum(allMoney) as allMoney,
         sum(paidNoTaxAmount) as comeAllMoney,
@@ -696,6 +696,259 @@
         </where>
     </select>
 
+    <!--    科室统计-->
+    <select id="queryPageListProject" resultType="com.jero.statistics.entity.AllProjectStatistics">
+        select * from
+        (select projectId,
+        projectName,
+        principalName,
+        chargeCompanyTemporaryName,
+        allMoney,
+        paidNoTaxAmount as comeAllMoney,
+        chargeUse,
+        depart,
+        createTime,
+        packText,
+        pack,
+        invoiceNoTaxAmount as billMoney,
+        confirmNoTaxAmount as confirmAmount,
+        year
+        from
+        <if test="allProjectStatisticsSearch.paymentYear == null or allProjectStatisticsSearch.paymentYear == ''">
+            v_statistical v
+        </if>
+        <if test="allProjectStatisticsSearch.paymentYear != null and allProjectStatisticsSearch.paymentYear != ''">
+            (select
+            <include refid="v_statistical_confirm_sql"/>
+            from v_statistical_confirm v
+            <where>
+                <choose>
+                    <when test="allProjectStatisticsSearch.paymentMonth != null and allProjectStatisticsSearch.paymentMonth != ''">
+                        and confirmDate like
+                        concat('%',#{allProjectStatisticsSearch.paymentYear},'-',#{allProjectStatisticsSearch.paymentMonth},'%')
+                    </when>
+                    <when test="allProjectStatisticsSearch.paymentYear != null and allProjectStatisticsSearch.paymentYear != ''">
+                        and confirmDate like concat('%',#{allProjectStatisticsSearch.paymentYear},'%')
+                    </when>
+                </choose>
+            </where>
+            group by projectId
+            ) v
+        </if>
+        <where>
+            <if test="idList != null and idList != ''">
+                principalNameId in
+                <foreach item="item" open="(" separator="," close=")" collection="idList">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="allProjectStatisticsSearch.projectName != null and allProjectStatisticsSearch.projectName != ''">
+                AND projectName LIKE
+                concat('%', #{allProjectStatisticsSearch.projectName}, '%')
+            </if>
+            <if test="allProjectStatisticsSearch.year != null and allProjectStatisticsSearch.year != ''">
+                AND year LIKE
+                concat(#{allProjectStatisticsSearch.year}, '%')
+            </if>
+            <if test="allProjectStatisticsSearch.payStatue != null and allProjectStatisticsSearch.payStatue != ''">
+                AND payStatue LIKE
+                concat('%', #{allProjectStatisticsSearch.payStatue}, '%')
+            </if>
+            <if test="allProjectStatisticsSearch.departCode != null and allProjectStatisticsSearch.departCode != ''">
+                AND departCode = #{allProjectStatisticsSearch.departCode}
+            </if>
+            <if test="allProjectStatisticsSearch.chargeUse != null and allProjectStatisticsSearch.chargeUse != ''">
+                AND chargeUse = #{allProjectStatisticsSearch.chargeUse}
+            </if>
+            <if test="allProjectStatisticsSearch.chargeCompanyTemporaryName != null and allProjectStatisticsSearch.chargeCompanyTemporaryName != ''">
+                AND chargeCompanyTemporaryName LIKE
+                concat('%', #{allProjectStatisticsSearch.chargeCompanyTemporaryName}, '%')
+            </if>
+            <if test="allProjectStatisticsSearch.principalNameId != null and allProjectStatisticsSearch.principalNameId != ''">
+                AND principalNameId = #{allProjectStatisticsSearch.principalNameId}
+            </if>
+            <if test="allProjectStatisticsSearch.pack != null and allProjectStatisticsSearch.pack != ''">
+                AND pack = #{allProjectStatisticsSearch.pack}
+            </if>
+            <if test="allProjectStatisticsSearch.estimatedArrivalDateHasFlag != null and allProjectStatisticsSearch.estimatedArrivalDateHasFlag == '1'.toString()">
+                AND estimatedArrivalDate is null
+            </if>
+            <if test="allProjectStatisticsSearch.estimatedArrivalDateHasFlag != null and allProjectStatisticsSearch.estimatedArrivalDateHasFlag == '0'.toString()">
+                AND estimatedArrivalDate is not null
+            </if>
+            <choose>
+                <when test="allProjectStatisticsSearch.estimatedArrivalMonth != null and allProjectStatisticsSearch.estimatedArrivalMonth != ''">
+                    and estimatedArrivalDate like
+                    concat('%',#{allProjectStatisticsSearch.estimatedArrivalYear},'-',#{allProjectStatisticsSearch.estimatedArrivalMonth},'%')
+                </when>
+                <when test="allProjectStatisticsSearch.estimatedArrivalYear != null and allProjectStatisticsSearch.estimatedArrivalYear != ''">
+                    and estimatedArrivalDate like concat('%',#{allProjectStatisticsSearch.estimatedArrivalYear},'%')
+                </when>
+            </choose>
+            <choose>
+                <when test="allProjectStatisticsSearch.allMoney != null and allProjectStatisticsSearch.allMoney != '' and allProjectStatisticsSearch.allMoneyTwo != null and allProjectStatisticsSearch.allMoneyTwo != ''">
+                    AND allMoney >= #{allProjectStatisticsSearch.allMoney}
+                    and allMoney <![CDATA[<]]>=
+                    #{allProjectStatisticsSearch.allMoneyTwo}
+                </when>
+                <otherwise>
+                    <if test="allProjectStatisticsSearch.allMoney != null and allProjectStatisticsSearch.allMoney != ''">
+                        AND allMoney >= #{allProjectStatisticsSearch.allMoney}
+                    </if>
+                    <if test="allProjectStatisticsSearch.allMoneyTwo != null and allProjectStatisticsSearch.allMoneyTwo != ''">
+                        AND allMoney <![CDATA[<]]>= #{allProjectStatisticsSearch.allMoneyTwo}
+                    </if>
+                </otherwise>
+            </choose>
+            <!--<choose>
+                <when test="allProjectStatisticsSearch.paymentMonth != null and allProjectStatisticsSearch.paymentMonth != ''">
+                    and confirmDate like concat('%',#{allProjectStatisticsSearch.paymentYear},'-',#{allProjectStatisticsSearch.paymentMonth},'%')
+                </when>
+                <when test="allProjectStatisticsSearch.paymentYear != null and allProjectStatisticsSearch.paymentYear != ''">
+                    and confirmDate like concat('%',#{allProjectStatisticsSearch.paymentYear},'%')
+                </when>
+            </choose>-->
+            <if test="allProjectStatisticsSearch.companyContactName != null and allProjectStatisticsSearch.companyContactName != ''">
+                and contactsName like concat('%', #{allProjectStatisticsSearch.companyContactName}, '%')
+            </if>
+        </where>
+        group by v.projectId) p
+        <if test="allProjectStatisticsSearch.column != null and allProjectStatisticsSearch.column != ''">
+            <if test="allProjectStatisticsSearch.column == 'allMoney' and allProjectStatisticsSearch.order == 'desc'">
+                order by allMoney desc
+            </if>
+            <if test="allProjectStatisticsSearch.column == 'comeAllMoney' and allProjectStatisticsSearch.order == 'desc'">
+                order by comeAllMoney desc
+            </if>
+            <if test="allProjectStatisticsSearch.column == 'billMoney' and allProjectStatisticsSearch.order == 'desc'">
+                order by billMoney desc
+            </if>
+            <if test="allProjectStatisticsSearch.column == 'confirmAmount' and allProjectStatisticsSearch.order == 'desc'">
+                order by confirmAmount desc
+            </if>
+            <if test="allProjectStatisticsSearch.column == 'confirmAmount' and allProjectStatisticsSearch.order == 'asc'">
+                order by confirmAmount
+            </if>
+            <if test="allProjectStatisticsSearch.column == 'allMoney' and allProjectStatisticsSearch.order == 'asc'">
+                order by allMoney
+            </if>
+            <if test="allProjectStatisticsSearch.column == 'comeAllMoney' and allProjectStatisticsSearch.order == 'asc'">
+                order by comeAllMoney
+            </if>
+            <if test="allProjectStatisticsSearch.column == 'billMoney' and allProjectStatisticsSearch.order == 'asc'">
+                order by billMoney
+            </if>
+        </if>
+    </select>
+
+    <!--    科室统计总计-->
+    <select id="queryPageListProjectTotal" resultType="com.jero.statistics.entity.AllMoney">
+        select sum(allMoney) as allMoney,
+        sum(paidNoTaxAmount) as comeAllMoney,
+        sum(invoiceNoTaxAmount) as billMoney,
+        sum(confirmNoTaxAmount) as confirmAmount
+        from
+        <if test="allProjectStatisticsSearch.paymentYear == null or allProjectStatisticsSearch.paymentYear == ''">
+            v_statistical v
+        </if>
+        <if test="allProjectStatisticsSearch.paymentYear != null and allProjectStatisticsSearch.paymentYear != ''">
+            (select
+            <include refid="v_statistical_confirm_sql"/>
+            from v_statistical_confirm v
+            <where>
+                <choose>
+                    <when test="allProjectStatisticsSearch.paymentMonth != null and allProjectStatisticsSearch.paymentMonth != ''">
+                        and confirmDate like
+                        concat('%',#{allProjectStatisticsSearch.paymentYear},'-',#{allProjectStatisticsSearch.paymentMonth},'%')
+                    </when>
+                    <when test="allProjectStatisticsSearch.paymentYear != null and allProjectStatisticsSearch.paymentYear != ''">
+                        and confirmDate like concat('%',#{allProjectStatisticsSearch.paymentYear},'%')
+                    </when>
+                </choose>
+            </where>
+            group by projectId
+            ) v
+        </if>
+        <where>
+            <if test="idList != null and idList != ''">
+                principalNameId in
+                <foreach item="item" open="(" separator="," close=")" collection="idList">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="allProjectStatisticsSearch.projectName != null and allProjectStatisticsSearch.projectName != ''">
+                AND projectName LIKE
+                concat('%', #{allProjectStatisticsSearch.projectName}, '%')
+            </if>
+            <if test="allProjectStatisticsSearch.year != null and allProjectStatisticsSearch.year != ''">
+                AND year LIKE
+                concat(#{allProjectStatisticsSearch.year}, '%')
+            </if>
+            <if test="allProjectStatisticsSearch.payStatue != null and allProjectStatisticsSearch.payStatue != ''">
+                AND payStatue LIKE
+                concat('%', #{allProjectStatisticsSearch.payStatue}, '%')
+            </if>
+            <if test="allProjectStatisticsSearch.departCode != null and allProjectStatisticsSearch.departCode != ''">
+                AND departCode = #{allProjectStatisticsSearch.departCode}
+            </if>
+            <if test="allProjectStatisticsSearch.chargeUse != null and allProjectStatisticsSearch.chargeUse != ''">
+                AND chargeUse = #{allProjectStatisticsSearch.chargeUse}
+            </if>
+            <if test="allProjectStatisticsSearch.chargeCompanyTemporaryName != null and allProjectStatisticsSearch.chargeCompanyTemporaryName != ''">
+                AND chargeCompanyTemporaryName LIKE
+                concat('%', #{allProjectStatisticsSearch.chargeCompanyTemporaryName}, '%')
+            </if>
+            <if test="allProjectStatisticsSearch.principalNameId != null and allProjectStatisticsSearch.principalNameId != ''">
+                AND principalNameId = #{allProjectStatisticsSearch.principalNameId}
+            </if>
+            <if test="allProjectStatisticsSearch.pack != null and allProjectStatisticsSearch.pack != ''">
+                AND pack = #{allProjectStatisticsSearch.pack}
+            </if>
+            <if test="allProjectStatisticsSearch.estimatedArrivalDateHasFlag != null and allProjectStatisticsSearch.estimatedArrivalDateHasFlag == '1'.toString()">
+                AND estimatedArrivalDate is null
+            </if>
+            <if test="allProjectStatisticsSearch.estimatedArrivalDateHasFlag != null and allProjectStatisticsSearch.estimatedArrivalDateHasFlag == '0'.toString()">
+                AND estimatedArrivalDate is not null
+            </if>
+            <choose>
+                <when test="allProjectStatisticsSearch.estimatedArrivalMonth != null and allProjectStatisticsSearch.estimatedArrivalMonth != ''">
+                    and estimatedArrivalDate like
+                    concat('%',#{allProjectStatisticsSearch.estimatedArrivalYear},'-',#{allProjectStatisticsSearch.estimatedArrivalMonth},'%')
+                </when>
+                <when test="allProjectStatisticsSearch.estimatedArrivalYear != null and allProjectStatisticsSearch.estimatedArrivalYear != ''">
+                    and estimatedArrivalDate like concat('%',#{allProjectStatisticsSearch.estimatedArrivalYear},'%')
+                </when>
+            </choose>
+            <choose>
+                <when test="allProjectStatisticsSearch.allMoney != null and allProjectStatisticsSearch.allMoney != '' and allProjectStatisticsSearch.allMoneyTwo != null and allProjectStatisticsSearch.allMoneyTwo != ''">
+                    AND allMoney >= #{allProjectStatisticsSearch.allMoney}
+                    and allMoney <![CDATA[<]]>=
+                    #{allProjectStatisticsSearch.allMoneyTwo}
+                </when>
+                <otherwise>
+                    <if test="allProjectStatisticsSearch.allMoney != null and allProjectStatisticsSearch.allMoney != ''">
+                        AND allMoney >= #{allProjectStatisticsSearch.allMoney}
+                    </if>
+                    <if test="allProjectStatisticsSearch.allMoneyTwo != null and allProjectStatisticsSearch.allMoneyTwo != ''">
+                        AND allMoney <![CDATA[<]]>= #{allProjectStatisticsSearch.allMoneyTwo}
+                    </if>
+                </otherwise>
+            </choose>
+            <!--<choose>
+                <when test="allProjectStatisticsSearch.paymentMonth != null and allProjectStatisticsSearch.paymentMonth != ''">
+                    and confirmDate like concat('%',#{allProjectStatisticsSearch.paymentYear},'-',#{allProjectStatisticsSearch.paymentMonth},'%')
+                </when>
+                <when test="allProjectStatisticsSearch.paymentYear != null and allProjectStatisticsSearch.paymentYear != ''">
+                    and confirmDate like concat('%',#{allProjectStatisticsSearch.paymentYear},'%')
+                </when>
+            </choose>-->
+            <if test="allProjectStatisticsSearch.companyContactName != null and allProjectStatisticsSearch.companyContactName != ''">
+                and contactsName like concat('%', #{allProjectStatisticsSearch.companyContactName}, '%')
+            </if>
+        </where>
+    </select>
+
     <!--    统计-->
     <select id="queryPageListForDepartFirstPage" resultType="com.jero.statistics.entity.DepartStatistics">
        select sum(pppp.comeAllMoney) as comeAllMoney,sum(pppp.allMoney) as allMoney,sd.depart_name as departName from (select  principalId, principalName,allMoney,comeAllMoney,createTime,
@@ -1312,8 +1565,8 @@
         ) pp
     </select>
 
-    <!--企业来款统计-->
-    <select id="queryPageListForCompany" resultType="com.jero.statistics.entity.CompanyComeMoneyList">
+    <!--企业来款统计首页-->
+    <select id="queryPageListForCompanyIndex" resultType="com.jero.statistics.entity.CompanyComeMoneyList">
         select * from (
         select chargeCompanyTemporaryId as chargeCompanyId,
         pcm.company_name as chargeCompanyName,
@@ -1424,6 +1677,119 @@
             </if>
         </if>
     </select>
+
+    <!--企业来款统计-->
+    <select id="queryPageListForCompany" resultType="com.jero.statistics.entity.CompanyComeMoneyList">
+        select * from (
+        select chargeCompanyTemporaryId as chargeCompanyId,
+        pcm.company_name as chargeCompanyName,
+        allMoney,
+        comeAllMoney,
+        createTime,
+        CONCAT(CAST(ROUND((confirmAmount / allMoney) * 100, 2) AS CHAR), '%') AS finishRate,
+        billMoney,
+        confirmAmount from
+        (select chargeCompanyId as chargeCompanyTemporaryId,
+        SUM(allMoney) as allMoney,
+        sum(paidNoTaxAmount) as comeAllMoney,
+        createTime,
+        sum(invoiceNoTaxAmount) as billMoney,
+        sum(confirmNoTaxAmount) as confirmAmount
+        from
+        <if test="companyComeMoneySearch.paymentYear == null or companyComeMoneySearch.paymentYear == ''">
+            v_statistical v
+        </if>
+        <if test="companyComeMoneySearch.paymentYear != null and companyComeMoneySearch.paymentYear != ''">
+            (select
+            <include refid="v_statistical_confirm_sql"/>
+            from v_statistical_confirm v
+            <where>
+                <choose>
+                    <when test="companyComeMoneySearch.paymentMonth != null and companyComeMoneySearch.paymentMonth != ''">
+                        and confirmDate like
+                        concat('%',#{companyComeMoneySearch.paymentYear},'-',#{companyComeMoneySearch.paymentMonth},'%')
+                    </when>
+                    <when test="companyComeMoneySearch.paymentYear != null and companyComeMoneySearch.paymentYear != ''">
+                        and confirmDate like concat('%',#{companyComeMoneySearch.paymentYear},'%')
+                    </when>
+                </choose>
+            </where>
+            group by projectId
+            ) v
+        </if>
+        <where>
+            <if test="idList != null and idList != ''">
+                principalNameId in
+                <foreach item="item" open="(" separator="," close=")" collection="idList">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="companyComeMoneySearch.year != null and companyComeMoneySearch.year != ''">
+                AND year LIKE
+                concat(#{companyComeMoneySearch.year}, '%')
+            </if>
+            <if test="companyComeMoneySearch.chargeCompanyId != null and companyComeMoneySearch.chargeCompanyId != ''">
+                <foreach item="item" index="index" collection="companyComeMoneySearch.chargeCompanyIds"
+                         open="AND chargeCompanyId in (" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+            <!--<choose>
+                <when test="companyComeMoneySearch.paymentMonth != null and companyComeMoneySearch.paymentMonth != ''">
+                    and confirmDate like concat('%',#{companyComeMoneySearch.paymentYear},'-',#{companyComeMoneySearch.paymentMonth},'%')
+                </when>
+                <when test="companyComeMoneySearch.paymentYear != null and companyComeMoneySearch.paymentYear != ''">
+                    and confirmDate like concat('%',#{companyComeMoneySearch.paymentYear},'%')
+                </when>
+            </choose>-->
+        </where>
+        group by chargeCompanyId
+        ) ppp left join pay_company_management pcm on ppp.chargeCompanyTemporaryId = pcm.id
+        <where>
+            <choose>
+                <when test="companyComeMoneySearch.allMoney != null and companyComeMoneySearch.allMoney != '' and companyComeMoneySearch.allMoneyTwo != null and companyComeMoneySearch.allMoneyTwo != ''">
+                    ppp.allMoney >= #{companyComeMoneySearch.allMoney}
+                    and ppp.allMoney <![CDATA[<]]>=
+                    #{companyComeMoneySearch.allMoneyTwo}
+                </when>
+                <otherwise>
+                    <if test="companyComeMoneySearch.allMoney != null and companyComeMoneySearch.allMoney != ''">
+                        AND ppp.allMoney >= #{companyComeMoneySearch.allMoney}
+                    </if>
+                    <if test="companyComeMoneySearch.allMoneyTwo != null and companyComeMoneySearch.allMoneyTwo != ''">
+                        AND ppp.allMoney <![CDATA[<]]>= #{companyComeMoneySearch.allMoneyTwo}
+                    </if>
+                </otherwise>
+            </choose>
+        </where>
+        ) p
+        <if test="companyComeMoneySearch.column != null and companyComeMoneySearch.column != ''">
+            <if test="companyComeMoneySearch.column == 'allMoney' and companyComeMoneySearch.order == 'desc'">
+                order by allMoney desc
+            </if>
+            <if test="companyComeMoneySearch.column == 'comeAllMoney' and companyComeMoneySearch.order == 'desc'">
+                order by comeAllMoney desc
+            </if>
+            <if test="companyComeMoneySearch.column == 'billMoney' and companyComeMoneySearch.order == 'desc'">
+                order by billMoney desc
+            </if>
+            <if test="companyComeMoneySearch.column == 'confirmAmount' and companyComeMoneySearch.order == 'desc'">
+                order by confirmAmount desc
+            </if>
+            <if test="companyComeMoneySearch.column == 'confirmAmount' and companyComeMoneySearch.order == 'asc'">
+                order by confirmAmount
+            </if>
+            <if test="companyComeMoneySearch.column == 'allMoney' and companyComeMoneySearch.order == 'asc'">
+                order by allMoney
+            </if>
+            <if test="companyComeMoneySearch.column == 'comeAllMoney' and companyComeMoneySearch.order == 'asc'">
+                order by comeAllMoney
+            </if>
+            <if test="companyComeMoneySearch.column == 'billMoney' and companyComeMoneySearch.order == 'asc'">
+                order by billMoney
+            </if>
+        </if>
+    </select>
     <!--企业来款统计统计总金额-->
     <select id="queryPageListForCompany33" resultType="com.jero.statistics.entity.AllMoney">
         select SUM(ppp.allMoney) as allMoney,
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupService.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupService.java
index 8401daad..1fc95f51 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupService.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupService.java
@@ -100,6 +100,9 @@ public interface IPayWorkingGroupService extends IService<PayWorkingGroup> {
      * 全所查询
      */
     IPage<AllProjectStatistics> queryPageList(Page<AllProjectStatistics> page , AllProjectStatisticsSearch allProjectStatisticsSearch, List<String> idList );
+
+    AllMoney queryPageListTotal(AllProjectStatisticsSearch allProjectStatisticsSearch, List<String> idList);
+
     /**
      * 全所查询导出
      */
@@ -159,6 +162,14 @@ public interface IPayWorkingGroupService extends IService<PayWorkingGroup> {
      * @param idList
      * @return
      */
+    IPage<CompanyComeMoneyList> queryPageListForCompanyIndex(Page<CompanyComeMoneyList> page, CompanyComeMoneySearch companyComeMoneySearch, List<String> idList);
+/**
+     * 企业来款统计
+     * @param page
+     * @param companyComeMoneySearch
+     * @param idList
+     * @return
+     */
     IPage<CompanyComeMoneyList> queryPageListForCompany(Page<CompanyComeMoneyList> page, CompanyComeMoneySearch companyComeMoneySearch, List<String> idList);
 
     /**
@@ -216,7 +227,7 @@ public interface IPayWorkingGroupService extends IService<PayWorkingGroup> {
      */
     IPage<AllProjectStatistics> queryPageListForProject(Page<AllProjectStatistics> page, AllProjectStatisticsSearch allProjectStatisticsSearch, List<String> idList);
 
-    AllMoney queryPageList33(AllProjectStatisticsSearch allProjectStatisticsSearch, List<String> idList);
+    AllMoney queryPageListProjectTotal(AllProjectStatisticsSearch allProjectStatisticsSearch, List<String> idList);
 
     AllMoney queryPageListForCompany33(CompanyComeMoneySearch companyComeMoneySearch, List<String> idList);
 
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java
index df31950e..8d83c81e 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java
@@ -427,7 +427,15 @@ public class PayWorkingGroupServiceImpl extends ServiceImpl<PayWorkingGroupMappe
      */
     @Override
     public IPage<AllProjectStatistics> queryPageList(Page<AllProjectStatistics> page ,AllProjectStatisticsSearch allProjectStatisticsSearch, List<String> idList ) {
-        return payWorkingGroupMapper.queryPageList3(page,allProjectStatisticsSearch,idList);
+        return payWorkingGroupMapper.queryPageListPack3(page,allProjectStatisticsSearch,idList);
+    }
+
+    /**
+     * 全所统计总计
+     */
+    @Override
+    public AllMoney queryPageListTotal(AllProjectStatisticsSearch allProjectStatisticsSearch, List<String> idList) {
+        return payWorkingGroupMapper.queryPageList33(allProjectStatisticsSearch, idList);
     }
 
     /**
@@ -437,7 +445,7 @@ public class PayWorkingGroupServiceImpl extends ServiceImpl<PayWorkingGroupMappe
      */
     @Override
     public List<AllProjectStatistics> queryPageListExcel(AllProjectStatisticsSearch allProjectStatisticsSearch, List<String> idList) {
-        return payWorkingGroupMapper.queryPageList3(allProjectStatisticsSearch,idList);
+        return payWorkingGroupMapper.queryPageListPack3(allProjectStatisticsSearch,idList);
     }
 
     /**
@@ -488,6 +496,17 @@ public class PayWorkingGroupServiceImpl extends ServiceImpl<PayWorkingGroupMappe
         return payWorkingGroupMapper.queryPageListForPrincipalDetail(principalPeopleDetailSearch);
     }
 
+    /**
+     * 企业来款统计
+     * @param page
+     * @param companyComeMoneySearch
+     * @param idList
+     * @return
+     */
+    @Override
+    public IPage<CompanyComeMoneyList> queryPageListForCompanyIndex(Page<CompanyComeMoneyList> page, CompanyComeMoneySearch companyComeMoneySearch, List<String> idList) {
+        return payWorkingGroupMapper.queryPageListForCompanyIndex(page,companyComeMoneySearch,idList);
+    }
     /**
      * 企业来款统计
      * @param page
@@ -553,14 +572,21 @@ public class PayWorkingGroupServiceImpl extends ServiceImpl<PayWorkingGroupMappe
         return payWorkingGroupMapper.queryPageListForDepartFirstPage();
     }
 
+
+    /**
+     * 科室统计
+     */
     @Override
     public IPage<AllProjectStatistics> queryPageListForProject(Page<AllProjectStatistics> page, AllProjectStatisticsSearch allProjectStatisticsSearch, List<String> idList) {
-        return payWorkingGroupMapper.queryPageList3(page,allProjectStatisticsSearch,idList);
+        return payWorkingGroupMapper.queryPageListProject(page,allProjectStatisticsSearch,idList);
     }
 
+    /**
+     * 科室统计总计
+     */
     @Override
-    public AllMoney queryPageList33(AllProjectStatisticsSearch allProjectStatisticsSearch, List<String> idList) {
-        return payWorkingGroupMapper.queryPageList33(allProjectStatisticsSearch, idList);
+    public AllMoney queryPageListProjectTotal(AllProjectStatisticsSearch allProjectStatisticsSearch, List<String> idList) {
+        return payWorkingGroupMapper.queryPageListProjectTotal(allProjectStatisticsSearch, idList);
     }
 
     @Override
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/AllProjectStatisticsController.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/AllProjectStatisticsController.java
index 15be2801..1259acd4 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/AllProjectStatisticsController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/AllProjectStatisticsController.java
@@ -3,7 +3,6 @@ package com.jero.statistics.controller;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jero.common.api.vo.Result;
 import com.jero.common.aspect.annotation.AutoLog;
@@ -90,7 +89,7 @@ public class AllProjectStatisticsController {
             }
 
         }
-        AllMoney allMoney = payWorkingGroupService.queryPageList33(allProjectStatisticsSearch, null);
+        AllMoney allMoney = payWorkingGroupService.queryPageListTotal(allProjectStatisticsSearch, null);
 
         hashMap.put("sumOfMoney", ObjectUtils.isEmpty(allMoney) ? 0 : allMoney.getAllMoney());
         hashMap.put("sumOfReallyMoney", ObjectUtils.isEmpty(allMoney) ? 0 : allMoney.getComeAllMoney());
@@ -159,7 +158,7 @@ public class AllProjectStatisticsController {
             }
 
         }
-        AllMoney allMoney = payWorkingGroupService.queryPageList33(allProjectStatisticsSearch, idList);
+        AllMoney allMoney = payWorkingGroupService.queryPageListProjectTotal(allProjectStatisticsSearch, idList);
 
         hashMap.put("sumOfMoney", ObjectUtils.isEmpty(allMoney) ? 0 : allMoney.getAllMoney());
         hashMap.put("sumOfReallyMoney", ObjectUtils.isEmpty(allMoney) ? 0 : allMoney.getComeAllMoney());