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

commons/src/main/java/com/jzg/commons/entity/finance/vo/importbatchmodify/InsPlyIncomeExportVo.java

@@ -32,27 +32,27 @@ public class InsPlyIncomeExportVo implements Serializable {
     private String jyPolicyNo;
 
     @Schema(description = "交强手续费比例")
-    @ExcelProperty(value ="交强手续费比例，单位：百分比(%)", index = 4)
+    @ExcelProperty(value ="交强手续费比例,单位:百分比(%)", index = 4)
     private BigDecimal jqSuperviseCostsProportion;
 
     @Schema(description = "交强跟单费比例")
-    @ExcelProperty(value = "交强跟单费比例，单位：百分比(%)", index = 5)
+    @ExcelProperty(value = "交强跟单费比例,单位:百分比(%)", index = 5)
     private BigDecimal jqOtherCostsProportion;
 
     @Schema(description = "商业手续费比例")
-    @ExcelProperty(value = "商业手续费比例，单位：百分比(%)", index = 6)
+    @ExcelProperty(value = "商业手续费比例,单位:百分比(%)", index = 6)
     private BigDecimal sySuperviseCostsProportion;
 
     @Schema(description = "商业跟单费比例")
-    @ExcelProperty(value = "商业跟单费比例，单位：百分比(%)", index = 7)
+    @ExcelProperty(value = "商业跟单费比例,单位:百分比(%)", index = 7)
     private BigDecimal syOtherCostsProportion;
 
     @Schema(description = "驾意手续费比例")
-    @ExcelProperty(value = "驾意手续费比例，单位：百分比(%)", index = 8)
+    @ExcelProperty(value = "驾意手续费比例,单位:百分比(%)", index = 8)
     private BigDecimal jySuperviseCostsProportion;
 
     @Schema(description = "驾意跟单费比例")
-    @ExcelProperty(value = "驾意跟单费比例，单位：百分比(%)", index = 9)
+    @ExcelProperty(value = "驾意跟单费比例,单位:百分比(%)", index = 9)
     private BigDecimal jyOtherCostsProportion;
 
 }

commons/src/main/java/com/jzg/commons/entity/finance/vo/importimcome/ExcelContent4Platform.java

@@ -37,15 +37,15 @@ public class ExcelContent4Platform implements InsuranceData {
     private String jyPolicyNo;
 
     @Schema(description = "交强险入口比例")
-    @ExcelProperty(value = "交强险入口比例", index = 4)
+    @ExcelProperty(value = "交强险入口比例,单位:百分比(%)", index = 4)
     private String jqInletRatio;
 
     @Schema(description = "商业险入口比例")
-    @ExcelProperty(value = "商业险入口比例", index = 5)
+    @ExcelProperty(value = "商业险入口比例,单位:百分比(%)", index = 5)
     private String syInletRatio;
 
     @Schema(description = "非车险入口比例")
-    @ExcelProperty(value = "非车险入口比例", index = 6)
+    @ExcelProperty(value = "非车险入口比例,单位:百分比(%)", index = 6)
     private String jyInletRatio;
 
 }

commons/src/main/java/com/jzg/commons/entity/finance/vo/importimcome/ExcelContent4PrivateFollow.java

@@ -39,15 +39,15 @@ public class ExcelContent4PrivateFollow implements Serializable {
     private String jyPolicyNo;
 
     @Schema(description = "交强险跟单费比例")
-    @ExcelProperty(value = "交强险跟单费比例", index = 4)
+    @ExcelProperty(value = "交强险跟单费比例,单位:百分比(%)", index = 4)
     private String jqOtherCostsProportion;
 
     @Schema(description = "商业险跟单费比例")
-    @ExcelProperty(value = "商业险跟单费比例", index = 5)
+    @ExcelProperty(value = "商业险跟单费比例,单位:百分比(%)", index = 5)
     private String syOtherCostsProportion;
 
     @Schema(description = "非车险跟单费比例")
-    @ExcelProperty(value = "非车险跟单费比例", index = 6)
+    @ExcelProperty(value = "非车险跟单费比例,单位:百分比(%)", index = 6)
     private String jyOtherCostsProportion;
 
 }

commons/src/main/java/com/jzg/commons/entity/finance/vo/importimcome/ExcelContent4PrivateSuperviseCar.java

@@ -34,12 +34,12 @@ public class ExcelContent4PrivateSuperviseCar implements InsuranceData {
     private String syPolicyNo;
 
     @Schema(description = "交强险手续费比例")
-    @ExcelProperty(value = "交强险手续费比例", index = 3)
+    @ExcelProperty(value = "交强险手续费比例,单位:百分比(%)", index = 3)
     private String jqSuperviseCostsProportion;
 
 
     @Schema(description = "商业险手续费比例")
-    @ExcelProperty(value = "商业险手续费比例", index = 4)
+    @ExcelProperty(value = "商业险手续费比例,单位:百分比(%)", index = 4)
     private String sySuperviseCostsProportion;
 
 

commons/src/main/java/com/jzg/commons/entity/finance/vo/importimcome/ExcelContent4PrivateSuperviseNoCar.java

@@ -31,7 +31,7 @@ public class ExcelContent4PrivateSuperviseNoCar implements InsuranceData {
 
 
     @Schema(description = "非车险手续费比例")
-    @ExcelProperty(value = "非车险手续费比例", index = 2)
+    @ExcelProperty(value = "非车险手续费比例,单位:百分比(%)", index = 2)
     private String jySuperviseCostsProportion;
 
 }

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

@@ -1566,8 +1566,24 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
     @Override
     public String exportDynamicFields(InsOrdersParamVO insOrdersParam) {
         log.info("导出订单列表。支持动态选择要导出的字段：导出车险订单=[{}]", JSONUtil.toJsonStr(insOrdersParam));
-        insOrdersParam.setSystemCode(baseController.getSystemCode());
-        List<OrderListVo> orderListVos = insOrdersMapper.queryOrderListAll(insOrdersParam);
+        // 分页无限大
+        insOrdersParam.getPage().setPages(1);
+        insOrdersParam.getPage().setSize(Integer.MAX_VALUE);
+        insOrdersParam.setPages(1);
+        insOrdersParam.setSize(Integer.MAX_VALUE);
+
+        String systemCode = "";
+        //如果是APP登录的话 则传递SystemCode的头部字段
+        if (baseController.getUserSystemCode().equals("APP")) {
+            HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+            systemCode = request.getHeader("system_code");
+        } else {
+            systemCode = baseController.getUserSystemCode();
+        }
+        insOrdersParam.setSystemCode(systemCode);
+        Page<OrderListVo> orderListVoPage = queryMainOrderList(insOrdersParam);
+        List<OrderListVo> orderListVos = orderListVoPage.getRecords();
+
         log.info("导出订单列表，导出[{}]条记录", CollUtil.size(orderListVos));
         // 动态设置要导出的字段
         String exportDynamicFields = insOrdersParam.getExportDynamicFields();