Merge remote-tracking branch 'origin/master'

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

@@ -54,6 +54,9 @@ public class PtlAgreementCostParam extends PageRequest {
     @Schema(description = "是否启用")
     private String isEnabled;
 
-
+    @Schema(description = "协议id")
+    private String agreementId;
+    @Schema(description = "承包规则id")
+    private String coverRuleId;
 
 }

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

@@ -406,6 +406,12 @@
             <if test="costParam.productId != null and costParam.productId != ''">
                 AND pc.product_id = #{costParam.productId}
             </if>
+            <if test="costParam.agreementId != null and costParam.agreementId != ''">
+                AND pc.ptl_agreement_id = #{costParam.agreementId}
+            </if>
+            <if test="costParam.coverRuleId != null and costParam.coverRuleId != ''">
+                AND pc.cover_rule_id = #{costParam.coverRuleId}
+            </if>
             <if test="costParam.rulesName != null and costParam.rulesName != ''">
                 AND (
                     (pr_raw.parent_id IS NOT NULL AND pr_raw.parent_id != ''