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

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/service/impl/InsOrdersServiceImpl.java

@@ -2413,22 +2413,22 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
         }
 
         // 获取新的保司ID
-        String newPartnerCompanyId = agreementVo.getPartnerCompanyId();
-        if (StrUtil.isBlank(newPartnerCompanyId)) {
+        String newCompanyId = agreementVo.getCompanyId();
+        if (StrUtil.isBlank(newCompanyId)) {
             return HttpResult.error("批量修改保司信息时，请指定保司ID");
         }
 
         // 通过保司ID查询保司名称
-        String companyName = "";
-        HttpResult<EsmInsCompany> companyResult = esmInsCompanyClient.findById(newPartnerCompanyId);
+        String companySimpleName = "";
+        HttpResult<EsmInsCompany> companyResult = esmInsCompanyClient.findById(newCompanyId);
         if (companyResult != null && companyResult.isSuccess() && companyResult.getData() != null) {
-            companyName = companyResult.getData().getName();
+            companySimpleName = companyResult.getData().getNameSimple();
         }
 
         // 修改ins_orders表的保司信息
         int orderCount = baseMapper.update(null, new LambdaUpdateWrapper<InsOrders>()
-                .set(InsOrders::getCompanyId, newPartnerCompanyId)
-                .set(InsOrders::getCompanyName, companyName)
+                .set(InsOrders::getCompanyId, newCompanyId)
+                .set(InsOrders::getCompanyName, companySimpleName)
                 .set(InsOrders::getAgreementId, batchModifyVo.getUpdateAgreementId())
                 .set(InsOrders::getDockingPerson, agreementVo.getDockingPerson())
                 .set(InsOrders::getDockingPersonPhone, agreementVo.getDockingPhone())
@@ -2437,8 +2437,8 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
 
         // 修改ins_order_adjust表的保司信息
         int adjustCount = insOrderAdjustMapper.update(null, new LambdaUpdateWrapper<InsOrderAdjust>()
-                .set(InsOrderAdjust::getCompanyId, newPartnerCompanyId)
-                .set(InsOrderAdjust::getCompanyName, companyName)
+                .set(InsOrderAdjust::getCompanyId, newCompanyId)
+                .set(InsOrderAdjust::getCompanyName, companySimpleName)
                 .in(InsOrderAdjust::getOrderNo, orderNos));
         log.info("修改ins_order_adjust保司信息完成，影响行数: {}", adjustCount);
 

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

@@ -212,7 +212,7 @@
         year(io.signing_time) as sign_year,
         ipi.id,
         io.id as 'orderNo',
-        io.company_name,
+        eic.name_simple as companyName,
         ipi.dept_name,
         ipi.agreement_name,
         ipi.agreement_id,