feat(crm/BusinessTripApply): 在出差申请服务中新增客户信息查询关联

ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/domain/vo/CrmBusinessTripApplyVo.java

@@ -111,6 +111,12 @@ public class CrmBusinessTripApplyVo implements Serializable {
      */
     private Long customerId;
 
+    /**
+     * 客户名称（关联查询）
+     */
+    @ExcelProperty(value = "交流对象")
+    private String customerName;
+
     /**
      * 项目名称
      */

ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/service/impl/CrmBusinessTripApplyServiceImpl.java

@@ -16,6 +16,7 @@ import org.dromara.oa.crm.domain.CrmBusinessTripApply;
 import org.dromara.oa.crm.mapper.CrmBusinessTripApplyMapper;
 import org.dromara.oa.crm.service.ICrmBusinessTripApplyService;
 import org.dromara.oa.erp.domain.ErpProjectInfo;
+import org.dromara.oa.crm.domain.CrmCustomerInfo;
 
 import java.util.List;
 import java.util.Map;
@@ -67,7 +68,9 @@ public class CrmBusinessTripApplyServiceImpl implements ICrmBusinessTripApplySer
                 .selectAll(CrmBusinessTripApply.class)
                 .selectAs(ErpProjectInfo::getProjectName, CrmBusinessTripApplyVo::getProjectName)
                 .selectAs(ErpProjectInfo::getProjectCode, CrmBusinessTripApplyVo::getProjectCode)
+                .selectAs(CrmCustomerInfo::getCustomerName, CrmBusinessTripApplyVo::getCustomerName)
                 .leftJoin(ErpProjectInfo.class, ErpProjectInfo::getProjectId, CrmBusinessTripApply::getProjectId)
+                .leftJoin(CrmCustomerInfo.class, CrmCustomerInfo::getCustomerId, CrmBusinessTripApply::getCustomerId)
                 .eq(CrmBusinessTripApply::getTripId, tripId);
         return baseMapper.selectJoinOne(CrmBusinessTripApplyVo.class, lqw);
     }
@@ -105,7 +108,9 @@ public class CrmBusinessTripApplyServiceImpl implements ICrmBusinessTripApplySer
                 .selectAll(CrmBusinessTripApply.class)
                 .selectAs(ErpProjectInfo::getProjectName, CrmBusinessTripApplyVo::getProjectName)
                 .selectAs(ErpProjectInfo::getProjectCode, CrmBusinessTripApplyVo::getProjectCode)
+                .selectAs(CrmCustomerInfo::getCustomerName, CrmBusinessTripApplyVo::getCustomerName)
                 .leftJoin(ErpProjectInfo.class, ErpProjectInfo::getProjectId, CrmBusinessTripApply::getProjectId)
+                .leftJoin(CrmCustomerInfo.class, CrmCustomerInfo::getCustomerId, CrmBusinessTripApply::getCustomerId)
                 .eq(CrmBusinessTripApply::getDelFlag, "0")
                 // 按指定ID列表过滤（用于导出选中数据）
                 .in(StringUtils.isNotBlank(bo.getTripIds()), CrmBusinessTripApply::getTripId,