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

commons/src/main/java/com/jzg/commons/entity/dto/FeeAuditParam.java

@@ -67,6 +67,10 @@ public class FeeAuditParam extends PageRequest {
     @JsonFormat(pattern = "yyyy-MM-dd")
     private LocalDate signingTimeEnd;
 
+    @Schema(description = "签单时间")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private List<String> signingTime;
+
     @Schema(description = "订单号")
     private String orderNo;
 

commons/src/main/java/com/jzg/commons/entity/orders/vo/FeeAuditVo.java

@@ -18,6 +18,7 @@ public class FeeAuditVo extends BaseModel {
 
     @Serial
     private static final long serialVersionUID = 4631117388822444574L;
+
     @ExcelProperty("订单号")
     @Schema(description = "订单号")
     private String orderNo;
@@ -29,9 +30,7 @@ public class FeeAuditVo extends BaseModel {
     @ExcelIgnore
     @Schema(description = "保险公司ID")
     private String companyId;
-    /**
-     * 保险公司名称及父级的名称，例如
-     */
+
     @ExcelIgnore
     @Schema(description = "保险公司名称及父级的名称")
     private String companyALlName;
@@ -116,8 +115,8 @@ public class FeeAuditVo extends BaseModel {
     @Schema(description = "驾意险保费")
     private BigDecimal jyPremium;
 
-    @ExcelProperty("总保费")
-    @Schema(description = "总保费")
+    @ExcelProperty("险种总保费")
+    @Schema(description = "险种合计总保费")
     private BigDecimal sumPremium;
 
     @ExcelProperty("审核时间")
@@ -133,11 +132,11 @@ public class FeeAuditVo extends BaseModel {
     @Schema(description = "驳回原因")
     private String refuse;
 
-    @ExcelProperty("是否是疑问订单 0.否 1.是")
+    @ExcelProperty("是否疑问订单")
     @Schema(description = "是否是疑问订单 0.否 1.是")
     private String isProblem;
 
-    @ExcelProperty("订单来源 0 pc  1 app")
+    @ExcelProperty("订单来源")
     @Schema(description = "订单来源 0 pc  1 app")
     private String orderSource;
 
@@ -149,17 +148,16 @@ public class FeeAuditVo extends BaseModel {
     @Schema(description = "是否是疑问单")
     private int problem;
 
-    @ExcelProperty("设置为疑问单的原因")
+    @ExcelProperty("疑问单设置原因")
     @Schema(description = "设置为疑问单的原因")
     private String problemReason;
 
-    @ExcelProperty("设为疑问单的时间")
-    @Schema(description = "设为疑问单的时间")
+    @ExcelProperty("疑问单设置时间")
+    @Schema(description = "设置为疑问单的时间")
     private String problemTime;
 
-
-    @ExcelProperty("总保费")
-    @Schema(description = "总保费")
+    @ExcelProperty("订单总保费")
+    @Schema(description = "订单最终总保费")
     private BigDecimal totalPremium;
 
     @ExcelProperty("交强险应收费用")
@@ -194,14 +192,10 @@ public class FeeAuditVo extends BaseModel {
     @Schema(description = "总应付费用（含分销）")
     private BigDecimal totalPayablePremium;
 
-    /**
-     * 表示不含分销费用的金额
-     */
     @ExcelProperty("总应付费用")
-    @Schema(description = "总应付费用")
+    @Schema(description = "不含分销费用的总应付金额")
     private BigDecimal totalExportPremium;
 
-
     @ExcelProperty("交强险手续费费用")
     @Schema(description = "交强险手续费费用")
     private BigDecimal jqCommissionPremium;
@@ -358,11 +352,10 @@ public class FeeAuditVo extends BaseModel {
     @Schema(description = "驾意出口留点费用")
     private BigDecimal jyExportKeepPointPremium;
 
-    @ExcelProperty("权益相关：可用金额<可用金额＝出口费用➖出口人留点费用>")
-    @Schema(description = "权益相关：可用金额<可用金额＝出口费用➖出口人留点费用>")
+    @ExcelProperty("可用金额")
+    @Schema(description = "可用金额＝出口费用➖出口人留点费用")
     private BigDecimal availableAmount;
 
-
     @Schema(description = "一级分销费")
     @ExcelProperty("一级分销费")
     @TableField(exist = false)
@@ -424,33 +417,63 @@ public class FeeAuditVo extends BaseModel {
     @TableField(exist = false)
     private BigDecimal thirdDistributionRatio;
 
+    @ExcelIgnore
+    @Schema(description = "支付时间")
     private String payingTime;
 
+    @ExcelIgnore
+    @Schema(description = "合作保险公司ID")
     private String partnerCompanyId;
 
+    @ExcelIgnore
     @Schema(description = "保险机构名称")
     private String partnerCompanyName;
-    @Schema(description = "保险机构名称")
+
+    @ExcelIgnore
+    @Schema(description = "保险机构简称")
     private String partnerCompanySimplyName;
 
+    @ExcelIgnore
     @Schema(description = "对接人姓名")
     private String contact;
 
+    @ExcelIgnore
     @Schema(description = "交强保单号")
     private String jqPolicyNo;
+
+    @ExcelIgnore
     @Schema(description = "非车保单号")
     private String jyPolicyNo;
+
+    @ExcelIgnore
     @Schema(description = "商业保单号")
     private String syPolicyNo;
 
-    @Schema(description = "起保时间")
+    @ExcelIgnore
+    @Schema(description = "交强险起保时间")
     private String jqRiskStartDate;
+
+    @ExcelIgnore
+    @Schema(description = "交强险终保时间")
     private String jqRiskEndDate;
+
+    @ExcelIgnore
+    @Schema(description = "商业险起保时间")
     private String syRiskStartDate;
+
+    @ExcelIgnore
+    @Schema(description = "商业险终保时间")
     private String syRiskEndDate;
+
+    @ExcelIgnore
+    @Schema(description = "驾意险起保时间")
     private String jyRiskStartDate;
+
+    @ExcelIgnore
+    @Schema(description = "驾意险终保时间")
     private String jyRiskEndDate;
 
+    @ExcelIgnore
     @Schema(description = "投保人")
     private String policyholder;
 }

tenant/insurance/quotation-summary/src/main/resources/mapper/InsFeeAuditMapper.xml

@@ -188,6 +188,9 @@
             <if test="param.signingTimeStart != null and param.signingTimeEnd != null">
                 and DATE_FORMAT(io.signing_time, '%Y-%m-%d') between #{param.signingTimeStart} AND #{param.signingTimeEnd}
             </if>
+            <if test="param.signingTime != null and param.signingTime.size() > 0">
+                and DATE_FORMAT(io.signing_time,'%Y-%m-%d') between #{param.signingTime[0]} AND #{param.signingTime[1]}
+            </if>
             <if test="param.orderNo != null and param.orderNo != ''">
                 and ifa.order_no = #{param.orderNo}
             </if>

tenant/organization/src/main/resources/mapper/ReceivableMapper.xml

@@ -346,7 +346,7 @@
         </if>
         <if test="receivableQueryVo.invoiceSettlementStatus != null and receivableQueryVo.invoiceSettlementStatus != ''">
             <!-- 当状态为1时，查询已开票的数据 -->
-            <if test="receivableQueryVo.invoiceSettlementStatus != '2'">
+            <if test="receivableQueryVo.invoiceSettlementStatus != 2">
                 AND ipi.id in (
                 select ipil.income_id from ins_ply_income_invoice_link ipil
                 LEFT JOIN ins_ply_income_invoice ipii ON ipil.invoice_id = ipii.id AND ipii.is_delete = 0
@@ -354,7 +354,7 @@
                 )
             </if>
             <!-- 当状态为2时，查询未开票的数据 -->
-            <if test="receivableQueryVo.invoiceSettlementStatus == '2'">
+            <if test="receivableQueryVo.invoiceSettlementStatus == 2">
                 AND NOT EXISTS (
                 SELECT 1 FROM ins_ply_income_invoice_link link
                 LEFT JOIN ins_ply_income_invoice inv ON link.invoice_id = inv.id AND inv.is_delete = 0