Merge remote-tracking branch 'origin/dev_jzg_lipf_v20260622' into dev_jzg_lipf_v20260622

commons/src/main/java/com/jzg/commons/entity/finance/vo/QueryFollowIncomeVo.java

@@ -3,13 +3,17 @@ package com.jzg.commons.entity.finance.vo;
 import com.jzg.commons.core.base.PageRequest;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
 import java.util.List;
 
 @Data
 @AllArgsConstructor
+@NoArgsConstructor
+@Builder
 public class QueryFollowIncomeVo  extends PageRequest implements Serializable {
 
     @Schema(description = "开始年份")

commons/src/main/java/com/jzg/commons/entity/report/vo/PayableStatisticsDetailParam.java

@@ -17,6 +17,6 @@ public class PayableStatisticsDetailParam extends PageRequest {
     private static final long serialVersionUID = 1L;
 
     @Schema(description = "年月时间，格式：yyyy-MM")
-    private String yearAndMonthTime;
+    private String yearMonth;
 
 }

consoleStatistics/src/main/java/com/jzg/console/controller/ReportFinanceDataManageController.java

@@ -5,20 +5,22 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jzg.commons.core.base.BaseController;
 import com.jzg.commons.core.page.HttpResult;
+import com.jzg.commons.entity.orders.vo.FeeAuditVo;
 import com.jzg.commons.entity.report.dto.FeeAuditSummaryVo;
 import com.jzg.commons.entity.report.vo.FeeAuditDetailParam;
 import com.jzg.commons.entity.report.vo.FeeAuditSummaryParam;
 import com.jzg.commons.entity.report.vo.PayableStatisticsDetailParam;
 import com.jzg.commons.entity.report.vo.ReportSearchCommonVo;
-import com.jzg.commons.entity.orders.vo.FeeAuditVo;
 import com.jzg.console.service.*;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -502,5 +504,26 @@ public class ReportFinanceDataManageController extends BaseController {
             return HttpResult.error(e.getMessage());
         }
     }
+    /**
+     * 财务数据-应付统计：按月份汇总查询应付数据导出
+     * @author: jk
+     */
+    @Operation(summary = "财务数据-应付统计导出Excel", description = "财务数据-应付统计导出Excel")
+    @PostMapping(value = "/exportPayableStatistics")
+    public void exportPayableStatistics(@RequestBody ReportSearchCommonVo reportSearchCommonVo) {
+        String systemCode = getSystemCode();
+        reportMeetDataService.exportPayableStatistics(reportSearchCommonVo, systemCode);
+    }
+
+    /**
+     * 财务数据-应付统计明细：查询指定年月的提现明细列表导出
+     * @author: jk
+     */
+    @Operation(summary = "财务数据-应付统计明细导出Excel", description = "财务数据-应付统计明细导出Excel")
+    @PostMapping(value = "/exportPayableStatisticsDetail")
+    public void exportPayableStatisticsDetail(@RequestBody PayableStatisticsDetailParam param) {
+        String systemCode = getSystemCode();
+        reportMeetDataService.exportPayableStatisticsDetail(param, systemCode);
+    }
 
 }

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

@@ -95,7 +95,7 @@ public class ReportMeetDataServiceImpl extends ReportBaseServiceImpl implements
     @Override
     public IPage<?> getPayableStatisticsDetail(PayableStatisticsDetailParam param, String systemCode) {
         log.info("财务数据-应付统计明细. param=[{}], systemCode=[{}]", JSONUtil.toJsonStr(param), systemCode);
-        if (param == null || StrUtil.isBlank(param.getYearAndMonthTime())) {
+        if (param == null || StrUtil.isBlank(param.getYearMonth())) {
             log.warn("查询年月为空，返回空列表");
             return new Page<>(param.getPages(), param.getSize());
         }
@@ -138,7 +138,7 @@ public class ReportMeetDataServiceImpl extends ReportBaseServiceImpl implements
     @Override
     public void exportPayableStatisticsDetail(PayableStatisticsDetailParam param, String systemCode) {
         log.info("财务数据-应付统计明细导出Excel. param=[{}], systemCode=[{}]", JSONUtil.toJsonStr(param), systemCode);
-        if (param == null || StrUtil.isBlank(param.getYearAndMonthTime())) {
+        if (param == null || StrUtil.isBlank(param.getYearMonth())) {
             log.warn("查询年月为空，不导出");
             return;
         }

consoleStatistics/src/main/resources/mapper/ReportMeetDataMapper.xml

@@ -153,8 +153,8 @@
         <where>
             saa.is_delete = 0
             AND saa.system_code = #{systemCode}
-            <if test="param.yearAndMonthTime != null and param.yearAndMonthTime != ''">
-                AND DATE_FORMAT(saa.create_time, '%Y-%m') = #{param.yearAndMonthTime}
+            <if test="param.yearMonth != null and param.yearMonth != ''">
+                AND DATE_FORMAT(saa.create_time, '%Y-%m') = #{param.yearMonth}
             </if>
         </where>
         ORDER BY saa.create_time DESC

tenant/organization/src/main/java/com/jzg/organization/service/impl/ReceivableServiceImpl.java

@@ -961,11 +961,12 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
      * 查询收入基础数据
      */
     private List<InsPlyIncomeDto> queryFollowIncomeData(SettlementReportQueryVo queryVo) {
-        QueryFollowIncomeVo incomeVo = new QueryFollowIncomeVo(
-                null, null, baseController.getSystemCode(), null,
-                queryVo.getCompanyId(), queryVo.getStartTime(), queryVo.getEndTime(),
-                queryVo.getSigningStartTime(), queryVo.getSigningEndTime()
-        );
+        QueryFollowIncomeVo incomeVo = QueryFollowIncomeVo.builder()
+                .systemCode(baseController.getSystemCode())
+                .companyId(queryVo.getCompanyId())
+                .startTime(queryVo.getStartTime()).endTime(queryVo.getEndTime())
+                .signingStartTime(queryVo.getSigningStartTime()).signingEndTime(queryVo.getSigningEndTime())
+                .build();
         return baseMapper.queryFollowIncome(incomeVo);
     }
 
@@ -4243,7 +4244,7 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
         String systemCode = baseController.getUserSystemCode();
 
         // 查询该年份下的所有跟进收入数据，并按合作方公司ID进行分组
-        QueryFollowIncomeVo queryFollowIncomeVo = new QueryFollowIncomeVo(startYear, endYear, systemCode, null, null, null, null, null, null);
+        QueryFollowIncomeVo queryFollowIncomeVo = QueryFollowIncomeVo.builder().startYear(startYear).endYear(endYear).systemCode(systemCode).build();
         List<InsPlyIncomeDto> incomes = baseMapper.queryFollowIncome(queryFollowIncomeVo);
 
         // ====================== 增加动态条件过滤 ======================