Merge branch 'dev_jzg_lipf_v20260403'

commons/src/main/java/com/jzg/commons/entity/quote/vo/base/OrderBase.java

@@ -11,9 +11,9 @@ import java.io.Serial;
 import java.io.Serializable;
 
 /**
- * @description: 订单交互信息
- * @author: wenks
- * @date: 2025/2/21 16:28
+ * @description 订单交互信息
+ * @author wenks
+ * @date 2025/2/21 16:28
  **/
 @Data
 public class OrderBase implements Serializable {

commons/src/main/java/com/jzg/commons/entity/report/po/ReportUploadExcelTask.java

@@ -15,10 +15,10 @@ import java.io.Serializable;
 import java.util.Date;
 
 /**
- *  @version
- *  @author: hxl
- *  @Date: 2025/9/16 15:30
- *  @Description: 导入任务表
+ * 导入任务表
+ *
+ * @author hxl
+ * @Date 2025/9/16 15:30
  */
 @TableName(value ="report_upload_excel_task")
 @Builder

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

@@ -3,7 +3,6 @@ package com.jzg.console.controller;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.jzg.commons.core.base.BaseController;
 import com.jzg.commons.core.page.HttpResult;
-import com.jzg.commons.entity.report.dto.ReportSearchConfigurationDto;
 import com.jzg.commons.entity.report.vo.ReportSearchCommonVo;
 import com.jzg.console.service.*;
 import io.swagger.v3.oas.annotations.Operation;
@@ -12,13 +11,11 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
-
 /**
- *  @version
- *  @author: hxl
- *  @Date: 2025/9/22 17:56
- *  @Description: 业务数据管理
+ * 业务数据管理
+ *
+ * @author hxl
+ * @Date 2025/9/22 17:56
  */
 @Slf4j
 @Tag(name="业务数据管理")
@@ -52,10 +49,10 @@ public class ReportBusinessDataManageController extends BaseController {
 
 
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2025/9/22 17:08
-     *  @Description: 业务数据-保险公司-列表
+     * 业务数据-保险公司-列表
+     *
+     * @author hxl
+     * @Date 2025/9/22 17:08
      */
     @Operation(summary = "业务数据-保险公司-列表查询", description = "业务数据-保险公司-列表查询")
     @PostMapping(value = "/companyDataManagePageList")
@@ -64,14 +61,15 @@ public class ReportBusinessDataManageController extends BaseController {
             IPage<?> pageList = reportCompanyDataManageService.getPageListByParams(reportSearchCommonVo);
             return HttpResult.ok(pageList);
         }catch (Exception e){
+            log.error("业务数据-保险公司-列表查询", e);
             return HttpResult.error(e.getMessage());
         }
     }
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2025/9/22 17:09
-     *  @Description: 业务数据-保险公司-列表导出
+     * 业务数据-保险公司-列表导出
+     *
+     * @author hxl
+     * @Date 2025/9/22 17:09
      */
     @Operation(summary = "业务数据-保险公司-列表导出", description = "业务数据-保险公司-列表导出")
     @PostMapping(value = "/companyDataManageToTask")
@@ -84,10 +82,10 @@ public class ReportBusinessDataManageController extends BaseController {
         }
     }
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2025/9/22 17:11
-     *  @Description:  业务数据-保险公司-明细查询
+     * 业务数据-保险公司-明细查询
+     *
+     * @author hxl
+     * @Date 2025/9/22 17:11
      */
     @Operation(summary = "业务数据-保险公司-明细查询", description = "业务数据-保险公司-明细查询")
     @PostMapping(value = "/companyDataManageDetailPageList")
@@ -100,10 +98,10 @@ public class ReportBusinessDataManageController extends BaseController {
         }
     }
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2025/9/22 17:11
-     *  @Description:  业务数据-保险公司-明细导出
+     * 业务数据-保险公司-明细导出
+     *
+     * @author hxl
+     * @Date 2025/9/22 17:11
      */
     @Operation(summary = "业务数据-保险公司-明细导出", description = "业务数据-保险公司-明细导出")
     @PostMapping(value = "/companyDataManageDetailToTask")
@@ -117,10 +115,10 @@ public class ReportBusinessDataManageController extends BaseController {
     }
 
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2025/9/22 17:08
-     *  @Description: 业务数据-险种报表-列表
+     * 业务数据-险种报表-列表
+     *
+     * @author hxl
+     * @Date 2025/9/22 17:08
      */
     @Operation(summary = "业务数据-险种报表-列表查询", description = "业务数据-险种报表-列表查询")
     @PostMapping(value = "/riskDataManagePageList")
@@ -133,10 +131,10 @@ public class ReportBusinessDataManageController extends BaseController {
         }
     }
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2025/9/22 17:09
-     *  @Description: 业务数据-险种报表-列表导出
+     * 业务数据-险种报表-列表导出
+     *
+     * @author hxl
+     * @Date 2025/9/22 17:09
      */
     @Operation(summary = "业务数据-险种报表-列表导出", description = "业务数据-险种报表-列表导出")
     @PostMapping(value = "/riskDataManageToTask")
@@ -149,10 +147,10 @@ public class ReportBusinessDataManageController extends BaseController {
         }
     }
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2025/9/22 17:11
-     *  @Description:  业务数据-保险公司-明细查询
+     * 业务数据-保险公司-明细查询
+     *
+     * @author hxl
+     * @Date 2025/9/22 17:11
      */
     @Operation(summary = "业务数据-险种报表-明细查询", description = "业务数据-险种报表-明细查询")
     @PostMapping(value = "/riskDataManageDetailPageList")
@@ -165,10 +163,10 @@ public class ReportBusinessDataManageController extends BaseController {
         }
     }
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2025/9/22 17:11
-     *  @Description:  业务数据-保险公司-明细导出
+     * 业务数据-保险公司-明细导出
+     *
+     * @author hxl
+     * @Date 2025/9/22 17:11
      */
     @Operation(summary = "业务数据-险种报表-明细导出", description = "业务数据-险种报表-明细导出")
     @PostMapping(value = "/riskDataManageDetailToPage")
@@ -182,10 +180,10 @@ public class ReportBusinessDataManageController extends BaseController {
     }
 
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2025/9/22 17:08
-     *  @Description: 业务数据-对接人-列表
+     * 业务数据-对接人-列表
+     *
+     * @author hxl
+     * @Date 2025/9/22 17:08
      */
     @Operation(summary = "业务数据-对接人-列表查询", description = "业务数据-对接人-列表查询")
     @PostMapping(value = "/contactPersonDataManagePageList")
@@ -198,10 +196,10 @@ public class ReportBusinessDataManageController extends BaseController {
         }
     }
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2025/9/22 17:09
-     *  @Description: 业务数据-对接人-列表导出
+     * 业务数据-对接人-列表导出
+     *
+     * @author hxl
+     * @Date 2025/9/22 17:09
      */
     @Operation(summary = "业务数据-对接人-列表导出", description = "业务数据-对接人-列表导出")
     @PostMapping(value = "/contactPersonDataManageToTask")
@@ -214,10 +212,10 @@ public class ReportBusinessDataManageController extends BaseController {
         }
     }
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2025/9/22 17:11
-     *  @Description:  业务数据-对接人-明细查询
+     * 业务数据-对接人-明细查询
+     *
+     * @author hxl
+     * @Date 2025/9/22 17:11
      */
     @Operation(summary = "业务数据-对接人-明细查询", description = "业务数据-对接人-明细查询")
     @PostMapping(value = "/contactPersonDataManageDetailPageList")
@@ -230,10 +228,10 @@ public class ReportBusinessDataManageController extends BaseController {
         }
     }
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2025/9/22 17:11
-     *  @Description:  业务数据-对接人-明细导出
+     * 业务数据-对接人-明细导出
+     *
+     * @author hxl
+     * @Date 2025/9/22 17:11
      */
     @Operation(summary = "业务数据-对接人-明细导出", description = "业务数据-对接人-明细导出")
     @PostMapping(value = "/contactPersonDataManageDetailToTask")
@@ -247,10 +245,10 @@ public class ReportBusinessDataManageController extends BaseController {
     }
 
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2025/9/22 17:08
-     *  @Description: 业务数据-业务员-列表
+     * 业务数据-业务员-列表
+     *
+     * @author hxl
+     * @Date 2025/9/22 17:08
      */
     @Operation(summary = "业务数据-业务员-列表查询", description = "业务数据-业务员-列表查询")
     @PostMapping(value = "/salesmanDataManagePageList")
@@ -263,10 +261,10 @@ public class ReportBusinessDataManageController extends BaseController {
         }
     }
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2025/9/22 17:09
-     *  @Description: 业务数据-业务员-列表导出
+     * 业务数据-业务员-列表导出
+     *
+     * @author hxl
+     * @Date 2025/9/22 17:09
      */
     @Operation(summary = "业务数据-业务员-列表导出", description = "业务数据-业务员-列表导出")
     @PostMapping(value = "/salesmanDataManageToTask")
@@ -279,10 +277,10 @@ public class ReportBusinessDataManageController extends BaseController {
         }
     }
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2025/9/22 17:11
-     *  @Description:  业务数据-保险公司-明细查询
+     * 业务数据-保险公司-明细查询
+     *
+     * @author hxl
+     * @Date 2025/9/22 17:11
      */
     @Operation(summary = "业务数据-业务员-明细查询", description = "业务数据-业务员-明细查询")
     @PostMapping(value = "/salesmanDataManageDetailPageList")
@@ -295,10 +293,10 @@ public class ReportBusinessDataManageController extends BaseController {
         }
     }
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2025/9/22 17:11
-     *  @Description:  业务数据-业务员-明细导出
+     * 业务数据-业务员-明细导出
+     *
+     * @author hxl
+     * @Date 2025/9/22 17:11
      */
     @Operation(summary = "业务数据-业务员-明细导出", description = "业务数据-业务员-明细导出")
     @PostMapping(value = "/salesmanDataManageDetailToTask")
@@ -312,10 +310,10 @@ public class ReportBusinessDataManageController extends BaseController {
     }
 
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2025/9/22 17:08
-     *  @Description: 业务数据-渠道-列表
+     * 业务数据-渠道-列表
+     *
+     * @author hxl
+     * @Date 2025/9/22 17:08
      */
     @Operation(summary = "业务数据-渠道-列表查询", description = "业务数据-渠道-列表查询")
     @PostMapping(value = "/channelDataManagePageList")
@@ -329,10 +327,10 @@ public class ReportBusinessDataManageController extends BaseController {
         }
     }
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2025/9/22 17:09
-     *  @Description: 业务数据-渠道-列表导出
+     * 业务数据-渠道-列表导出
+     *
+     * @author hxl
+     * @Date 2025/9/22 17:09
      */
     @Operation(summary = "业务数据-渠道-列表导出", description = "业务数据-渠道-列表导出")
     @PostMapping(value = "/channelDataManageToTask")
@@ -345,10 +343,10 @@ public class ReportBusinessDataManageController extends BaseController {
         }
     }
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2025/9/22 17:11
-     *  @Description:  业务数据-渠道-明细查询
+     * 业务数据-渠道-明细查询
+     *
+     * @author hxl
+     * @Date 2025/9/22 17:11
      */
     @Operation(summary = "业务数据-渠道-明细查询", description = "业务数据-渠道-明细查询")
     @PostMapping(value = "/channelDataManageDetailPageList")
@@ -361,10 +359,10 @@ public class ReportBusinessDataManageController extends BaseController {
         }
     }
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2025/9/22 17:11
-     *  @Description:  业务数据-渠道-明细导出
+     * 业务数据-渠道-明细导出
+     *
+     * @author hxl
+     * @Date 2025/9/22 17:11
      */
     @Operation(summary = "业务数据-渠道-明细导出", description = "业务数据-渠道-明细导出")
     @PostMapping(value = "/channelDataManageDetailToTask")
@@ -378,10 +376,10 @@ public class ReportBusinessDataManageController extends BaseController {
     }
 
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2025/9/22 17:08
-     *  @Description: 业务数据-电销-列表
+     * 业务数据-电销-列表
+     *
+     * @author hxl
+     * @Date 2025/9/22 17:08
      */
     @Operation(summary = "业务数据-电销-列表查询", description = "业务数据-电销-列表查询")
     @PostMapping(value = "/telemarketingDataManagePageList")
@@ -394,10 +392,10 @@ public class ReportBusinessDataManageController extends BaseController {
         }
     }
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2025/9/22 17:09
-     *  @Description: 业务数据-电销-列表导出
+     * 业务数据-电销-列表导出
+     *
+     * @author hxl
+     * @Date 2025/9/22 17:09
      */
     @Operation(summary = "业务数据-电销-列表导出", description = "业务数据-电销-列表导出")
     @PostMapping(value = "/telemarketingDataManageToTask")
@@ -410,10 +408,10 @@ public class ReportBusinessDataManageController extends BaseController {
         }
     }
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2025/9/22 17:11
-     *  @Description:  业务数据-电销-明细查询
+     * 业务数据-电销-明细查询
+     *
+     * @author hxl
+     * @Date 2025/9/22 17:11
      */
     @Operation(summary = "业务数据-电销-明细查询", description = "业务数据-电销-明细查询")
     @PostMapping(value = "/telemarketingDataManageDetailPageList")
@@ -426,10 +424,9 @@ public class ReportBusinessDataManageController extends BaseController {
         }
     }
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2025/9/22 17:11
-     *  @Description:  业务数据-电销-明细导出
+     * 业务数据-电销-明细导出
+     * @author hxl
+     * @Date 2025/9/22 17:11
      */
     @Operation(summary = "业务数据-电销-明细导出", description = "业务数据-电销-明细导出")
     @PostMapping(value = "/telemarketingDataManageDetailToTask")

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

@@ -12,10 +12,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 /**
- *  @version
- *  @author: hxl
- *  @Date: 2025/9/22 17:56
- *  @Description: 报价数据管理
+ *  
+ * @author hxl
+ * @Date 2025/9/22 17:56
+ *  报价数据管理
  */
 @Slf4j
 @Tag(name="报价数据管理")
@@ -45,10 +45,10 @@ public class ReportQuotationDataManageController extends BaseController {
 
 
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2025/9/22 17:08
-     *  @Description: 报价数据-报价订单-列表
+     *  
+     * @author hxl
+     * @Date 2025/9/22 17:08
+     *  报价数据-报价订单-列表
      */
     @Operation(summary = "报价数据-报价订单-列表查询", description = "报价数据-报价订单-列表查询")
     @PostMapping(value = "/quotationOrderDataPageList")
@@ -61,10 +61,10 @@ public class ReportQuotationDataManageController extends BaseController {
         }
     }
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2025/9/22 17:09
-     *  @Description: 报价数据-报价订单-列表导出
+     *  
+     * @author hxl
+     * @Date 2025/9/22 17:09
+     *  报价数据-报价订单-列表导出
      */
     @Operation(summary = "报价数据-报价订单-列表导出", description = "报价数据-报价订单-列表导出")
     @PostMapping(value = "/quotationOrderDataToTask")
@@ -78,10 +78,10 @@ public class ReportQuotationDataManageController extends BaseController {
     }
 
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2025/9/22 17:08
-     *  @Description: 报价数据-保险公司-列表
+     *  
+     * @author hxl
+     * @Date 2025/9/22 17:08
+     *  报价数据-保险公司-列表
      */
     @Operation(summary = "报价数据-保险公司-列表查询", description = "报价数据-保险公司-列表查询")
     @PostMapping(value = "/companyQuotationDataPageList")
@@ -94,10 +94,10 @@ public class ReportQuotationDataManageController extends BaseController {
         }
     }
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2025/9/22 17:09
-     *  @Description: 报价数据-保险公司-列表导出
+     *  
+     * @author hxl
+     * @Date 2025/9/22 17:09
+     *  报价数据-保险公司-列表导出
      */
     @Operation(summary = "报价数据-保险公司-列表导出", description = "报价数据-保险公司-列表导出")
     @PostMapping(value = "/companyQuotationDataToTask")
@@ -110,10 +110,10 @@ public class ReportQuotationDataManageController extends BaseController {
         }
     }
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2025/9/22 17:08
-     *  @Description: 报价数据-业务员-列表
+     *  
+     * @author hxl
+     * @Date 2025/9/22 17:08
+     *  报价数据-业务员-列表
      */
     @Operation(summary = "报价数据--业务员-列表查询", description = "报价数据--业务员-列表查询")
     @PostMapping(value = "/salesmanQuotationDataPageList")
@@ -126,10 +126,10 @@ public class ReportQuotationDataManageController extends BaseController {
         }
     }
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2025/9/22 17:09
-     *  @Description: 报价数据-业务员-列表导出
+     *  
+     * @author hxl
+     * @Date 2025/9/22 17:09
+     *  报价数据-业务员-列表导出
      */
     @Operation(summary = "报价数据-业务员-列表导出", description = "报价数据-业务员-列表导出")
     @PostMapping(value = "/salesmanQuotationDataToTask")
@@ -143,10 +143,10 @@ public class ReportQuotationDataManageController extends BaseController {
     }
 
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2025/9/22 17:08
-     *  @Description: 报价数据-渠道-列表
+     *  
+     * @author hxl
+     * @Date 2025/9/22 17:08
+     *  报价数据-渠道-列表
      */
     @Operation(summary = "报价数据-渠道-列表查询", description = "报价数据-渠道-列表查询")
     @PostMapping(value = "/channelQuotationDataPageList")
@@ -159,10 +159,10 @@ public class ReportQuotationDataManageController extends BaseController {
         }
     }
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2025/9/22 17:09
-     *  @Description: 报价数据-渠道-列表导出
+     *  
+     * @author hxl
+     * @Date 2025/9/22 17:09
+     *  报价数据-渠道-列表导出
      */
     @Operation(summary = "报价数据-渠道-列表导出", description = "报价数据-渠道-列表导出")
     @PostMapping(value = "/channelQuotationDataToTask")
@@ -176,10 +176,10 @@ public class ReportQuotationDataManageController extends BaseController {
     }
 
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2025/9/22 17:08
-     *  @Description: 报价数据-电销-列表
+     *  
+     * @author hxl
+     * @Date 2025/9/22 17:08
+     *  报价数据-电销-列表
      */
     @Operation(summary = "报价数据-电销-列表查询", description = "报价数据-电销-列表查询")
     @PostMapping(value = "/telemarketingQuotationDataPageList")
@@ -192,10 +192,10 @@ public class ReportQuotationDataManageController extends BaseController {
         }
     }
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2025/9/22 17:09
-     *  @Description: 报价数据-电销-列表导出
+     *  
+     * @author hxl
+     * @Date 2025/9/22 17:09
+     *  报价数据-电销-列表导出
      */
     @Operation(summary = "报价数据-电销-列表导出", description = "报价数据-电销-列表导出")
     @PostMapping(value = "/telemarketingQuotationDataToTask")

consoleStatistics/src/main/java/com/jzg/console/mapper/ReportCompanyDataManageMapper.java

@@ -1,37 +1,33 @@
 package com.jzg.console.mapper;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jzg.commons.entity.report.dto.ReportCompanyDataManageDto;
-import com.jzg.commons.entity.report.dto.ReportUploadExcelTaskDto;
-import com.jzg.commons.entity.report.po.ReportUploadExcelTask;
 import com.jzg.commons.entity.report.vo.ReportSearchCommonVo;
-import com.jzg.commons.entity.report.vo.ReportUploadExcelTaskVo;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
 /**
- *  @version 
- *  @author: hxl
- *  @Date: 2025/9/23 15:35
- *  @Description: 业务数据-保险公司
- */ 
+ * 业务数据-保险公司
+ *
+ *  @author hxl
+ *  @Date 2025/9/23 15:35
+ */
 public interface ReportCompanyDataManageMapper  {
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2025/9/23 15:37
-     *  @Description:  业务数据-保险公司-列表查询
+     * 业务数据-保险公司-列表查询
+     *
+     *  @author hxl
+     *  @Date 2025/9/23 15:37
      */
     IPage<ReportCompanyDataManageDto> getReportCompanyDataManagePageListByParams(@Param("page") Page<ReportCompanyDataManageDto> page, @Param("vo") ReportSearchCommonVo reportSearchCommonVo);
 
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2025/9/23 15:37
-     *  @Description:  业务数据-保险公司-导出查询
+     * 业务数据-保险公司-导出查询
+     *
+     *  @author hxl
+     *  @Date 2025/9/23 15:37
      */
     List<ReportCompanyDataManageDto> getReportCompanyDataManageAllListByParams(@Param("vo") ReportSearchCommonVo reportSearchCommonVo);
 }

consoleStatistics/src/main/java/com/jzg/console/service/ReportBaseService.java

@@ -4,43 +4,43 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.jzg.commons.entity.report.vo.ReportSearchCommonVo;
 
 /**
- *  @version 
- *  @author: hxl
- *  @Date: 2025/9/22 16:43
- *  @Description:  基础的实现类
- */ 
+ * 基础的实现类
+ *
+ * @author hxl
+ * @Date 2025/9/22 16:43
+ */
 public interface ReportBaseService {
 
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2025/9/22 17:02
-     *  @Description:  查询列表
+     *  业务数据-保险公司-列表
+     *
+     *  @author hxl
+     *  @Date 2025/9/22 17:02
      */
     IPage<?> getPageListByParams(ReportSearchCommonVo reportSearchCommonVo);
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2025/9/22 17:02
-     *  @Description:  导出列表
+     * 导出列表
+     *
+     * @author hxl
+     * @Date 2025/9/22 17:02
      */
     void downloadListByParams(ReportSearchCommonVo reportSearchCommonVo);
 
 
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2025/9/22 17:02
-     *  @Description:  查询详情列表
+     * 查询详情列表
+     *
+     * @author hxl
+     * @Date 2025/9/22 17:02
      */
     IPage<?> getPageDetailListByParams(ReportSearchCommonVo reportSearchCommonVo);
 
 
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2025/9/22 17:02
-     *  @Description:  导出详情列表
+     * 导出详情列表
+     *
+     * @author hxl
+     * @Date 2025/9/22 17:02
      */
     void downloadDetailListByParams(ReportSearchCommonVo reportSearchCommonVo);
 

consoleStatistics/src/main/java/com/jzg/console/service/ReportCompanyDataManageService.java

@@ -1,11 +1,11 @@
 package com.jzg.console.service;
 
 /**
- *  @version 
- *  @author: hxl
- *  @Date: 2025/9/22 16:43
- *  @Description:  业务数据-保险公司
- */ 
+ * 业务数据-保险公司
+ *
+ * @author hxl
+ * @Date 2025/9/22 16:43
+ */
 public interface ReportCompanyDataManageService extends  ReportBaseService{
 
 }

consoleStatistics/src/main/java/com/jzg/console/service/ReportContactPersonDataManageService.java

@@ -1,11 +1,10 @@
 package com.jzg.console.service;
 
 /**
- *  @version 
- *  @author: hxl
- *  @Date: 2025/9/22 16:43
- *  @Description:  业务数据-对接人
- */ 
+ * 业务数据-对接人
+ * @author hxl
+ * @Date 2025/9/22 16:43
+ */
 public interface ReportContactPersonDataManageService extends  ReportBaseService{
 
 }

consoleStatistics/src/main/java/com/jzg/console/service/ReportQuotationOrderDataService.java

@@ -1,10 +1,10 @@
 package com.jzg.console.service;
 
 /**
- *  @version 
- *  @author: hxl
- *  @Date: 2025/9/22 16:43
- *  @Description:  报价数据-报价订单
+ * 报价数据-报价订单
+ *
+ * @author hxl
+ * @Date 2025/9/22 16:43
  */ 
 public interface ReportQuotationOrderDataService extends  ReportBaseService{
 

consoleStatistics/src/main/java/com/jzg/console/service/ReportRiskDataManageService.java

@@ -1,11 +1,11 @@
 package com.jzg.console.service;
 
 /**
- *  @version 
- *  @author: hxl
- *  @Date: 2025/9/22 16:43
- *  @Description:  业务数据-险种报表
- */ 
+ * 业务数据-险种报表
+ *
+ * @author hxl
+ * @Date 2025/9/22 16:43
+ */
 public interface ReportRiskDataManageService extends  ReportBaseService{
 
 }

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

@@ -1,13 +1,10 @@
 package com.jzg.console.service.impl;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.jzg.commons.entity.report.dto.ReportCompanyDataManageDto;
 import com.jzg.commons.entity.report.po.ReportUploadExcelTask;
 import com.jzg.commons.entity.report.vo.ReportSearchCommonVo;
 import com.jzg.commons.util.MinioUtils;
 import com.jzg.console.service.ReportUploadExcelTaskService;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@@ -17,10 +14,10 @@ import java.util.List;
 import java.util.Set;
 
 /**
- *  @version 
- *  @author: hxl
- *  @Date: 2025/9/22 16:43
- *  @Description:  基础的实现类处理导出excel逻辑
+ * 基础的实现类处理导出excel逻辑
+ *
+ * @author hxl
+ * @Date 2025/9/22 16:43
  */
 @Slf4j
 @Service
@@ -35,11 +32,11 @@ public class ReportBaseServiceImpl {
     // 从配置文件获取存储桶名称
     @Value("${minio.bucket-name:excel-files}")
     private String bucketName;
+
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2025/9/24 10:28
-     *  @Description:  通用上传文件
+     * 通用上传文件
+     * @author hxl
+     * @Date 2025/9/24 10:28
      */
     public <T> void upLoadFile(ReportSearchCommonVo reportSearchCommonVo, Class<T> clazz, List<T> list, String upLoadName) {
         //打印导入数据的时间
@@ -54,14 +51,14 @@ public class ReportBaseServiceImpl {
                 .readStatus(0)
                 .build();
         reportUploadExcelTaskService.save(reportUploadExcelTask);
-        long endTime = System.currentTimeMillis();
+        long endTime;
         try{
             String fileName = MinioUtils.exportAndUploadToMinIO(upLoadName, clazz, list,bucketName,minioUrl);
             endTime = System.currentTimeMillis();
             long duration = endTime - startTime;
             double minutes = (double) duration / (1000 * 60);
-            log.info("方法执行时间: " + minutes + " 分钟");
-            log.debug("方法执行时间: " + minutes + " 分钟");
+            log.info("MinioUtils.exportAndUploadToMinIO方法执行时间:[{}]分钟", minutes);
+            log.debug("MinioUtils.exportAndUploadToMinIO方法执行时间[{}]分钟", minutes);
             reportUploadExcelTask.setTaskStatus(2);
             reportUploadExcelTask.setUploadMinutes(minutes);
             reportUploadExcelTask.setFilePath(fileName);
@@ -69,8 +66,8 @@ public class ReportBaseServiceImpl {
             endTime = System.currentTimeMillis();
             long duration = endTime - startTime;
             double minutes = (double) duration / (1000 * 60);
-            log.info("方法执行时间: " + minutes + " 分钟");
-            log.debug("方法执行时间: " + minutes + " 分钟");
+            log.info("MinioUtils.exportAndUploadToMinIO方法执行异常，方法执行时间[{}]分钟 ", minutes);
+            log.debug("MinioUtils.exportAndUploadToMinIO方法执行异常方法执行时间[{}]分钟",minutes);
             reportUploadExcelTask.setTaskStatus(0);
             reportUploadExcelTask.setUploadMinutes(minutes);
             reportUploadExcelTask.setUploadMsg(e.getMessage());

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

@@ -18,10 +18,10 @@ import java.util.Date;
 import java.util.List;
 
 /**
- *  @version
- *  @author: hxl
- *  @Date: 2025/9/22 16:45
- *  @Description:  业务数据-保险公司
+ * 业务数据-保险公司
+ *
+ * @author hxl
+ * @Date 2025/9/22 16:45
  */
 @Slf4j
 @Service
@@ -32,22 +32,21 @@ public class ReportCompanyDataManageServiceImpl extends ReportBaseServiceImpl im
 
 
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2025/9/23 11:49
-     *  @Description:  业务数据-保险公司-列表查询
+     * 业务数据-保险公司-列表查询
+     *
+     * @author hxl
+     * @Date 2025/9/23 11:49
      */
     @Override
     public IPage<?> getPageListByParams(ReportSearchCommonVo reportSearchCommonVo) {
         Page<ReportCompanyDataManageDto> page = new Page<>(reportSearchCommonVo.getPageNo(), reportSearchCommonVo.getPageSize());
-        IPage<ReportCompanyDataManageDto> orderList = reportCompanyDataManageMapper.getReportCompanyDataManagePageListByParams(page, reportSearchCommonVo);
-        return orderList;
+        return reportCompanyDataManageMapper.getReportCompanyDataManagePageListByParams(page, reportSearchCommonVo);
     }
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2025/9/24 10:21
-     *  @Description: 列表导出
+     * 列表导出
+     *
+     * @author hxl
+     * @Date 2025/9/24 10:21
      */
     @Async
     @Override
@@ -56,10 +55,10 @@ public class ReportCompanyDataManageServiceImpl extends ReportBaseServiceImpl im
         upLoadFile(reportSearchCommonVo, ReportCompanyDataManageDto.class,list,"业务数据-保险公司-列表查询-"+ reportSearchCommonVo.getUserId());
     }
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2025/9/23 11:49
-     *  @Description:  业务数据-保险公司-明细查询
+     * 业务数据-保险公司-明细查询
+     *
+     *  @author hxl
+     *  @Date 2025/9/23 11:49
      */
     @Override
     public IPage<?> getPageDetailListByParams(ReportSearchCommonVo reportSearchCommonVo) {
@@ -67,17 +66,17 @@ public class ReportCompanyDataManageServiceImpl extends ReportBaseServiceImpl im
         IPage<ReportCompanyDataManageDetailDto> detailPageList = new Page<ReportCompanyDataManageDetailDto>();
         List<ReportCompanyDataManageDetailDto> detailList = getDetailList();
         detailPageList.setRecords(detailList);
-        detailPageList.setTotal(1l);
+        detailPageList.setTotal(1L);
         detailPageList.setCurrent(reportSearchCommonVo.getPageNo());
         detailPageList.setPages(reportSearchCommonVo.getPageNo());
         detailPageList.setPages(reportSearchCommonVo.getPageSize());
         return detailPageList;
     }
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2025/9/24 10:39
-     *  @Description:  业务数据-保险公司-明细导出
+     * 业务数据-保险公司-明细导出
+     *
+     *  @author hxl
+     *  @Date 2025/9/24 10:39
      */
     @Override
     public void downloadDetailListByParams(ReportSearchCommonVo reportSearchCommonVo) {
@@ -85,10 +84,10 @@ public class ReportCompanyDataManageServiceImpl extends ReportBaseServiceImpl im
         upLoadFile(reportSearchCommonVo, ReportCompanyDataManageDetailDto.class,detailList,"业务数据-保险公司-明细导出-"+ reportSearchCommonVo.getUserId());
     }
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2025/9/24 10:42
-     *  @Description:  模拟数据
+     * 模拟数据
+     *
+     *  @author hxl
+     *  @Date 2025/9/24 10:42
      */
     public List<ReportCompanyDataManageDetailDto>  getDetailList(){
          List<ReportCompanyDataManageDetailDto> list =new ArrayList<>();

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

@@ -1,20 +1,12 @@
 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 com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.jzg.commons.entity.report.dto.ReportContactPersonDataManageDetailDto;
 import com.jzg.commons.entity.report.dto.ReportContactPersonDataManageDto;
-import com.jzg.commons.entity.report.dto.ReportRiskDataManageDetailDto;
-import com.jzg.commons.entity.report.dto.ReportRiskDataManageDto;
 import com.jzg.commons.entity.report.vo.ReportSearchCommonVo;
 import com.jzg.console.service.ReportContactPersonDataManageService;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
@@ -23,20 +15,20 @@ import java.util.Date;
 import java.util.List;
 
 /**
- *  @version
- *  @author: hxl
- *  @Date: 2025/9/22 16:45
- *  @Description:  业务数据-对接人
+ * 业务数据-对接人
+ *
+ * @author hxl
+ * @Date 2025/9/22 16:45
  */
 @Service
 public class ReportContactPersonDataManageServiceImpl extends ReportBaseServiceImpl  implements ReportContactPersonDataManageService {
 
 
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2025/9/24 14:12
-     *  @Description: 业务数据-对接人-列表查询
+     * 业务数据-对接人-列表查询
+     *
+     * @author hxl
+     * @Date 2025/9/24 14:12
      */
     @Override
     public IPage<?> getPageListByParams(ReportSearchCommonVo reportSearchCommonVo) {
@@ -44,17 +36,17 @@ public class ReportContactPersonDataManageServiceImpl extends ReportBaseServiceI
         IPage<ReportContactPersonDataManageDto> pageList = new Page<ReportContactPersonDataManageDto>();
         List<ReportContactPersonDataManageDto> list = getList();
         pageList.setRecords(list);
-        pageList.setTotal(1l);
+        pageList.setTotal(1L);
         pageList.setCurrent(reportSearchCommonVo.getPageNo());
         pageList.setPages(reportSearchCommonVo.getPageNo());
         pageList.setPages(reportSearchCommonVo.getPageSize());
         return pageList;
     }
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2025/9/24 14:13
-     *  @Description:  业务数据-对接人-列表导出
+     * 业务数据-对接人-列表导出
+     *
+     * @author hxl
+     * @Date 2025/9/24 14:13
      */
     @Override
     public void downloadListByParams(ReportSearchCommonVo reportSearchCommonVo) {
@@ -62,10 +54,10 @@ public class ReportContactPersonDataManageServiceImpl extends ReportBaseServiceI
         upLoadFile(reportSearchCommonVo, ReportContactPersonDataManageDto.class,list,"业务数据-对接人-列表导出-"+ reportSearchCommonVo.getUserId());
     }
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2025/9/24 14:13
-     *  @Description: 业务数据-对接人-明细列表
+     * 业务数据-对接人-明细列表
+     *
+     * @author hxl
+     * @Date 2025/9/24 14:13
      */
     @Override
     public IPage<?> getPageDetailListByParams(ReportSearchCommonVo reportSearchCommonVo) {
@@ -73,17 +65,17 @@ public class ReportContactPersonDataManageServiceImpl extends ReportBaseServiceI
         IPage<ReportContactPersonDataManageDetailDto> detailPageList = new Page<ReportContactPersonDataManageDetailDto>();
         List<ReportContactPersonDataManageDetailDto> detailList = getDetailList();
         detailPageList.setRecords(detailList);
-        detailPageList.setTotal(1l);
+        detailPageList.setTotal(1L);
         detailPageList.setCurrent(reportSearchCommonVo.getPageNo());
         detailPageList.setPages(reportSearchCommonVo.getPageNo());
         detailPageList.setPages(reportSearchCommonVo.getPageSize());
         return detailPageList;
     }
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2025/9/24 14:13
-     *  @Description: 业务数据-对接人-明细导出
+     *  
+     * @author hxl
+     * @Date 2025/9/24 14:13
+     *   业务数据-对接人-明细导出
      */
     @Override
     public void downloadDetailListByParams(ReportSearchCommonVo reportSearchCommonVo) {
@@ -92,10 +84,11 @@ public class ReportContactPersonDataManageServiceImpl extends ReportBaseServiceI
     }
 
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2025/9/24 10:42
-     *  @Description:  模拟数据
+     * 模拟数据
+     *  TODO 这里使用的也是假数据
+     * @author hxl
+     * @Date 2025/9/24 10:42
+     *
      */
     public List<ReportContactPersonDataManageDto>  getList(){
         List<ReportContactPersonDataManageDto> list =new ArrayList<>();
@@ -109,10 +102,10 @@ public class ReportContactPersonDataManageServiceImpl extends ReportBaseServiceI
     }
 
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2025/9/24 10:42
-     *  @Description:  模拟数据
+     * 模拟数据
+     *
+     * @author hxl
+     * @Date 2025/9/24 10:42
      */
     public List<ReportContactPersonDataManageDetailDto>  getDetailList(){
         List<ReportContactPersonDataManageDetailDto> list =new ArrayList<>();

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

@@ -1,38 +1,29 @@
 package com.jzg.console.service.impl;
 
-
-import com.alibaba.excel.annotation.ExcelProperty;
-import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jzg.commons.entity.report.dto.ReportQuotationOrderDataDto;
-import com.jzg.commons.entity.report.dto.ReportRiskDataManageDetailDto;
-import com.jzg.commons.entity.report.dto.ReportRiskDataManageDto;
-import com.jzg.commons.entity.report.dto.ReportSalesmanDataManageDto;
 import com.jzg.commons.entity.report.vo.ReportSearchCommonVo;
-import com.jzg.console.service.ReportChannelDataManageService;
 import com.jzg.console.service.ReportQuotationOrderDataService;
-import io.swagger.v3.oas.annotations.media.Schema;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 
 /**
- *  @version
- *  @author: hxl
- *  @Date: 2025/9/22 16:45
- *  @Description:  报价数据-报价订单
+ *  
+ * @author hxl
+ * @Date 2025/9/22 16:45
+ *   报价数据-报价订单
  */
 @Service
 public class ReportQuotationOrderDataServiceImpl extends ReportBaseServiceImpl implements ReportQuotationOrderDataService {
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2025/9/24 15:37
-     *  @Description: 报价数据-报价订单-列表查询
+     *  
+     * @author hxl
+     * @Date 2025/9/24 15:37
+     *  报价数据-报价订单-列表查询
      */
     @Override
     public IPage<?> getPageListByParams(ReportSearchCommonVo reportSearchCommonVo) {
@@ -40,17 +31,17 @@ public class ReportQuotationOrderDataServiceImpl extends ReportBaseServiceImpl i
         IPage<ReportQuotationOrderDataDto> pageList = new Page<ReportQuotationOrderDataDto>();
         List<ReportQuotationOrderDataDto> list = getList();
         pageList.setRecords(list);
-        pageList.setTotal(1l);
+        pageList.setTotal(1L);
         pageList.setCurrent(reportSearchCommonVo.getPageNo());
         pageList.setPages(reportSearchCommonVo.getPageNo());
         pageList.setPages(reportSearchCommonVo.getPageSize());
         return pageList;
     }
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2025/9/25 9:02
-     *  @Description:  报价数据-报价订单-列表导出
+     *  
+     * @author hxl
+     * @Date 2025/9/25 9:02
+     *   报价数据-报价订单-列表导出
      */
     @Override
     public void downloadListByParams(ReportSearchCommonVo reportSearchCommonVo) {
@@ -67,10 +58,10 @@ public class ReportQuotationOrderDataServiceImpl extends ReportBaseServiceImpl i
     }
 
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2025/9/24 10:42
-     *  @Description:  模拟数据
+     *  
+     * @author hxl
+     * @Date 2025/9/24 10:42
+     *   模拟数据
      */
     public List<ReportQuotationOrderDataDto>  getList(){
         List<ReportQuotationOrderDataDto> list =new ArrayList<>();

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

@@ -1,11 +1,14 @@
 package com.jzg.console.service.impl;
 
+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.ReportRiskDataManageDetailDto;
 import com.jzg.commons.entity.report.dto.ReportRiskDataManageDto;
 import com.jzg.commons.entity.report.vo.ReportSearchCommonVo;
 import com.jzg.console.service.ReportRiskDataManageService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 import java.math.BigDecimal;
 import java.util.ArrayList;
@@ -13,19 +16,20 @@ import java.util.Date;
 import java.util.List;
 
 /**
- *  @version
- *  @author: hxl
- *  @Date: 2025/9/22 16:45
- *  @Description:  业务数据-险种报表
+ * 业务数据-险种报表
+ *
+ * @author hxl
+ * @Date 2025/9/22 16:45
  */
 @Service
 public class ReportRiskDataManageServiceImpl extends ReportBaseServiceImpl  implements ReportRiskDataManageService {
 
+    private static final Logger log = LoggerFactory.getLogger(ReportRiskDataManageServiceImpl.class);
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2025/9/24 11:26
-     *  @Description:  业务数据-险种报表-列表查詢
+     * 业务数据-险种报表-列表查詢
+     *
+     * @author hxl
+     * @Date 2025/9/24 11:26
      */
     @Override
     public IPage<?> getPageListByParams(ReportSearchCommonVo reportSearchCommonVo) {
@@ -33,17 +37,17 @@ public class ReportRiskDataManageServiceImpl extends ReportBaseServiceImpl  impl
         IPage<ReportRiskDataManageDto> pageList = new Page<ReportRiskDataManageDto>();
         List<ReportRiskDataManageDto> list = getList();
         pageList.setRecords(list);
-        pageList.setTotal(1l);
+        pageList.setTotal(1L);
         pageList.setCurrent(reportSearchCommonVo.getPageNo());
         pageList.setPages(reportSearchCommonVo.getPageNo());
         pageList.setPages(reportSearchCommonVo.getPageSize());
         return pageList;
     }
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2025/9/24 11:27
-     *  @Description:  业务数据-险种报表-列表导出
+     * 业务数据-险种报表-列表导出
+     *
+     * @author hxl
+     * @Date 2025/9/24 11:27
      */
     @Override
     public void downloadListByParams(ReportSearchCommonVo reportSearchCommonVo) {
@@ -51,10 +55,10 @@ public class ReportRiskDataManageServiceImpl extends ReportBaseServiceImpl  impl
         upLoadFile(reportSearchCommonVo, ReportRiskDataManageDto.class,list,"业务数据-险种报表-列表导出-"+ reportSearchCommonVo.getUserId());
     }
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2025/9/24 11:27
-     *  @Description:  业务数据-险种报表-明细
+     * 业务数据-险种报表-明细
+     *
+     * @author hxl
+     * @Date 2025/9/24 11:27
      */
     @Override
     public IPage<?> getPageDetailListByParams(ReportSearchCommonVo reportSearchCommonVo) {
@@ -62,45 +66,45 @@ public class ReportRiskDataManageServiceImpl extends ReportBaseServiceImpl  impl
         IPage<ReportRiskDataManageDetailDto> detailPageList = new Page<ReportRiskDataManageDetailDto>();
         List<ReportRiskDataManageDetailDto> detailList = getDetailList();
         detailPageList.setRecords(detailList);
-        detailPageList.setTotal(1l);
+        detailPageList.setTotal(1L);
         detailPageList.setCurrent(reportSearchCommonVo.getPageNo());
         detailPageList.setPages(reportSearchCommonVo.getPageNo());
         detailPageList.setPages(reportSearchCommonVo.getPageSize());
         return detailPageList;
     }
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2025/9/24 11:27
-     *  @Description:  业务数据-险种报表-明细导出
+     * 业务数据-险种报表-明细导出
+     *
+     * @author hxl
+     * @Date 2025/9/24 11:27
      */
     @Override
     public void downloadDetailListByParams(ReportSearchCommonVo reportSearchCommonVo) {
+        log.info("业务数据-险种报表-明细导出, 导出条件reportSearchCommonVo=[{}]", JSONUtil.toJsonStr(reportSearchCommonVo));
         List<ReportRiskDataManageDetailDto> detailList = getDetailList();
         upLoadFile(reportSearchCommonVo, ReportRiskDataManageDetailDto.class,detailList,"业务数据-险种报表-明细导出-"+ reportSearchCommonVo.getUserId());
     }
 
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2025/9/24 10:42
-     *  @Description:  模拟数据
+     * 模拟数据
+     * TODO 这里使用的是假数据，没有从数据库里面获取数据
+     * @author hxl
+     * @Date 2025/9/24 10:42
      */
     public List<ReportRiskDataManageDto>  getList(){
         List<ReportRiskDataManageDto> list =new ArrayList<>();
         ReportRiskDataManageDto reportRiskDataManageDto = ReportRiskDataManageDto.builder()
                 .companyId("1").companyName("永诚财险").partnerCompanyId("1").partnerCompanyName("众安财险科技营销部")
-                .riskName("单交").quoteCountNum(1000l).quoteOrderNum(500l).underwriteOrderNum(300l).underwritePremium(new BigDecimal(456))
+                .riskName("单交").quoteCountNum(1000L).quoteOrderNum(500L).underwriteOrderNum(300L).underwritePremium(new BigDecimal(456))
                 .penetrationRate(new BigDecimal(23)).underwriteRate(new BigDecimal(32)).build();
         list.add(reportRiskDataManageDto);
         return list;
     }
 
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2025/9/24 10:42
-     *  @Description:  模拟数据
+     * 模拟数据
+     * @author hxl
+     * @Date 2025/9/24 10:42
      */
     public List<ReportRiskDataManageDetailDto>  getDetailList(){
         List<ReportRiskDataManageDetailDto> list =new ArrayList<>();

gateway/src/main/resources/application-prod.yml

@@ -1,9 +1,4 @@
 spring:
-  redis:
-    redisson:
-      address: redis://xxx:xxx
-      password: xxx
-      database: 0
   minio:
     url: http://172.24.144.227:9000
     access-key: v7Zb8XhyLcYNcSHlxvyK

platform/src/main/java/com/jzg/controller/AttributionTemplateController.java

@@ -8,7 +8,6 @@ import com.jzg.commons.entity.agreement.vo.PtlInsAttributionTemplateSaveVo;
 import com.jzg.commons.entity.agreement.vo.PtlInsAttributionTemplateVo;
 import com.jzg.service.PtlInsAttributionTemplateService;
 import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -37,9 +36,9 @@ public class AttributionTemplateController {
 
     @Operation(summary = "提交模板信息",description = "提交模板信息")
     @PostMapping(value = "submit")
-    public HttpResult<Object> saveTemplate(@RequestBody List<PtlInsAttributionTemplateSaveVo> ptlInsAttributionTemplateSaveVo) {
+    public HttpResult<Boolean> saveTemplate(@RequestBody List<PtlInsAttributionTemplateSaveVo> ptlInsAttributionTemplateSaveVo) {
         ptlInsAttributionTemplateSaveVo.forEach(PtlInsAttributionTemplateSaveVo::converApi);
-        return ptlInsAttributionTemplateService.submit(ptlInsAttributionTemplateSaveVo) ? HttpResult.ok("提交模版信息成功") : HttpResult.error("提交模版信息失败");
+        return ptlInsAttributionTemplateService.submit(ptlInsAttributionTemplateSaveVo);
     }
 
     @PostMapping("/getPtlInsAttributionTemplate")
@@ -60,8 +59,9 @@ public class AttributionTemplateController {
     }
 
     /**
-     *获取协议属性信息
-     * @param companyId
+     * 获取协议属性信息
+     *
+     * @param companyId 保司的id
      * @return HttpResult<PtlAgreementAttribution>
      */
     @GetMapping("/getAgreementAttributionByCompanyId")

platform/src/main/java/com/jzg/service/PtlInsAttributionTemplateService.java

@@ -20,9 +20,8 @@ public interface PtlInsAttributionTemplateService extends IService<PtlInsAttribu
     /**
      * 分页查询
      *
-     * @param page
      * @param ptlInsAttributionTemplateVo
-     * @return
+     * @return List<PtlInsAttributionTemplateVo>
      */
     List<PtlInsAttributionTemplateVo> getList(PtlInsAttributionTemplateQueryVo ptlInsAttributionTemplateVo);
 
@@ -36,10 +35,10 @@ public interface PtlInsAttributionTemplateService extends IService<PtlInsAttribu
     /**
      * 保存 保险公司归属信息模版
      *
-     * @param ptlInsAttributionTemplateSaveVo
-     * @return
+     * @param ptlInsAttributionTemplateSaveVo 保险公司归属信息模版, 内部包含多个对象
+     * @return boolean
      */
-    boolean submit(List<PtlInsAttributionTemplateSaveVo> ptlInsAttributionTemplateSaveVo);
+    HttpResult<Boolean> submit(List<PtlInsAttributionTemplateSaveVo> ptlInsAttributionTemplateSaveVo);
 
     HttpResult<PtlInsAttributionTemplate> getPtlInsAttributionTemplate(PtlInsAttributionTemplateVo ptlInsAttributionTemplateVo);
 
@@ -51,5 +50,11 @@ public interface PtlInsAttributionTemplateService extends IService<PtlInsAttribu
      */
     HttpResult<PtlAgreementAttribution> getAgreementAttribution(String agreementId);
 
+    /**
+     * 获取协议属性信息
+     *
+     * @param companyId 保司的id
+     * @return HttpResult<PtlAgreementAttribution>
+     */
     HttpResult<List<PtlAgreementAttribution>> getAgreementAttributionByCompanyId(String companyId);
 }

platform/src/main/java/com/jzg/service/impl/PtlInsAttributionTemplateServiceImpl.java

@@ -1,9 +1,11 @@
 package com.jzg.service.impl;
 
+import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jzg.commons.constants.PtlApiType;
 import com.jzg.commons.core.page.HttpResult;
+import com.jzg.commons.entity.agreement.dto.PtlAttributionTemplateDto;
 import com.jzg.commons.entity.agreement.po.PtlAgreementAttribution;
 import com.jzg.commons.entity.agreement.po.PtlCrawlerApi;
 import com.jzg.commons.entity.agreement.po.PtlInsAttributionTemplate;
@@ -21,15 +23,22 @@ import com.jzg.service.PtlAgreementService;
 import com.jzg.service.PtlCrawlerApiService;
 import com.jzg.service.PtlInsAttributionTemplateService;
 import jakarta.annotation.Resource;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Collections;
 import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
 
 @Service
 public class PtlInsAttributionTemplateServiceImpl extends ServiceImpl<PtlInsAttributionTemplateMapper, PtlInsAttributionTemplate> implements PtlInsAttributionTemplateService {
 
+    private static final Logger log = LoggerFactory.getLogger(PtlInsAttributionTemplateServiceImpl.class);
+
     @Autowired
     EsmInsCompanyService esmInsCompanyService;
 
@@ -64,12 +73,30 @@ public class PtlInsAttributionTemplateServiceImpl extends ServiceImpl<PtlInsAttr
         return baseMapper.selectOne(wrapper);
     }
 
+    /**
+     * 保存 保险公司归属信息模版
+     *
+     * @param ptlInsAttributionTemplateSaveVo 保险公司归属信息模版, 内部包含多个对象
+     * @return HttpResult<Boolean>
+     */
     @Override
     @Transactional
-    public boolean submit(List<PtlInsAttributionTemplateSaveVo> ptlInsAttributionTemplateSaveVo) {
+    public HttpResult<Boolean> submit(List<PtlInsAttributionTemplateSaveVo> ptlInsAttributionTemplateSaveVo) {
+        log.info("保存保险公司归属信息模板： ptlInsAttributionTemplateSaveVo=[{}]", JSONUtil.toJsonStr(ptlInsAttributionTemplateSaveVo));
         // 一个保险公司，一种api方式只能配置一种
         ptlInsAttributionTemplateSaveVo.forEach(this::validate);
-
+        List<PtlAttributionTemplateDto> fields = ptlInsAttributionTemplateSaveVo.get(0).getFields();
+        List<String> fieldList = fields.stream().map(PtlAttributionTemplateDto::getField).toList();
+        Set<String> duplicates = fieldList.stream()
+                .filter(n -> Collections.frequency(fieldList, n) > 1)
+                .collect(Collectors.toSet());
+        if(!duplicates.isEmpty()) {
+            log.info("存在字段名称重复的设置。duplicates=[{}]", JSONUtil.toJsonStr(duplicates));
+            HttpResult<Boolean> res = new HttpResult<Boolean>();
+            res.setData(Boolean.FALSE);
+            res.setMsg("存在字段名称重复的设置. 重复字段是" + JSONUtil.toJsonStr(duplicates));
+            return res;
+        }
         ptlInsAttributionTemplateSaveVo.forEach(saveVo -> {
             EsmInsCompany esmInsCompany = esmInsCompanyService.isExists(saveVo.getInsCompanyId());
             PtlInsAttributionTemplate ptlInsAttributionTemplate = new PtlInsAttributionTemplate(saveVo, esmInsCompany.getCnName());
@@ -86,7 +113,7 @@ public class PtlInsAttributionTemplateServiceImpl extends ServiceImpl<PtlInsAttr
                 AssertionUtils.isSucceed(b, "保险公司api请求插入失败");
             }
         });
-        return true;
+        return HttpResult.ok("提交模板信息成功");
     }
 
     private void validate(PtlInsAttributionTemplateSaveVo ptlInsAttributionTemplateSaveVo) {
@@ -124,6 +151,12 @@ public class PtlInsAttributionTemplateServiceImpl extends ServiceImpl<PtlInsAttr
         return HttpResult.ok(ptlAgreementAttribution);
     }
 
+    /**
+     * 获取协议属性信息
+     *
+     * @param companyId 保司的id
+     * @return HttpResult<PtlAgreementAttribution>
+     */
     @Override
     public HttpResult<List<PtlAgreementAttribution>> getAgreementAttributionByCompanyId(String companyId) {
         EsmInsCompany company = esmInsCompanyService.getById(companyId);

tenant/costsorrule/src/main/java/com/jzg/costsorrule/CostsOrRuleApplication.java

@@ -3,11 +3,9 @@ package com.jzg.costsorrule;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.context.annotation.ComponentScan;
 
 @SpringBootApplication
-//@EnableDiscoveryClient
 @ComponentScan(basePackages = {"com.jzg.commons","com.jzg.costsorrule"})
 @MapperScan({"com.jzg.costsorrule.mapper","com.jzg.commons.mapper"})
 public class CostsOrRuleApplication {

tenant/insurance/quotation-commons/src/main/java/com/jzg/quotation/commons/filter/CarModelsFilterUtils.java

@@ -9,9 +9,9 @@ import java.util.List;
 import java.util.stream.Collectors;
 
 /**
- * @description: 过滤车型
- * @author: wenks
- * @date: 2023/8/22 9:54
+ * @description 过滤车型
+ * @author wenks
+ * @date 2023/8/22 9:54
  **/
 public final class CarModelsFilterUtils {
 

tenant/insurance/quotation-commons/src/main/java/com/jzg/quotation/commons/service/QuotationApiBaseService.java

@@ -2,9 +2,9 @@ package com.jzg.quotation.commons.service;
 
 
 /**
- * @description: api报价基类
- * @author: wenks
- * @date: 2025/2/20 14:15
+ * @description api报价基类
+ * @author wenks
+ * @date 2025/2/20 14:15
  **/
 public interface QuotationApiBaseService extends QuotationBaseService {
 

tenant/insurance/quotation-commons/src/main/java/com/jzg/quotation/commons/service/QuotationBaseService.java

@@ -4,9 +4,10 @@ import com.jzg.commons.entity.quote.vo.QuoteVo;
 import com.jzg.commons.entity.quote.vo.aggregated.*;
 
 /**
- * @description: 报价基类
- * @author: wenks
- * @date: 2025/2/18 15:57
+ * 报价基类
+ *
+ * @author wenks
+ * @date 2025/2/18 15:57
  **/
 public interface QuotationBaseService {
 

tenant/insurance/quotation-commons/src/main/java/com/jzg/quotation/commons/service/QuotationCrawlerBaseService.java

@@ -5,9 +5,9 @@ import com.jzg.commons.entity.quote.vo.base.LoginBase;
 
 
 /**
- * @description: 爬虫报价基类
- * @author: wenks
- * @date: 2025/2/18 16:00
+ * @description 爬虫报价基类
+ * @author wenks
+ * @date 2025/2/18 16:00
  **/
 public interface QuotationCrawlerBaseService extends QuotationBaseService {
 

tenant/insurance/quotation-commons/src/main/java/com/jzg/quotation/commons/standard/conversion/ConfigureParametersConversion.java

@@ -10,9 +10,9 @@ import java.util.Map;
 
 
 /**
- * @description: 归属信息转换为配置实体
- * @author: wenks
- * @date: 2025/2/18 17:06
+ * @description 归属信息转换为配置实体
+ * @author wenks
+ * @date 2025/2/18 17:06
  **/
 public final class ConfigureParametersConversion {
 

tenant/insurance/quotation-huanong/src/main/java/com/jzg/quotation/huanong/crawler/service/impl/HuaNongCrawlerRequestImpl.java

@@ -1,5 +1,6 @@
 package com.jzg.quotation.huanong.crawler.service.impl;
 
+import cn.hutool.json.JSONUtil;
 import com.jzg.commons.entity.quote.vo.AttributionInformationVo;
 import com.jzg.commons.entity.quote.vo.CarInfoVo;
 import com.jzg.commons.entity.quote.vo.QuoteVo;
@@ -28,17 +29,19 @@ import com.jzg.quotation.huanong.enums.dictionary.Risk;
 import lombok.RequiredArgsConstructor;
 import org.jetbrains.annotations.NotNull;
 import org.redisson.api.RMap;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.http.HttpHeaders;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
-import java.util.concurrent.atomic.AtomicReference;
 
 @QuoteCrawlerService(InsuranceCode.INSURANCE_HNIC)
 @RequiredArgsConstructor
 public class HuaNongCrawlerRequestImpl implements HuaNongCrawlerRequest {
 
+    private static final Logger log = LoggerFactory.getLogger(HuaNongCrawlerRequestImpl.class);
     private final HuaNongCrawlerRequestComponent huaNongCrawlerRequestComponent;
 
     private final HuaNongCrawlerOrderService huaNongCrawlerOrderService;
@@ -54,6 +57,7 @@ public class HuaNongCrawlerRequestImpl implements HuaNongCrawlerRequest {
 
     @Override
     public QuoteResultsVo quote(QuoteVo quoteVo) {
+        log.info("HuaNong: 通过爬虫爬取报价信息。 参数quoteVo=[{}]", JSONUtil.toJsonStr(quoteVo));
         HttpHeaders httpHeaders = new HttpHeaders();
         AttributionInformationVo attributionInformationVo = quoteVo.getOrder().getAttributionInformationVo();
         LoginInfoBO loginInfoDto = getLoginInfoDto(attributionInformationVo);

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/controller/UnifyOrderManager.java

@@ -3,6 +3,7 @@ package com.jzg.quotation.summary.controller;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.util.ArrayUtil;
+import cn.hutool.json.JSONUtil;
 import com.alibaba.nacos.common.utils.CollectionUtils;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.fasterxml.jackson.core.JsonProcessingException;
@@ -49,7 +50,8 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.servlet.http.HttpServletRequest;
 import lombok.RequiredArgsConstructor;
-import lombok.val;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.context.request.RequestContextHolder;
@@ -67,6 +69,8 @@ import java.util.stream.Collectors;
 @RequiredArgsConstructor
 public class UnifyOrderManager {
 
+    private static final Logger log = LoggerFactory.getLogger(UnifyOrderManager.class);
+
     @Autowired
     private SysQuoteRedisService sysQuoteRedisService;
 
@@ -178,7 +182,7 @@ public class UnifyOrderManager {
      * 统一报价
      *
      * @param quoteVo
-     * @return
+     * @return HttpResult<QuoteResultsVo>
      */
     @OrderOperationLog(
             module = "车险订单",
@@ -192,6 +196,7 @@ public class UnifyOrderManager {
     @PostMapping("/quote")
     @QuoteVerification
     public HttpResult<QuoteResultsVo> quote(@RequestBody QuoteVo quoteVo) throws Exception {
+        log.info("进行车险报价：quoteVo=[{}]", JSONUtil.toJsonStr(quoteVo));
         HttpResult<EsmInsCompany> esmInsCompanyHttpResult = platformClient.findById(quoteVo.getOrder().getInsuranceCompanyCode());
         AssertionUtils.isFail(esmInsCompanyHttpResult.getCode() != 200, esmInsCompanyHttpResult.getMsg());
         String systemCode = getSystemCode();
@@ -210,6 +215,9 @@ public class UnifyOrderManager {
         quoteVo.getOrder().setApiType(ptlAgreement.getApiType());
         // 设置人员区划
         insOrdersService.setUserAreaCode(quoteVo);
+        log.debug("设置人员区域后信息是：quoteVo=[{}]", JSONUtil.toJsonStr(quoteVo));
+
+
         //获取保司实体
         QuotationBaseService quoteService = companyFactory.getQuoteService(esmInsCompanyHttpResult.getData()
                 .getCompanyCode(), quoteVo.getOrder()
@@ -234,9 +242,7 @@ public class UnifyOrderManager {
             if (CollUtil.isNotEmpty(quoteVo.getKindInfoVo())) {
                 QuoteInfoConverter.converterKindInfoVo(quoteVo.getKindInfoVo(), quoteKindMappingMap.get(QuoteRuleCategory.KIND.getCode()), quoteVo.getCarInfoVo());
             }
-
             quoteResultsVo = quoteService.quote(quoteVo);
-//            quoteResultsVo.setKindInfoVo(quoteVo.getKindInfoVo());
             quoteResultsVo.setCiRiskInfoVo(quoteVo.getCiRiskInfoVo());
             quoteResultsVo.setBiRiskInfoVo(quoteVo.getBiRiskInfoVo());
             quoteResultsVo.setQuoteStatus(quoteResultsVo.getQuoteStatusEnum().getCode());
@@ -244,7 +250,7 @@ public class UnifyOrderManager {
             // 报价后更新订单
             insOrdersService.orderAfterUpdateQuote(ordersNo, quoteResultsVo);
         } catch (Exception e) {
-            e.printStackTrace();
+            log.error("车险报价异常", e);
             Throwable root = e.getCause() != null ? e.getCause() : e;
             insOrdersService.orderAfterUpdateFailedQuote(ordersNo, root.getMessage());
             throw new SystemException(root.getMessage());
@@ -266,6 +272,7 @@ public class UnifyOrderManager {
     @PostMapping("/underwriting")
     @AuditVerification
     public HttpResult underwriting(@RequestBody UnderwritingVo underwritingVo) throws Exception {
+        log.info("统一核保. underwritingVo = [{}]", JSONUtil.toJsonStr(underwritingVo));
         //获取保司实体
         InsOrders insOrders = insOrdersService.getById(underwritingVo.getOrder().getOrdersNo());
         AssertionUtils.isFail(Objects.isNull(insOrders), "订单不存在");

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/factory/CompanyFactory.java

@@ -102,9 +102,16 @@ public class CompanyFactory {
         if (!ObjectUtils.isEmpty(quotationApiBaseService)) {
             return quotationApiBaseService;
         }
+        log.error("报价类型出错，请联系管理员：apiType=[{}],insuranceCode=[{}]", apiType, insuranceCode);
         throw new SystemException("报价类型出错，请联系管理员处理。");
     }
 
+    /**
+     * 获取保司实体
+     *
+     * @author lipf
+     * @date 2026/4/7 11:38
+     */
     public QuotationBaseService getQuoteService(String companyCode, int apiType, SysQuoteConfigService sysQuoteConfigService, SysQuoteRedisService sysQuoteRedisService,
                                                 PlatformClient platformClient, BaseController baseController) {
         // 获取service
@@ -124,9 +131,10 @@ public class CompanyFactory {
     public QuotationBaseService getUnderwritingService(InsOrders insOrders, String companyCode, BaseController baseController, UnderwritingVo underwritingVo) {
         //设置归属信息
         HttpResult<PtlAgreementAttribution> agreementAttribution = platformClient.getAgreementAttribution(insOrders.getAgreementId());
-        log.info("agreementAttribution对象的值：{}", JSON.toJSONString(agreementAttribution.getData()));
+        log.info("agreementId = [{}], agreementAttribution对象的值：[{}]",insOrders.getAgreementId(), JSON.toJSONString(agreementAttribution.getData()));
         AssertionUtils.isFail(agreementAttribution.getCode() == 500, "获取协议属性失败");
 
+        //JSONArray fields = agreementAttribution.getData().getFields();
         Map<String, String> fieldMap = agreementAttribution.getData().getFields().stream()
                 .map(obj -> new JSONObject((Map<String, Object>) obj))  // 转换为 JSONObject
                 .collect(Collectors.toMap(

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/service/impl/InsOrdersServiceImpl.java

@@ -1067,9 +1067,7 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
     public Page<OrderListVo> queryList(InsOrdersParamVO insOrdersParam) {
         String userName = baseController.getUserName();
         insOrdersParam.setSalesman(userName);
-        Page<OrderListVo> orderListVoPage = insOrdersMapper.queryOrderList(insOrdersParam.getPage(), insOrdersParam);
-
-        return orderListVoPage;
+        return insOrdersMapper.queryOrderList(insOrdersParam.getPage(), insOrdersParam);
     }
 
     @Override

tenant/insurance/quotation-yangguang/src/main/java/com/jzg/quotation/yangguang/api/componet/YangGuangApiRequestComponent.java

@@ -62,6 +62,7 @@ public class YangGuangApiRequestComponent {
         try {
             jsonObject = JSON.parseObject(decryptedResponse);
         }catch (Exception e){
+            log.error("解密decryptedResponse=[{}]异常。 请检查summary微服务中关于解密的配置", decryptedResponse, e);
             throw new SystemException(type + "解密失败");
         }
         S t = jsonObject.toJavaObject(tClass);

tenant/insurance/quotation-yangguang/src/main/java/com/jzg/quotation/yangguang/api/service/impl/YangGuangApiRequestImpl.java

@@ -1,5 +1,6 @@
 package com.jzg.quotation.yangguang.api.service.impl;
 
+import cn.hutool.json.JSONUtil;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.jzg.commons.constants.dict.InsOrderStatusEnum;
@@ -28,6 +29,8 @@ import com.jzg.quotation.yangguang.api.service.YangGuangApiOrderService;
 import com.jzg.quotation.yangguang.api.service.YangGuangApiRequest;
 import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
@@ -40,11 +43,11 @@ import java.util.regex.Pattern;
  * @author quchen
  * @date 2025/3/6 16:54
  */
-
 @QuoteApiService(value = InsuranceCode.INSURANCE_YGBX)
 @RequiredArgsConstructor
 public class YangGuangApiRequestImpl implements YangGuangApiRequest {
 
+    private static final Logger log = LoggerFactory.getLogger(YangGuangApiRequestImpl.class);
     private final YangGuangApiRequestComponent yangGuangApiRequestComponent;
 
     private final YangGuangApiOrderService yangGuangApiOrderService;
@@ -60,6 +63,7 @@ public class YangGuangApiRequestImpl implements YangGuangApiRequest {
     }
     @Override
     public QuoteResultsVo quote(QuoteVo quoteVo) throws JsonProcessingException {
+        log.info("阳光财险通过api获取报价信息。报价参数：quoteVo=[{}]", JSONUtil.toJsonStr(quoteVo));
         OrderBase order = quoteVo.getOrder();
         AttributionInformationVo attributionInformationVo = order.getAttributionInformationVo();
         String url = getApiUrl(order.getInsuranceCompanyCode());
@@ -82,7 +86,13 @@ public class YangGuangApiRequestImpl implements YangGuangApiRequest {
         yangGuangAccuracyCalculateRequest.setInfotransNo(yangGuangQueryVehicleModelResponse.getInfotransNo());
         return recursiveQuote(yangGuangAccuracyCalculateRequest, carModel, yangGuangQueryVehicleModelResponse,quoteVo, parameters, url);
     }
-    // 递归报价
+
+    /**
+     * 递归报价
+     *
+     * @author Qchen
+     * @date 2026/4/7 16:07
+     */
     private QuoteResultsVo recursiveQuote(YangGuangAccuracyCalculateRequest request,
                                           YangGuangQueryVehicleModelResponse.carmodellist carModel,
                                           YangGuangQueryVehicleModelResponse yangGuangQueryVehicleModelResponse,
@@ -383,6 +393,12 @@ public class YangGuangApiRequestImpl implements YangGuangApiRequest {
         return orderStatusResultVo;
     }
 
+    /**
+     * 获取非车套餐列表
+     *
+     * @author lipf
+     * @date 2026/4/7 11:54
+     */
     public YangGuangGetNonVehicleProductsResponse getNonVehicleList(CarInfoVo carInfoVo, YangGuangConfigureParameters ygConfigureParameters,String apiUrl) throws JsonProcessingException {
         // 获取非车列表
         YangGuangGetNonVehicleProductsRequest yangGuangGetNonVehicleProductsRequest = new YangGuangGetNonVehicleProductsRequest(carInfoVo,ygConfigureParameters);

tenant/organization/src/main/java/com/jzg/organization/controller/SchemeController.java

@@ -23,8 +23,8 @@ public class SchemeController {
     //region 基础方案配置
     @Operation(summary = "保存方案")
     @PostMapping("/saveScheme")
-    public HttpResult saveScheme(@RequestBody @Valid PtlSchemeSaveVo ptlSchemeSaveVo){
-        return ptlSchemeService.saveScheme(ptlSchemeSaveVo) ? HttpResult.ok("保存方案成功") : HttpResult.error("保存方案失败");
+    public HttpResult<Boolean> saveScheme(@RequestBody @Valid PtlSchemeSaveVo ptlSchemeSaveVo){
+        return ptlSchemeService.saveScheme(ptlSchemeSaveVo);
     }
 
     @Operation(summary = "获取方案")

tenant/organization/src/main/java/com/jzg/organization/service/PtlSchemeService.java

@@ -2,6 +2,7 @@ package com.jzg.organization.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.jzg.commons.core.page.HttpResult;
 import com.jzg.commons.entity.po.PtlAgreementUndwrtRulesAttr;
 import com.jzg.commons.entity.scheme.po.PtlScheme;
 import com.jzg.commons.entity.scheme.vo.*;
@@ -18,10 +19,10 @@ public interface PtlSchemeService extends IService<PtlScheme> {
 
     /**
      * 添加方案
-     * @param ptlSchemeSaveVo
-     * @return
+     * @param ptlSchemeSaveVo 车险报价的方案
+     * @return HttpResult<Boolean>
      */
-    public boolean saveScheme(PtlSchemeSaveVo ptlSchemeSaveVo);
+    HttpResult<Boolean> saveScheme(PtlSchemeSaveVo ptlSchemeSaveVo);
 
     /**
      * 获取方案

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

@@ -81,14 +81,26 @@ public class PtlSchemeServiceImpl extends ServiceImpl<PtlSchemeMapper, PtlScheme
     @Autowired
     OrgClient orgClient;
 
+    /**
+     * 添加方案
+     * @param ptlSchemeSaveVo 车险报价的方案
+     * @return HttpResult<Boolean>
+     */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public boolean saveScheme(PtlSchemeSaveVo ptlSchemeSaveVo) {
-        //校验方案是否存在
-        List<PtlScheme> ptlSchemes = ptlSchemeMapper.selectList(new LambdaQueryWrapper<PtlScheme>()
-                .eq(PtlScheme::getCompanyId, ptlSchemeSaveVo.getCompanyId())
-                .eq(PtlScheme::getProductId, ptlSchemeSaveVo.getProductId()));
-
+    public HttpResult<Boolean> saveScheme(PtlSchemeSaveVo ptlSchemeSaveVo) {
+        log.info("新增方案：ptlSchemeSaveVo=[{}]", JSONUtil.toJsonStr(ptlSchemeSaveVo));
+//        //校验方案是否存在
+//        List<PtlScheme> ptlSchemes = ptlSchemeMapper.selectList(new LambdaQueryWrapper<PtlScheme>()
+//                .eq(PtlScheme::getCompanyId, ptlSchemeSaveVo.getCompanyId())
+//                .eq(PtlScheme::getProductId, ptlSchemeSaveVo.getProductId()));
+//        // modify by lipf ，2026年4月7日10:47:42 校验方案是否存在
+//        if(CollUtil.isNotEmpty(ptlSchemes)){
+//            log.info("方案已存在。 companyId=[{}], productId=[{}]",ptlSchemeSaveVo.getCompanyId(), ptlSchemeSaveVo.getProductId());
+//            HttpResult<Boolean> res = HttpResult.error("方案已存在");
+//            res.setData(Boolean.FALSE);
+//            return res;
+//        }
         List<PtlAgreementUndwrtRulesAttr> undwrtRulesAttrList = agreementUndwrtRulesAttrService.getUndwrtRulesAttrList();
         PtlScheme ptlScheme = ptlSchemeSaveVo.getPtlScheme(undwrtRulesAttrList);
         ptlSchemeMapper.insertOrUpdate(ptlScheme);
@@ -115,7 +127,10 @@ public class PtlSchemeServiceImpl extends ServiceImpl<PtlSchemeMapper, PtlScheme
         cleanRules(ptlScheme);
         ptlSchemeRulesAttrLinkMapper.insertOrUpdate(ptlSchemeRulesAttrLinkList);
 
-        return true;
+        HttpResult<Boolean> ok = HttpResult.ok("保存方案成功");
+        ok.setData(Boolean.TRUE);
+        return ok;
+
     }
 
     /**