ソースを参照

费用列表添加费用描述查询

Qchen 7 ヶ月 前
コミット
cc183b26cb

+ 3 - 0
commons/src/main/java/com/jzg/commons/entity/dto/CostManagementVo.java

@@ -42,6 +42,9 @@ public class CostManagementVo {
     @Schema(description = "费用规则")
     @Schema(description = "费用规则")
     private String costRules;
     private String costRules;
 
 
+    @Schema(description = "费用描述")
+    private String costDescribe;
+
     @Schema(description = "生效时间")
     @Schema(description = "生效时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private String effectiveTime;
     private String effectiveTime;

+ 3 - 1
tenant/organization/src/main/resources/mapper/PtlAgreementCostMapper.xml

@@ -110,6 +110,7 @@
         <result column="is_enabled" property="isEnabled" jdbcType="VARCHAR"/>
         <result column="is_enabled" property="isEnabled" jdbcType="VARCHAR"/>
         <result column="is_valid" property="isValid" jdbcType="VARCHAR"/>
         <result column="is_valid" property="isValid" jdbcType="VARCHAR"/>
         <result column="approved" property="approved" jdbcType="VARCHAR"/>
         <result column="approved" property="approved" jdbcType="VARCHAR"/>
+        <result column="cost_describe" property="costDescribe" jdbcType="VARCHAR"/>
         <result column="rule_description" property="ruleDescription" jdbcType="VARCHAR"/>
         <result column="rule_description" property="ruleDescription" jdbcType="VARCHAR"/>
         <result column="product_id" property="productId" jdbcType="VARCHAR"/>
         <result column="product_id" property="productId" jdbcType="VARCHAR"/>
         <result column="product_name" property="productName" jdbcType="VARCHAR"/>
         <result column="product_name" property="productName" jdbcType="VARCHAR"/>
@@ -320,6 +321,7 @@
             pc.ptl_agreement_id,
             pc.ptl_agreement_id,
             pc.cover_rule_id,
             pc.cover_rule_id,
             pc.approved,
             pc.approved,
+            pc.cost_describe,
             pc.priority_level,
             pc.priority_level,
             pc.is_enabled,
             pc.is_enabled,
             pc.create_time,
             pc.create_time,
@@ -358,7 +360,7 @@
                 AND pr.rule_description  like concat('%',#{costParam.rulesName},'%')
                 AND pr.rule_description  like concat('%',#{costParam.rulesName},'%')
             </if>
             </if>
             <if test="costParam.costRules != null and costParam.costRules != ''">
             <if test="costParam.costRules != null and costParam.costRules != ''">
-                AND pc.cost_rules  like concat('%',#{costParam.costRules},'%')
+                AND pc.cost_describe like concat('%',#{costParam.costRules},'%')
             </if>
             </if>
             <if test="costParam.agreementStatus != null and costParam.agreementStatus != ''">
             <if test="costParam.agreementStatus != null and costParam.agreementStatus != ''">
                 AND pc.is_enabled = #{costParam.agreementStatus}
                 AND pc.is_enabled = #{costParam.agreementStatus}