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

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

@@ -34,6 +34,9 @@ public class CostExternalPageParam extends PageRequest {
     @Schema(description = "协议id")
     private String ptlAgreementId;
 
+    @Schema(description = "协议id集")
+    private String[] agreementIds;
+
     @Schema(description = "生效时间")
     private List<String> effectiveTime;
 

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

@@ -58,6 +58,7 @@
         <result column="update_by" property="updateBy" />
         <result column="is_delete" property="isDelete" />
         <result column="system_code" property="systemCode" />
+        <result column="agreement_title" property="agreementTitle" />
         <collection property="costExternalTypeAdds" column="id" ofType="com.jzg.commons.entity.vo.CostExternalTypeVo" select="selectCostExternalTypeVo" />
     </resultMap>
 
@@ -155,7 +156,8 @@
         ce.add_throw,
         ce.keep_point_ratio,
         pa.agreement_code,
-        pa.agreement_abbreviation
+        pa.agreement_abbreviation,
+        pa.agreement_title
         FROM
         ptl_agreement_cost_external ce
         LEFT JOIN ptl_agreement pa ON pa.id = ce.ptl_agreement_id AND pa.is_delete = 0
@@ -173,6 +175,12 @@
             <if test="costParam.ptlAgreementId != null and costParam.ptlAgreementId != ''">
                 AND ce.ptl_agreement_id = #{costParam.ptlAgreementId}
             </if>
+            <if test="costParam.agreementIds.length > 0 ">
+                AND ce.ptl_agreement_id in
+                <foreach collection="costParam.agreementIds" item="ptlAgreementId" separator="," open="(" close=")">
+                    #{ptlAgreementId}
+                </foreach>
+            </if>
             <if test="costParam.rulesName != null and costParam.rulesName != ''">
                 AND ce.rule_description  like concat('%',#{costParam.rulesName},'%')
             </if>