Merge remote-tracking branch 'origin/dev_jzg_lipf_v20260622' into dev_jzg_lipf_v20260622

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

@@ -41,6 +41,9 @@ public class PtlAgreementCostParam extends PageRequest {
     @Schema(description = "费用规则")
     private List<String> costRulesList;
 
+    @Schema(description = "费用描述")
+    private String[] costDescribes;
+
     @Schema(description = "费用状态")
     private String agreementStatus;
 

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

@@ -410,6 +410,13 @@
                     #{phone}
                 </foreach>
             </if>
+            <if test="costParam.costDescribes != null and costParam.costDescribes.length >0 ">
+                and (
+                    <foreach  collection="costParam.costDescribes" close=")" open="(" separator="and " item="costDescribe">
+                        pc.cost_describe like concat('%', #{costDescribe} ,'%')
+                    </foreach>
+                )
+            </if>
             <if test="costParam.auditTimeBegin != null and costParam.auditTimeBegin != ''">
                 and pc.audit_time &gt;= #{costParam.auditTimeBegin}
             </if>