|
@ -59,6 +59,8 @@ import org.springframework.beans.factory.annotation.Autowired; |
|
|
import org.springframework.stereotype.Service; |
|
|
import org.springframework.stereotype.Service; |
|
|
import org.springframework.transaction.annotation.Transactional; |
|
|
import org.springframework.transaction.annotation.Transactional; |
|
|
|
|
|
|
|
|
|
|
|
import java.text.ParseException; |
|
|
|
|
|
import java.text.SimpleDateFormat; |
|
|
import java.util.*; |
|
|
import java.util.*; |
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
@ -215,11 +217,19 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa |
|
|
if (StringUtils.isNotBlank(query.getMobile())) { |
|
|
if (StringUtils.isNotBlank(query.getMobile())) { |
|
|
qw.like("cct.mobile", query.getMobile()); |
|
|
qw.like("cct.mobile", query.getMobile()); |
|
|
} |
|
|
} |
|
|
|
|
|
if (StringUtils.isNotBlank(query.getStaffName())) { |
|
|
|
|
|
qw.like("st.name", query.getStaffName()); |
|
|
|
|
|
} |
|
|
String remindStartDay = query.getRemindStartDay(); |
|
|
String remindStartDay = query.getRemindStartDay(); |
|
|
String remindEndDay = query.getRemindEndDay(); |
|
|
String remindEndDay = query.getRemindEndDay(); |
|
|
qw.apply(StringUtils.isNotBlank(remindStartDay), "date_format (cct.remind_day,'%Y-%m-%d') >= date_format('" + remindStartDay + "','%Y-%m-%d')"). |
|
|
qw.apply(StringUtils.isNotBlank(remindStartDay), "date_format (cct.remind_day,'%Y-%m-%d') >= date_format('" + remindStartDay + "','%Y-%m-%d')"). |
|
|
apply(StringUtils.isNotBlank(remindEndDay), "date_format (cct.remind_day,'%Y-%m-%d') <= date_format('" + remindEndDay + "','%Y-%m-%d')" |
|
|
apply(StringUtils.isNotBlank(remindEndDay), "date_format (cct.remind_day,'%Y-%m-%d') <= date_format('" + remindEndDay + "','%Y-%m-%d')" |
|
|
); |
|
|
); |
|
|
|
|
|
String createStartDate = query.getCreateStartDate(); |
|
|
|
|
|
String createEndDate = query.getCreateEndDate(); |
|
|
|
|
|
qw.apply(StringUtils.isNotBlank(createStartDate), "date_format (cct.createTime,'%Y-%m-%d') >= date_format('" + createStartDate + "','%Y-%m-%d')"). |
|
|
|
|
|
apply(StringUtils.isNotBlank(createEndDate), "date_format (cct.createTime,'%Y-%m-%d') <= date_format('" + createEndDate + "','%Y-%m-%d')" |
|
|
|
|
|
); |
|
|
IPage<CrmCustomerTemp> page = PagerUtil.queryToPage(pq); |
|
|
IPage<CrmCustomerTemp> page = PagerUtil.queryToPage(pq); |
|
|
IPage<CrmCustomerTempVo> pagging = baseMapper.selectPageVo(page, qw); |
|
|
IPage<CrmCustomerTempVo> pagging = baseMapper.selectPageVo(page, qw); |
|
|
for (CrmCustomerTempVo record : pagging.getRecords()) { |
|
|
for (CrmCustomerTempVo record : pagging.getRecords()) { |
|
@ -227,8 +237,8 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa |
|
|
String staffSid = record.getStaffSid(); |
|
|
String staffSid = record.getStaffSid(); |
|
|
String createOrgName = sysOrganizationFeign.fetchBySid(createOrgSid).getData().getName(); |
|
|
String createOrgName = sysOrganizationFeign.fetchBySid(createOrgSid).getData().getName(); |
|
|
record.setCreateOrgName(createOrgName); |
|
|
record.setCreateOrgName(createOrgName); |
|
|
String staffName = sysStaffinfoFeign.fetchBySid(staffSid).getData().getName(); |
|
|
// String staffName = sysStaffinfoFeign.fetchBySid(staffSid).getData().getName();
|
|
|
record.setStaffName(staffName); |
|
|
// record.setStaffName(staffName);
|
|
|
List<SysStaffOrgVo> sysStaffOrgVos = sysStaffOrgFeign.getSysStaffOrgListByStaffSid(staffSid).getData(); |
|
|
List<SysStaffOrgVo> sysStaffOrgVos = sysStaffOrgFeign.getSysStaffOrgListByStaffSid(staffSid).getData(); |
|
|
for (SysStaffOrgVo sysStaffOrgVo : sysStaffOrgVos) { |
|
|
for (SysStaffOrgVo sysStaffOrgVo : sysStaffOrgVos) { |
|
|
SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(sysStaffOrgVo.getOrgSid()).getData(); |
|
|
SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(sysStaffOrgVo.getOrgSid()).getData(); |
|
@ -1223,6 +1233,87 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
public void updateIdBySid(String idCard, String custSid) { |
|
|
public void updateIdBySid(String idCard, String custSid) { |
|
|
baseMapper.updateIdBySid(idCard,custSid); |
|
|
baseMapper.updateIdBySid(idCard, custSid); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
public List<CrmCustomerTempExportVo> exportExcel(CrmCustomerTempQuery query) { |
|
|
|
|
|
QueryWrapper<CrmCustomerTemp> qw = new QueryWrapper<>(); |
|
|
|
|
|
String userSid = query.getUserSid(); |
|
|
|
|
|
//根据用户的组织机构查询分公司
|
|
|
|
|
|
String orgSidPath = query.getOrgSidPath(); |
|
|
|
|
|
String orgSid = "";//分公司sid
|
|
|
|
|
|
if (StringUtils.isNotBlank(orgSidPath)) { |
|
|
|
|
|
orgSid = sysStaffOrgFeign.getOrgSidByPath(orgSidPath).getData(); |
|
|
|
|
|
} else { |
|
|
|
|
|
SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.getUseOrgByUserSid(userSid).getData(); |
|
|
|
|
|
if (sysOrganizationVo != null) { |
|
|
|
|
|
orgSid = sysOrganizationVo.getSid(); |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
SysOrganizationVo data = sysOrganizationFeign.selectByOrgSidPath(orgSidPath).getData(); |
|
|
|
|
|
String orgLevelKey = data.getOrgLevelKey(); |
|
|
|
|
|
if ("2".equals(orgLevelKey)) { |
|
|
|
|
|
orgSidPath = orgSidPath.substring(0, 73); |
|
|
|
|
|
qw.like("so.orgSidPath", orgSidPath); |
|
|
|
|
|
} else if ("3".equals(orgLevelKey)) { |
|
|
|
|
|
qw.eq("cct.createOrgSid", orgSid); |
|
|
|
|
|
} |
|
|
|
|
|
if (StringUtils.isNotBlank(query.getCustomerTypeKey())) { |
|
|
|
|
|
qw.eq("cct.customerTypeKey", query.getCustomerTypeKey()); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
if (StringUtils.isNotBlank(query.getName())) { |
|
|
|
|
|
qw.like("cct.name", query.getName()); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
if (StringUtils.isNotBlank(query.getLevelKey())) { |
|
|
|
|
|
qw.eq("cct.levelKey", query.getLevelKey()); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
if (StringUtils.isNotBlank(query.getMobile())) { |
|
|
|
|
|
qw.like("cct.mobile", query.getMobile()); |
|
|
|
|
|
} |
|
|
|
|
|
if (StringUtils.isNotBlank(query.getStaffName())) { |
|
|
|
|
|
qw.like("st.name", query.getStaffName()); |
|
|
|
|
|
} |
|
|
|
|
|
String remindStartDay = query.getRemindStartDay(); |
|
|
|
|
|
String remindEndDay = query.getRemindEndDay(); |
|
|
|
|
|
qw.apply(StringUtils.isNotBlank(remindStartDay), "date_format (cct.remind_day,'%Y-%m-%d') >= date_format('" + remindStartDay + "','%Y-%m-%d')"). |
|
|
|
|
|
apply(StringUtils.isNotBlank(remindEndDay), "date_format (cct.remind_day,'%Y-%m-%d') <= date_format('" + remindEndDay + "','%Y-%m-%d')" |
|
|
|
|
|
); |
|
|
|
|
|
String createStartDate = query.getCreateStartDate(); |
|
|
|
|
|
String createEndDate = query.getCreateEndDate(); |
|
|
|
|
|
qw.apply(StringUtils.isNotBlank(createStartDate), "date_format (cct.createTime,'%Y-%m-%d') >= date_format('" + createStartDate + "','%Y-%m-%d')"). |
|
|
|
|
|
apply(StringUtils.isNotBlank(createEndDate), "date_format (cct.createTime,'%Y-%m-%d') <= date_format('" + createEndDate + "','%Y-%m-%d')" |
|
|
|
|
|
); |
|
|
|
|
|
List<CrmCustomerTempExportVo> 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<SysStaffOrgVo> 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; |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
return records; |
|
|
} |
|
|
} |
|
|
} |
|
|
} |