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

tenant/insurance/quotation-summary/src/main/resources/mapper/InsFeeAuditMapper.xml

@@ -59,7 +59,7 @@
         ELSE ''
         END AS attrType,
         io.signing_time as signingTime,
-        io.create_time as quotationTime, sua.username as dockingPerson,
+        io.create_time as quotationTime, io.docking_person as dockingPerson,
         pa.agreement_abbreviation as agreementName,io.product_name as productName,
         ioc.jq_premium as jqPremium, ioc.sy_premium as syPremium, ioc.jy_premium as jyPremium,
         ioc.sum_premium as sumPremium,sd.name as deptName,ifa.create_time as createTime,

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

@@ -1488,8 +1488,7 @@
         eic.name_simple as companyNameSimple,
         sum( ipiis.actual_received_amount ) AS actual_received_amount,
         GROUP_CONCAT(DISTINCT ipiis.settlement_payment_reason SEPARATOR ',') AS paymentReason,
-        ipii.status,
-        ipii.payment_reason
+        ipii.status
         FROM
         ins_ply_income_invoice ipii
         LEFT JOIN ins_ply_income_invoice_settlement ipiis ON ipii.id = ipiis.invoice_id AND ipiis.is_delete = 0
@@ -2090,7 +2089,7 @@
                 AND a.system_code = #{query.systemCode}
             </if>
             <if test="query.companyId != null and query.companyId != ''">
-                AND a.company_id = #{query.companyId}
+                AND b.partner_company_id = #{query.companyId}
             </if>
             <if test="query.startTime != null and query.startTime != '' and query.endTime != null and query.endTime != ''">
                 AND a.create_time between #{query.startTime} and #{query.endTime}