diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutVoExeclNew.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutVoExeclNew.java index 9765ae928a..09b05421e9 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutVoExeclNew.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutVoExeclNew.java @@ -1,6 +1,7 @@ package com.yxt.anrui.base.api.basevehicleout; import com.yxt.common.core.utils.ExportEntityMap; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** @@ -61,4 +62,6 @@ public class BaseVehicleOutVoExeclNew { private String rebateMoneyTwo; @ExportEntityMap(CnName = "内部引荐人姓名", EnName = "innerName") private String innerName; + @ApiModelProperty("分公司sid") + private String createOrgSid; } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutMapper.xml index 3483622778..d5d5c54be9 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutMapper.xml @@ -221,7 +221,8 @@ bvo.middleTwo, bvo.rebateMoneyTwo, bvoa.innerName, - bvo.manPurOrderTypeValue + bvo.manPurOrderTypeValue, + bvoa.createOrgSid FROM base_vehicle_out bvo LEFT JOIN base_vehicle_out_apply bvoa ON bvo.`mainSid` = bvoa.`sid` diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java index 3c53d43b72..a28955bb7f 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java @@ -1845,7 +1845,6 @@ public class BaseVehicleOutService extends MybatisBaseService listExcelNew(BaseVehicleOutQuery params) { QueryWrapper qw = new QueryWrapper<>(); - SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(params.getCreateOrgSid()).getData(); if (params != null) { String orgSidPath = params.getOrgSidPath(); SysOrganizationVo data = sysOrganizationFeign.selectByOrgSidPath(orgSidPath).getData(); @@ -1897,6 +1896,8 @@ public class BaseVehicleOutService extends MybatisBaseService @@ -122,7 +124,8 @@ public class BaseVehicleOutApplyService extends MybatisBaseService qw = createQueryWrapper(query); IPage page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.selectPageVo(page, qw); - for (BaseVehicleOutApplyVoNew record : pagging.getRecords()) { + List records = pagging.getRecords(); + for (BaseVehicleOutApplyVoNew record : records) { String createOrgSid = record.getCreateOrgSid(); String createorgName = sysOrganizationFeign.fetchBySid(createOrgSid).getData().getName(); record.setCreateOrgName(createorgName); @@ -131,6 +134,7 @@ public class BaseVehicleOutApplyService extends MybatisBaseService p = PagerUtil.pageToVo(pagging, null); return p; }