From be0f4ea73f9a4eb30c97b7527147fdbcdde2cd21 Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Sun, 4 Feb 2024 15:19:44 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E4=BF=A1=E6=81=AF=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E4=BC=98=E5=8C=96=E3=80=81=E8=A7=A3=E6=8A=B5=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E4=BC=98=E5=8C=962?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CrmCustomerTempExportVo.java | 4 +- .../crmcustomertemp/CrmCustomerTempMapper.xml | 5 +- .../CrmCustomerTempService.java | 51 ++++++-------- .../LoanRelieveMortgageService.java | 66 ++++++++++--------- 4 files changed, 60 insertions(+), 66 deletions(-) diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempExportVo.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempExportVo.java index 721d8d98c6..530eb0d402 100644 --- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempExportVo.java +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempExportVo.java @@ -10,8 +10,8 @@ import lombok.Data; */ @Data public class CrmCustomerTempExportVo { -// private String staffSid; -// private String createOrgSid; + private String staffSid; + private String createOrgSid; @ExportEntityMap(CnName = "序号", EnName = "rankNo") private Integer rankNo; @ExportEntityMap(CnName = "创建日期", EnName = "createTime") diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.xml b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.xml index 80535972b6..c8ef529172 100644 --- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.xml +++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.xml @@ -258,9 +258,10 @@ cct.customerNo, so.`name` AS createOrgName, st.NAME AS staffName, - org.orgName AS deptName, + cct.staffSid, cct.`name`, cct.customerType, +-- org.orgName AS deptName, cct.mobile, cct.weixin, cct.`level`, @@ -275,7 +276,7 @@ crm_customer_temp cct LEFT JOIN anrui_portal.sys_organization so ON cct.createOrgSid = so.sid LEFT JOIN anrui_portal.sys_staffinfo st ON cct.staffSid = st.sid - LEFT JOIN anrui_portal.sys_staff_org AS org ON org.staffSid = st.sid +-- LEFT JOIN anrui_portal.sys_staff_org AS org ON org.staffSid = st.sid and so.psid = org.orgSid ) as a,(SELECT @row_number:=0) AS t ${ew.sqlSegment} 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 16ca1f80b9..8625998c5e 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 @@ -62,6 +62,7 @@ import org.springframework.transaction.annotation.Transactional; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; +import java.util.function.Predicate; /** * Project: anrui-crm(客户管理)
@@ -1276,7 +1277,7 @@ public class CrmCustomerTempService extends MybatisBaseService records = baseMapper.exportExcel(qw); -// SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); -// int id = 1; -// if (!records.isEmpty()) { -// for (CrmCustomerTempExportVo record : records) { -// try { -// Date date = sdf.parse(record.getCreateTime()); -// record.setCreateTime(sdf.format(date)); -// } catch (ParseException e) { -// e.printStackTrace(); -// } -// String createOrgSid = record.getCreateOrgSid(); -// String staffSid = record.getStaffSid(); -// String createOrgName = sysOrganizationFeign.fetchBySid(createOrgSid).getData().getName(); -// record.setCreateOrgName(createOrgName); -// List sysStaffOrgVos = sysStaffOrgFeign.getSysStaffOrgListByStaffSid(staffSid).getData(); -// for (SysStaffOrgVo sysStaffOrgVo : sysStaffOrgVos) { -// SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(sysStaffOrgVo.getOrgSid()).getData(); -// String psid = sysOrganizationVo.getPsid(); -// if (psid.equals(createOrgSid)) { -// String orgName = sysStaffOrgVo.getOrgName(); -// record.setDeptName(orgName); -// } -// } -// record.setRankNo(id); -// id = id + 1; -// } -// } + if (!records.isEmpty()) { + records.stream().forEach(r -> { + String createOrgSid = r.getCreateOrgSid(); + String staffSid = r.getStaffSid(); + List sysStaffOrgVos = sysStaffOrgFeign.getSysStaffOrgListByStaffSid(staffSid).getData(); + sysStaffOrgVos.stream().forEach(s -> { + SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(s.getOrgSid()).getData(); + String psid = sysOrganizationVo.getPsid(); + if (psid.equals(createOrgSid)) { + String orgName = s.getOrgName(); + r.setDeptName(orgName); + } + }); + }); + } return records; } public ResultBean updateTemp(CustomerSecondSalesDto dto) { ResultBean rb = ResultBean.fireFail(); AppCrmCustomerTempDto appCrmCustomerTempDto = new AppCrmCustomerTempDto(); - if(StringUtils.isNotBlank(dto.getCustomerSid())){ + if (StringUtils.isNotBlank(dto.getCustomerSid())) { CrmCustomerTemp customerTemp = fetchBySid(dto.getCustomerSid()); - BeanUtils.copyProperties(customerTemp,appCrmCustomerTempDto); + BeanUtils.copyProperties(customerTemp, appCrmCustomerTempDto); appCrmCustomerTempDto.setSid(dto.getCustomerSid()); appCrmCustomerTempDto.setCertificateTypeKey(dto.getCertificateTypeKey()); appCrmCustomerTempDto.setCertificateType(dto.getCertificateType()); @@ -1332,7 +1321,7 @@ public class CrmCustomerTempService extends MybatisBaseService defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery); -// if (StringUtils.isNotBlank(defaultIdReltBean.getData())) { -// //数据权限ID(1集团、2事业部、3分公司、4部门、5个人) -// String orgSidPath = pagerQuery.getOrgPath(); -// orgSidPath = orgSidPath + "/"; -// int i1 = orgSidPath.indexOf("/"); -// int i2 = orgSidPath.indexOf("/", i1 + 1); -// int i3 = orgSidPath.indexOf("/", i2 + 1); -// int i4 = orgSidPath.indexOf("/", i3 + 1); -// String orgLevelKey = defaultIdReltBean.getData(); -// if ("1".equals(orgLevelKey)) { -// orgSidPath = orgSidPath.substring(0, i1); -// qw.like("orgSidPath", orgSidPath); -// } else if ("2".equals(orgLevelKey)) { -// orgSidPath = orgSidPath.substring(0, i2); -// qw.like("orgSidPath", orgSidPath); -// } else if ("3".equals(orgLevelKey)) { -// orgSidPath = orgSidPath.substring(0, i3); -// qw.like("orgSidPath", orgSidPath); -// } else if ("4".equals(orgLevelKey)) { -// orgSidPath = orgSidPath.substring(0, i4); -// qw.like("orgSidPath", orgSidPath); -// } else if ("5".equals(orgLevelKey)) { -// qw.eq("createBySid", pagerQuery.getUserSid()); -// } else { -// PagerVo p = new PagerVo<>(); -// return p; -// } -// } else { -// PagerVo p = new PagerVo<>(); -// return p; -// } + if (StringUtils.isNotBlank(defaultIdReltBean.getData())) { + //数据权限ID(1集团、2事业部、3分公司、4部门、5个人) + String orgSidPath = pagerQuery.getOrgPath(); + orgSidPath = orgSidPath + "/"; + int i1 = orgSidPath.indexOf("/"); + int i2 = orgSidPath.indexOf("/", i1 + 1); + int i3 = orgSidPath.indexOf("/", i2 + 1); + int i4 = orgSidPath.indexOf("/", i3 + 1); + String orgLevelKey = defaultIdReltBean.getData(); + if ("1".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i1); + qw.like("orgSidPath", orgSidPath); + } else if ("2".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i2); + qw.like("orgSidPath", orgSidPath); + } else if ("3".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i3); + qw.like("orgSidPath", orgSidPath); + } else if ("4".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i4); + qw.like("orgSidPath", orgSidPath); + } else if ("5".equals(orgLevelKey)) { + qw.eq("createBySid", pagerQuery.getUserSid()); + } else { + PagerVo p = new PagerVo<>(); + return p; + } + } else { + PagerVo p = new PagerVo<>(); + return p; + } //======================= //移交状态 if (StringUtils.isNotBlank(pagerQuery.getState())) { qw.like("`state`", pagerQuery.getState()); } + //销售专员 + if (StringUtils.isNotBlank(pagerQuery.getSalesman())) { + qw.like("salesman", pagerQuery.getSalesman()); + } //分公司 if (StringUtils.isNotBlank(pagerQuery.getUseOrgName())) { qw.like("useOrgName", pagerQuery.getUseOrgName());