数据报表数据统计-应收

consoleStatistics/src/main/java/com/jzg/console/service/impl/ReportReceivableDataServiceImpl.java

@@ -1,21 +1,19 @@
 package com.jzg.console.service.impl;
 
 
-import com.alibaba.excel.annotation.ExcelIgnore;
-import com.alibaba.excel.annotation.ExcelProperty;
-import com.alibaba.excel.annotation.write.style.ColumnWidth;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jzg.commons.entity.report.dto.*;
 import com.jzg.commons.entity.report.vo.ReportSearchCommonVo;
-import com.jzg.console.service.ReportCostVerificationDataService;
 import com.jzg.console.service.ReportReceivableDataService;
-import io.swagger.v3.oas.annotations.media.Schema;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 
 /**
@@ -26,6 +24,9 @@ import java.util.List;
  */
 @Service
 public class ReportReceivableDataServiceImpl extends ReportBaseServiceImpl implements ReportReceivableDataService {
+
+    private static final Logger log = LoggerFactory.getLogger(ReportReceivableDataServiceImpl.class);
+
     /**
      *  @version
      *  @author: hxl
@@ -34,7 +35,8 @@ public class ReportReceivableDataServiceImpl extends ReportBaseServiceImpl imple
      */
     @Override
     public List<?> getListByParams(ReportSearchCommonVo reportSearchCommonVo){
-        return getList();
+        log.info("数据报表-财务数据-应收. reportSearchCommonVo=[{}]", JSONUtil.toJsonStr(reportSearchCommonVo));
+        return getList(reportSearchCommonVo);
     }
     @Override
     public IPage<?> getPageListByParams(ReportSearchCommonVo reportSearchCommonVo) {
@@ -48,7 +50,7 @@ public class ReportReceivableDataServiceImpl extends ReportBaseServiceImpl imple
      */
     @Override
     public void downloadListByParams(ReportSearchCommonVo reportSearchCommonVo) {
-        List<ReportReceivableDataDto> list = getList();
+        List<ReportReceivableDataDto> list = getList(reportSearchCommonVo);
         upLoadFile(reportSearchCommonVo, ReportReceivableDataDto.class,list,"财务数据-应收-列表导出-"+ reportSearchCommonVo.getUserId());
     }
     /**
@@ -83,8 +85,16 @@ public class ReportReceivableDataServiceImpl extends ReportBaseServiceImpl imple
      *  @Date: 2025/9/24 10:42
      *  @Description:  模拟数据
      */
-    public List<ReportReceivableDataDto>  getList(){
+    public List<ReportReceivableDataDto>  getList(ReportSearchCommonVo param){
+        log.info("数据报表-财务数据-应收。 param=[{}]", JSONUtil.toJsonStr(param));
         List<ReportReceivableDataDto> list =new ArrayList<>();
+        // 和财务沟通过， 开票的时候，一个月的进行开票，不进行跨月开票。
+        List<String> years = param.getYear();
+        String year="";
+        if(CollUtil.isNotEmpty(years)){
+            year = years.get(0);
+        }
+
         ReportReceivableDataDto reportReceivableDataDto = ReportReceivableDataDto.builder()
                 .yearAndMonthTime("2023-10").accountsReceivableMoney(new BigDecimal(100))
                 .uninvoicedMoney(new BigDecimal(100)).invoicedMoney(new BigDecimal(100))