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

partner/src/main/java/com/jzg/utils/DistributionUtils.java

@@ -124,8 +124,8 @@ public class DistributionUtils {
         details.setUserName("");
         details.setIssuerId(userId);
         details.setIssuerName("");
-        details.setOrderno(insOrders.getQuoteNo());
-        details.setCompanyId(insOrders.getId());
+        details.setOrderno(insOrders.getId());
+        details.setCompanyId(insOrders.getCompanyId());
         details.setDeptId(partnerUser.getDeptId());
         details.setLicenseno(licenseNo);
         details.setSumpremium(feeOrders.getTotalPremium());

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