Просмотр исходного кода

修改bug:
平台协议应收-应收订单,筛选项增加业务来源/结算状态/增加类型

jiakai 5 месяцев назад
Родитель
Сommit
3483fda6c4

+ 9 - 0
commons/src/main/java/com/jzg/commons/entity/finance/po/InsPlyIncome.java

@@ -159,6 +159,15 @@ public class InsPlyIncome  extends BaseModel {
     @Schema(description = "系统code")
     private String systemCode;
 
+    @Schema(description = "业务来源")
+    private String businessSource;
+
+    @Schema(description = "结算状态")
+    private String settlementStatus;
+
+    @Schema(description = "增加类型")
+    private String addType;
+
     @TableField(exist = false)
     @Schema(description = "交强起保日期")
     private String jqStartDate;

+ 9 - 0
commons/src/main/java/com/jzg/commons/entity/finance/vo/ReceivableQueryVo.java

@@ -98,5 +98,14 @@ public class ReceivableQueryVo extends PageRequest {
     @Schema(description = "产品名称")
     private String productName;
 
+    @Schema(description = "业务来源")
+    private String businessSource;
+
+    @Schema(description = "结算状态")
+    private String settlementStatus;
+
+    @Schema(description = "增加类型")
+    private String addType;
+
 
 }

+ 12 - 0
tenant/organization/src/main/resources/mapper/ReceivableMapper.xml

@@ -228,6 +228,9 @@
             ipi.jq_other_costs_proportion,
             ipi.sy_other_costs_proportion,
             ipi.jy_other_costs_proportion,
+            ipi.business_source,
+            ipi.settlement_status,
+            ipi.add_type,
             ior1.start_date as jq_start_date,
             ior2.start_date as sy_start_date,
             io.product_name AS productName,
@@ -274,6 +277,15 @@
         <if test="receivableQueryVo.companyId != null and receivableQueryVo.companyId != ''">
             AND ipi.company_id = #{receivableQueryVo.companyId}
         </if>
+        <if test="receivableQueryVo.businessSource != null and receivableQueryVo.businessSource != ''">
+            AND ipi.business_source = #{receivableQueryVo.businessSource}
+        </if>
+        <if test="receivableQueryVo.settlementStatus != null and receivableQueryVo.settlementStatus != ''">
+            AND ipi.settlement_status = #{receivableQueryVo.settlementStatus}
+        </if>
+        <if test="receivableQueryVo.addType != null and receivableQueryVo.addType != ''">
+            AND ipi.add_type = #{receivableQueryVo.addType}
+        </if>
         <if test="receivableQueryVo.orderNo != null and receivableQueryVo.orderNo != ''">
             AND ipi.order_no = #{receivableQueryVo.orderNo}
         </if>