Przeglądaj źródła

缺失功能:
订单审核-任务中心,筛选项应该添加疑问订单、外部订单、业务员工号、业务来源

jiakai 4 miesięcy temu
rodzic
commit
036dcdba7b

+ 3 - 1
commons/src/main/java/com/jzg/commons/entity/dto/FeeAuditParam.java

@@ -3,7 +3,6 @@ package com.jzg.commons.entity.dto;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.jzg.commons.core.base.PageRequest;
 import com.jzg.commons.core.base.PageRequest;
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
 import lombok.Data;
 
 
 import java.time.LocalDate;
 import java.time.LocalDate;
@@ -109,4 +108,7 @@ public class FeeAuditParam extends PageRequest {
     @Schema(description = "系统code")
     @Schema(description = "系统code")
     private String systemCode;
     private String systemCode;
 
 
+    @Schema(description = "订单来源 0 pc  1 app")
+    private String orderSource;
+
 }
 }

+ 8 - 0
commons/src/main/java/com/jzg/commons/entity/orders/vo/FeeAuditVo.java

@@ -125,6 +125,14 @@ public class FeeAuditVo extends BaseModel {
     @Schema(description = "驳回原因")
     @Schema(description = "驳回原因")
     private String refuse;
     private String refuse;
 
 
+    @ExcelProperty("是否是疑问订单 0.否 1.是")
+    @Schema(description = "是否是疑问订单 0.否 1.是")
+    private String isProblem;
+
+    @ExcelProperty("订单来源 0 pc  1 app")
+    @Schema(description = "订单来源 0 pc  1 app")
+    private String orderSource;
+
     @ExcelProperty("权益金额")
     @ExcelProperty("权益金额")
     @Schema(description = "权益金额")
     @Schema(description = "权益金额")
     private BigDecimal equityAmount;
     private BigDecimal equityAmount;

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

@@ -57,7 +57,13 @@
                ioc.jq_premium as jqPremium, ioc.sy_premium as syPremium, ioc.jy_premium as jyPremium,
                ioc.jq_premium as jqPremium, ioc.sy_premium as syPremium, ioc.jy_premium as jyPremium,
                ioc.sum_premium as sumPremium,sd.name as deptName,ifa.create_time as createTime,
                ioc.sum_premium as sumPremium,sd.name as deptName,ifa.create_time as createTime,
                ifa.create_by as createBy,io.pay_time as payTime, ifa.audit_time as auditTime,
                ifa.create_by as createBy,io.pay_time as payTime, ifa.audit_time as auditTime,
-               ifa.audit_user as auditUser, ifa.refuse
+               ifa.audit_user as auditUser, ifa.refuse,
+                CASE ifa.is_problem
+                WHEN 0 THEN '否'
+                WHEN 1 THEN '是'
+                ELSE ''
+                END AS isProblem,
+            io.order_source
         FROM ins_fee_audit ifa
         FROM ins_fee_audit ifa
         LEFT JOIN ins_orders as io on ifa.order_no = io.id
         LEFT JOIN ins_orders as io on ifa.order_no = io.id
         LEFT JOIN ins_orders_car_info as ioci on io.id = ioci.order_no
         LEFT JOIN ins_orders_car_info as ioci on io.id = ioci.order_no
@@ -85,6 +91,12 @@
             <if test="param.isProblem != null">
             <if test="param.isProblem != null">
                 and ifa.is_problem = #{param.isProblem}
                 and ifa.is_problem = #{param.isProblem}
             </if>
             </if>
+            <if test="param.orderSource != null">
+                and io.order_source = #{param.orderSource}
+            </if>
+            <if test="param.isProblem != null">
+                and ifa.is_problem = #{param.isProblem}
+            </if>
             <if test="param.licenseNo != null and param.licenseNo != ''">
             <if test="param.licenseNo != null and param.licenseNo != ''">
                 and ioci.license_no like concat('%',#{param.licenseNo},'%')
                 and ioci.license_no like concat('%',#{param.licenseNo},'%')
             </if>
             </if>