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

外部费用审核 费用一级和五级比例显示的都是乱码

将一级和五级调整为加投和出口比例,并且设置初始值都为0
lipf 3 недель назад
Родитель
Сommit
5099499b30

+ 8 - 0
commons/src/main/java/com/jzg/commons/entity/dto/PtlAgreementCostParam.java

@@ -4,9 +4,11 @@ package com.jzg.commons.entity.dto;
 import com.jzg.commons.core.base.PageRequest;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.util.List;
 
+@EqualsAndHashCode(callSuper = true)
 @Data
 @Schema(description = "协议费用管理参数")
 public class PtlAgreementCostParam extends PageRequest {
@@ -21,9 +23,15 @@ public class PtlAgreementCostParam extends PageRequest {
     @Schema(description = "输入代码,名称,简称查找")
     private String agreement;
 
+    @Schema(description = "输入代码,名称,简称查找,支持多选")
+    private String[] agreementIds;
+
     @Schema(description = "险种id")
     private String productId;
 
+    @Schema(description = "险种id(支持多选)")
+    private String[] productIds;
+
     @Schema(description = "承保规则")
     private String rulesName;
 

+ 5 - 6
commons/src/main/java/com/jzg/commons/entity/vo/CostExternalTypeVo.java

@@ -10,15 +10,14 @@ import java.math.BigDecimal;
 @Schema(description = "补录协议费用管理列表VO")
 public class CostExternalTypeVo {
 
-    private String costType;
+    private String costType="0.0";
 
-    private BigDecimal inlet;
+    private BigDecimal inlet=BigDecimal.ZERO;
 
-    private BigDecimal export;
+    private BigDecimal export=BigDecimal.ZERO;
 
-    private BigDecimal addThrow;
-
-    private BigDecimal keepPointRatio;
+    private BigDecimal addThrow=BigDecimal.ZERO;
 
+    private BigDecimal keepPointRatio=BigDecimal.ZERO;
 
 }

+ 10 - 7
tenant/organization/src/main/resources/mapper/PtlAgreementCostMapper.xml

@@ -420,14 +420,17 @@
                     #{partnerCompnayId}
                 </foreach>
             </if>
-            <if test="costParam.agreement != null and costParam.agreement != ''">
-                AND (pa.agreement_title  like concat('%',#{costParam.agreement},'%') or
-                pa.agreement_code  like concat('%',#{costParam.agreement},'%') or
-                pa.agreement_abbreviation  like concat('%',#{costParam.agreement},'%') or
-                pa.id = #{costParam.agreement})
+            <if test="costParam.agreementIds != null and costParam.agreementIds.length >0 ">
+                AND pa.id in
+                <foreach collection="costParam.agreementIds" item="agreementId" separator="," open="(" close=")">
+                    #{agreementId}
+                </foreach>
             </if>
-            <if test="costParam.productId != null and costParam.productId != ''">
-                AND pc.product_id = #{costParam.productId}
+            <if test="costParam.productIds != null and costParam.productIds.length > 0 ">
+                AND pc.product_id in
+                <foreach collection="costParam.productIds" item="productId" separator="," open="(" close=")">
+                        #{productId}
+                </foreach>
             </if>
             <if test="costParam.agreementId != null and costParam.agreementId != ''">
                 AND pc.ptl_agreement_id = #{costParam.agreementId}