update 当查询条件选择确认年份时，采用以确认日期为维度的统计，保证统计报表和首页的数据一致性

db/统计视图.sql

@@ -408,5 +408,232 @@ set confirm_no_tax_amount = confirm_amount ,
     invoice_no_tax_amount = invoice_amount
 where invoice_requirements = 0;
 
-select *
+create view v_statistical_confirm as
-from v_statistical;
+select pp.id                               as projectId,
+       pp.superId,
+       pp.projectName,
+       principalName,
+       chargeCompanyId,
+       chargeCompanyTemporaryId,
+       chargeCompanyTemporaryName,
+       allMoney,
+       comeAllMoney,
+       chargeUse,
+       depart,
+       createTime,
+       if(pp.pack = 0, '否', '是')           as packText,
+       year,
+       payStatue,
+       departId,
+       departCode,
+       principalNameId,
+       type,
+       if(billMoney is null, 0, billMoney) as billMoney,
+       confirmAmount,
+       invoiceNoTaxAmount,
+       paidNoTaxAmount,
+       confirmNoTaxAmount,
+       contactsName,
+       confirmDate,
+       pp.pack
+from (SELECT pwgs.id,
+             pwg.id                             as superId,
+             pwg.working_group_project          AS projectName,
+             pwg.principal_name_a               as principalName,
+             pwgs.charge_company_id             AS chargeCompanyId,
+             pwgs.charge_company_temporary_id   as chargeCompanyTemporaryId,
+             pwgs.charge_company_temporary_name AS chargeCompanyTemporaryName,
+             pwgs.receivable_amount             as allMoney,
+             pwgs.paid_amount                   as comeAllMoney,
+             pwgs.charge_use                    as chargeUse,
+             sd.depart_name                     as depart,
+             pwgs.pack                          as pack,
+             pwg.year                           as year,
+             pwgs.in_account                    as payStatue,
+             sd.org_code                        as departCode,
+             sd.id                              as departId,
+             pwg.principal_id_a                 as principalNameId,
+             2                                  as type,
+             pwgs.invoice_amount                AS billMoney,
+             confirm_amount                     as confirmAmount,
+             invoice_no_tax_amount              as invoiceNoTaxAmount,
+             paid_no_tax_amount                 as paidNoTaxAmount,
+             pcpr.no_tax_amount              as confirmNoTaxAmount,
+             (select GROUP_CONCAT(DISTINCT pwgsc.contacts_temporary_name order by pwgsc.contacts_temporary_name) from pay_working_group_subitem_contacts pwgsc where pwgsc.working_group_sub_id = pwgs.id) as contactsName,
+             DATE_FORMAT(pcpr.payment_date,'%Y-%m') as confirmDate,
+             pwgs.create_time                   as createTime
+      FROM pay_working_group pwg
+               right join pay_working_group_subitem pwgs on (pwg.id = pwgs.working_group_id)
+               left JOIN sys_user su on (pwg.principal_id_a = su.id)
+               left join sys_depart sd on (su.depart_ids = sd.id)
+               left JOIN pay_working_group_subitem_contacts pwgsc on pwgsc.working_group_sub_id = pwgs.id
+               left join pay_confirm_payment_record pcpr on pwgs.id = pcpr.project_id
+group by pwgs.id,pcpr.id
+      union all
+      SELECT pcp.id,
+             pcp.id                            as superId,
+             pcp.charge_project                AS projectName,
+             pcp.principal_name                as principalName,
+             pcp.charge_company_id             AS chargeCompanyId,
+             pcp.charge_company_temporary_id   as chargeCompanyTemporaryId,
+             pcp.charge_company_temporary_name AS chargeCompanyTemporaryName,
+             pcp.receivable_amount             as allMoney,
+             pcp.paid_amount                   as comeAllMoney,
+             pcp.charge_use                    as chargeUse,
+             sd.depart_name                    as depart,
+             pcp.pack                          as pack,
+             pcp.year                          as year,
+             pcp.in_account                    as payStatue,
+             sd.org_code                       as departCode,
+             sd.id                             as departId,
+             pcp.principal_id                  as principalNameId,
+             1                                 as type,
+             pcp.invoice_amount                AS billMoney,
+             confirm_amount                    as confirmAmount,
+             invoice_no_tax_amount             as invoiceNoTaxAmount,
+             paid_no_tax_amount                as paidNoTaxAmount,
+             pcpr.no_tax_amount             as confirmNoTaxAmount,
+             contacts_temporary_name           as contactsName,
+             DATE_FORMAT(pcpr.payment_date,'%Y-%m') as confirmDate,
+             pcp.create_time                   as createTime
+      FROM pay_common_project pcp
+               left JOIN sys_user su on (pcp.principal_id = su.id)
+               left join sys_depart sd on (su.depart_ids = sd.id)
+               left join pay_confirm_payment_record pcpr on pcp.id = pcpr.project_id
+group by pcp.id,pcpr.id
+      union all
+      SELECT pmps.id,
+             pmp.id                 as superId,
+             pmp.project_name       AS projectName,
+             su.realname            as principalName,
+             pmps.company_id        AS chargeCompanyId,
+             pmps.company_id        as chargeCompanyTemporaryId,
+             pmps.company_name      AS chargeCompanyTemporaryName,
+             pmps.amount_receivable as allMoney,
+             pmps.paid_amount       as comeAllMoney,
+             pmps.charge_use        as chargeUse,
+             sd.depart_name         as depart,
+             pmps.pack              as pack,
+             pmp.particular_year    as year,
+             pmps.in_account        as payStatue,
+             sd.org_code            as departCode,
+             sd.id                  as departId,
+             pmp.director_id        as principalNameId,
+             4                      as type,
+             pmps.invoice_amount    AS billMoney,
+             confirm_amount         as confirmAmount,
+             invoice_no_tax_amount  as invoiceNoTaxAmount,
+             paid_no_tax_amount     as paidNoTaxAmount,
+             pcpr.no_tax_amount  as confirmNoTaxAmount,
+             company_contact_name   as contactsName,
+             DATE_FORMAT(pcpr.payment_date,'%Y-%m') as confirmDate,
+             pmps.create_time       as createTime
+      FROM pay_member_project pmp
+               right join pay_member_project_subitem pmps on (pmp.id = pmps.project_id)
+               left JOIN sys_user su on (pmp.director_id = su.id)
+               left join sys_depart sd on (su.depart_ids = sd.id)
+               left join pay_confirm_payment_record pcpr on pmps.id = pcpr.project_id
+      group by pmps.id,pcpr.id
+      union all
+      SELECT pms.id,
+             pm.id                 as superId,
+             pm.meeting_name       AS projectName,
+             su.realname           as principalName,
+             pms.company_id        AS chargeCompanyId,
+             pms.company_id        as chargeCompanyTemporaryId,
+             pms.company_name      AS chargeCompanyTemporaryName,
+             pms.amount_receivable as allMoney,
+             pms.paid_amount       as comeAllMoney,
+             pms.charge_use        as chargeUse,
+             sd.depart_name        as depart,
+             pms.pack              as pack,
+             pm.particular_year    as year,
+             pms.in_account        as payStatue,
+             sd.org_code           as departCode,
+             sd.id                 as departId,
+             pm.director_id        as principalNameId,
+             3                     as type,
+             pms.invoice_amount    AS billMoney,
+             confirm_amount        as confirmAmount,
+             invoice_no_tax_amount as invoiceNoTaxAmount,
+             paid_no_tax_amount    as paidNoTaxAmount,
+             pcpr.no_tax_amount as confirmNoTaxAmount,
+             company_contact_name  as contactsName,
+             DATE_FORMAT(pcpr.payment_date,'%Y-%m') as confirmDate,
+             pms.create_time       as createTime
+      FROM pay_meeting pm
+               right join pay_meeting_situation pms on (pm.id = pms.meeting_id)
+               left JOIN sys_user su on (pm.director_id = su.id)
+               left join sys_depart sd on (su.depart_ids = sd.id)
+               left join pay_confirm_payment_record pcpr on pms.id = pcpr.project_id
+      group by pms.id,pcpr.id
+      union all
+      SELECT tmps.id,
+             tmp.id                 as superId,
+             tmp.project_name       AS projectName,
+             su.realname            as principalName,
+             tmps.company_id        AS chargeCompanyId,
+             tmps.company_id        as chargeCompanyTemporaryId,
+             tmps.company_name      AS chargeCompanyTemporaryName,
+             tmps.amount_receivable as allMoney,
+             tmps.paid_amount       as comeAllMoney,
+             tmps.charge_use        as chargeUse,
+             sd.depart_name         as depart,
+             tmps.pack              as pack,
+             tmp.year               as year,
+             tmps.in_account        as payStatue,
+             sd.org_code            as departCode,
+             sd.id                  as departId,
+             tmp.director_id        as principalNameId,
+             5                      as type,
+             tmps.invoice_amount    AS billMoney,
+             confirm_amount         as confirmAmount,
+             invoice_no_tax_amount  as invoiceNoTaxAmount,
+             paid_no_tax_amount     as paidNoTaxAmount,
+             pcpr.no_tax_amount  as confirmNoTaxAmount,
+             liaison_man            as contactsName,
+             DATE_FORMAT(pcpr.payment_date,'%Y-%m') as confirmDate,
+             tmps.create_time       as createTime
+      FROM tb_member_project tmp
+               left join tb_member_project_subitem tmps on (tmp.id = tmps.project_id)
+               left JOIN sys_user su on (tmp.director_id = su.id)
+               left join sys_depart sd on (su.depart_ids = sd.id)
+               left join pay_confirm_payment_record pcpr on tmps.id = pcpr.project_id
+      group by tmps.id,pcpr.id
+      union all
+      SELECT tcp.id,
+             tmp.id                as superId,
+             tmp.project_name      AS projectName,
+             su.realname           as principalName,
+             tcp.company_id        AS chargeCompanyId,
+             tcp.company_id        as chargeCompanyTemporaryId,
+             tcp.company_name      AS chargeCompanyTemporaryName,
+             tcp.amount_receivable as allMoney,
+             tcp.paid_amount       as comeAllMoney,
+             tcp.charge_use        as chargeUse,
+             sd.depart_name        as depart,
+             tcp.pack              as pack,
+             tmp.year              as year,
+             tcp.in_account        as payStatue,
+             sd.org_code           as departCode,
+             sd.id                 as departId,
+             tmp.director_id       as principalNameId,
+             6                     as type,
+             tcp.invoice_amount    AS billMoney,
+             confirm_amount        as confirmAmount,
+             invoice_no_tax_amount as invoiceNoTaxAmount,
+             paid_no_tax_amount    as paidNoTaxAmount,
+             pcpr.no_tax_amount as confirmNoTaxAmount,
+             liaison_man           as contactsName,
+             DATE_FORMAT(pcpr.payment_date,'%Y-%m') as confirmDate,
+             tcp.create_time       as createTime
+      FROM tb_member_project tmp
+               left join tb_certificate_payment tcp on (tmp.id = tcp.project_id)
+               left JOIN sys_user su on (tmp.director_id = su.id)
+               left join sys_depart sd on (su.depart_ids = sd.id)
+               left join pay_confirm_payment_record pcpr on tcp.id = pcpr.project_id
+      group by tcp.id,pcpr.id
+     ) pp
+where pp.allMoney is not null
+  and pp.allMoney != 0
+order by pp.createTime;

jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupMapper.java

@@ -116,9 +116,6 @@ public interface PayWorkingGroupMapper extends BaseMapper<PayWorkingGroup> {
      */
     IPage<AllProjectStatistics> queryPageList3(Page<AllProjectStatistics> page, @Param(value = "allProjectStatisticsSearch") AllProjectStatisticsSearch allProjectStatisticsSearch, @Param("idList") List<String> idList);
 
-    List<AllProjectStatistics> queryPageListExcel(@Param(value = "allProjectStatisticsSearch") AllProjectStatisticsSearch allProjectStatisticsSearch, @Param("idList") List<String> idList, @Param("ids") List<String> ids);
-
-
     /**
      * 个人来款统计
      *

jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupSubItemMapper.java

@@ -55,8 +55,6 @@ public interface PayWorkingGroupSubItemMapper extends BaseMapper<PayWorkingGroup
     IPage<PayWorkingGroupSubItem> queryCompanyPageListByCompanyManager(Page<PayWorkingGroupSubItem> page,@Param("payWorkingGroupSubItem") PayWorkingGroupSubItem payWorkingGroupSubItem,@Param("listNeedInvoice") List<Integer> listNeedInvoice,@Param("companyId") String companyId);
 
 
-    List<PayWorkGroupSubletStatistics> importExcelStatistics2(@Param("payWorkingGroupSubletSearch") PayWorkingGroupSubletSearch payWorkingGroupSubletSearch,@Param("id")  String id,@Param("selections") ArrayList<String> selections);
-
     AllMoney queryPageList233(@Param("payWorkingGroupSubletSearch") PayWorkingGroupSubletSearch payWorkingGroupSubletSearch, @Param("id") String id);
 
 }

jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml

@@ -65,24 +65,71 @@
         GROUP BY pwgs.id
         ORDER BY pwgs.create_time desc
     </select>
+    <sql id="v_statistical_confirm_sql">
+        projectId,
+        superId,
+        projectName,
+        principalName,
+        chargeCompanyId,
+        chargeCompanyTemporaryId,
+        chargeCompanyTemporaryName,
+        allMoney,
+        comeAllMoney,
+        chargeUse,
+        depart,
+        createTime,
+        packText,
+        year,
+        payStatue,
+        departId,
+        departCode,
+        principalNameId,
+        type,
+        billMoney,
+        confirmAmount,
+        invoiceNoTaxAmount,
+        paidNoTaxAmount,
+        sum(confirmNoTaxAmount) as confirmNoTaxAmount,
+        contactsName,
+        confirmDate,
+        pack
+    </sql>
 <!--工作组详情-->
     <select id="queryPageList2" resultType="com.jero.project.entity.PayWorkGroupSubletStatistics">
        SELECT
         principalNameId as principalId,
         principalName,
         chargeCompanyTemporaryName,
-        allMoney,
-        comeAllMoney,
         chargeUse,
         packText,
         pack,
         projectId as id,
-        if(pmb.invoice_amount is null, 0.00, pmb.invoice_amount) as billMoney,
+        allMoney,
-        confirmAmount
+        sum(paidNoTaxAmount) as comeAllMoney,
-        FROM v_statistical v
+        sum(invoiceNoTaxAmount) as billMoney,
-        left join pay_mail_bill_project pmbp on v.projectId = pmbp.project_id
+        sum(confirmNoTaxAmount) as confirmAmount
-        left join pay_mail_bill pmb on pmbp.bill_id = pmb.id
+        FROM
-        left join pay_confirm_payment_record pcpr on(pmbp.project_id=pcpr.project_id)
+        <if test="payWorkingGroupSubletSearch.paymentYear == null or payWorkingGroupSubletSearch.paymentYear == ''">
+            v_statistical v
+        </if>
+        <if test="payWorkingGroupSubletSearch.paymentYear != null and payWorkingGroupSubletSearch.paymentYear != ''">
+            (select
+            <include refid="v_statistical_confirm_sql"/>
+            from v_statistical_confirm v
+            <where>
+                <choose>
+                    <when test="payWorkingGroupSubletSearch.paymentMonth != null and payWorkingGroupSubletSearch.paymentMonth != ''">
+                        and confirmDate like
+                        concat('%',#{payWorkingGroupSubletSearch.paymentYear},'-',#{payWorkingGroupSubletSearch.paymentMonth},'%')
+                    </when>
+                    <when test="payWorkingGroupSubletSearch.paymentYear != null and payWorkingGroupSubletSearch.paymentYear != ''">
+                        and confirmDate like concat('%',#{payWorkingGroupSubletSearch.paymentYear},'%')
+                    </when>
+                </choose>
+            </where>
+            group by projectId
+            ) v
+        </if>
         <where>
             superId = #{id}
             <if test="payWorkingGroupSubletSearch.projectName != null and payWorkingGroupSubletSearch.projectName != ''">
@@ -119,12 +166,12 @@
                     </if>
                 </otherwise>
             </choose>
-            <if test="payWorkingGroupSubletSearch.paymentYear != null and payWorkingGroupSubletSearch.paymentYear != ''">
+            <!--<if test="payWorkingGroupSubletSearch.paymentYear != null and payWorkingGroupSubletSearch.paymentYear != ''">
                 and DATE_FORMAT (pcpr.payment_date,'%Y') like concat(#{payWorkingGroupSubletSearch.paymentYear}, '%')
                 <if test="payWorkingGroupSubletSearch.paymentMonth != null and payWorkingGroupSubletSearch.paymentMonth != ''">
                     and DATE_FORMAT (pcpr.payment_date,'%m') like concat(#{payWorkingGroupSubletSearch.paymentMonth}, '%')
                 </if>
-            </if>
+            </if>-->
         </where>
         group by id
     </select>
@@ -134,21 +181,33 @@
         sum(billMoney) as billMoney,
         sum(confirmAmount) as confirmAmount from (
         SELECT
-        principalNameId as principalId,
-        principalName,
-        chargeCompanyTemporaryName,
-        allMoney,
-        comeAllMoney,
-        chargeUse,
-        packText,
-        pack,
         projectId as id,
-        if(pmb.invoice_amount is null, 0.00, pmb.invoice_amount) as billMoney,
+        allMoney,
-        confirmAmount
+        sum(paidNoTaxAmount) as comeAllMoney,
-        FROM v_statistical v
+        sum(invoiceNoTaxAmount) as billMoney,
-        left join pay_mail_bill_project pmbp on v.projectId = pmbp.project_id
+        sum(confirmNoTaxAmount) as confirmAmount
-        left join pay_mail_bill pmb on pmbp.bill_id = pmb.id
+        FROM
-        left join pay_confirm_payment_record pcpr on(pmbp.project_id=pcpr.project_id)
+        <if test="payWorkingGroupSubletSearch.paymentYear == null or payWorkingGroupSubletSearch.paymentYear == ''">
+            v_statistical v
+        </if>
+        <if test="payWorkingGroupSubletSearch.paymentYear != null and payWorkingGroupSubletSearch.paymentYear != ''">
+            (select
+            <include refid="v_statistical_confirm_sql"/>
+            from v_statistical_confirm v
+            <where>
+                <choose>
+                    <when test="payWorkingGroupSubletSearch.paymentMonth != null and payWorkingGroupSubletSearch.paymentMonth != ''">
+                        and confirmDate like
+                        concat('%',#{payWorkingGroupSubletSearch.paymentYear},'-',#{payWorkingGroupSubletSearch.paymentMonth},'%')
+                    </when>
+                    <when test="payWorkingGroupSubletSearch.paymentYear != null and payWorkingGroupSubletSearch.paymentYear != ''">
+                        and confirmDate like concat('%',#{payWorkingGroupSubletSearch.paymentYear},'%')
+                    </when>
+                </choose>
+            </where>
+            group by projectId
+            ) v
+        </if>
         <where>
             superId = #{id}
             <if test="payWorkingGroupSubletSearch.projectName != null and payWorkingGroupSubletSearch.projectName != ''">
@@ -185,71 +244,16 @@
                     </if>
                 </otherwise>
             </choose>
-            <if test="payWorkingGroupSubletSearch.paymentYear != null and payWorkingGroupSubletSearch.paymentYear != ''">
+            <!--<if test="payWorkingGroupSubletSearch.paymentYear != null and payWorkingGroupSubletSearch.paymentYear != ''">
                 and DATE_FORMAT (pcpr.payment_date,'%Y') like concat(#{payWorkingGroupSubletSearch.paymentYear}, '%')
                 <if test="payWorkingGroupSubletSearch.paymentMonth != null and payWorkingGroupSubletSearch.paymentMonth != ''">
                     and DATE_FORMAT (pcpr.payment_date,'%m') like concat(#{payWorkingGroupSubletSearch.paymentMonth}, '%')
                 </if>
-            </if>
+            </if>-->
         </where>
         group by id) p
     </select>
 
-<!-- 工作组详情导出 -->
-    <select id="importExcelStatistics2" resultType="com.jero.project.entity.PayWorkGroupSubletStatistics">
-        select * 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.create_time
-        FROM pay_working_group_subitem pwgs
-        left join pay_working_group pwg on(pwgs.working_group_id=pwg.id)
-        <where>
-            pwgs.working_group_id = #{id} and pwgs.id in
-            <foreach collection="selections" open="(" separator="," close=")" item="item" index="index">
-                #{item}
-            </foreach>
-            <if test="payWorkingGroupSubletSearch.projectName != null and payWorkingGroupSubletSearch.projectName != ''">
-                AND pwg.working_group_project LIKE
-                concat('%',concat(#{payWorkingGroupSubletSearch.projectName},'%'))
-            </if>
-            <if test="payWorkingGroupSubletSearch.year != null and payWorkingGroupSubletSearch.year != ''">
-                AND pwg.year LIKE
-                concat(#{payWorkingGroupSubletSearch.year},'%')
-            </if>
-            <if test="payWorkingGroupSubletSearch.chargeUse != null and payWorkingGroupSubletSearch.chargeUse != ''">
-                AND pwgs.charge_use=#{payWorkingGroupSubletSearch.chargeUse}
-            </if>
-            <if test="payWorkingGroupSubletSearch.chargeCompanyTemporaryName != null and payWorkingGroupSubletSearch.chargeCompanyTemporaryName != ''">
-                AND pwgs.charge_company_temporary_name LIKE
-                concat('%',concat(#{payWorkingGroupSubletSearch.chargeCompanyTemporaryName},'%'))
-            </if>
-            <if test="payWorkingGroupSubletSearch.inAccountStatue != null and payWorkingGroupSubletSearch.inAccountStatue != ''">
-                AND pwgs.in_account= #{payWorkingGroupSubletSearch.inAccountStatue}
-            </if>
-            <if test="payWorkingGroupSubletSearch.principalNameId != null and payWorkingGroupSubletSearch.principalNameId != ''">
-                AND pwg.principal_id_a=#{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}
-                </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}
-                    </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}
-                    </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
-    </select>
     <select id="queryCompanyPageList" resultType="com.jero.project.entity.PayWorkingGroupSubItem">
         select pwgs.*,pwg.working_group_project as chargeProject from pay_working_group_subitem pwgs
         left join pay_working_group pwg ON pwgs.working_group_id = pwg.id

jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupService.java

@@ -104,10 +104,6 @@ public interface IPayWorkingGroupService extends IService<PayWorkingGroup> {
      * 全所查询导出
      */
     List<AllProjectStatistics> queryPageListExcel( AllProjectStatisticsSearch allProjectStatisticsSearch, List<String> idList);
-    /**
-     * 全所查询导出
-     */
-    List<AllProjectStatistics> queryPageListExcel( AllProjectStatisticsSearch allProjectStatisticsSearch, List<String> idList, List<String> ids);
 
     /**
      * 个人来款统计

jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupSubItemService.java

@@ -104,7 +104,6 @@ public interface IPayWorkingGroupSubItemService extends IService<PayWorkingGroup
      */
     IPage<PayWorkingGroupSubItem> queryCompanyPageListByCompanyManager(Page<PayWorkingGroupSubItem> page, PayWorkingGroupSubItem payWorkingGroupSubItem, List<Integer> listNeedInvoice, String companyId);
 
-    List<PayWorkGroupSubletStatistics> importExcelStatistics2(PayWorkingGroupSubletSearch payWorkingGroupSubletSearch, String id, ArrayList<String> selections);
     /**
      * @Description 设置收费通知
      * @Author  lqt

jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayCommonProjectServiceImpl.java

@@ -16,16 +16,11 @@ import com.jero.common.service.RolePermissionService;
 import com.jero.common.system.vo.LoginUser;
 import com.jero.common.vo.ProjectStatusVO;
 import com.jero.company.entity.PayContactsManagement;
-import com.jero.company.mapper.PayContactsManagementMapper;
 import com.jero.company.service.IPayContactsManagementService;
 import com.jero.contract.entity.PayIncomeContract;
 import com.jero.contract.entity.PayIncomeContractAssociated;
 import com.jero.contract.service.IPayIncomeContractAssociatedService;
 import com.jero.contract.service.IPayIncomeContractService;
-import com.jero.mail.entity.PayMailBill;
-import com.jero.mail.entity.PayMailBillProject;
-import com.jero.mail.mapper.PayMailBillMapper;
-import com.jero.mail.service.IPayMailBillProjectService;
 import com.jero.mail.service.IPayMailBillService;
 import com.jero.modules.system.entity.SysUser;
 import com.jero.modules.system.service.ISysUserService;

jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java

@@ -391,15 +391,6 @@ public class PayWorkingGroupServiceImpl extends ServiceImpl<PayWorkingGroupMappe
     public List<AllProjectStatistics> queryPageListExcel(AllProjectStatisticsSearch allProjectStatisticsSearch, List<String> idList) {
         return payWorkingGroupMapper.queryPageList3(allProjectStatisticsSearch,idList);
     }
-    /**
-     * 全所统计ecxel全查
-     * @param allProjectStatisticsSearch
-     * @return
-     */
-    @Override
-    public List<AllProjectStatistics> queryPageListExcel(AllProjectStatisticsSearch allProjectStatisticsSearch, List<String> idList, List<String> ids) {
-        return payWorkingGroupMapper.queryPageListExcel(allProjectStatisticsSearch,idList,ids);
-    }
 
     /**
      * 个人来款统计

jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java

@@ -867,11 +867,6 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl<PayWorkingGro
         return payWorkingGroupSubItemMapper.queryCompanyPageListByCompanyManager( page, payWorkingGroupSubItem,listNeedInvoice,companyId);
     }
 
-    @Override
-    public List<PayWorkGroupSubletStatistics> importExcelStatistics2(PayWorkingGroupSubletSearch payWorkingGroupSubletSearch, String id, ArrayList<String> selections) {
-        return payWorkingGroupSubItemMapper.importExcelStatistics2(payWorkingGroupSubletSearch,id,selections);
-    }
-
     @Override
     @Transactional
     public List<String> setCharge(SetChargeInput input) {

jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/AllProjectStatisticsController.java

@@ -180,11 +180,11 @@ public class AllProjectStatisticsController {
                               @RequestParam(name = "selections", required = false) String selections) {
             allProjectStatisticsSearch.setProjectName(oConvertUtils.replaceAllPercent(allProjectStatisticsSearch.getProjectName()));
             allProjectStatisticsSearch.setChargeCompanyTemporaryName(oConvertUtils.replaceAllPercent(allProjectStatisticsSearch.getChargeCompanyTemporaryName()));
-            if (allProjectStatisticsSearch.getYear() == null || allProjectStatisticsSearch.getYear().equals("")) {
+            //if (allProjectStatisticsSearch.getYear() == null || allProjectStatisticsSearch.getYear().equals("")) {
-                Calendar calendar = Calendar.getInstance();
+            //    Calendar calendar = Calendar.getInstance();
-                String year = String.valueOf(calendar.get(Calendar.YEAR));
+            //    String year = String.valueOf(calendar.get(Calendar.YEAR));
-                allProjectStatisticsSearch.setYear(year);
+            //    allProjectStatisticsSearch.setYear(year);
-            }
+            //}
 
             List<AllProjectStatistics> pageList = payWorkingGroupService.queryPageListExcel(allProjectStatisticsSearch, null);
             if (pageList != null) {