shiyunteng
2026-10-30 145580fd820bb31334f2e71643413e846b7ce904
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/StatisticServiceImpl.java
@@ -1,9 +1,11 @@
package com.by4cloud.platformx.business.service.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -14,6 +16,7 @@
import com.by4cloud.platformx.business.dto.AgingQueryDTO;
import com.by4cloud.platformx.business.dto.AnalysisCommonDTO;
import com.by4cloud.platformx.business.dto.HomeQueryDTO;
import com.by4cloud.platformx.business.dto.HomeZbjtDTO;
import com.by4cloud.platformx.business.entity.*;
import com.by4cloud.platformx.business.mapper.*;
import com.by4cloud.platformx.business.service.StatisticService;
@@ -967,22 +970,183 @@
   }
   @Override
   public R homeZbjtChart(HomeZbjtDTO queryDTO) {
      if (StrUtil.isBlank(queryDTO.getType())) {
         return R.failed("请传type");
      }
      JSONObject result = new JSONObject();
      HomeZbjtVo kp = contractInvoiceMapper.homeZbjt();
      result.put("chart-sr", handleChart(kp, queryDTO.getType()));
      HomeZbjtVo hk = paymentSlipMapper.homeZbjt();
      result.put("chart-hk", handleChart(hk, queryDTO.getType()));
      HomeZbjtVo htqd = contractMapper.homeZbjt();
      result.put("chart-ht", handleChart(htqd, queryDTO.getType()));
      return R.ok(result);
   }
//   private JSONArray handleTable(HomeZbjtVo kp, String type) {
//      kp.calcZbjt(kp);
//      JSONArray array = new JSONArray();
//      if (StrUtil.equals(type, "1")) {
//         JSONObject smj = new JSONObject();
//         smj.put("name", "石煤机");
//         smj.put("lj", kp.getSmjby() == null ? BigDecimal.ZERO : kp.getSmjby());
//         smj.put("zb", "");
//         if (ObjUtil.isNotNull(kp.getZbby()) && kp.getZbby().compareTo(new BigDecimal("0")) > 0) {
//            smj.put("zb", smj.getBigDecimal("lj").divide(kp.getZbby(), 10, RoundingMode.HALF_UP).multiply(new BigDecimal("100"))
//                  .setScale(2, RoundingMode.HALF_UP) + "%");
//         }
//         smj.put("tb", "");
//         array.add(smj);
//         JSONObject sgb = new JSONObject();
//         sgb.put("name", "石工泵");
//         sgb.put("lj", kp.getSgbby() == null ? BigDecimal.ZERO : kp.getSgbby());
//         sgb.put("zb", "");
//         if (ObjUtil.isNotNull(kp.getZbby()) && kp.getZbby().compareTo(new BigDecimal("0")) > 0) {
//            sgb.put("zb", sgb.getBigDecimal("lj").divide(kp.getZbby(), 10, RoundingMode.HALF_UP).multiply(new BigDecimal("100"))
//                  .setScale(2, RoundingMode.HALF_UP) + "%");
//         }
//         sgb.put("tb", "");
//         array.add(sgb);
//         JSONObject tf = new JSONObject();
//         tf.put("name", "通方公司");
//         tf.put("lj", kp.getTfby() == null ? BigDecimal.ZERO : kp.getTfby());
//         tf.put("zb", "");
//         if (ObjUtil.isNotNull(kp.getZbby()) && kp.getZbby().compareTo(new BigDecimal("0")) > 0) {
//            tf.put("zb", tf.getBigDecimal("lj").divide(kp.getZbby(), 10, RoundingMode.HALF_UP).multiply(new BigDecimal("100"))
//                  .setScale(2, RoundingMode.HALF_UP) + "%");
//         }
//
//         tf.put("tb", "");
//         array.add(tf);
//         JSONObject jxc = new JSONObject();
//         jxc.put("name", "机械厂");
//         jxc.put("lj", kp.getJxcby() == null ? BigDecimal.ZERO : kp.getJxcby());
//
//         jxc.put("zb", "");
//         if (ObjUtil.isNotNull(kp.getZbby()) && kp.getZbby().compareTo(new BigDecimal("0")) > 0) {
//            jxc.put("zb", jxc.getBigDecimal("lj").divide(kp.getZbby(), 10, RoundingMode.HALF_UP).multiply(new BigDecimal("100"))
//                  .setScale(2, RoundingMode.HALF_UP) + "%");
//         }
//         jxc.put("tb", "");
//         array.add(jxc);
//         JSONObject ymj = new JSONObject();
//         ymj.put("name", "一煤机");
//         ymj.put("lj", kp.getYmjby() == null ? BigDecimal.ZERO : kp.getYmjby());
//         ymj.put("zb", "");
//         if (ObjUtil.isNotNull(kp.getZbby()) && kp.getZbby().compareTo(new BigDecimal("0")) > 0) {
//            ymj.put("zb", ymj.getBigDecimal("lj").divide(kp.getZbby(), 10, RoundingMode.HALF_UP).multiply(new BigDecimal("100"))
//                  .setScale(2, RoundingMode.HALF_UP) + "%");
//         }
//
//         ymj.put("tb", "");
//         array.add(ymj);
//      }
//      if (StrUtil.equals(type, "2")) {
//         JSONObject smj = new JSONObject();
//         smj.put("name", "石煤机");
//         smj.put("lj", kp.getSmjbn() == null ? BigDecimal.ZERO : kp.getSmjbn());
//         smj.put("zb", "");
//         if (ObjUtil.isNotNull(kp.getZbbn()) && kp.getZbbn().compareTo(new BigDecimal("0")) > 0) {
//            smj.put("zb", smj.getBigDecimal("lj").divide(kp.getZbbn(), 10, RoundingMode.HALF_UP).multiply(new BigDecimal("100"))
//                  .setScale(2, RoundingMode.HALF_UP) + "%");
//         }
//         smj.put("tb", "");
//         array.add(smj);
//         JSONObject sgb = new JSONObject();
//         sgb.put("name", "石工泵");
//         sgb.put("lj", kp.getSgbbn() == null ? BigDecimal.ZERO : kp.getSgbbn());
//         sgb.put("zb", "");
//         if (ObjUtil.isNotNull(kp.getZbbn()) && kp.getZbbn().compareTo(new BigDecimal("0")) > 0) {
//            sgb.put("zb", sgb.getBigDecimal("lj").divide(kp.getZbbn(), 10, RoundingMode.HALF_UP).multiply(new BigDecimal("100"))
//                  .setScale(2, RoundingMode.HALF_UP) + "%");
//         }
//         sgb.put("tb", "");
//         array.add(sgb);
//         JSONObject tf = new JSONObject();
//         tf.put("name", "通方公司");
//         tf.put("lj", kp.getTfbn() == null ? BigDecimal.ZERO : kp.getTfbn());
//         tf.put("zb", "");
//         if (ObjUtil.isNotNull(kp.getZbbn()) && kp.getZbbn().compareTo(new BigDecimal("0")) > 0) {
//            tf.put("zb", tf.getBigDecimal("lj").divide(kp.getZbbn(), 10, RoundingMode.HALF_UP).multiply(new BigDecimal("100"))
//                  .setScale(2, RoundingMode.HALF_UP) + "%");
//         }
//         tf.put("tb", "");
//         array.add(tf);
//         JSONObject jxc = new JSONObject();
//         jxc.put("name", "机械厂");
//         jxc.put("lj", kp.getJxcbn() == null ? BigDecimal.ZERO : kp.getJxcbn());
//         jxc.put("zb", "");
//         if (ObjUtil.isNotNull(kp.getZbbn()) && kp.getZbbn().compareTo(new BigDecimal("0")) > 0) {
//            jxc.put("zb", jxc.getBigDecimal("lj").divide(kp.getZbbn(), 10, RoundingMode.HALF_UP).multiply(new BigDecimal("100"))
//                  .setScale(2, RoundingMode.HALF_UP) + "%");
//         }
//         jxc.put("tb", "");
//         array.add(jxc);
//         JSONObject ymj = new JSONObject();
//         ymj.put("name", "一煤机");
//         ymj.put("lj", kp.getYmjbn() == null ? BigDecimal.ZERO : kp.getYmjbn());
//         ymj.put("zb", "");
//         if (ObjUtil.isNotNull(kp.getZbbn()) && kp.getZbbn().compareTo(new BigDecimal("0")) > 0) {
//            ymj.put("zb", ymj.getBigDecimal("lj").divide(kp.getZbbn(), 10, RoundingMode.HALF_UP).multiply(new BigDecimal("100"))
//                  .setScale(2, RoundingMode.HALF_UP) + "%");
//         }
//         ymj.put("tb", "");
//         array.add(ymj);
//      }
//      return array;
//   }
   private List<BigDecimal> handleChart(HomeZbjtVo htqd, String type) {
      if (StrUtil.equals(type, "1")) {
         List<BigDecimal> srList = new ArrayList<>();
         srList.add(htqd.getSmjby() == null ? BigDecimal.ZERO : htqd.getSmjby());
         srList.add(htqd.getSgbby() == null ? BigDecimal.ZERO : htqd.getSgbby());
         srList.add(htqd.getTfby() == null ? BigDecimal.ZERO : htqd.getTfby());
         srList.add(htqd.getJxcby() == null ? BigDecimal.ZERO : htqd.getJxcby());
         srList.add(htqd.getYmjby() == null ? BigDecimal.ZERO : htqd.getYmjby());
         return srList;
      }
      if (StrUtil.equals(type, "2")) {
         List<BigDecimal> srList = new ArrayList<>();
         srList.add(htqd.getSmjbn() == null ? BigDecimal.ZERO : htqd.getSmjbn());
         srList.add(htqd.getSgbbn() == null ? BigDecimal.ZERO : htqd.getSgbbn());
         srList.add(htqd.getTfbn() == null ? BigDecimal.ZERO : htqd.getTfbn());
         srList.add(htqd.getJxcbn() == null ? BigDecimal.ZERO : htqd.getJxcbn());
         srList.add(htqd.getYmjbn() == null ? BigDecimal.ZERO : htqd.getYmjbn());
         return srList;
      }
      return null;
   }
   @Override
   public R homeZbjt() {
      List<HomeZbjtVo> homeZbjtVoList = new ArrayList<>();
//      List<HomeZbjtVo> homeZbjtVoList = new ArrayList<>();
//      String curYear = DateUtil.year(new Date()) + "";
//      String curMonth = DateUtil.month(new Date()) + "";
      //出货
//      HomeZbjtVo ch = contractOutBoundMapper.homeZbjt();
//      homeZbjtVoList.add(ch);
      //只保留销售收入 回款 新增合同
      //开票
      HomeZbjtVo kp = contractInvoiceMapper.homeZbjt();
      homeZbjtVoList.add(kp);
//      HomeZbjtVo kp = contractInvoiceMapper.homeZbjt();
//      kp.calcZbjt(kp);
//
//      kp = handleWCAndTB("2", curMonth, curYear, kp);
//
//      homeZbjtVoList.add(kp);
      //回款
      HomeZbjtVo hk = paymentSlipMapper.homeZbjt();
      homeZbjtVoList.add(hk);
//      HomeZbjtVo hk = paymentSlipMapper.homeZbjt();
//      hk.calcZbjt(hk);
//      hk = handleWCAndTB("3", curMonth, curYear, hk);
//
//      homeZbjtVoList.add(hk);
      //合同签订 sgb smj jxc tfgs ymj
      HomeZbjtVo htqd = contractMapper.homeZbjt();
      homeZbjtVoList.add(htqd);
//      HomeZbjtVo htqd = contractMapper.homeZbjt();
//      htqd.calcZbjt(htqd);
//      hk = handleWCAndTB("1", curMonth, curYear, htqd);
//      homeZbjtVoList.add(htqd);
      //赊销产生值 今天发货加今天开票额
//      if (ObjUtil.isNotNull(ch)&&ObjUtil.isNotNull(kp)){
//         HomeZbjtVo sxsy = ch.add(kp);
@@ -1012,7 +1176,116 @@
//      //逾期产生值 今天产生-今天已付
//
//      homeZbjtVoList.add(yq);
      return R.ok(homeZbjtVoList);
      return R.ok();
   }
   private HomeZbjtVo handleWCAndTB(String planType, String curMonth, String curYear, HomeZbjtVo kp) {
      List<Long> compIds = new ArrayList<>();
      compIds.add(2089995177814495234L);
      compIds.add(2089996921978040321L);
      compIds.add(2089997578009128962L);
      compIds.add(2101966257365045249L);
      //装备
//      AnnualPlanTotalVo planListZB = annualPlanMapper.selectPlanYear(curYear, planType);
//      if (ObjUtil.isNotNull(planListZB)) {
//         AnnualPlanTotalVo planzb = BeanUtil.copyProperties(planListZB, AnnualPlanTotalVo.class);
//         BigDecimal curMonAmount = planzb.getMonthAmount(curMonth);
//         if (ObjUtil.isNotNull(kp.getZbby()) && kp.getZbby().compareTo(new BigDecimal("0")) > 0) {
//            kp.setSmjbywc(kp.getZbby().divide(curMonAmount, 10, RoundingMode.HALF_UP).multiply(new BigDecimal("100"))
//                  .setScale(2, RoundingMode.HALF_UP) + "%");
//         }
//         BigDecimal yearAmount = planzb.getTotalAmount();
//         if (ObjUtil.isNotNull(kp.getZbbn()) && kp.getZbbn().compareTo(new BigDecimal("0")) > 0) {
//            kp.setSmjbywc(kp.getZbbn().divide(yearAmount, 10, RoundingMode.HALF_UP).multiply(new BigDecimal("100"))
//                  .setScale(2, RoundingMode.HALF_UP) + "%");
//         }
//      }
//      //石煤机收入
//      AnnualPlan planListSMJ = annualPlanMapper.selectOne(Wrappers.<AnnualPlan>lambdaQuery()
//            .eq(AnnualPlan::getPlanYear, curYear).eq(AnnualPlan::getPlanType, planType)
//            .in(AnnualPlan::getCompId, compIds).last("limit 1"));
//      if (ObjUtil.isNotNull(planListSMJ)) {
//         AnnualPlanTotalVo plansmj = BeanUtil.copyProperties(planListSMJ, AnnualPlanTotalVo.class);
//         BigDecimal curMonAmount = plansmj.getMonthAmount(curMonth);
//         if (ObjUtil.isNotNull(kp.getSmjby()) && kp.getSmjby().compareTo(new BigDecimal("0")) > 0) {
//            kp.setSmjbywc(kp.getSmjby().divide(curMonAmount, 10, RoundingMode.HALF_UP).multiply(new BigDecimal("100"))
//                  .setScale(2, RoundingMode.HALF_UP) + "%");
//         }
//         BigDecimal yearAmount = plansmj.getTotalAmount();
//         if (ObjUtil.isNotNull(kp.getSmjbn()) && kp.getSmjbn().compareTo(new BigDecimal("0")) > 0) {
//            kp.setSmjbywc(kp.getSmjbn().divide(yearAmount, 10, RoundingMode.HALF_UP).multiply(new BigDecimal("100"))
//                  .setScale(2, RoundingMode.HALF_UP) + "%");
//         }
//      }
//      //石工泵收入
//      AnnualPlan planListSRSGB = annualPlanMapper.selectOne(Wrappers.<AnnualPlan>lambdaQuery()
//            .eq(AnnualPlan::getPlanYear, curYear).eq(AnnualPlan::getPlanType, planType)
//            .eq(AnnualPlan::getCompId, 2056556196124250113L).last("limit 1"));
//      if (ObjUtil.isNotNull(planListSRSGB)) {
//         AnnualPlanTotalVo plansgb = BeanUtil.copyProperties(planListSRSGB, AnnualPlanTotalVo.class);
//         BigDecimal curMonAmount = plansgb.getMonthAmount(curMonth);
//         if (ObjUtil.isNotNull(kp.getSgbby()) && kp.getSgbby().compareTo(new BigDecimal("0")) > 0) {
//            kp.setSmjbywc(kp.getSgbby().divide(curMonAmount, 10, RoundingMode.HALF_UP).multiply(new BigDecimal("100"))
//                  .setScale(2, RoundingMode.HALF_UP) + "%");
//         }
//         BigDecimal yearAmount = plansgb.getTotalAmount();
//         if (ObjUtil.isNotNull(kp.getSgbbn()) && kp.getSgbbn().compareTo(new BigDecimal("0")) > 0) {
//            kp.setSmjbywc(kp.getSgbbn().divide(yearAmount, 10, RoundingMode.HALF_UP).multiply(new BigDecimal("100"))
//                  .setScale(2, RoundingMode.HALF_UP) + "%");
//         }
//      }
//      //通方公司收入
//      AnnualPlan planListSRTFGS = annualPlanMapper.selectOne(Wrappers.<AnnualPlan>lambdaQuery()
//            .eq(AnnualPlan::getPlanYear, curYear).eq(AnnualPlan::getPlanType, planType)
//            .eq(AnnualPlan::getCompId, 2056556421857497090L).last("limit 1"));
//      if (ObjUtil.isNotNull(planListSRTFGS)) {
//         AnnualPlanTotalVo plantf = BeanUtil.copyProperties(planListSRTFGS, AnnualPlanTotalVo.class);
//         BigDecimal curMonAmount = plantf.getMonthAmount(curMonth);
//         if (ObjUtil.isNotNull(kp.getTfby()) && kp.getTfby().compareTo(new BigDecimal("0")) > 0) {
//            kp.setSmjbywc(kp.getTfby().divide(curMonAmount, 10, RoundingMode.HALF_UP).multiply(new BigDecimal("100"))
//                  .setScale(2, RoundingMode.HALF_UP) + "%");
//         }
//         BigDecimal yearAmount = plantf.getTotalAmount();
//         if (ObjUtil.isNotNull(kp.getTfbn()) && kp.getTfbn().compareTo(new BigDecimal("0")) > 0) {
//            kp.setSmjbywc(kp.getTfbn().divide(yearAmount, 10, RoundingMode.HALF_UP).multiply(new BigDecimal("100"))
//                  .setScale(2, RoundingMode.HALF_UP) + "%");
//         }
//      }
//      //机械厂收入
//      AnnualPlan planListSRJXC = annualPlanMapper.selectOne(Wrappers.<AnnualPlan>lambdaQuery()
//            .eq(AnnualPlan::getPlanYear, curYear).eq(AnnualPlan::getPlanType, planType)
//            .eq(AnnualPlan::getCompId, 2056556317461270529L).last("limit 1"));
//      if (ObjUtil.isNotNull(planListSRJXC)) {
//         AnnualPlanTotalVo planjxc = BeanUtil.copyProperties(planListSRJXC, AnnualPlanTotalVo.class);
//         BigDecimal curMonAmount = planjxc.getMonthAmount(curMonth);
//         if (ObjUtil.isNotNull(kp.getJxcby()) && kp.getJxcby().compareTo(new BigDecimal("0")) > 0) {
//            kp.setSmjbywc(kp.getJxcby().divide(curMonAmount, 10, RoundingMode.HALF_UP).multiply(new BigDecimal("100"))
//                  .setScale(2, RoundingMode.HALF_UP) + "%");
//         }
//         BigDecimal yearAmount = planjxc.getTotalAmount();
//         if (ObjUtil.isNotNull(kp.getJxcbn()) && kp.getJxcbn().compareTo(new BigDecimal("0")) > 0) {
//            kp.setSmjbywc(kp.getJxcbn().divide(yearAmount, 10, RoundingMode.HALF_UP).multiply(new BigDecimal("100"))
//                  .setScale(2, RoundingMode.HALF_UP) + "%");
//         }
//      }
//      //一煤机收入
//      AnnualPlan planListHYMJ = annualPlanMapper.selectOne(Wrappers.<AnnualPlan>lambdaQuery()
//            .eq(AnnualPlan::getPlanYear, curYear).eq(AnnualPlan::getPlanType, planType)
//            .eq(AnnualPlan::getCompId, 2056556535640576002L).last("limit 1"));
//      if (ObjUtil.isNotNull(planListHYMJ)) {
//         AnnualPlanTotalVo planymj = BeanUtil.copyProperties(planListHYMJ, AnnualPlanTotalVo.class);
//         BigDecimal curMonAmount = planymj.getMonthAmount(curMonth);
//         if (ObjUtil.isNotNull(kp.getYmjby()) && kp.getYmjby().compareTo(new BigDecimal("0")) > 0) {
//            kp.setSmjbywc(kp.getYmjby().divide(curMonAmount, 10, RoundingMode.HALF_UP).multiply(new BigDecimal("100"))
//                  .setScale(2, RoundingMode.HALF_UP) + "%");
//         }
//         BigDecimal yearAmount = planymj.getTotalAmount();
//         if (ObjUtil.isNotNull(kp.getYmjbn()) && kp.getYmjbn().compareTo(new BigDecimal("0")) > 0) {
//            kp.setSmjbywc(kp.getYmjbn().divide(yearAmount, 10, RoundingMode.HALF_UP).multiply(new BigDecimal("100"))
//                  .setScale(2, RoundingMode.HALF_UP) + "%");
//         }
//      }
      return kp;
   }
   @Override
@@ -1076,7 +1349,8 @@
      compIds.add(Long.valueOf(jxc));
      if (compIds.contains(userId)){
         return R.ok(false);
      };
      }
      ;
      return R.ok(true);
   }
@@ -1111,8 +1385,7 @@
            .le(StrUtil.isNotEmpty(queryDTO.getQueryType())&&StrUtil.equals(queryDTO.getQueryType(),"3"),Contract::getSignDate,endOfYear)
            .eq(StrUtil.isNotEmpty(queryDTO.getQueryArea()),BusinessCustomer::getAreaId,queryDTO.getQueryArea())
            .eq(StrUtil.isNotEmpty(queryDTO.getQueryServiceAttr()),BusinessCustomer::getExportServiceAttr,queryDTO.getQueryServiceAttr())
            .orderByDesc(Contract::getCreateTime)
            ;
            .orderByDesc(Contract::getCreateTime);
      return R.ok(contractMapper.selectList(wrapper));
   }
@@ -1146,8 +1419,7 @@
            .le(StrUtil.isNotEmpty(queryDTO.getQueryType())&&StrUtil.equals(queryDTO.getQueryType(),"3"),PaymentSlip::getPaymentTime,endOfYear)
            .eq(StrUtil.isNotEmpty(queryDTO.getQueryArea()),BusinessCustomer::getAreaId,queryDTO.getQueryArea())
            .eq(StrUtil.isNotEmpty(queryDTO.getQueryServiceAttr()),BusinessCustomer::getExportServiceAttr,queryDTO.getQueryServiceAttr())
            .orderByDesc(PaymentSlip::getCreateTime)
            ;
            .orderByDesc(PaymentSlip::getCreateTime);
      return R.ok(paymentSlipMapper.selectList(wrapper));
   }
@@ -1189,8 +1461,7 @@
            .le(StrUtil.isNotEmpty(queryDTO.getQueryType())&&StrUtil.equals(queryDTO.getQueryType(),"3"),ContractOutBound::getOutBoundTime,endOfYear)
            .eq(StrUtil.isNotEmpty(queryDTO.getQueryArea()),BusinessCustomer::getAreaId,queryDTO.getQueryArea())
            .eq(StrUtil.isNotEmpty(queryDTO.getQueryServiceAttr()),BusinessCustomer::getExportServiceAttr,queryDTO.getQueryServiceAttr())
            .orderByDesc(ContractOutBound::getCreateTime)
            ;
            .orderByDesc(ContractOutBound::getCreateTime);
      return R.ok(contractOutBoundMapper.selectJoinList(HomeOutBoundVo.class,wrapper));
   }
@@ -1227,8 +1498,7 @@
            .le(StrUtil.isNotEmpty(queryDTO.getQueryType())&&StrUtil.equals(queryDTO.getQueryType(),"3"),ContractInvoice::getInvoiceTime,endOfYear)
            .eq(StrUtil.isNotEmpty(queryDTO.getQueryArea()),BusinessCustomer::getAreaId,queryDTO.getQueryArea())
            .eq(StrUtil.isNotEmpty(queryDTO.getQueryServiceAttr()),BusinessCustomer::getExportServiceAttr,queryDTO.getQueryServiceAttr())
            .orderByDesc(ContractInvoice::getCreateTime)
            ;
            .orderByDesc(ContractInvoice::getCreateTime);
      return R.ok(contractInvoiceMapper.selectJoinList(HomeInvoiceVo.class,wrapper));
   }
@@ -1270,8 +1540,7 @@
            .le(StrUtil.isNotEmpty(queryDTO.getQueryType())&&StrUtil.equals(queryDTO.getQueryType(),"3"),ContractOutBound::getOutBoundTime,endOfYear)
            .eq(StrUtil.isNotEmpty(queryDTO.getQueryArea()),BusinessCustomer::getAreaId,queryDTO.getQueryArea())
            .eq(StrUtil.isNotEmpty(queryDTO.getQueryServiceAttr()),BusinessCustomer::getExportServiceAttr,queryDTO.getQueryServiceAttr())
            .orderByDesc(ContractOutBound::getCreateTime)
            ;
            .orderByDesc(ContractOutBound::getCreateTime);
      return R.ok(contractOutBoundMapper.selectJoinList(HomeCreditSaleVo.class,wrapper));
   }
@@ -1308,8 +1577,7 @@
            .le(StrUtil.isNotEmpty(queryDTO.getQueryType())&&StrUtil.equals(queryDTO.getQueryType(),"3"),CurrentOverdue::getContractExpirTime,endOfYear)
            .eq(StrUtil.isNotEmpty(queryDTO.getQueryArea()),BusinessCustomer::getAreaId,queryDTO.getQueryArea())
            .eq(StrUtil.isNotEmpty(queryDTO.getQueryServiceAttr()),BusinessCustomer::getExportServiceAttr,queryDTO.getQueryServiceAttr())
            .orderByDesc(CurrentOverdue::getCreateTime)
            ;
            .orderByDesc(CurrentOverdue::getCreateTime);
      return R.ok(currentOverdueMapper.selectJoinList(HomeOverdueVo.class,wrapper));
   }