diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempVo.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempVo.java index 8fb98cc9f2..6628e1e07e 100644 --- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempVo.java +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempVo.java @@ -35,6 +35,15 @@ public class CrmCustomerTempVo implements Vo { @ApiModelProperty("潜在客户sid") private String sid; + @ApiModelProperty("分公司名称") + private String createOrgName; + + @ApiModelProperty("业务员名称") + private String staffName; + + @ApiModelProperty("部门名称") + private String deptName; + @ApiModelProperty("创建人sid") private String createBySid; diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java index 68493d7532..b914710b96 100644 --- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java +++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java @@ -28,8 +28,10 @@ import com.yxt.anrui.portal.api.dictcommon.DictCommonFeign; import com.yxt.anrui.portal.api.dictcommon.DictCommonVo; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; +import com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfoFeign; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; +import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgVo; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.portal.api.sysuser.SysUserInfoVo; import com.yxt.anrui.portal.api.sysuser.SysUserVo; @@ -96,6 +98,8 @@ public class CrmCustomerTempService extends MybatisBaseService page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.selectPageVo(page, qw); + for (CrmCustomerTempVo record : pagging.getRecords()) { + String createOrgSid = record.getCreateOrgSid(); + String staffSid = record.getStaffSid(); + String createOrgName = sysOrganizationFeign.fetchBySid(createOrgSid).getData().getName(); + record.setCreateOrgName(createOrgName); + String staffName = sysStaffinfoFeign.fetchBySid(staffSid).getData().getName(); + record.setStaffName(staffName); + List sysStaffOrgVos = sysStaffOrgFeign.getSysStaffOrgListByStaffSid(staffSid).getData(); + StringBuilder deptName = new StringBuilder(); + for (SysStaffOrgVo sysStaffOrgVo : sysStaffOrgVos) { + String orgName = sysStaffOrgVo.getOrgName(); + deptName.append(orgName).append(" "); + } + record.setDeptName(deptName.toString()); + } PagerVo p = PagerUtil.pageToVo(pagging, null); return p; }