From 7b4d2d43cc5567a74c8e98e011cd25f76cf412be Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Wed, 8 Jun 2022 11:18:30 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=81=E4=B8=9A=E3=80=81=E5=B7=A5?=
 =?UTF-8?q?=E4=BD=9C=E7=BB=84=E3=80=81=E4=B8=AA=E4=BA=BA=20=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E8=AF=A6=E6=83=85=E6=9B=B4=E6=8D=A2=E4=B8=BA=E8=A7=86?=
 =?UTF-8?q?=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/xml/PayWorkingGroupMapper.xml      | 1299 ++---------------
 .../xml/PayWorkingGroupSubItemMapper.xml      |  123 +-
 .../CompanyComeMoneyStatisticsController.java |  110 --
 3 files changed, 140 insertions(+), 1392 deletions(-)

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 a47776c4..5638a441 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
@@ -1190,635 +1190,96 @@
     </select>
 <!--    个人来款详情-->
 <select id="queryPageListForPrincipalDetail" resultType="com.jero.statistics.entity.PrincipalPeopleDetail">
-    select  pp.id,pp.projectName,pp.principalId,pp.allMoney,pp.comeAllMoney,if(pp.pack=0,'否','是') as packText,pp.pack,pp.chargeUse,pp.chargeCompanyTemporaryName from  (SELECT
-    pwgs.create_time as createTime,
-    pwgs.id,
-    pwgs.charge_company_temporary_name as chargeCompanyTemporaryName,
-    pwg.working_group_project as projectName,
-    pwg.principal_id_a as principalId,
-    pwgs.receivable_amount AS allMoney,
-    pwgs.paid_amount AS comeAllMoney,
-    pwgs.pack as pack,
-    pwgs.charge_use as chargeUse
-    FROM pay_working_group_subitem pwgs
-    inner join pay_working_group pwg on (pwgs.working_group_id=pwg.id)
+    select projectId as id,
+           projectName,
+            principalNameId as principalId,
+           allMoney,
+           comeAllMoney,
+            packText,
+           pack,
+           chargeUse,
+           chargeCompanyTemporaryName
+    from v_statistical
     <where>
-        pwg.principal_id_a = #{principalPeopleDetailSearch.principalNameId}
+        principalNameId = #{principalPeopleDetailSearch.principalNameId}
         <if test="principalPeopleDetailSearch.projectName != null and principalPeopleDetailSearch.projectName != ''">
-            AND pwg.working_group_project LIKE
-            concat('%',concat(#{principalPeopleDetailSearch.projectName},'%'))
+            AND projectName LIKE
+                concat('%'#{principalPeopleDetailSearch.projectName}, '%')
         </if>
         <if test="principalPeopleDetailSearch.chargeUse != null and principalPeopleDetailSearch.chargeUse != ''">
-            AND pwgs.charge_use=#{principalPeopleDetailSearch.chargeUse}
+            AND chargeUse = #{principalPeopleDetailSearch.chargeUse}
         </if>
         <if test="principalPeopleDetailSearch.year != null and principalPeopleDetailSearch.year != ''">
-            AND pwg.year LIKE
-            concat(#{principalPeopleDetailSearch.year},'%')
+            AND year LIKE
+                concat('%',#{principalPeopleDetailSearch.year}, '%')
         </if>
         <if test="principalPeopleDetailSearch.inAccountStatue != null and principalPeopleDetailSearch.inAccountStatue != ''">
-            AND pwgs.in_account=#{principalPeopleDetailSearch.inAccountStatue}
+            AND payStatue = #{principalPeopleDetailSearch.inAccountStatue}
         </if>
-            <choose>
-                <when test="principalPeopleDetailSearch.allMoney != null and principalPeopleDetailSearch.allMoney != '' and principalPeopleDetailSearch.allMoneyTwo != null and principalPeopleDetailSearch.allMoneyTwo != ''">
-                    AND   pwgs.receivable_amount >= #{principalPeopleDetailSearch.allMoney} and pwgs.receivable_amount <![CDATA[<]]>=
+        <choose>
+            <when test="principalPeopleDetailSearch.allMoney != null and principalPeopleDetailSearch.allMoney != '' and principalPeopleDetailSearch.allMoneyTwo != null and principalPeopleDetailSearch.allMoneyTwo != ''">
+                AND allMoney >= #{principalPeopleDetailSearch.allMoney}
+                and allMoney <![CDATA[<]]>=
                     #{principalPeopleDetailSearch.allMoneyTwo}
-                </when>
-                <otherwise>
-                    <if test="principalPeopleDetailSearch.allMoney != null and principalPeopleDetailSearch.allMoney != ''">
-                        AND pwgs.receivable_amount >= #{principalPeopleDetailSearch.allMoney}
-                    </if>
-                    <if test="principalPeopleDetailSearch.allMoneyTwo != null and principalPeopleDetailSearch.allMoneyTwo != ''">
-                        AND pwgs.receivable_amount <![CDATA[<]]>= #{principalPeopleDetailSearch.allMoneyTwo}
-                    </if>
-                </otherwise>
-            </choose>
-    </where>
-    union ALL
-    SELECT
-    pcp.create_time as createTime,
-    pcp.id,
-    pcp.charge_company_temporary_name as chargeCompanyTemporaryName,
-    pcp.charge_project as projectName,
-    pcp.principal_id as principalId,
-    pcp.receivable_amount AS allMoney,
-    pcp.paid_amount AS comeAllMoney,
-    pcp.pack as pack,
-    pcp.charge_use as chargeUse
-    FROM pay_common_project pcp
-    <where>
-        pcp.principal_id = #{principalPeopleDetailSearch.principalNameId}
-        <if test="principalPeopleDetailSearch.projectName != null and principalPeopleDetailSearch.projectName != ''">
-            AND pcp.charge_project LIKE
-            concat('%',concat(#{principalPeopleDetailSearch.projectName},'%'))
-        </if>
-        <if test="principalPeopleDetailSearch.chargeUse != null and principalPeopleDetailSearch.chargeUse != ''">
-            AND pcp.charge_use=#{principalPeopleDetailSearch.chargeUse}
-        </if>
-        <if test="principalPeopleDetailSearch.year != null and principalPeopleDetailSearch.year != ''">
-            AND pcp.year LIKE
-            concat(#{principalPeopleDetailSearch.year},'%')
-        </if>
-        <if test="principalPeopleDetailSearch.inAccountStatue != null and principalPeopleDetailSearch.inAccountStatue != ''">
-            AND pcp.in_account=#{principalPeopleDetailSearch.inAccountStatue}
-        </if>
-        <choose>
-            <when test="principalPeopleDetailSearch.allMoney != null and principalPeopleDetailSearch.allMoney != '' and principalPeopleDetailSearch.allMoneyTwo != null and principalPeopleDetailSearch.allMoneyTwo != ''">
-                AND   pcp.receivable_amount >= #{principalPeopleDetailSearch.allMoney} and pcp.receivable_amount <![CDATA[<]]>=
-                #{principalPeopleDetailSearch.allMoneyTwo}
             </when>
             <otherwise>
                 <if test="principalPeopleDetailSearch.allMoney != null and principalPeopleDetailSearch.allMoney != ''">
-                    AND pcp.receivable_amount >= #{principalPeopleDetailSearch.allMoney}
+                    AND allMoney >= #{principalPeopleDetailSearch.allMoney}
                 </if>
                 <if test="principalPeopleDetailSearch.allMoneyTwo != null and principalPeopleDetailSearch.allMoneyTwo != ''">
-                    AND pcp.receivable_amount <![CDATA[<]]>= #{principalPeopleDetailSearch.allMoneyTwo}
+                    AND allMoney <![CDATA[<]]>= #{principalPeopleDetailSearch.allMoneyTwo}
                 </if>
             </otherwise>
         </choose>
     </where>
-    union ALL
-    SELECT
-    pms.create_time as createTime,
-    pms.id,
-    pms.company_name as chargeCompanyTemporaryName,
-    pm.meeting_name as projectName,
-    pm.director_id as principalId,
-    pms.amount_receivable AS allMoney,
-    pms.paid_amount AS comeAllMoney,
-    pms.pack as pack,
-    pms.charge_use as chargeUse
-    FROM pay_meeting pm inner join pay_meeting_situation pms on(pm.id=pms.meeting_id)
-    <where>
-        pm.director_id = #{principalPeopleDetailSearch.principalNameId}
-        <if test="principalPeopleDetailSearch.projectName != null and principalPeopleDetailSearch.projectName != ''">
-            AND pm.meeting_name LIKE
-            concat('%',concat(#{principalPeopleDetailSearch.projectName},'%'))
-        </if>
-        <if test="principalPeopleDetailSearch.chargeUse != null and principalPeopleDetailSearch.chargeUse != ''">
-            AND pms.charge_use=#{principalPeopleDetailSearch.chargeUse}
-        </if>
-        <if test="principalPeopleDetailSearch.year != null and principalPeopleDetailSearch.year != ''">
-            AND pm.particular_year LIKE
-            concat(#{principalPeopleDetailSearch.year},'%')
-        </if>
-        <if test="principalPeopleDetailSearch.inAccountStatue != null and principalPeopleDetailSearch.inAccountStatue != ''">
-            AND pms.in_account=#{principalPeopleDetailSearch.inAccountStatue}
-        </if>
-        <choose>
-            <when test="principalPeopleDetailSearch.allMoney != null and principalPeopleDetailSearch.allMoney != '' and principalPeopleDetailSearch.allMoneyTwo != null and principalPeopleDetailSearch.allMoneyTwo != ''">
-                AND  pms.amount_receivable >= #{principalPeopleDetailSearch.allMoney} and pms.amount_receivable <![CDATA[<]]>=
-                #{principalPeopleDetailSearch.allMoneyTwo}
-            </when>
-            <otherwise>
-                <if test="principalPeopleDetailSearch.allMoney != null and principalPeopleDetailSearch.allMoney != ''">
-                    AND pms.amount_receivable >= #{principalPeopleDetailSearch.allMoney}
-                </if>
-                <if test="principalPeopleDetailSearch.allMoneyTwo != null and principalPeopleDetailSearch.allMoneyTwo != ''">
-                    AND pms.amount_receivable <![CDATA[<]]>= #{principalPeopleDetailSearch.allMoneyTwo}
-                </if>
-            </otherwise>
-        </choose>
-    </where>
-    union ALL
-    SELECT
-    pmps.create_time as createTime,
-    pmps.id,
-    pmps.company_name as chargeCompanyTemporaryName,
-    pmp.project_name as projectName,
-    pmp.director_id as principalId,
-    pmps.amount_receivable AS allMoney,
-    pmps.paid_amount AS comeAllMoney,
-    pmps.pack as pack,
-    pmps.charge_use as chargeUse
-    FROM pay_member_project pmp inner join pay_member_project_subitem pmps on(pmp.id=pmps.project_id)
-    <where>
-        pmp.director_id = #{principalPeopleDetailSearch.principalNameId}
-        <if test="principalPeopleDetailSearch.projectName != null and principalPeopleDetailSearch.projectName != ''">
-            AND pmp.project_name LIKE
-            concat('%',concat(#{principalPeopleDetailSearch.projectName},'%'))
-        </if>
-        <if test="principalPeopleDetailSearch.chargeUse != null and principalPeopleDetailSearch.chargeUse != ''">
-            AND pmps.charge_use=#{principalPeopleDetailSearch.chargeUse}
-        </if>
-        <if test="principalPeopleDetailSearch.year != null and principalPeopleDetailSearch.year != ''">
-            AND pmp.particular_year LIKE
-            concat(#{principalPeopleDetailSearch.year},'%')
-        </if>
-        <if test="principalPeopleDetailSearch.inAccountStatue != null and principalPeopleDetailSearch.inAccountStatue != ''">
-            AND pmps.in_account=#{principalPeopleDetailSearch.inAccountStatue}
-        </if>
-        <choose>
-            <when test="principalPeopleDetailSearch.allMoney != null and principalPeopleDetailSearch.allMoney != '' and principalPeopleDetailSearch.allMoneyTwo != null and principalPeopleDetailSearch.allMoneyTwo != ''">
-                AND  pmps.amount_receivable >= #{principalPeopleDetailSearch.allMoney} and pmps.amount_receivable <![CDATA[<]]>=
-                #{principalPeopleDetailSearch.allMoneyTwo}
-            </when>
-            <otherwise>
-                <if test="principalPeopleDetailSearch.allMoney != null and principalPeopleDetailSearch.allMoney != ''">
-                    AND pmps.amount_receivable >= #{principalPeopleDetailSearch.allMoney}
-                </if>
-                <if test="principalPeopleDetailSearch.allMoneyTwo != null and principalPeopleDetailSearch.allMoneyTwo != ''">
-                    AND pmps.amount_receivable <![CDATA[<]]>= #{principalPeopleDetailSearch.allMoneyTwo}
-                </if>
-            </otherwise>
-        </choose>
-    </where>
-    union ALL
-    SELECT
-    tmps.create_time as createTime,
-    tmps.id,
-    tmps.company_name as chargeCompanyTemporaryName,
-    tmp.project_name as projectName,
-    tmp.director_id as principalId,
-    tmps.amount_receivable AS allMoney,
-    tmps.paid_amount AS comeAllMoney,
-    tmps.pack as pack,
-    tmps.charge_use as chargeUse
-    FROM tb_member_project tmp inner join tb_member_project_subitem tmps on(tmp.id=tmps.project_id)
-    <where>
-        tmp.director_id = #{principalPeopleDetailSearch.principalNameId}
-        <if test="principalPeopleDetailSearch.projectName != null and principalPeopleDetailSearch.projectName != ''">
-            AND tmp.project_name LIKE
-            concat('%',concat(#{principalPeopleDetailSearch.projectName},'%'))
-        </if>
-        <if test="principalPeopleDetailSearch.chargeUse != null and principalPeopleDetailSearch.chargeUse != ''">
-            AND tmps.charge_use=#{principalPeopleDetailSearch.chargeUse}
-        </if>
-        <if test="principalPeopleDetailSearch.year != null and principalPeopleDetailSearch.year != ''">
-            AND tmp.year LIKE
-            concat(#{principalPeopleDetailSearch.year},'%')
-        </if>
-        <if test="principalPeopleDetailSearch.inAccountStatue != null and principalPeopleDetailSearch.inAccountStatue != ''">
-            AND tmps.in_account=#{principalPeopleDetailSearch.inAccountStatue}
-        </if>
-        <choose>
-            <when test="principalPeopleDetailSearch.allMoney != null and principalPeopleDetailSearch.allMoney != '' and principalPeopleDetailSearch.allMoneyTwo != null and principalPeopleDetailSearch.allMoneyTwo != ''">
-                AND  tmps.amount_receivable >= #{principalPeopleDetailSearch.allMoney} and tmps.amount_receivable <![CDATA[<]]>=
-                #{principalPeopleDetailSearch.allMoneyTwo}
-            </when>
-            <otherwise>
-                <if test="principalPeopleDetailSearch.allMoney != null and principalPeopleDetailSearch.allMoney != ''">
-                    AND tmps.amount_receivable >= #{principalPeopleDetailSearch.allMoney}
-                </if>
-                <if test="principalPeopleDetailSearch.allMoneyTwo != null and principalPeopleDetailSearch.allMoneyTwo != ''">
-                    AND tmps.amount_receivable <![CDATA[<]]>= #{principalPeopleDetailSearch.allMoneyTwo}
-                </if>
-            </otherwise>
-        </choose>
-    </where>
-    union ALL
-    SELECT
-    tmps.create_time as createTime,
-    tmps.id,
-    tmps.company_name as chargeCompanyTemporaryName,
-    tmp.project_name as projectName,
-    tmp.director_id as principalId,
-    tmps.amount_receivable AS allMoney,
-    tmps.paid_amount AS comeAllMoney,
-    tmps.pack as pack,
-    tmps.charge_use as chargeUse
-    FROM tb_member_project tmp inner join tb_certificate_payment tmps on(tmp.id=tmps.project_id)
-    <where>
-        tmp.director_id = #{principalPeopleDetailSearch.principalNameId}
-        <if test="principalPeopleDetailSearch.projectName != null and principalPeopleDetailSearch.projectName != ''">
-            AND tmp.project_name LIKE
-            concat('%',concat(#{principalPeopleDetailSearch.projectName},'%'))
-        </if>
-        <if test="principalPeopleDetailSearch.year != null and principalPeopleDetailSearch.year != ''">
-            AND tmp.year LIKE
-            concat(#{principalPeopleDetailSearch.year},'%')
-        </if>
-        <if test="principalPeopleDetailSearch.chargeUse != null and principalPeopleDetailSearch.chargeUse != ''">
-            AND tmps.charge_use=#{principalPeopleDetailSearch.chargeUse}
-        </if>
-        <if test="principalPeopleDetailSearch.inAccountStatue != null and principalPeopleDetailSearch.inAccountStatue != ''">
-            AND tmps.in_account=#{principalPeopleDetailSearch.inAccountStatue}
-        </if>
-        <choose>
-            <when test="principalPeopleDetailSearch.allMoney != null and principalPeopleDetailSearch.allMoney != '' and principalPeopleDetailSearch.allMoneyTwo != null and principalPeopleDetailSearch.allMoneyTwo != ''">
-                AND  tmps.amount_receivable >= #{principalPeopleDetailSearch.allMoney} and tmps.amount_receivable <![CDATA[<]]>=
-                #{principalPeopleDetailSearch.allMoneyTwo}
-            </when>
-            <otherwise>
-                <if test="principalPeopleDetailSearch.allMoney != null and principalPeopleDetailSearch.allMoney != ''">
-                    AND tmps.amount_receivable >= #{principalPeopleDetailSearch.allMoney}
-                </if>
-                <if test="principalPeopleDetailSearch.allMoneyTwo != null and principalPeopleDetailSearch.allMoneyTwo != ''">
-                    AND tmps.amount_receivable <![CDATA[<]]>= #{principalPeopleDetailSearch.allMoneyTwo}
-                </if>
-            </otherwise>
-        </choose>
-    </where>
-    ) pp where pp.allMoney is not null and pp.allMoney !=0
-<!--    left join-->
-<!--    &lt;!&ndash;          判断来款项目的来款年份&ndash;&gt;-->
-<!--   (select pwgs.id as id,max(ppr.payment_date) as payment_date-->
-<!--      from pay_working_group_subitem pwgs-->
-<!--      inner join pay_payment_record ppr on(pwgs.id=ppr.project_id)-->
-<!--      <if test="principalPeopleDetailSearch.year !='' and principalPeopleDetailSearch.year !=null">-->
-<!--      WHERE ppr.payment_date like-->
-<!--      concat('%',#{principalPeopleDetailSearch.year},'%')-->
-<!--      </if>-->
-<!--      GROUP BY pwgs.id-->
-<!--      union ALL-->
-<!--      SELECT-->
-<!--      pcp.id as id,max(ppr.payment_date) as payment_date-->
-<!--      FROM pay_common_project pcp inner JOIN   pay_payment_record ppr on(pcp.id=ppr.project_id)-->
-<!--    <if test="principalPeopleDetailSearch.year !='' and principalPeopleDetailSearch.year !=null">-->
-<!--        WHERE ppr.payment_date like-->
-<!--        concat('%',#{principalPeopleDetailSearch.year},'%')-->
-<!--    </if>-->
-<!--      group by pcp.id-->
-<!--      union all-->
-<!--      SELECT-->
-<!--      pmps.id as id,max(ppr.payment_date) as payment_date from-->
-<!--       pay_member_project_subitem pmps  inner join pay_payment_record ppr on(pmps.id=ppr.project_id)-->
-<!--    <if test="principalPeopleDetailSearch.year !='' and principalPeopleDetailSearch.year !=null">-->
-<!--        WHERE ppr.payment_date like-->
-<!--        concat('%',#{principalPeopleDetailSearch.year},'%')-->
-<!--    </if>-->
-<!--      group by pmps.id-->
-<!--      union all-->
-<!--      SELECT-->
-<!--      pms.id as id ,max(ppr.payment_date) as payment_date  from pay_meeting_situation  pms inner join  pay_payment_record ppr on (pms.id=ppr.project_id)-->
-<!--    <if test="principalPeopleDetailSearch.year !='' and principalPeopleDetailSearch.year !=null">-->
-<!--        WHERE ppr.payment_date like-->
-<!--        concat('%',#{principalPeopleDetailSearch.year},'%')-->
-<!--    </if>-->
-<!--      group by pms.id-->
-<!--    union all-->
-<!--    SELECT-->
-<!--    tmps.id as id ,max(ppr.payment_date) as payment_date  from tb_member_project_subitem  tmps inner join  pay_payment_record ppr on (tmps.id=ppr.project_id)-->
-<!--    <if test="principalPeopleDetailSearch.year !='' and principalPeopleDetailSearch.year !=null">-->
-<!--        WHERE ppr.payment_date like-->
-<!--        concat('%',#{principalPeopleDetailSearch.year},'%')-->
-<!--    </if>-->
-<!--    group by tmps.id-->
-<!--    union all-->
-<!--    SELECT-->
-<!--    tmps.id as id ,max(ppr.payment_date) as payment_date  from tb_certificate_payment  tmps inner join  pay_payment_record ppr on (tmps.id=ppr.project_id)-->
-<!--    <if test="principalPeopleDetailSearch.year !='' and principalPeopleDetailSearch.year !=null">-->
-<!--        WHERE ppr.payment_date like-->
-<!--        concat('%',#{principalPeopleDetailSearch.year},'%')-->
-<!--    </if>-->
-<!--    group by tmps.id-->
-<!--      ) pprr on(pp.id=pprr.id)-->
-<!--      order by pprr.payment_date desc-->
-  </select>
+</select>
     <!--    个人来款详情总金额-->
     <select id="queryPageListForPrincipalDetail33" resultType="com.jero.statistics.entity.AllMoney">
-        select  sum(pp.allMoney) as allMoney, sum(pp.comeAllMoney) as comeAllMoney from  (SELECT
-        pwgs.create_time as createTime,
-        pwgs.id,
-        pwgs.charge_company_temporary_name as chargeCompanyTemporaryName,
-        pwg.working_group_project as projectName,
-        pwg.principal_id_a as principalId,
-        pwgs.receivable_amount AS allMoney,
-        pwgs.paid_amount AS comeAllMoney,
-        pwgs.pack as pack,
-        pwgs.charge_use as chargeUse
-        FROM pay_working_group_subitem pwgs
-        inner join pay_working_group pwg on (pwgs.working_group_id=pwg.id)
+        select sum(allMoney) as allMoney, sum(comeAllMoney) as comeAllMoney
+        from (
+        select projectId as id,
+        projectName,
+        principalNameId as principalId,
+        allMoney,
+        comeAllMoney,
+        packText,
+        pack,
+        chargeUse,
+        chargeCompanyTemporaryName
+        from v_statistical
         <where>
-            pwg.principal_id_a = #{principalPeopleDetailSearch.principalNameId}
+            principalNameId = #{principalPeopleDetailSearch.principalNameId}
             <if test="principalPeopleDetailSearch.projectName != null and principalPeopleDetailSearch.projectName != ''">
-                AND pwg.working_group_project LIKE
-                concat('%',concat(#{principalPeopleDetailSearch.projectName},'%'))
+                AND projectName LIKE
+                concat('%'#{principalPeopleDetailSearch.projectName}, '%')
             </if>
             <if test="principalPeopleDetailSearch.chargeUse != null and principalPeopleDetailSearch.chargeUse != ''">
-                AND pwgs.charge_use=#{principalPeopleDetailSearch.chargeUse}
+                AND chargeUse = #{principalPeopleDetailSearch.chargeUse}
             </if>
             <if test="principalPeopleDetailSearch.year != null and principalPeopleDetailSearch.year != ''">
-                AND pwg.year LIKE
-                concat(#{principalPeopleDetailSearch.year},'%')
+                AND year LIKE
+                concat('%',#{principalPeopleDetailSearch.year}, '%')
             </if>
             <if test="principalPeopleDetailSearch.inAccountStatue != null and principalPeopleDetailSearch.inAccountStatue != ''">
-                AND pwgs.in_account=#{principalPeopleDetailSearch.inAccountStatue}
+                AND payStatue = #{principalPeopleDetailSearch.inAccountStatue}
             </if>
             <choose>
                 <when test="principalPeopleDetailSearch.allMoney != null and principalPeopleDetailSearch.allMoney != '' and principalPeopleDetailSearch.allMoneyTwo != null and principalPeopleDetailSearch.allMoneyTwo != ''">
-                    AND   pwgs.receivable_amount >= #{principalPeopleDetailSearch.allMoney} and pwgs.receivable_amount <![CDATA[<]]>=
+                    AND allMoney >= #{principalPeopleDetailSearch.allMoney}
+                    and allMoney <![CDATA[<]]>=
                     #{principalPeopleDetailSearch.allMoneyTwo}
                 </when>
                 <otherwise>
                     <if test="principalPeopleDetailSearch.allMoney != null and principalPeopleDetailSearch.allMoney != ''">
-                        AND pwgs.receivable_amount >= #{principalPeopleDetailSearch.allMoney}
+                        AND allMoney >= #{principalPeopleDetailSearch.allMoney}
                     </if>
                     <if test="principalPeopleDetailSearch.allMoneyTwo != null and principalPeopleDetailSearch.allMoneyTwo != ''">
-                        AND pwgs.receivable_amount <![CDATA[<]]>= #{principalPeopleDetailSearch.allMoneyTwo}
+                        AND allMoney <![CDATA[<]]>= #{principalPeopleDetailSearch.allMoneyTwo}
                     </if>
                 </otherwise>
             </choose>
         </where>
-        union ALL
-        SELECT
-        pcp.create_time as createTime,
-        pcp.id,
-        pcp.charge_company_temporary_name as chargeCompanyTemporaryName,
-        pcp.charge_project as projectName,
-        pcp.principal_id as principalId,
-        pcp.receivable_amount AS allMoney,
-        pcp.paid_amount AS comeAllMoney,
-        pcp.pack as pack,
-        pcp.charge_use as chargeUse
-        FROM pay_common_project pcp
-        <where>
-            pcp.principal_id = #{principalPeopleDetailSearch.principalNameId}
-            <if test="principalPeopleDetailSearch.projectName != null and principalPeopleDetailSearch.projectName != ''">
-                AND pcp.charge_project LIKE
-                concat('%',concat(#{principalPeopleDetailSearch.projectName},'%'))
-            </if>
-            <if test="principalPeopleDetailSearch.chargeUse != null and principalPeopleDetailSearch.chargeUse != ''">
-                AND pcp.charge_use=#{principalPeopleDetailSearch.chargeUse}
-            </if>
-            <if test="principalPeopleDetailSearch.year != null and principalPeopleDetailSearch.year != ''">
-                AND pcp.year LIKE
-                concat(#{principalPeopleDetailSearch.year},'%')
-            </if>
-            <if test="principalPeopleDetailSearch.inAccountStatue != null and principalPeopleDetailSearch.inAccountStatue != ''">
-                AND pcp.in_account=#{principalPeopleDetailSearch.inAccountStatue}
-            </if>
-            <choose>
-                <when test="principalPeopleDetailSearch.allMoney != null and principalPeopleDetailSearch.allMoney != '' and principalPeopleDetailSearch.allMoneyTwo != null and principalPeopleDetailSearch.allMoneyTwo != ''">
-                    AND   pcp.receivable_amount >= #{principalPeopleDetailSearch.allMoney} and pcp.receivable_amount <![CDATA[<]]>=
-                    #{principalPeopleDetailSearch.allMoneyTwo}
-                </when>
-                <otherwise>
-                    <if test="principalPeopleDetailSearch.allMoney != null and principalPeopleDetailSearch.allMoney != ''">
-                        AND pcp.receivable_amount >= #{principalPeopleDetailSearch.allMoney}
-                    </if>
-                    <if test="principalPeopleDetailSearch.allMoneyTwo != null and principalPeopleDetailSearch.allMoneyTwo != ''">
-                        AND pcp.receivable_amount <![CDATA[<]]>= #{principalPeopleDetailSearch.allMoneyTwo}
-                    </if>
-                </otherwise>
-            </choose>
-        </where>
-        union ALL
-        SELECT
-        pms.create_time as createTime,
-        pms.id,
-        pms.company_name as chargeCompanyTemporaryName,
-        pm.meeting_name as projectName,
-        pm.director_id as principalId,
-        pms.amount_receivable AS allMoney,
-        pms.paid_amount AS comeAllMoney,
-        pms.pack as pack,
-        pms.charge_use as chargeUse
-        FROM pay_meeting pm inner join pay_meeting_situation pms on(pm.id=pms.meeting_id)
-        <where>
-            pm.director_id = #{principalPeopleDetailSearch.principalNameId}
-            <if test="principalPeopleDetailSearch.projectName != null and principalPeopleDetailSearch.projectName != ''">
-                AND pm.meeting_name LIKE
-                concat('%',concat(#{principalPeopleDetailSearch.projectName},'%'))
-            </if>
-            <if test="principalPeopleDetailSearch.chargeUse != null and principalPeopleDetailSearch.chargeUse != ''">
-                AND pms.charge_use=#{principalPeopleDetailSearch.chargeUse}
-            </if>
-            <if test="principalPeopleDetailSearch.year != null and principalPeopleDetailSearch.year != ''">
-                AND pm.particular_year LIKE
-                concat(#{principalPeopleDetailSearch.year},'%')
-            </if>
-            <if test="principalPeopleDetailSearch.inAccountStatue != null and principalPeopleDetailSearch.inAccountStatue != ''">
-                AND pms.in_account=#{principalPeopleDetailSearch.inAccountStatue}
-            </if>
-            <choose>
-                <when test="principalPeopleDetailSearch.allMoney != null and principalPeopleDetailSearch.allMoney != '' and principalPeopleDetailSearch.allMoneyTwo != null and principalPeopleDetailSearch.allMoneyTwo != ''">
-                    AND  pms.amount_receivable >= #{principalPeopleDetailSearch.allMoney} and pms.amount_receivable <![CDATA[<]]>=
-                    #{principalPeopleDetailSearch.allMoneyTwo}
-                </when>
-                <otherwise>
-                    <if test="principalPeopleDetailSearch.allMoney != null and principalPeopleDetailSearch.allMoney != ''">
-                        AND pms.amount_receivable >= #{principalPeopleDetailSearch.allMoney}
-                    </if>
-                    <if test="principalPeopleDetailSearch.allMoneyTwo != null and principalPeopleDetailSearch.allMoneyTwo != ''">
-                        AND pms.amount_receivable <![CDATA[<]]>= #{principalPeopleDetailSearch.allMoneyTwo}
-                    </if>
-                </otherwise>
-            </choose>
-        </where>
-        union ALL
-        SELECT
-        pmps.create_time as createTime,
-        pmps.id,
-        pmps.company_name as chargeCompanyTemporaryName,
-        pmp.project_name as projectName,
-        pmp.director_id as principalId,
-        pmps.amount_receivable AS allMoney,
-        pmps.paid_amount AS comeAllMoney,
-        pmps.pack as pack,
-        pmps.charge_use as chargeUse
-        FROM pay_member_project pmp inner join pay_member_project_subitem pmps on(pmp.id=pmps.project_id)
-        <where>
-            pmp.director_id = #{principalPeopleDetailSearch.principalNameId}
-            <if test="principalPeopleDetailSearch.projectName != null and principalPeopleDetailSearch.projectName != ''">
-                AND pmp.project_name LIKE
-                concat('%',concat(#{principalPeopleDetailSearch.projectName},'%'))
-            </if>
-            <if test="principalPeopleDetailSearch.chargeUse != null and principalPeopleDetailSearch.chargeUse != ''">
-                AND pmps.charge_use=#{principalPeopleDetailSearch.chargeUse}
-            </if>
-            <if test="principalPeopleDetailSearch.year != null and principalPeopleDetailSearch.year != ''">
-                AND pmp.particular_year LIKE
-                concat(#{principalPeopleDetailSearch.year},'%')
-            </if>
-            <if test="principalPeopleDetailSearch.inAccountStatue != null and principalPeopleDetailSearch.inAccountStatue != ''">
-                AND pmps.in_account=#{principalPeopleDetailSearch.inAccountStatue}
-            </if>
-            <choose>
-                <when test="principalPeopleDetailSearch.allMoney != null and principalPeopleDetailSearch.allMoney != '' and principalPeopleDetailSearch.allMoneyTwo != null and principalPeopleDetailSearch.allMoneyTwo != ''">
-                    AND  pmps.amount_receivable >= #{principalPeopleDetailSearch.allMoney} and pmps.amount_receivable <![CDATA[<]]>=
-                    #{principalPeopleDetailSearch.allMoneyTwo}
-                </when>
-                <otherwise>
-                    <if test="principalPeopleDetailSearch.allMoney != null and principalPeopleDetailSearch.allMoney != ''">
-                        AND pmps.amount_receivable >= #{principalPeopleDetailSearch.allMoney}
-                    </if>
-                    <if test="principalPeopleDetailSearch.allMoneyTwo != null and principalPeopleDetailSearch.allMoneyTwo != ''">
-                        AND pmps.amount_receivable <![CDATA[<]]>= #{principalPeopleDetailSearch.allMoneyTwo}
-                    </if>
-                </otherwise>
-            </choose>
-        </where>
-        union ALL
-        SELECT
-        tmps.create_time as createTime,
-        tmps.id,
-        tmps.company_name as chargeCompanyTemporaryName,
-        tmp.project_name as projectName,
-        tmp.director_id as principalId,
-        tmps.amount_receivable AS allMoney,
-        tmps.paid_amount AS comeAllMoney,
-        tmps.pack as pack,
-        tmps.charge_use as chargeUse
-        FROM tb_member_project tmp inner join tb_member_project_subitem tmps on(tmp.id=tmps.project_id)
-        <where>
-            tmp.director_id = #{principalPeopleDetailSearch.principalNameId}
-            <if test="principalPeopleDetailSearch.projectName != null and principalPeopleDetailSearch.projectName != ''">
-                AND tmp.project_name LIKE
-                concat('%',concat(#{principalPeopleDetailSearch.projectName},'%'))
-            </if>
-            <if test="principalPeopleDetailSearch.chargeUse != null and principalPeopleDetailSearch.chargeUse != ''">
-                AND tmps.charge_use=#{principalPeopleDetailSearch.chargeUse}
-            </if>
-            <if test="principalPeopleDetailSearch.year != null and principalPeopleDetailSearch.year != ''">
-                AND tmp.year LIKE
-                concat(#{principalPeopleDetailSearch.year},'%')
-            </if>
-            <if test="principalPeopleDetailSearch.inAccountStatue != null and principalPeopleDetailSearch.inAccountStatue != ''">
-                AND tmps.in_account=#{principalPeopleDetailSearch.inAccountStatue}
-            </if>
-            <choose>
-                <when test="principalPeopleDetailSearch.allMoney != null and principalPeopleDetailSearch.allMoney != '' and principalPeopleDetailSearch.allMoneyTwo != null and principalPeopleDetailSearch.allMoneyTwo != ''">
-                    AND  tmps.amount_receivable >= #{principalPeopleDetailSearch.allMoney} and tmps.amount_receivable <![CDATA[<]]>=
-                    #{principalPeopleDetailSearch.allMoneyTwo}
-                </when>
-                <otherwise>
-                    <if test="principalPeopleDetailSearch.allMoney != null and principalPeopleDetailSearch.allMoney != ''">
-                        AND tmps.amount_receivable >= #{principalPeopleDetailSearch.allMoney}
-                    </if>
-                    <if test="principalPeopleDetailSearch.allMoneyTwo != null and principalPeopleDetailSearch.allMoneyTwo != ''">
-                        AND tmps.amount_receivable <![CDATA[<]]>= #{principalPeopleDetailSearch.allMoneyTwo}
-                    </if>
-                </otherwise>
-            </choose>
-        </where>
-        union ALL
-        SELECT
-        tmps.create_time as createTime,
-        tmps.id,
-        tmps.company_name as chargeCompanyTemporaryName,
-        tmp.project_name as projectName,
-        tmp.director_id as principalId,
-        tmps.amount_receivable AS allMoney,
-        tmps.paid_amount AS comeAllMoney,
-        tmps.pack as pack,
-        tmps.charge_use as chargeUse
-        FROM tb_member_project tmp inner join tb_certificate_payment tmps on(tmp.id=tmps.project_id)
-        <where>
-            tmp.director_id = #{principalPeopleDetailSearch.principalNameId}
-            <if test="principalPeopleDetailSearch.projectName != null and principalPeopleDetailSearch.projectName != ''">
-                AND tmp.project_name LIKE
-                concat('%',concat(#{principalPeopleDetailSearch.projectName},'%'))
-            </if>
-            <if test="principalPeopleDetailSearch.year != null and principalPeopleDetailSearch.year != ''">
-                AND tmp.year LIKE
-                concat(#{principalPeopleDetailSearch.year},'%')
-            </if>
-            <if test="principalPeopleDetailSearch.chargeUse != null and principalPeopleDetailSearch.chargeUse != ''">
-                AND tmps.charge_use=#{principalPeopleDetailSearch.chargeUse}
-            </if>
-            <if test="principalPeopleDetailSearch.inAccountStatue != null and principalPeopleDetailSearch.inAccountStatue != ''">
-                AND tmps.in_account=#{principalPeopleDetailSearch.inAccountStatue}
-            </if>
-            <choose>
-                <when test="principalPeopleDetailSearch.allMoney != null and principalPeopleDetailSearch.allMoney != '' and principalPeopleDetailSearch.allMoneyTwo != null and principalPeopleDetailSearch.allMoneyTwo != ''">
-                    AND  tmps.amount_receivable >= #{principalPeopleDetailSearch.allMoney} and tmps.amount_receivable <![CDATA[<]]>=
-                    #{principalPeopleDetailSearch.allMoneyTwo}
-                </when>
-                <otherwise>
-                    <if test="principalPeopleDetailSearch.allMoney != null and principalPeopleDetailSearch.allMoney != ''">
-                        AND tmps.amount_receivable >= #{principalPeopleDetailSearch.allMoney}
-                    </if>
-                    <if test="principalPeopleDetailSearch.allMoneyTwo != null and principalPeopleDetailSearch.allMoneyTwo != ''">
-                        AND tmps.amount_receivable <![CDATA[<]]>= #{principalPeopleDetailSearch.allMoneyTwo}
-                    </if>
-                </otherwise>
-            </choose>
-        </where>
-        ) pp where pp.allMoney is not null and pp.allMoney !=0
-        <!--    left join-->
-        <!--    &lt;!&ndash;          判断来款项目的来款年份&ndash;&gt;-->
-        <!--   (select pwgs.id as id,max(ppr.payment_date) as payment_date-->
-        <!--      from pay_working_group_subitem pwgs-->
-        <!--      inner join pay_payment_record ppr on(pwgs.id=ppr.project_id)-->
-        <!--      <if test="principalPeopleDetailSearch.year !='' and principalPeopleDetailSearch.year !=null">-->
-        <!--      WHERE ppr.payment_date like-->
-        <!--      concat('%',#{principalPeopleDetailSearch.year},'%')-->
-        <!--      </if>-->
-        <!--      GROUP BY pwgs.id-->
-        <!--      union ALL-->
-        <!--      SELECT-->
-        <!--      pcp.id as id,max(ppr.payment_date) as payment_date-->
-        <!--      FROM pay_common_project pcp inner JOIN   pay_payment_record ppr on(pcp.id=ppr.project_id)-->
-        <!--    <if test="principalPeopleDetailSearch.year !='' and principalPeopleDetailSearch.year !=null">-->
-        <!--        WHERE ppr.payment_date like-->
-        <!--        concat('%',#{principalPeopleDetailSearch.year},'%')-->
-        <!--    </if>-->
-        <!--      group by pcp.id-->
-        <!--      union all-->
-        <!--      SELECT-->
-        <!--      pmps.id as id,max(ppr.payment_date) as payment_date from-->
-        <!--       pay_member_project_subitem pmps  inner join pay_payment_record ppr on(pmps.id=ppr.project_id)-->
-        <!--    <if test="principalPeopleDetailSearch.year !='' and principalPeopleDetailSearch.year !=null">-->
-        <!--        WHERE ppr.payment_date like-->
-        <!--        concat('%',#{principalPeopleDetailSearch.year},'%')-->
-        <!--    </if>-->
-        <!--      group by pmps.id-->
-        <!--      union all-->
-        <!--      SELECT-->
-        <!--      pms.id as id ,max(ppr.payment_date) as payment_date  from pay_meeting_situation  pms inner join  pay_payment_record ppr on (pms.id=ppr.project_id)-->
-        <!--    <if test="principalPeopleDetailSearch.year !='' and principalPeopleDetailSearch.year !=null">-->
-        <!--        WHERE ppr.payment_date like-->
-        <!--        concat('%',#{principalPeopleDetailSearch.year},'%')-->
-        <!--    </if>-->
-        <!--      group by pms.id-->
-        <!--    union all-->
-        <!--    SELECT-->
-        <!--    tmps.id as id ,max(ppr.payment_date) as payment_date  from tb_member_project_subitem  tmps inner join  pay_payment_record ppr on (tmps.id=ppr.project_id)-->
-        <!--    <if test="principalPeopleDetailSearch.year !='' and principalPeopleDetailSearch.year !=null">-->
-        <!--        WHERE ppr.payment_date like-->
-        <!--        concat('%',#{principalPeopleDetailSearch.year},'%')-->
-        <!--    </if>-->
-        <!--    group by tmps.id-->
-        <!--    union all-->
-        <!--    SELECT-->
-        <!--    tmps.id as id ,max(ppr.payment_date) as payment_date  from tb_certificate_payment  tmps inner join  pay_payment_record ppr on (tmps.id=ppr.project_id)-->
-        <!--    <if test="principalPeopleDetailSearch.year !='' and principalPeopleDetailSearch.year !=null">-->
-        <!--        WHERE ppr.payment_date like-->
-        <!--        concat('%',#{principalPeopleDetailSearch.year},'%')-->
-        <!--    </if>-->
-        <!--    group by tmps.id-->
-        <!--      ) pprr on(pp.id=pprr.id)-->
-        <!--      order by pprr.payment_date desc-->
+        ) pp
     </select>
     <!--    个人来款详情导出ids-->
     <select id="queryPageListForPrincipalDetailTwo" resultType="com.jero.statistics.entity.PrincipalPeopleDetail">
@@ -2083,7 +1544,7 @@
         chargeCompanyName,allMoney,comeAllMoney,createTime,
         CONCAT(CAST(ROUND((comeAllMoney/allMoney)*100,2) AS CHAR),'%') AS finishRate from
         (select
-        chargeCompanyTemporaryId,chargeCompanyTemporaryName,SUM(allMoney) as allMoney,sum(comeAllMoney) as comeAllMoney,
+        chargeCompanyId as chargeCompanyTemporaryId,chargeCompanyTemporaryName,SUM(allMoney) as allMoney,sum(comeAllMoney) as comeAllMoney,
         createTime
         from
         v_statistical v
@@ -2099,10 +1560,10 @@
                 concat(#{companyComeMoneySearch.year},'%')
             </if>
             <if test="companyComeMoneySearch.chargeCompanyId != null and companyComeMoneySearch.chargeCompanyId != ''">
-                AND chargeCompanyTemporaryId = #{companyComeMoneySearch.chargeCompanyId}
+                AND chargeCompanyId = #{companyComeMoneySearch.chargeCompanyId}
             </if>
         </where>
-        group by v.chargeCompanyTemporaryId
+        group by chargeCompanyId
         ) ppp
         <where>
             <choose>
@@ -2141,10 +1602,10 @@
                 concat(#{companyComeMoneySearch.year},'%')
             </if>
             <if test="companyComeMoneySearch.chargeCompanyId != null and companyComeMoneySearch.chargeCompanyId != ''">
-                AND chargeCompanyTemporaryId = #{companyComeMoneySearch.chargeCompanyId}
+                AND chargeCompanyId = #{companyComeMoneySearch.chargeCompanyId}
             </if>
         </where>
-        group by v.chargeCompanyTemporaryId
+        group by chargeCompanyId
         ) ppp
         <where>
             <choose>
@@ -2277,679 +1738,97 @@
 
 <!--    企业来款详情统计-->
     <select id="queryPageListForCompanyDetail" resultType="com.jero.statistics.entity.CompanyComeMoneyDetail">
-        select  pp.projectId,pp.projectName,pp.allMoney,pp.comeAllMoney,pp.chargeUse,if(pp.pack=0,'否','是') as packText,pp.pack  from  (SELECT
-        pwgs.create_time as createTime,
-        pwgs.id AS projectId,
-        pwg.working_group_project as projectName,
-        pwgs.receivable_amount AS allMoney,
-        pwgs.paid_amount AS comeAllMoney,
-        pwgs.charge_use as chargeUse,
-        pwgs.pack
-        FROM pay_working_group_subitem pwgs
-        left join pay_working_group pwg on (pwgs.working_group_id=pwg.id)
+        select  projectId,projectName,allMoney,comeAllMoney,chargeUse,packText,pack
+        from
+        v_statistical
         <where>
-            pwgs.charge_company_id = #{CompanyComeMoneyDetailSearch.chargeCompanyId}
+            chargeCompanyId = #{CompanyComeMoneyDetailSearch.chargeCompanyId}
             <if test="idList != null and idList != ''">
-                and pwg.principal_id_a in
-                <foreach item="item" open="(" separator="," close=")" collection="idList">
-                    #{item}
-                </foreach>
-            </if>
-            <if test="CompanyComeMoneyDetailSearch.year != null and CompanyComeMoneyDetailSearch.year != ''">
-                AND pwg.year LIKE
-                concat(#{CompanyComeMoneyDetailSearch.year},'%')
-            </if>
-            <if test="CompanyComeMoneyDetailSearch.projectName != null and CompanyComeMoneyDetailSearch.projectName != ''">
-                AND pwg.working_group_project LIKE
-                concat('%',concat(#{CompanyComeMoneyDetailSearch.projectName},'%'))
-            </if>
-            <if test="CompanyComeMoneyDetailSearch.chargeUse != null and CompanyComeMoneyDetailSearch.chargeUse != ''">
-                AND pwgs.charge_use=#{CompanyComeMoneyDetailSearch.chargeUse}
-            </if>
-            <if test="CompanyComeMoneyDetailSearch.inAccountStatue != null and CompanyComeMoneyDetailSearch.inAccountStatue != ''">
-                AND pwgs.in_account=#{CompanyComeMoneyDetailSearch.inAccountStatue}
-            </if>
-            <choose>
-                <when test="CompanyComeMoneyDetailSearch.allMoney != null and CompanyComeMoneyDetailSearch.allMoney != '' and CompanyComeMoneyDetailSearch.allMoneyTwo != null and CompanyComeMoneyDetailSearch.allMoneyTwo != ''">
-                    AND pwgs.receivable_amount >= #{CompanyComeMoneyDetailSearch.allMoney} and
-                    pwgs.receivable_amount <![CDATA[<]]>=  #{CompanyComeMoneyDetailSearch.allMoneyTwo}
-                </when>
-                <otherwise>
-                    <if test="CompanyComeMoneyDetailSearch.allMoney != null and CompanyComeMoneyDetailSearch.allMoney != ''">
-                        AND pwgs.receivable_amount >= #{CompanyComeMoneyDetailSearch.allMoney}
-                    </if>
-                    <if test="CompanyComeMoneyDetailSearch.allMoneyTwo != null and CompanyComeMoneyDetailSearch.allMoneyTwo != ''">
-                        AND pwgs.receivable_amount <![CDATA[<]]>= #{CompanyComeMoneyDetailSearch.allMoneyTwo}
-                    </if>
-                </otherwise>
-            </choose>
-        </where>
-        union ALL
-        SELECT
-        pcp.create_time as createTime,
-        pcp.id AS projectId,
-        pcp.charge_project as projectName,
-        pcp.receivable_amount AS allMoney,
-        pcp.paid_amount AS comeAllMoney,
-        pcp.charge_use as chargeUse,
-        pcp.pack
-        FROM pay_common_project pcp
-        <where>
-            pcp.charge_company_id = #{CompanyComeMoneyDetailSearch.chargeCompanyId}
-            <if test="idList != null and idList != ''">
-               and PCP.principal_id in
-                <foreach item="item" open="(" separator="," close=")" collection="idList">
-                    #{item}
-                </foreach>
-            </if>
-            <if test="CompanyComeMoneyDetailSearch.year != null and CompanyComeMoneyDetailSearch.year != ''">
-                AND pcp.year LIKE
-                concat(#{CompanyComeMoneyDetailSearch.year},'%')
-            </if>
-            <if test="CompanyComeMoneyDetailSearch.projectName != null and CompanyComeMoneyDetailSearch.projectName != ''">
-                AND pcp.charge_project LIKE
-                concat('%',concat(#{CompanyComeMoneyDetailSearch.projectName},'%'))
-            </if>
-            <if test="CompanyComeMoneyDetailSearch.chargeUse != null and CompanyComeMoneyDetailSearch.chargeUse != ''">
-                AND pcp.charge_use=#{CompanyComeMoneyDetailSearch.chargeUse}
-            </if>
-            <if test="CompanyComeMoneyDetailSearch.inAccountStatue != null and CompanyComeMoneyDetailSearch.inAccountStatue != ''">
-                AND pcp.in_account=#{CompanyComeMoneyDetailSearch.inAccountStatue}
-            </if>
-            <choose>
-                <when test="CompanyComeMoneyDetailSearch.allMoney != null and CompanyComeMoneyDetailSearch.allMoney != '' and CompanyComeMoneyDetailSearch.allMoneyTwo != null and CompanyComeMoneyDetailSearch.allMoneyTwo != ''">
-                    AND  pcp.receivable_amount >= #{CompanyComeMoneyDetailSearch.allMoney} and pcp.receivable_amount <![CDATA[<]]>=
-                    #{CompanyComeMoneyDetailSearch.allMoneyTwo}
-                </when>
-                <otherwise>
-                    <if test="CompanyComeMoneyDetailSearch.allMoney != null and CompanyComeMoneyDetailSearch.allMoney != ''">
-                        AND pcp.receivable_amount >= #{CompanyComeMoneyDetailSearch.allMoney}
-                    </if>
-                    <if test="CompanyComeMoneyDetailSearch.allMoneyTwo != null and CompanyComeMoneyDetailSearch.allMoneyTwo != ''">
-                        AND pcp.receivable_amount <![CDATA[<]]>= #{CompanyComeMoneyDetailSearch.allMoneyTwo}
-                    </if>
-                </otherwise>
-            </choose>
-        </where>
-        union ALL
-        SELECT
-        pms.create_time as createTime,
-        pms.id AS projectId,
-        pm.meeting_name as projectName,
-        pms.amount_receivable AS allMoney,
-        pms.paid_amount AS comeAllMoney,
-        pms.charge_use as chargeUse,
-        pms.pack
-        FROM pay_meeting pm right join pay_meeting_situation pms on(pm.id=pms.meeting_id)
-        <where>
-            pms.company_id = #{CompanyComeMoneyDetailSearch.chargeCompanyId}
-            <if test="idList != null and idList != ''">
-              and  pm.director_id in
-                <foreach item="item" open="(" separator="," close=")" collection="idList">
-                    #{item}
-                </foreach>
-            </if>
-            <if test="CompanyComeMoneyDetailSearch.year != null and CompanyComeMoneyDetailSearch.year != ''">
-                AND pm.particular_year LIKE
-                concat(#{CompanyComeMoneyDetailSearch.year},'%')
-            </if>
-            <if test="CompanyComeMoneyDetailSearch.projectName != null and CompanyComeMoneyDetailSearch.projectName != ''">
-                AND pm.meeting_name LIKE
-                concat('%',concat(#{CompanyComeMoneyDetailSearch.projectName},'%'))
-            </if>
-            <if test="CompanyComeMoneyDetailSearch.chargeUse != null and CompanyComeMoneyDetailSearch.chargeUse != ''">
-                AND pms.charge_use=#{CompanyComeMoneyDetailSearch.chargeUse}
-            </if>
-            <if test="CompanyComeMoneyDetailSearch.inAccountStatue != null and CompanyComeMoneyDetailSearch.inAccountStatue != ''">
-                AND pms.in_account=#{CompanyComeMoneyDetailSearch.inAccountStatue}
-            </if>
-            <choose>
-                <when test="CompanyComeMoneyDetailSearch.allMoney != null and CompanyComeMoneyDetailSearch.allMoney != '' and CompanyComeMoneyDetailSearch.allMoneyTwo != null and CompanyComeMoneyDetailSearch.allMoneyTwo != ''">
-                    AND  pms.amount_receivable >= #{CompanyComeMoneyDetailSearch.allMoney} and pms.amount_receivable <![CDATA[<]]>=
-                    #{CompanyComeMoneyDetailSearch.allMoneyTwo}
-                </when>
-                <otherwise>
-                    <if test="CompanyComeMoneyDetailSearch.allMoney != null and CompanyComeMoneyDetailSearch.allMoney != ''">
-                        AND pms.amount_receivable >= #{CompanyComeMoneyDetailSearch.allMoney}
-                    </if>
-                    <if test="CompanyComeMoneyDetailSearch.allMoneyTwo != null and CompanyComeMoneyDetailSearch.allMoneyTwo != ''">
-                        AND pms.amount_receivable <![CDATA[<]]>= #{CompanyComeMoneyDetailSearch.allMoneyTwo}
-                    </if>
-                </otherwise>
-            </choose>
-        </where>
-        union ALL
-        SELECT
-        pmps.create_time as createTime,
-        pmps.id AS projectId,
-        pmp.project_name as projectName,
-        pmps.amount_receivable AS allMoney,
-        pmps.paid_amount AS comeAllMoney,
-        pmps.charge_use as chargeUse,
-        pmps.pack
-        FROM pay_member_project pmp right join pay_member_project_subitem pmps on(pmp.id=pmps.project_id)
-        <where>
-            pmps.company_id = #{CompanyComeMoneyDetailSearch.chargeCompanyId}
-            <if test="idList != null and idList != ''">
-               and pmp.director_id in
-                <foreach item="item" open="(" separator="," close=")" collection="idList">
-                    #{item}
-                </foreach>
-            </if>
-            <if test="CompanyComeMoneyDetailSearch.year != null and CompanyComeMoneyDetailSearch.year != ''">
-                AND pmp.particular_year LIKE
-                concat(#{CompanyComeMoneyDetailSearch.year},'%')
-            </if>
-            <if test="CompanyComeMoneyDetailSearch.projectName != null and CompanyComeMoneyDetailSearch.projectName != ''">
-                AND pmp.project_name LIKE
-                concat('%',concat(#{CompanyComeMoneyDetailSearch.projectName},'%'))
-            </if>
-            <if test="CompanyComeMoneyDetailSearch.chargeUse != null and CompanyComeMoneyDetailSearch.chargeUse != ''">
-                AND pmps.charge_use=#{CompanyComeMoneyDetailSearch.chargeUse}
-            </if>
-            <if test="CompanyComeMoneyDetailSearch.inAccountStatue != null and CompanyComeMoneyDetailSearch.inAccountStatue != ''">
-                AND pmps.in_account=#{CompanyComeMoneyDetailSearch.inAccountStatue}
-            </if>
-            <choose>
-                <when test="CompanyComeMoneyDetailSearch.allMoney != null and CompanyComeMoneyDetailSearch.allMoney != '' and CompanyComeMoneyDetailSearch.allMoneyTwo != null and CompanyComeMoneyDetailSearch.allMoneyTwo != ''">
-                    AND  pmps.amount_receivable >= #{CompanyComeMoneyDetailSearch.allMoney} and pmps.amount_receivable <![CDATA[<]]>=
-                    #{CompanyComeMoneyDetailSearch.allMoneyTwo}
-                </when>
-                <otherwise>
-                    <if test="CompanyComeMoneyDetailSearch.allMoney != null and CompanyComeMoneyDetailSearch.allMoney != ''">
-                        AND pmps.amount_receivable >= #{CompanyComeMoneyDetailSearch.allMoney}
-                    </if>
-                    <if test="CompanyComeMoneyDetailSearch.allMoneyTwo != null and CompanyComeMoneyDetailSearch.allMoneyTwo != ''">
-                        AND pmps.amount_receivable <![CDATA[<]]>= #{CompanyComeMoneyDetailSearch.allMoneyTwo}
-                    </if>
-                </otherwise>
-            </choose>
-        </where>
-        union all
-        SELECT
-        tmps.create_time as createTime,
-        tmps.id AS projectId,
-        tmp.project_name AS projectName,
-        tmps.amount_receivable as allMoney,
-        tmps.paid_amount as comeAllMoney,
-        tmps.charge_use as chargeUse,
-        tmps.pack
-        FROM tb_member_project tmp left join  tb_member_project_subitem  tmps on(tmp.id=tmps.project_id)
-        <where>
-            tmps.company_id = #{CompanyComeMoneyDetailSearch.chargeCompanyId}
-            <if test="idList != null and idList != ''">
-                and tmp.director_id in
+                and principalNameId in
                 <foreach item="item" open="(" separator="," close=")" collection="idList">
                     #{item}
                 </foreach>
             </if>
             <if test="CompanyComeMoneyDetailSearch.projectName != null and CompanyComeMoneyDetailSearch.projectName != ''">
-                AND tmp.project_name LIKE
-                concat('%',concat(#{CompanyComeMoneyDetailSearch.projectName},'%'))
+                AND projectName LIKE
+                concat('%'#{CompanyComeMoneyDetailSearch.projectName},'%')
+            </if>
+
+            <if test="CompanyComeMoneyDetailSearch.inAccountStatue != null and CompanyComeMoneyDetailSearch.inAccountStatue != ''">
+                AND payStatue =#{CompanyComeMoneyDetailSearch.inAccountStatue}
             </if>
             <if test="CompanyComeMoneyDetailSearch.year != null and CompanyComeMoneyDetailSearch.year != ''">
-                AND tmp.year LIKE
-                concat(#{CompanyComeMoneyDetailSearch.year},'%')
-            </if>
-            <if test="CompanyComeMoneyDetailSearch.inAccountStatue != null and CompanyComeMoneyDetailSearch.inAccountStatue != ''">
-                AND tmps.in_account =#{CompanyComeMoneyDetailSearch.inAccountStatue}
+                AND year LIKE
+                concat('%',#{CompanyComeMoneyDetailSearch.year},'%')
             </if>
 
             <if test="CompanyComeMoneyDetailSearch.chargeUse != null and CompanyComeMoneyDetailSearch.chargeUse != ''">
-                AND tmps.charge_use=#{CompanyComeMoneyDetailSearch.chargeUse}
+                AND chargeUse=#{CompanyComeMoneyDetailSearch.chargeUse}
             </if>
 
             <choose>
                 <when test="CompanyComeMoneyDetailSearch.allMoney != null and CompanyComeMoneyDetailSearch.allMoney != '' and CompanyComeMoneyDetailSearch.allMoneyTwo != null and CompanyComeMoneyDetailSearch.allMoneyTwo != ''">
-                    AND tmps.amount_receivable >= #{CompanyComeMoneyDetailSearch.allMoney} and tmps.amount_receivable <![CDATA[<]]>=
+                    AND allMoney >= #{CompanyComeMoneyDetailSearch.allMoney} and allMoney <![CDATA[<]]>=
                     #{CompanyComeMoneyDetailSearch.allMoneyTwo}
                 </when>
                 <otherwise>
                     <if test="CompanyComeMoneyDetailSearch.allMoney != null and CompanyComeMoneyDetailSearch.allMoney != ''">
-                        AND tmps.amount_receivable >= #{CompanyComeMoneyDetailSearch.allMoney}
+                        AND allMoney >= #{CompanyComeMoneyDetailSearch.allMoney}
                     </if>
                     <if test="CompanyComeMoneyDetailSearch.allMoneyTwo != null and CompanyComeMoneyDetailSearch.allMoneyTwo != ''">
-                        AND tmps.amount_receivable <![CDATA[<]]>= #{CompanyComeMoneyDetailSearch.allMoneyTwo}
+                        AND allMoney <![CDATA[<]]>= #{CompanyComeMoneyDetailSearch.allMoneyTwo}
                     </if>
                 </otherwise>
             </choose>
         </where>
-        union all
-        SELECT
-        tmps.create_time as createTime,
-        tmps.id AS projectId,
-        tmp.project_name AS projectName,
-        tmps.amount_receivable as allMoney,
-        tmps.paid_amount as comeAllMoney,
-        tmps.charge_use as chargeUse,
-        tmps.pack
-        FROM tb_member_project tmp left join  tb_certificate_payment  tmps on(tmp.id=tmps.project_id)
-        <where>
-            tmps.company_id = #{CompanyComeMoneyDetailSearch.chargeCompanyId}
-            <if test="idList != null and idList != ''">
-                and tmp.director_id in
-                <foreach item="item" open="(" separator="," close=")" collection="idList">
-                    #{item}
-                </foreach>
-            </if>
-            <if test="CompanyComeMoneyDetailSearch.projectName != null and CompanyComeMoneyDetailSearch.projectName != ''">
-                AND tmp.project_name LIKE
-                concat('%',concat(#{CompanyComeMoneyDetailSearch.projectName},'%'))
-            </if>
-
-            <if test="CompanyComeMoneyDetailSearch.inAccountStatue != null and CompanyComeMoneyDetailSearch.inAccountStatue != ''">
-                AND tmps.in_account =#{CompanyComeMoneyDetailSearch.inAccountStatue}
-            </if>
-            <if test="CompanyComeMoneyDetailSearch.year != null and CompanyComeMoneyDetailSearch.year != ''">
-                AND tmp.year LIKE
-                concat(#{CompanyComeMoneyDetailSearch.year},'%')
-            </if>
-
-            <if test="CompanyComeMoneyDetailSearch.chargeUse != null and CompanyComeMoneyDetailSearch.chargeUse != ''">
-                AND tmps.charge_use=#{CompanyComeMoneyDetailSearch.chargeUse}
-            </if>
-
-            <choose>
-                <when test="CompanyComeMoneyDetailSearch.allMoney != null and CompanyComeMoneyDetailSearch.allMoney != '' and CompanyComeMoneyDetailSearch.allMoneyTwo != null and CompanyComeMoneyDetailSearch.allMoneyTwo != ''">
-                    AND tmps.amount_receivable >= #{CompanyComeMoneyDetailSearch.allMoney} and tmps.amount_receivable <![CDATA[<]]>=
-                    #{CompanyComeMoneyDetailSearch.allMoneyTwo}
-                </when>
-                <otherwise>
-                    <if test="CompanyComeMoneyDetailSearch.allMoney != null and CompanyComeMoneyDetailSearch.allMoney != ''">
-                        AND tmps.amount_receivable >= #{CompanyComeMoneyDetailSearch.allMoney}
-                    </if>
-                    <if test="CompanyComeMoneyDetailSearch.allMoneyTwo != null and CompanyComeMoneyDetailSearch.allMoneyTwo != ''">
-                        AND tmps.amount_receivable <![CDATA[<]]>= #{CompanyComeMoneyDetailSearch.allMoneyTwo}
-                    </if>
-                </otherwise>
-            </choose>
-        </where>
-        ) pp where pp.allMoney is not null and pp.allMoney !=0
-<!--        left join-->
-<!--        (select pwgs.id as id,max(ppr.payment_date) as payment_date-->
-<!--        from pay_working_group_subitem pwgs-->
-<!--        inner join pay_payment_record ppr on(pwgs.id=ppr.project_id)-->
-<!--        <if test="CompanyComeMoneyDetailSearch.year !='' and CompanyComeMoneyDetailSearch.year !=null">-->
-<!--            WHERE ppr.payment_date like concat('%',#{CompanyComeMoneyDetailSearch.year},'%')-->
-<!--        </if>-->
-<!--        GROUP BY pwgs.id-->
-<!--        union ALL-->
-<!--        SELECT-->
-<!--        pcp.id as id,max(ppr.payment_date) as payment_date-->
-<!--        FROM pay_common_project pcp inner JOIN   pay_payment_record ppr on(pcp.id=ppr.project_id)-->
-<!--        <if test="CompanyComeMoneyDetailSearch.year !='' and CompanyComeMoneyDetailSearch.year !=null">-->
-<!--            WHERE ppr.payment_date like concat('%',#{CompanyComeMoneyDetailSearch.year},'%')-->
-<!--        </if>-->
-<!--        group by pcp.id-->
-<!--        union all-->
-<!--        SELECT-->
-<!--        pmps.id as id,max(ppr.payment_date) as payment_date from-->
-<!--        pay_member_project_subitem pmps  inner join pay_payment_record ppr on(pmps.id=ppr.project_id)-->
-<!--        <if test="CompanyComeMoneyDetailSearch.year !='' and CompanyComeMoneyDetailSearch.year !=null">-->
-<!--            WHERE ppr.payment_date like concat('%',#{CompanyComeMoneyDetailSearch.year},'%')-->
-<!--        </if>-->
-<!--        group by pmps.id-->
-<!--        union all-->
-<!--        SELECT-->
-<!--        pms.id as id,max(ppr.payment_date) as payment_date from pay_meeting_situation  pms inner join  pay_payment_record ppr on (pms.id=ppr.project_id)-->
-<!--        <if test="CompanyComeMoneyDetailSearch.year !='' and CompanyComeMoneyDetailSearch.year !=null">-->
-<!--            WHERE ppr.payment_date like concat('%',#{CompanyComeMoneyDetailSearch.year},'%')-->
-<!--        </if>-->
-<!--        group by pms.id-->
-<!--        union all-->
-<!--        SELECT-->
-<!--        tmps.id,max(ppr.payment_date) as payment_date from tb_member_project_subitem  tmps inner join  pay_payment_record ppr on(tmps.id=ppr.project_id)-->
-<!--        <if test="CompanyComeMoneyDetailSearch.year !='' and CompanyComeMoneyDetailSearch.year !=null">-->
-<!--            WHERE ppr.payment_date like concat('%',#{CompanyComeMoneyDetailSearch.year},'%')-->
-<!--        </if>-->
-<!--        group by tmps.id-->
-<!--        union all-->
-<!--        SELECT-->
-<!--        tmps.id,max(ppr.payment_date) as payment_date from tb_certificate_payment  tmps inner join  pay_payment_record ppr on(tmps.id=ppr.project_id)-->
-<!--        <if test="CompanyComeMoneyDetailSearch.year !='' and CompanyComeMoneyDetailSearch.year !=null">-->
-<!--            WHERE ppr.payment_date like concat('%',#{CompanyComeMoneyDetailSearch.year},'%')-->
-<!--        </if>-->
-<!--        group by tmps.id-->
-<!--        ) pprr on(pp.projectId=pprr.id)-->
-<!--        order by pprr.payment_date desc-->
     </select>
     <!--    企业来款详情统计总金额-->
     <select id="queryPageListForCompanyDetail33" resultType="com.jero.statistics.entity.AllMoney">
-        select  sum(allMoney) as allMoney,sum(comeAllMoney) as comeAllMoney from  (SELECT
-        pwgs.create_time as createTime,
-        pwgs.id AS projectId,
-        pwg.working_group_project as projectName,
-        pwgs.receivable_amount AS allMoney,
-        pwgs.paid_amount AS comeAllMoney,
-        pwgs.charge_use as chargeUse,
-        pwgs.pack
-        FROM pay_working_group_subitem pwgs
-        left join pay_working_group pwg on (pwgs.working_group_id=pwg.id)
+        select  sum(allMoney) as allMoney,sum(comeAllMoney) as comeAllMoney from  (
+        select  projectId,projectName,allMoney,comeAllMoney,chargeUse,packText,pack
+        from
+        v_statistical
         <where>
-            pwgs.charge_company_id = #{CompanyComeMoneyDetailSearch.chargeCompanyId}
+            chargeCompanyId = #{CompanyComeMoneyDetailSearch.chargeCompanyId}
             <if test="idList != null and idList != ''">
-                and pwg.principal_id_a in
-                <foreach item="item" open="(" separator="," close=")" collection="idList">
-                    #{item}
-                </foreach>
-            </if>
-            <if test="CompanyComeMoneyDetailSearch.year != null and CompanyComeMoneyDetailSearch.year != ''">
-                AND pwg.year LIKE
-                concat(#{CompanyComeMoneyDetailSearch.year},'%')
-            </if>
-            <if test="CompanyComeMoneyDetailSearch.projectName != null and CompanyComeMoneyDetailSearch.projectName != ''">
-                AND pwg.working_group_project LIKE
-                concat('%',concat(#{CompanyComeMoneyDetailSearch.projectName},'%'))
-            </if>
-            <if test="CompanyComeMoneyDetailSearch.chargeUse != null and CompanyComeMoneyDetailSearch.chargeUse != ''">
-                AND pwgs.charge_use=#{CompanyComeMoneyDetailSearch.chargeUse}
-            </if>
-            <if test="CompanyComeMoneyDetailSearch.inAccountStatue != null and CompanyComeMoneyDetailSearch.inAccountStatue != ''">
-                AND pwgs.in_account=#{CompanyComeMoneyDetailSearch.inAccountStatue}
-            </if>
-            <choose>
-                <when test="CompanyComeMoneyDetailSearch.allMoney != null and CompanyComeMoneyDetailSearch.allMoney != '' and CompanyComeMoneyDetailSearch.allMoneyTwo != null and CompanyComeMoneyDetailSearch.allMoneyTwo != ''">
-                    AND pwgs.receivable_amount >= #{CompanyComeMoneyDetailSearch.allMoney} and
-                    pwgs.receivable_amount <![CDATA[<]]>=  #{CompanyComeMoneyDetailSearch.allMoneyTwo}
-                </when>
-                <otherwise>
-                    <if test="CompanyComeMoneyDetailSearch.allMoney != null and CompanyComeMoneyDetailSearch.allMoney != ''">
-                        AND pwgs.receivable_amount >= #{CompanyComeMoneyDetailSearch.allMoney}
-                    </if>
-                    <if test="CompanyComeMoneyDetailSearch.allMoneyTwo != null and CompanyComeMoneyDetailSearch.allMoneyTwo != ''">
-                        AND pwgs.receivable_amount <![CDATA[<]]>= #{CompanyComeMoneyDetailSearch.allMoneyTwo}
-                    </if>
-                </otherwise>
-            </choose>
-        </where>
-        union ALL
-        SELECT
-        pcp.create_time as createTime,
-        pcp.id AS projectId,
-        pcp.charge_project as projectName,
-        pcp.receivable_amount AS allMoney,
-        pcp.paid_amount AS comeAllMoney,
-        pcp.charge_use as chargeUse,
-        pcp.pack
-        FROM pay_common_project pcp
-        <where>
-            pcp.charge_company_id = #{CompanyComeMoneyDetailSearch.chargeCompanyId}
-            <if test="idList != null and idList != ''">
-                and pcp.principal_id in
-                <foreach item="item" open="(" separator="," close=")" collection="idList">
-                    #{item}
-                </foreach>
-            </if>
-            <if test="CompanyComeMoneyDetailSearch.year != null and CompanyComeMoneyDetailSearch.year != ''">
-                AND pcp.year LIKE
-                concat(#{CompanyComeMoneyDetailSearch.year},'%')
-            </if>
-            <if test="CompanyComeMoneyDetailSearch.projectName != null and CompanyComeMoneyDetailSearch.projectName != ''">
-                AND pcp.charge_project LIKE
-                concat('%',concat(#{CompanyComeMoneyDetailSearch.projectName},'%'))
-            </if>
-            <if test="CompanyComeMoneyDetailSearch.chargeUse != null and CompanyComeMoneyDetailSearch.chargeUse != ''">
-                AND pcp.charge_use=#{CompanyComeMoneyDetailSearch.chargeUse}
-            </if>
-            <if test="CompanyComeMoneyDetailSearch.inAccountStatue != null and CompanyComeMoneyDetailSearch.inAccountStatue != ''">
-                AND pcp.in_account=#{CompanyComeMoneyDetailSearch.inAccountStatue}
-            </if>
-            <choose>
-                <when test="CompanyComeMoneyDetailSearch.allMoney != null and CompanyComeMoneyDetailSearch.allMoney != '' and CompanyComeMoneyDetailSearch.allMoneyTwo != null and CompanyComeMoneyDetailSearch.allMoneyTwo != ''">
-                    AND  pcp.receivable_amount >= #{CompanyComeMoneyDetailSearch.allMoney} and pcp.receivable_amount <![CDATA[<]]>=
-                    #{CompanyComeMoneyDetailSearch.allMoneyTwo}
-                </when>
-                <otherwise>
-                    <if test="CompanyComeMoneyDetailSearch.allMoney != null and CompanyComeMoneyDetailSearch.allMoney != ''">
-                        AND pcp.receivable_amount >= #{CompanyComeMoneyDetailSearch.allMoney}
-                    </if>
-                    <if test="CompanyComeMoneyDetailSearch.allMoneyTwo != null and CompanyComeMoneyDetailSearch.allMoneyTwo != ''">
-                        AND pcp.receivable_amount <![CDATA[<]]>= #{CompanyComeMoneyDetailSearch.allMoneyTwo}
-                    </if>
-                </otherwise>
-            </choose>
-        </where>
-        union ALL
-        SELECT
-        pms.create_time as createTime,
-        pms.id AS projectId,
-        pm.meeting_name as projectName,
-        pms.amount_receivable AS allMoney,
-        pms.paid_amount AS comeAllMoney,
-        pms.charge_use as chargeUse,
-        pms.pack
-        FROM pay_meeting pm right join pay_meeting_situation pms on(pm.id=pms.meeting_id)
-        <where>
-            pms.company_id = #{CompanyComeMoneyDetailSearch.chargeCompanyId}
-            <if test="idList != null and idList != ''">
-                and  pm.director_id in
-                <foreach item="item" open="(" separator="," close=")" collection="idList">
-                    #{item}
-                </foreach>
-            </if>
-            <if test="CompanyComeMoneyDetailSearch.year != null and CompanyComeMoneyDetailSearch.year != ''">
-                AND pm.particular_year LIKE
-                concat(#{CompanyComeMoneyDetailSearch.year},'%')
-            </if>
-            <if test="CompanyComeMoneyDetailSearch.projectName != null and CompanyComeMoneyDetailSearch.projectName != ''">
-                AND pm.meeting_name LIKE
-                concat('%',concat(#{CompanyComeMoneyDetailSearch.projectName},'%'))
-            </if>
-            <if test="CompanyComeMoneyDetailSearch.chargeUse != null and CompanyComeMoneyDetailSearch.chargeUse != ''">
-                AND pms.charge_use=#{CompanyComeMoneyDetailSearch.chargeUse}
-            </if>
-            <if test="CompanyComeMoneyDetailSearch.inAccountStatue != null and CompanyComeMoneyDetailSearch.inAccountStatue != ''">
-                AND pms.in_account=#{CompanyComeMoneyDetailSearch.inAccountStatue}
-            </if>
-            <choose>
-                <when test="CompanyComeMoneyDetailSearch.allMoney != null and CompanyComeMoneyDetailSearch.allMoney != '' and CompanyComeMoneyDetailSearch.allMoneyTwo != null and CompanyComeMoneyDetailSearch.allMoneyTwo != ''">
-                    AND  pms.amount_receivable >= #{CompanyComeMoneyDetailSearch.allMoney} and pms.amount_receivable <![CDATA[<]]>=
-                    #{CompanyComeMoneyDetailSearch.allMoneyTwo}
-                </when>
-                <otherwise>
-                    <if test="CompanyComeMoneyDetailSearch.allMoney != null and CompanyComeMoneyDetailSearch.allMoney != ''">
-                        AND pms.amount_receivable >= #{CompanyComeMoneyDetailSearch.allMoney}
-                    </if>
-                    <if test="CompanyComeMoneyDetailSearch.allMoneyTwo != null and CompanyComeMoneyDetailSearch.allMoneyTwo != ''">
-                        AND pms.amount_receivable <![CDATA[<]]>= #{CompanyComeMoneyDetailSearch.allMoneyTwo}
-                    </if>
-                </otherwise>
-            </choose>
-        </where>
-        union ALL
-        SELECT
-        pmps.create_time as createTime,
-        pmps.id AS projectId,
-        pmp.project_name as projectName,
-        pmps.amount_receivable AS allMoney,
-        pmps.paid_amount AS comeAllMoney,
-        pmps.charge_use as chargeUse,
-        pmps.pack
-        FROM pay_member_project pmp right join pay_member_project_subitem pmps on(pmp.id=pmps.project_id)
-        <where>
-            pmps.company_id = #{CompanyComeMoneyDetailSearch.chargeCompanyId}
-            <if test="idList != null and idList != ''">
-                and pmp.director_id in
-                <foreach item="item" open="(" separator="," close=")" collection="idList">
-                    #{item}
-                </foreach>
-            </if>
-            <if test="CompanyComeMoneyDetailSearch.year != null and CompanyComeMoneyDetailSearch.year != ''">
-                AND pmp.particular_year LIKE
-                concat(#{CompanyComeMoneyDetailSearch.year},'%')
-            </if>
-            <if test="CompanyComeMoneyDetailSearch.projectName != null and CompanyComeMoneyDetailSearch.projectName != ''">
-                AND pmp.project_name LIKE
-                concat('%',concat(#{CompanyComeMoneyDetailSearch.projectName},'%'))
-            </if>
-            <if test="CompanyComeMoneyDetailSearch.chargeUse != null and CompanyComeMoneyDetailSearch.chargeUse != ''">
-                AND pmps.charge_use=#{CompanyComeMoneyDetailSearch.chargeUse}
-            </if>
-            <if test="CompanyComeMoneyDetailSearch.inAccountStatue != null and CompanyComeMoneyDetailSearch.inAccountStatue != ''">
-                AND pmps.in_account=#{CompanyComeMoneyDetailSearch.inAccountStatue}
-            </if>
-            <choose>
-                <when test="CompanyComeMoneyDetailSearch.allMoney != null and CompanyComeMoneyDetailSearch.allMoney != '' and CompanyComeMoneyDetailSearch.allMoneyTwo != null and CompanyComeMoneyDetailSearch.allMoneyTwo != ''">
-                    AND  pmps.amount_receivable >= #{CompanyComeMoneyDetailSearch.allMoney} and pmps.amount_receivable <![CDATA[<]]>=
-                    #{CompanyComeMoneyDetailSearch.allMoneyTwo}
-                </when>
-                <otherwise>
-                    <if test="CompanyComeMoneyDetailSearch.allMoney != null and CompanyComeMoneyDetailSearch.allMoney != ''">
-                        AND pmps.amount_receivable >= #{CompanyComeMoneyDetailSearch.allMoney}
-                    </if>
-                    <if test="CompanyComeMoneyDetailSearch.allMoneyTwo != null and CompanyComeMoneyDetailSearch.allMoneyTwo != ''">
-                        AND pmps.amount_receivable <![CDATA[<]]>= #{CompanyComeMoneyDetailSearch.allMoneyTwo}
-                    </if>
-                </otherwise>
-            </choose>
-        </where>
-        union all
-        SELECT
-        tmps.create_time as createTime,
-        tmps.id AS projectId,
-        tmp.project_name AS projectName,
-        tmps.amount_receivable as allMoney,
-        tmps.paid_amount as comeAllMoney,
-        tmps.charge_use as chargeUse,
-        tmps.pack
-        FROM tb_member_project tmp left join  tb_member_project_subitem  tmps on(tmp.id=tmps.project_id)
-        <where>
-            tmps.company_id = #{CompanyComeMoneyDetailSearch.chargeCompanyId}
-            <if test="idList != null and idList != ''">
-                and tmp.director_id in
+                and principalNameId in
                 <foreach item="item" open="(" separator="," close=")" collection="idList">
                     #{item}
                 </foreach>
             </if>
             <if test="CompanyComeMoneyDetailSearch.projectName != null and CompanyComeMoneyDetailSearch.projectName != ''">
-                AND tmp.project_name LIKE
-                concat('%',concat(#{CompanyComeMoneyDetailSearch.projectName},'%'))
+                AND projectName LIKE
+                concat('%'#{CompanyComeMoneyDetailSearch.projectName},'%')
+            </if>
+
+            <if test="CompanyComeMoneyDetailSearch.inAccountStatue != null and CompanyComeMoneyDetailSearch.inAccountStatue != ''">
+                AND payStatue =#{CompanyComeMoneyDetailSearch.inAccountStatue}
             </if>
             <if test="CompanyComeMoneyDetailSearch.year != null and CompanyComeMoneyDetailSearch.year != ''">
-                AND tmp.year LIKE
-                concat(#{CompanyComeMoneyDetailSearch.year},'%')
-            </if>
-            <if test="CompanyComeMoneyDetailSearch.inAccountStatue != null and CompanyComeMoneyDetailSearch.inAccountStatue != ''">
-                AND tmps.in_account =#{CompanyComeMoneyDetailSearch.inAccountStatue}
+                AND year LIKE
+                concat('%',#{CompanyComeMoneyDetailSearch.year},'%')
             </if>
 
             <if test="CompanyComeMoneyDetailSearch.chargeUse != null and CompanyComeMoneyDetailSearch.chargeUse != ''">
-                AND tmps.charge_use=#{CompanyComeMoneyDetailSearch.chargeUse}
+                AND chargeUse=#{CompanyComeMoneyDetailSearch.chargeUse}
             </if>
 
             <choose>
                 <when test="CompanyComeMoneyDetailSearch.allMoney != null and CompanyComeMoneyDetailSearch.allMoney != '' and CompanyComeMoneyDetailSearch.allMoneyTwo != null and CompanyComeMoneyDetailSearch.allMoneyTwo != ''">
-                    AND tmps.amount_receivable >= #{CompanyComeMoneyDetailSearch.allMoney} and tmps.amount_receivable <![CDATA[<]]>=
+                    AND allMoney >= #{CompanyComeMoneyDetailSearch.allMoney} and allMoney <![CDATA[<]]>=
                     #{CompanyComeMoneyDetailSearch.allMoneyTwo}
                 </when>
                 <otherwise>
                     <if test="CompanyComeMoneyDetailSearch.allMoney != null and CompanyComeMoneyDetailSearch.allMoney != ''">
-                        AND tmps.amount_receivable >= #{CompanyComeMoneyDetailSearch.allMoney}
+                        AND allMoney >= #{CompanyComeMoneyDetailSearch.allMoney}
                     </if>
                     <if test="CompanyComeMoneyDetailSearch.allMoneyTwo != null and CompanyComeMoneyDetailSearch.allMoneyTwo != ''">
-                        AND tmps.amount_receivable <![CDATA[<]]>= #{CompanyComeMoneyDetailSearch.allMoneyTwo}
+                        AND allMoney <![CDATA[<]]>= #{CompanyComeMoneyDetailSearch.allMoneyTwo}
                     </if>
                 </otherwise>
             </choose>
         </where>
-        union all
-        SELECT
-        tmps.create_time as createTime,
-        tmps.id AS projectId,
-        tmp.project_name AS projectName,
-        tmps.amount_receivable as allMoney,
-        tmps.paid_amount as comeAllMoney,
-        tmps.charge_use as chargeUse,
-        tmps.pack
-        FROM tb_member_project tmp left join  tb_certificate_payment  tmps on(tmp.id=tmps.project_id)
-        <where>
-            tmps.company_id = #{CompanyComeMoneyDetailSearch.chargeCompanyId}
-            <if test="idList != null and idList != ''">
-                and tmp.director_id in
-                <foreach item="item" open="(" separator="," close=")" collection="idList">
-                    #{item}
-                </foreach>
-            </if>
-            <if test="CompanyComeMoneyDetailSearch.projectName != null and CompanyComeMoneyDetailSearch.projectName != ''">
-                AND tmp.project_name LIKE
-                concat('%',concat(#{CompanyComeMoneyDetailSearch.projectName},'%'))
-            </if>
-
-            <if test="CompanyComeMoneyDetailSearch.inAccountStatue != null and CompanyComeMoneyDetailSearch.inAccountStatue != ''">
-                AND tmps.in_account =#{CompanyComeMoneyDetailSearch.inAccountStatue}
-            </if>
-            <if test="CompanyComeMoneyDetailSearch.year != null and CompanyComeMoneyDetailSearch.year != ''">
-                AND tmp.year LIKE
-                concat(#{CompanyComeMoneyDetailSearch.year},'%')
-            </if>
-
-            <if test="CompanyComeMoneyDetailSearch.chargeUse != null and CompanyComeMoneyDetailSearch.chargeUse != ''">
-                AND tmps.charge_use=#{CompanyComeMoneyDetailSearch.chargeUse}
-            </if>
-
-            <choose>
-                <when test="CompanyComeMoneyDetailSearch.allMoney != null and CompanyComeMoneyDetailSearch.allMoney != '' and CompanyComeMoneyDetailSearch.allMoneyTwo != null and CompanyComeMoneyDetailSearch.allMoneyTwo != ''">
-                    AND tmps.amount_receivable >= #{CompanyComeMoneyDetailSearch.allMoney} and tmps.amount_receivable <![CDATA[<]]>=
-                    #{CompanyComeMoneyDetailSearch.allMoneyTwo}
-                </when>
-                <otherwise>
-                    <if test="CompanyComeMoneyDetailSearch.allMoney != null and CompanyComeMoneyDetailSearch.allMoney != ''">
-                        AND tmps.amount_receivable >= #{CompanyComeMoneyDetailSearch.allMoney}
-                    </if>
-                    <if test="CompanyComeMoneyDetailSearch.allMoneyTwo != null and CompanyComeMoneyDetailSearch.allMoneyTwo != ''">
-                        AND tmps.amount_receivable <![CDATA[<]]>= #{CompanyComeMoneyDetailSearch.allMoneyTwo}
-                    </if>
-                </otherwise>
-            </choose>
-        </where>
-        ) pp where pp.allMoney is not null and pp.allMoney !=0
-        <!--        left join-->
-        <!--        (select pwgs.id as id,max(ppr.payment_date) as payment_date-->
-        <!--        from pay_working_group_subitem pwgs-->
-        <!--        inner join pay_payment_record ppr on(pwgs.id=ppr.project_id)-->
-        <!--        <if test="CompanyComeMoneyDetailSearch.year !='' and CompanyComeMoneyDetailSearch.year !=null">-->
-        <!--            WHERE ppr.payment_date like concat('%',#{CompanyComeMoneyDetailSearch.year},'%')-->
-        <!--        </if>-->
-        <!--        GROUP BY pwgs.id-->
-        <!--        union ALL-->
-        <!--        SELECT-->
-        <!--        pcp.id as id,max(ppr.payment_date) as payment_date-->
-        <!--        FROM pay_common_project pcp inner JOIN   pay_payment_record ppr on(pcp.id=ppr.project_id)-->
-        <!--        <if test="CompanyComeMoneyDetailSearch.year !='' and CompanyComeMoneyDetailSearch.year !=null">-->
-        <!--            WHERE ppr.payment_date like concat('%',#{CompanyComeMoneyDetailSearch.year},'%')-->
-        <!--        </if>-->
-        <!--        group by pcp.id-->
-        <!--        union all-->
-        <!--        SELECT-->
-        <!--        pmps.id as id,max(ppr.payment_date) as payment_date from-->
-        <!--        pay_member_project_subitem pmps  inner join pay_payment_record ppr on(pmps.id=ppr.project_id)-->
-        <!--        <if test="CompanyComeMoneyDetailSearch.year !='' and CompanyComeMoneyDetailSearch.year !=null">-->
-        <!--            WHERE ppr.payment_date like concat('%',#{CompanyComeMoneyDetailSearch.year},'%')-->
-        <!--        </if>-->
-        <!--        group by pmps.id-->
-        <!--        union all-->
-        <!--        SELECT-->
-        <!--        pms.id as id,max(ppr.payment_date) as payment_date from pay_meeting_situation  pms inner join  pay_payment_record ppr on (pms.id=ppr.project_id)-->
-        <!--        <if test="CompanyComeMoneyDetailSearch.year !='' and CompanyComeMoneyDetailSearch.year !=null">-->
-        <!--            WHERE ppr.payment_date like concat('%',#{CompanyComeMoneyDetailSearch.year},'%')-->
-        <!--        </if>-->
-        <!--        group by pms.id-->
-        <!--        union all-->
-        <!--        SELECT-->
-        <!--        tmps.id,max(ppr.payment_date) as payment_date from tb_member_project_subitem  tmps inner join  pay_payment_record ppr on(tmps.id=ppr.project_id)-->
-        <!--        <if test="CompanyComeMoneyDetailSearch.year !='' and CompanyComeMoneyDetailSearch.year !=null">-->
-        <!--            WHERE ppr.payment_date like concat('%',#{CompanyComeMoneyDetailSearch.year},'%')-->
-        <!--        </if>-->
-        <!--        group by tmps.id-->
-        <!--        union all-->
-        <!--        SELECT-->
-        <!--        tmps.id,max(ppr.payment_date) as payment_date from tb_certificate_payment  tmps inner join  pay_payment_record ppr on(tmps.id=ppr.project_id)-->
-        <!--        <if test="CompanyComeMoneyDetailSearch.year !='' and CompanyComeMoneyDetailSearch.year !=null">-->
-        <!--            WHERE ppr.payment_date like concat('%',#{CompanyComeMoneyDetailSearch.year},'%')-->
-        <!--        </if>-->
-        <!--        group by tmps.id-->
-        <!--        ) pprr on(pp.projectId=pprr.id)-->
-        <!--        order by pprr.payment_date desc-->
+        ) pp
     </select>
 
 
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml
index faafbbfc..80a47521 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml
@@ -67,129 +67,108 @@
     </select>
 <!--工作组详情-->
     <select id="queryPageList2" resultType="com.jero.project.entity.PayWorkGroupSubletStatistics">
-       select pwg1.principalId,pwg1.principalName,pwg1.chargeCompanyTemporaryName,pwg1.allMoney,pwg1.comeAllMoney,pwg1.chargeUse,if(pwg1.pack=0,'否','是') as packText,pwg1.pack,pwg1.id from (SELECT
-        pwgs.id,
-        pwg.principal_id_a as principalId,
-        pwg.principal_name_a as principalName,
-        pwgs.charge_company_temporary_name AS chargeCompanyTemporaryName,
-        pwgs.receivable_amount AS allMoney,
-        pwgs.paid_amount AS comeAllMoney,
-        pwgs.charge_use as chargeUse,
-        pwgs.pack,
-        pwgs.create_time
-        FROM pay_working_group_subitem pwgs
-        left join pay_working_group pwg on(pwgs.working_group_id=pwg.id)
+       SELECT
+        principalNameId as principalId,
+        principalName,
+        chargeCompanyTemporaryName,
+        allMoney,
+        comeAllMoney,
+        chargeUse,
+        packText,
+        pack,
+        projectId as id
+        FROM v_statistical
         <where>
-            pwgs.working_group_id = #{id}
+            superId = #{id}
             <if test="payWorkingGroupSubletSearch.projectName != null and payWorkingGroupSubletSearch.projectName != ''">
-                AND pwg.working_group_project LIKE
-                concat('%',concat(#{payWorkingGroupSubletSearch.projectName},'%'))
+                AND projectName LIKE
+                concat('%',#{payWorkingGroupSubletSearch.projectName},'%')
             </if>
             <if test="payWorkingGroupSubletSearch.year != null and payWorkingGroupSubletSearch.year != ''">
-                AND pwg.year LIKE
-                concat(#{payWorkingGroupSubletSearch.year},'%')
+                AND year LIKE
+                concat('%',#{payWorkingGroupSubletSearch.year},'%')
             </if>
             <if test="payWorkingGroupSubletSearch.chargeUse != null and payWorkingGroupSubletSearch.chargeUse != ''">
-                AND pwgs.charge_use=#{payWorkingGroupSubletSearch.chargeUse}
+                AND chargeUse=#{payWorkingGroupSubletSearch.chargeUse}
             </if>
             <if test="payWorkingGroupSubletSearch.chargeCompanyTemporaryName != null and payWorkingGroupSubletSearch.chargeCompanyTemporaryName != ''">
-                AND pwgs.charge_company_temporary_name LIKE
-                concat('%',concat(#{payWorkingGroupSubletSearch.chargeCompanyTemporaryName},'%'))
+                AND chargeCompanyTemporaryName LIKE
+                concat('%',#{payWorkingGroupSubletSearch.chargeCompanyTemporaryName},'%')
             </if>
             <if test="payWorkingGroupSubletSearch.inAccountStatue != null and payWorkingGroupSubletSearch.inAccountStatue != ''">
-                AND pwgs.in_account= #{payWorkingGroupSubletSearch.inAccountStatue}
+                AND payStatue= #{payWorkingGroupSubletSearch.inAccountStatue}
             </if>
             <if test="payWorkingGroupSubletSearch.principalNameId != null and payWorkingGroupSubletSearch.principalNameId != ''">
-                AND pwg.principal_id_a=#{payWorkingGroupSubletSearch.principalNameId}
+                AND principalNameId=#{payWorkingGroupSubletSearch.principalNameId}
             </if>
             <choose>
                 <when test="payWorkingGroupSubletSearch.allMoney != null and payWorkingGroupSubletSearch.allMoney != '' and payWorkingGroupSubletSearch.allMoneyTwo != null and payWorkingGroupSubletSearch.allMoneyTwo != ''">
-                    AND  if(pwgs.receivable_amount IS NULL OR pwgs.receivable_amount = '', 0, pwgs.receivable_amount ) >= #{payWorkingGroupSubletSearch.allMoney} and if(pwgs.receivable_amount IS NULL OR pwgs.receivable_amount = '', 0, pwgs.receivable_amount ) <![CDATA[<]]>= #{payWorkingGroupSubletSearch.allMoneyTwo}
+                    AND  if(allMoney IS NULL OR allMoney = '', 0, allMoney ) >= #{payWorkingGroupSubletSearch.allMoney} and if(allMoney IS NULL OR allMoney = '', 0, allMoney ) <![CDATA[<]]>= #{payWorkingGroupSubletSearch.allMoneyTwo}
                 </when>
                 <otherwise>
                     <if test="payWorkingGroupSubletSearch.allMoney != null and payWorkingGroupSubletSearch.allMoney != ''">
-                        AND if(pwgs.receivable_amount IS NULL OR pwgs.receivable_amount = '', 0, pwgs.receivable_amount ) >= #{payWorkingGroupSubletSearch.allMoney}
+                        AND if(allMoney IS NULL OR allMoney = '', 0, allMoney ) >= #{payWorkingGroupSubletSearch.allMoney}
                     </if>
                     <if test="payWorkingGroupSubletSearch.allMoneyTwo != null and payWorkingGroupSubletSearch.allMoneyTwo != ''">
-                        AND  if(pwgs.receivable_amount IS NULL OR pwgs.receivable_amount = '', 0, pwgs.receivable_amount ) <![CDATA[<]]>= #{payWorkingGroupSubletSearch.allMoneyTwo}
+                        AND  if(allMoney IS NULL OR allMoney = '', 0, allMoney ) <![CDATA[<]]>= #{payWorkingGroupSubletSearch.allMoneyTwo}
                     </if>
                 </otherwise>
             </choose>
         </where>
-        group by pwgs.id) pwg1 where pwg1.allMoney is not null and pwg1.allMoney !=0 order by pwg1.create_time desc
-<!--        inner join-->
-<!--        (select pwgs.id as id,working_group_id,max(ppr.payment_date) as payment_date-->
-<!--        from pay_working_group_subitem pwgs-->
-<!--        left join pay_payment_record ppr on(pwgs.id=ppr.project_id)-->
-<!--        <if test="payWorkingGroupSubletSearch.year !='' and payWorkingGroupSubletSearch.year !=null">-->
-<!--        WHERE ppr.payment_date like  concat('%',#{payWorkingGroupSubletSearch.year},'%')-->
-<!--        </if>-->
-<!--        GROUP BY pwgs.id-->
-<!--        ) pwg2 on (pwg2.id=pwg1.id)-->
-<!--      order by pwg2.payment_date-->
+        group by id
     </select>
     <!--工作组详情总金额-->
     <select id="queryPageList233" resultType="com.jero.statistics.entity.AllMoney">
-        select sum(pwg1.allMoney) as allMoney,sum(pwg1.comeAllMoney) as comeAllMoney from (SELECT
-        pwgs.id,
-        pwg.principal_id_a as principalId,
-        pwg.principal_name_a as principalName,
-        pwgs.charge_company_temporary_name AS chargeCompanyTemporaryName,
-        pwgs.receivable_amount AS allMoney,
-        pwgs.paid_amount AS comeAllMoney,
-        pwgs.charge_use as chargeUse,
-        pwgs.pack,
-        pwgs.create_time
-        FROM pay_working_group_subitem pwgs
-        left join pay_working_group pwg on(pwgs.working_group_id=pwg.id)
+        select sum(allMoney) as allMoney,sum(comeAllMoney) as comeAllMoney from (
+        SELECT
+        principalNameId as principalId,
+        principalName,
+        chargeCompanyTemporaryName,
+        allMoney,
+        comeAllMoney,
+        chargeUse,
+        packText,
+        pack,
+        projectId as id
+        FROM v_statistical
         <where>
-            pwgs.working_group_id = #{id}
+            superId = #{id}
             <if test="payWorkingGroupSubletSearch.projectName != null and payWorkingGroupSubletSearch.projectName != ''">
-                AND pwg.working_group_project LIKE
-                concat('%',concat(#{payWorkingGroupSubletSearch.projectName},'%'))
+                AND projectName LIKE
+                concat('%',#{payWorkingGroupSubletSearch.projectName},'%')
             </if>
             <if test="payWorkingGroupSubletSearch.year != null and payWorkingGroupSubletSearch.year != ''">
-                AND pwg.year LIKE
-                concat(#{payWorkingGroupSubletSearch.year},'%')
+                AND year LIKE
+                concat('%',#{payWorkingGroupSubletSearch.year},'%')
             </if>
             <if test="payWorkingGroupSubletSearch.chargeUse != null and payWorkingGroupSubletSearch.chargeUse != ''">
-                AND pwgs.charge_use=#{payWorkingGroupSubletSearch.chargeUse}
+                AND chargeUse=#{payWorkingGroupSubletSearch.chargeUse}
             </if>
             <if test="payWorkingGroupSubletSearch.chargeCompanyTemporaryName != null and payWorkingGroupSubletSearch.chargeCompanyTemporaryName != ''">
-                AND pwgs.charge_company_temporary_name LIKE
-                concat('%',concat(#{payWorkingGroupSubletSearch.chargeCompanyTemporaryName},'%'))
+                AND chargeCompanyTemporaryName LIKE
+                concat('%',#{payWorkingGroupSubletSearch.chargeCompanyTemporaryName},'%')
             </if>
             <if test="payWorkingGroupSubletSearch.inAccountStatue != null and payWorkingGroupSubletSearch.inAccountStatue != ''">
-                AND pwgs.in_account= #{payWorkingGroupSubletSearch.inAccountStatue}
+                AND payStatue= #{payWorkingGroupSubletSearch.inAccountStatue}
             </if>
             <if test="payWorkingGroupSubletSearch.principalNameId != null and payWorkingGroupSubletSearch.principalNameId != ''">
-                AND pwg.principal_id_a=#{payWorkingGroupSubletSearch.principalNameId}
+                AND principalNameId=#{payWorkingGroupSubletSearch.principalNameId}
             </if>
             <choose>
                 <when test="payWorkingGroupSubletSearch.allMoney != null and payWorkingGroupSubletSearch.allMoney != '' and payWorkingGroupSubletSearch.allMoneyTwo != null and payWorkingGroupSubletSearch.allMoneyTwo != ''">
-                    AND  if(pwgs.receivable_amount IS NULL OR pwgs.receivable_amount = '', 0, pwgs.receivable_amount ) >= #{payWorkingGroupSubletSearch.allMoney} and if(pwgs.receivable_amount IS NULL OR pwgs.receivable_amount = '', 0, pwgs.receivable_amount ) <![CDATA[<]]>= #{payWorkingGroupSubletSearch.allMoneyTwo}
+                    AND  if(allMoney IS NULL OR allMoney = '', 0, allMoney ) >= #{payWorkingGroupSubletSearch.allMoney} and if(allMoney IS NULL OR allMoney = '', 0, allMoney ) <![CDATA[<]]>= #{payWorkingGroupSubletSearch.allMoneyTwo}
                 </when>
                 <otherwise>
                     <if test="payWorkingGroupSubletSearch.allMoney != null and payWorkingGroupSubletSearch.allMoney != ''">
-                        AND if(pwgs.receivable_amount IS NULL OR pwgs.receivable_amount = '', 0, pwgs.receivable_amount ) >= #{payWorkingGroupSubletSearch.allMoney}
+                        AND if(allMoney IS NULL OR allMoney = '', 0, allMoney ) >= #{payWorkingGroupSubletSearch.allMoney}
                     </if>
                     <if test="payWorkingGroupSubletSearch.allMoneyTwo != null and payWorkingGroupSubletSearch.allMoneyTwo != ''">
-                        AND  if(pwgs.receivable_amount IS NULL OR pwgs.receivable_amount = '', 0, pwgs.receivable_amount ) <![CDATA[<]]>= #{payWorkingGroupSubletSearch.allMoneyTwo}
+                        AND  if(allMoney IS NULL OR allMoney = '', 0, allMoney ) <![CDATA[<]]>= #{payWorkingGroupSubletSearch.allMoneyTwo}
                     </if>
                 </otherwise>
             </choose>
         </where>
-        group by pwgs.id)  pwg1 where pwg1.allMoney is not null and pwg1.allMoney !=0 order by pwg1.create_time desc
-        <!--        inner join-->
-        <!--        (select pwgs.id as id,working_group_id,max(ppr.payment_date) as payment_date-->
-        <!--        from pay_working_group_subitem pwgs-->
-        <!--        left join pay_payment_record ppr on(pwgs.id=ppr.project_id)-->
-        <!--        <if test="payWorkingGroupSubletSearch.year !='' and payWorkingGroupSubletSearch.year !=null">-->
-        <!--        WHERE ppr.payment_date like  concat('%',#{payWorkingGroupSubletSearch.year},'%')-->
-        <!--        </if>-->
-        <!--        GROUP BY pwgs.id-->
-        <!--        ) pwg2 on (pwg2.id=pwg1.id)-->
-        <!--      order by pwg2.payment_date-->
+        group by id) p
     </select>
 
 <!-- 工作组详情导出 -->
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/CompanyComeMoneyStatisticsController.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/CompanyComeMoneyStatisticsController.java
index 1966b072..9fe5bdf2 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/CompanyComeMoneyStatisticsController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/CompanyComeMoneyStatisticsController.java
@@ -59,39 +59,9 @@ public class CompanyComeMoneyStatisticsController {
     public Result<?> list(CompanyComeMoneySearch companyComeMoneySearch,
                           @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                           @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
-            //根据不同角色加载不同列表的参数
-//            List<String> idList = new ArrayList<>();
-//            //判断登录角色，显示特定内容，判断依据为登录用户的角色和机构编码
-//            LoginUser sysUser =(LoginUser) SecurityUtils.getSubject().getPrincipal();
-//            String roleCode = sysUser.getRoleCode();
-//            List<String> roleCodes = new ArrayList<>(Arrays.asList(roleCode.split(",")));
-//                //admin
-//            if (roleCodes.contains(constant.ADMIN)) {
-//                idList = null;
-//                //部门负责人
-//            } else if (roleCodes.contains(constant.BMFZR)||roleCodes.contains(constant.SLD)) {
-//                //获取本部门及其所有下部部门所有成员(不包含最开始的部门下级成员)
-//               List<String> allDepartIds = sysBaseAPI.getAllDepartIds(sysUser.getDepartIds(),idList);
-//                //获取本部门成员
-//                idList.addAll((userMapper.selectList(new QueryWrapper<SysUser>().eq("status", 1).eq("del_flag", 0).eq("org_code", sysUser.getOrgCode()))).stream().map(SysUser::getId).collect(Collectors.toList()));
-//
-//                idList.addAll(allDepartIds);
-//                //项目负责人
-//            } else if (roleCodes.contains(constant.XMFZR)) {
-//                String userId = sysUser.getId();
-//                idList.add(userId);
-//            } else {
-//                return Result.OK();
-//            }
             Page<CompanyComeMoneyList> page = new Page<>(pageNo, pageSize);
             IPage<CompanyComeMoneyList> pageList = payWorkingGroupService.queryPageListForCompany(page,companyComeMoneySearch,null);
             HashMap<String, Object> hashMap = new HashMap<>();
-//            double sum=0;
-//            double sumTwo =0;
-//            if(ObjectUtils.isNotEmpty(pageList.getRecords())) {
-//                 sum = pageList.getRecords() != null ? pageList.getRecords().stream().mapToDouble(t -> Double.parseDouble(t.getAllMoney() == null || t.getAllMoney().equals("") ? "0" : t.getAllMoney())).sum() : 0;
-//                 sumTwo = pageList.getRecords() != null ? pageList.getRecords().stream().mapToDouble(t -> Double.parseDouble(t.getComeAllMoney() == null || t.getComeAllMoney().equals("") ? "0" : t.getComeAllMoney())).sum() : 0;
-//            }
             //处理为空数据为0
             for(CompanyComeMoneyList s: pageList.getRecords()){
                 if(s.getAllMoney()== null || s.getAllMoney().equals("") ){
@@ -130,30 +100,6 @@ public class CompanyComeMoneyStatisticsController {
                                    @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                    @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
             companyComeMoneyDetailSearch.setProjectName( oConvertUtils.replaceAllPercent(companyComeMoneyDetailSearch.getProjectName()));
-//            //根据不同角色加载不同列表的参数
-//            List<String> idList = new ArrayList<>();
-//            //判断登录角色，显示特定内容，判断依据为登录用户的角色和机构编码
-//            LoginUser sysUser =(LoginUser) SecurityUtils.getSubject().getPrincipal();
-//            String roleCode = sysUser.getRoleCode();
-//            List<String> roleCodes = new ArrayList<>(Arrays.asList(roleCode.split(",")));
-//            //admin
-//            if (roleCodes.contains(constant.ADMIN)) {
-//                idList = null;
-//                //部门负责人
-//            } else if (roleCodes.contains(constant.BMFZR)||roleCodes.contains(constant.SLD)) {
-//                //获取本部门及其所有下部部门所有成员(不包含最开始的部门下级成员)
-//               List<String> allDepartIds = sysBaseAPI.getAllDepartIds(sysUser.getDepartIds(),idList);
-//                //获取本部门成员
-//                idList.addAll((userMapper.selectList(new QueryWrapper<SysUser>().eq("status", 1).eq("del_flag", 0).eq("org_code", sysUser.getOrgCode()))).stream().map(SysUser::getId).collect(Collectors.toList()));
-//
-//                idList.addAll(allDepartIds);
-//                //项目负责人
-//            } else if (roleCodes.contains(constant.XMFZR)) {
-//                String userId = sysUser.getId();
-//                idList.add(userId);
-//            } else {
-//                return Result.OK();
-//            }
             PayCompanyManagement byId = payCompanyManagementService.getById(companyComeMoneyDetailSearch.getChargeCompanyId());
             if(ObjectUtils.isEmpty(byId)){
                 return Result.error("企业id错误，无对应企业id");
@@ -165,13 +111,6 @@ public class CompanyComeMoneyStatisticsController {
                 s.setChargeCompanyName(byId.getCompanyName());
             }
             HashMap<String, Object> hashMap = new HashMap<>();
-//                double sum=0;
-//                double sumTwo =0;
-//                if(ObjectUtils.isNotEmpty(pageList.getRecords())) {
-//                     sum = pageList.getRecords() != null ? pageList.getRecords().stream().mapToDouble(t -> Double.parseDouble(t.getAllMoney() == null || t.getAllMoney().equals("") ? "0" : t.getAllMoney())).sum() : 0;
-//                     sumTwo = pageList.getRecords() != null ? pageList.getRecords().stream().mapToDouble(t -> Double.parseDouble(t.getComeAllMoney() == null || t.getComeAllMoney().equals("") ? "0" : t.getComeAllMoney())).sum() : 0;
-//                }
-//                DecimalFormat df = new DecimalFormat("#,##0.00");
                 for(CompanyComeMoneyDetail s: pageList.getRecords()){
                     String key = String.valueOf(s.getChargeUse());
                     String payment_charge_use = sysBaseAPI.translateDict("payment_charge_use", key);
@@ -202,31 +141,6 @@ public class CompanyComeMoneyStatisticsController {
     @GetMapping(value = "/excel")
     @ApiOperation(value = "企业来款统计-导出统计", notes = "企业来款统计-导出统计")
     public ModelAndView excel(CompanyComeMoneySearch companyComeMoneySearch) {
-            //根据不同角色加载不同列表的参数
-//            List<String> idList = new ArrayList<>();
-//            //判断登录角色，显示特定内容，判断依据为登录用户的角色和机构编码
-//            LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-//            String roleCode = sysUser.getRoleCode();
-//            List<String> roleCodes = new ArrayList<>(Arrays.asList(roleCode.split(",")));
-//            //admin
-//            if (roleCodes.contains(constant.ADMIN)) {
-//                idList = null;
-//                //部门负责人
-//            } else if (roleCodes.contains(constant.BMFZR)||roleCodes.contains(constant.SLD)) {
-//                //获取本部门及其所有下部部门所有成员(不包含最开始的部门下级成员)
-//               List<String> allDepartIds = sysBaseAPI.getAllDepartIds(sysUser.getDepartIds(),idList);
-//                //获取本部门成员
-//                idList.addAll((userMapper.selectList(new QueryWrapper<SysUser>().eq("status", 1).eq("del_flag", 0).eq("org_code", sysUser.getOrgCode()))).stream().map(SysUser::getId).collect(Collectors.toList()));
-//
-//                idList.addAll(allDepartIds);//项目负责人
-//            } else if (roleCodes.contains(constant.XMFZR)) {
-//                String userId = sysUser.getId();
-//                idList.add(userId);
-//            } else {
-//                ArrayList<CompanyComeMoneyList> objects = new ArrayList<>();
-//                return AmountUtil.exportListXls(objects, CompanyComeMoneyList.class, "企业来款统计");
-//            }
-
                 List<CompanyComeMoneyList> pageList = payWorkingGroupService.queryPageListForCompanyExcel(companyComeMoneySearch, null);
                 //处理为空数据为0
                 for(CompanyComeMoneyList s: pageList) {
@@ -252,30 +166,6 @@ public class CompanyComeMoneyStatisticsController {
     @GetMapping(value = "/excelDetail")
     @ApiOperation(value = "企业来款详情统计-导出统计", notes = "企业来款详情统计-导出统计")
     public ModelAndView excelDetail( CompanyComeMoneyDetailSearch companyComeMoneyDetailSearch) {
-            //根据不同角色加载不同列表的参数
-//            List<String> idList = new ArrayList<>();
-//            //判断登录角色，显示特定内容，判断依据为登录用户的角色和机构编码
-//            LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-//            String roleCode = sysUser.getRoleCode();
-//            List<String> roleCodes = new ArrayList<>(Arrays.asList(roleCode.split(",")));
-//            //admin
-//            if (roleCodes.contains(constant.ADMIN)) {
-//                idList = null;
-//                //部门负责人
-//            } else if (roleCodes.contains(constant.BMFZR)||roleCodes.contains(constant.SLD)) {
-//                //获取本部门及其所有下部部门所有成员(不包含最开始的部门下级成员)
-//               List<String> allDepartIds = sysBaseAPI.getAllDepartIds(sysUser.getDepartIds(),idList);
-//                //获取本部门成员
-//                idList.addAll((userMapper.selectList(new QueryWrapper<SysUser>().eq("status", 1).eq("del_flag", 0).eq("org_code", sysUser.getOrgCode()))).stream().map(SysUser::getId).collect(Collectors.toList()));
-//
-//                idList.addAll(allDepartIds);//项目负责人
-//            } else if (roleCodes.contains(constant.XMFZR)) {
-//                String userId = sysUser.getId();
-//                idList.add(userId);
-//            } else {
-//                ArrayList<CompanyComeMoneyDetail> objects = new ArrayList<>();
-//                return AmountUtil.exportListXls(objects, CompanyComeMoneyDetail.class, "企业来款详情统计");
-//            }
                 List<CompanyComeMoneyDetail> pageList = payWorkingGroupService.queryPageListForCompanyDetailExcel(companyComeMoneyDetailSearch, null);
                 PayCompanyManagement byId = payCompanyManagementService.getById(companyComeMoneyDetailSearch.getChargeCompanyId());
                 for(CompanyComeMoneyDetail s:pageList){