diff --git a/user-client/src/main/java/com/hp/user/client/service/CustomerCompanyService.java b/user-client/src/main/java/com/hp/user/client/service/CustomerCompanyService.java index d42d7ff..1c06d34 100644 --- a/user-client/src/main/java/com/hp/user/client/service/CustomerCompanyService.java +++ b/user-client/src/main/java/com/hp/user/client/service/CustomerCompanyService.java @@ -20,7 +20,8 @@ public interface CustomerCompanyService { public PageResult getCompanysPage(Long current, Integer size,Integer type); public PageResult queryServiceProvidersByName(String name, Long current, Integer size); public PageResult queryCompanysPageByNameAndServiceAndStatus(String name, String serviceProviderName, Integer status, Long current, Integer size); + public PageResult queryCompanysPageByServiceProviderIdAndNameAndStatus(String serviceProviderId,String name,Integer status,Long current,Integer size); public PageResult getCompanyAuditsPage(Long current, Integer size); public PageResult queryCompanysPageByNameAndStatusAndCreateTime(String name, Integer status, Date startTime,Date endTime, Long current, Integer size); - public PageResult queryCluesPageOfContractUserByCreateTimeAndBusinessContactAndPhoneNumberAndFollowAndSourceAndPush(Date startTime, Date endTime,String businessContact,String phoneNumber,Integer follow, Integer resource, Integer push, Long current, Integer size); + public PageResult queryCluesPageOfContractUserByCreateTimeAndBusinessContactAndPhoneNumberAndFollowAndSourceAndPush(Date startTime, Date endTime,String businessContact,String phoneNumber,Integer follow, Integer source, Integer push, Long current, Integer size); } diff --git a/user-service/src/main/java/com/hp/user/service/controller/CompanyController.java b/user-service/src/main/java/com/hp/user/service/controller/CompanyController.java index 7c4cf06..670b27b 100644 --- a/user-service/src/main/java/com/hp/user/service/controller/CompanyController.java +++ b/user-service/src/main/java/com/hp/user/service/controller/CompanyController.java @@ -52,9 +52,9 @@ public class CompanyController { audit.setUserId(company.getCustomerId()); audit.setVipLevel((short) 1); // 普通会员 audit.setStatus(company.getStatus()); - audit.setIsReply((short)1); // 未回复 - audit.setFollow((short)1); // 未跟进 - audit.setPush((short)1); // 未推送 + audit.setIsReply((short) 1); // 未回复 + audit.setFollow((short) 1); // 未跟进 + audit.setPush((short) 1); // 未推送 result3 = auditService.insert(audit); } if (result1.getCode().equals("0") && result2.getCode().equals("0") && result3.getCode().equals("0")) { @@ -229,6 +229,22 @@ public class CompanyController { return customerCompanyService.queryCompanysPageByNameAndServiceAndStatus(name, serviceProviderName, status, current, size); } + /** + * 根据服务商Id、企业姓名、审核状态分页查询企业 + * + * @param serviceProviderId 服务商Id + * @param name 企业名称 + * @param status 审核状态 + * @param current 要查询页数 + * @param size 一页的行数 + * @return PageResult + */ + @ApiOperation(value = "根据服务商Id、企业姓名、审核状态分页查询企业", notes = "审核状态\"全部\"则status=0") + @GetMapping("/queryCompanysPageByServiceProviderIdAndNameAndStatus") + public PageResult queryCompanysPageByServiceProviderIdAndNameAndStatus(@RequestParam String serviceProviderId, String name, @RequestParam Integer status, @RequestParam Long current, @RequestParam Integer size) { + return customerCompanyService.queryCompanysPageByServiceProviderIdAndNameAndStatus(serviceProviderId, name, status, current, size); + } + /** * 微信端，成为合同用户 * @@ -248,9 +264,9 @@ public class CompanyController { audit.setUserId(company.getCustomerId()); audit.setStatus((short) 1); // 未审核 audit.setSource((short) 1); // 来源：维信 - audit.setIsReply((short)1); // 未回复 - audit.setFollow((short)1); // 未跟进 - audit.setPush((short)1); // 未推送 + audit.setIsReply((short) 1); // 未回复 + audit.setFollow((short) 1); // 未跟进 + audit.setPush((short) 1); // 未推送 // 愿意成为合同用户 if (willing) audit.setVipLevel((short) 1); // 普通会员 else audit.setVipLevel((short) 2); // 意向用户 @@ -298,13 +314,12 @@ public class CompanyController { } /** - * - * @param startTime 根据提交时间、企业联系人、联系电话、跟进状态、线索来源、推进状态分页查询合同用户线索 + * @param startTime 根据提交时间、企业联系人、联系电话、跟进状态、线索来源、推进状态分页查询合同用户线索 * @param endTime * @param businessContact * @param phoneNumber * @param follow - * @param resource + * @param source * @param push * @param current * @param size @@ -312,8 +327,8 @@ public class CompanyController { */ @ApiOperation(value = "根据提交时间、企业联系人、联系电话、跟进状态、线索来源、推进状态分页查询合同用户线索", notes = "跟进状态：1:未跟进；2:跟进；推送状态：1:未推送；2:已推送；3:已退回；来源：1：微信小程序；若状态为全部，填0") @GetMapping("/queryCluesPageOfContractUser") - public PageResult queryCluesPageOfContractUser(Date startTime, Date endTime,String businessContact,String phoneNumber,@RequestParam Integer follow,@RequestParam Integer resource,@RequestParam Integer push,@RequestParam Long current, @RequestParam Integer size){ - return customerCompanyService.queryCluesPageOfContractUserByCreateTimeAndBusinessContactAndPhoneNumberAndFollowAndSourceAndPush(startTime,endTime,businessContact,phoneNumber,follow,resource,push,current,size); + public PageResult queryCluesPageOfContractUser(Date startTime, Date endTime, String businessContact, String phoneNumber, @RequestParam Integer follow, @RequestParam Integer source, @RequestParam Integer push, @RequestParam Long current, @RequestParam Integer size) { + return customerCompanyService.queryCluesPageOfContractUserByCreateTimeAndBusinessContactAndPhoneNumberAndFollowAndSourceAndPush(startTime, endTime, businessContact, phoneNumber, follow, source, push, current, size); } // public HttpResult queryContectUserByBusinessContectAndPhone diff --git a/user-service/src/main/java/com/hp/user/service/dao/CustomerCompanyMapper.java b/user-service/src/main/java/com/hp/user/service/dao/CustomerCompanyMapper.java index 5bbb649..c141b75 100644 --- a/user-service/src/main/java/com/hp/user/service/dao/CustomerCompanyMapper.java +++ b/user-service/src/main/java/com/hp/user/service/dao/CustomerCompanyMapper.java @@ -20,5 +20,5 @@ import java.util.List; public interface CustomerCompanyMapper extends BaseMapper { List selectCompanyAuditPage(Page page); List queryCompanyAuditPageByNameAndStatusAndCreateTime(Page page, @Param("name") String name, @Param("status") Integer status, @Param("startTime") Date startTime, @Param("endTime") Date endTime); - List queryCluesPageOfContractUserByCreateTimeAndNameAndPhoneAndFollowAndSourceAndPush(Page page,@Param("startTime") Date startTime,@Param("endTime") Date endTime,@Param("businessContact") String businessContact,@Param("phoneNumber") String phoneNumber,@Param("follow") Integer follow,@Param("resource") Integer resource,@Param("push") Integer push); + List queryCluesPageOfContractUserByCreateTimeAndNameAndPhoneAndFollowAndSourceAndPush(Page page,@Param("startTime") Date startTime,@Param("endTime") Date endTime,@Param("businessContact") String businessContact,@Param("phoneNumber") String phoneNumber,@Param("follow") Integer follow,@Param("source") Integer source,@Param("push") Integer push); } diff --git a/user-service/src/main/java/com/hp/user/service/impl/CustomerCompanyServiceImpl.java b/user-service/src/main/java/com/hp/user/service/impl/CustomerCompanyServiceImpl.java index d98d4ab..50e6b66 100644 --- a/user-service/src/main/java/com/hp/user/service/impl/CustomerCompanyServiceImpl.java +++ b/user-service/src/main/java/com/hp/user/service/impl/CustomerCompanyServiceImpl.java @@ -42,15 +42,15 @@ public class CustomerCompanyServiceImpl implements CustomerCompanyService { public Result insert(CustomerCompanyVO company) { CustomerCompany temp = new CustomerCompany(); Result result = new Result(); - int flag=0; - try{ + int flag = 0; + try { BeanUtils.copyProperties(company, temp); flag = customerCompanyMapper.insert(temp); - }catch (Exception e){ + } catch (Exception e) { } // 判断数据库操作是否成功 - if(SqlHelper.retBool(flag)){ + if (SqlHelper.retBool(flag)) { result.setCode("0"); } else { result.setCode("-1"); @@ -63,17 +63,17 @@ public class CustomerCompanyServiceImpl implements CustomerCompanyService { public Result delete(String companyId) { CustomerCompany temp; Result result = new Result(); - int flag=0; + int flag = 0; try { // 将deleted字段设置为1 temp = customerCompanyMapper.selectById(companyId); - if(temp==null){ + if (temp == null) { result.setCode("-1"); result.setMessage("未查找到此企业/服务商"); return result; } temp.setSysDeleted((short) 1); - flag =customerCompanyMapper.updateById(temp); + flag = customerCompanyMapper.updateById(temp); } catch (Exception e) { } @@ -90,11 +90,11 @@ public class CustomerCompanyServiceImpl implements CustomerCompanyService { public Result update(CustomerCompanyVO company) { CustomerCompany temp = new CustomerCompany(); Result result = new Result(); - int flag=0; - try{ + int flag = 0; + try { BeanUtils.copyProperties(company, temp); flag = customerCompanyMapper.updateById(temp); - }catch(Exception e){ + } catch (Exception e) { } // 判断数据库操作是否成功 @@ -111,20 +111,19 @@ public class CustomerCompanyServiceImpl implements CustomerCompanyService { public DataResult queryCompanyByCompanyId(String companyId) { CustomerCompanyVO customerCompanyVO = new CustomerCompanyVO(); DataResult result = new DataResult<>(); - try{ + try { CustomerCompany temp = customerCompanyMapper.selectById(companyId); // 这个已经被删除 - if (temp == null || temp.getSysDeleted() == 1){ + if (temp == null || temp.getSysDeleted() == 1) { result.setCode("-1"); result.setMessage("企业不存在/已删除"); return result; - } - else { + } else { BeanUtils.copyProperties(temp, customerCompanyVO); result.setCode("0"); result.setData(customerCompanyVO); } - }catch(Exception e){ + } catch (Exception e) { } return result; @@ -136,7 +135,7 @@ public class CustomerCompanyServiceImpl implements CustomerCompanyService { List companyVOs = new ArrayList<>(); IPage page = new Page<>(current, size); QueryWrapper queryWrapper = new QueryWrapper<>(); - try{ + try { queryWrapper.orderByDesc("sys_create_time"); queryWrapper.eq("sys_deleted", 0); queryWrapper.eq("type", type); @@ -153,7 +152,7 @@ public class CustomerCompanyServiceImpl implements CustomerCompanyService { result.setTotal(page.getTotal()); result.setCurrent(current); result.setSize(size); - }catch (Exception e){ + } catch (Exception e) { } return result; @@ -165,7 +164,7 @@ public class CustomerCompanyServiceImpl implements CustomerCompanyService { List companyVOs = new ArrayList<>(); IPage page = new Page<>(current, size); QueryWrapper wrapper = new QueryWrapper<>(); - try{ + try { wrapper.orderByDesc("sys_create_time"); wrapper.eq("sys_deleted", 0); wrapper.eq("type", 0); @@ -185,7 +184,7 @@ public class CustomerCompanyServiceImpl implements CustomerCompanyService { result.setTotal(page.getTotal()); result.setCurrent(current); result.setSize(size); - }catch (Exception e){ + } catch (Exception e) { } return result; @@ -197,7 +196,7 @@ public class CustomerCompanyServiceImpl implements CustomerCompanyService { List companyVOs = new ArrayList<>(); IPage page = new Page<>(current, size); QueryWrapper wrapper = new QueryWrapper<>(); - try{ + try { // 关联服务商 if (!StringUtils.isEmpty(serviceProviderName)) { QueryWrapper queryWrapper = new QueryWrapper<>(); @@ -230,7 +229,7 @@ public class CustomerCompanyServiceImpl implements CustomerCompanyService { for (CustomerCompany company : companys) { t = new CustomerCompanyVO(); BeanUtils.copyProperties(company, t); - tt=csService.queryCsByCompanyId(company.getCustomerId()); + tt = csService.queryCsByCompanyId(company.getCustomerId()); if (tt.getCode().equals("0")) { t.setServiceProviderId(tt.getData().getServiceProviderId()); } @@ -241,7 +240,57 @@ public class CustomerCompanyServiceImpl implements CustomerCompanyService { result.setTotal(page.getTotal()); result.setCurrent(current); result.setSize(size); - }catch (Exception e){ + } catch (Exception e) { + + } + return result; + } + + @Override + public PageResult queryCompanysPageByServiceProviderIdAndNameAndStatus(String serviceProviderId, String name, Integer status, Long current, Integer size) { + PageResult result = new PageResult<>(); + List companyVOs = new ArrayList<>(); + IPage page = new Page<>(current, size); + QueryWrapper wrapper = new QueryWrapper<>(); + try { + //根据服务商Id与企业Id的对应情况查企业Id + QueryWrapper tempWrapper = new QueryWrapper<>(); + tempWrapper.eq("service_provider_id", serviceProviderId); + List temp = customerServiceProviderEnterpriseMapper.selectList(tempWrapper); + List companyIds = new ArrayList<>(); + for (CustomerServiceProviderEnterprise tt : temp) { + companyIds.add(tt.getEnterpriseId()); + } + wrapper.in("customer_id", companyIds); + + if (status != 0) { + wrapper.eq("status", status); + } + if (!StringUtils.isEmpty(name)) { + wrapper.like("name", name); + } + wrapper.orderByDesc("sys_create_time"); + wrapper.eq("sys_deleted", 0); + wrapper.eq("type", 1); + customerCompanyMapper.selectPage(page, wrapper); + List companys = page.getRecords(); + CustomerCompanyVO t; + DataResult tt; + for (CustomerCompany company : companys) { + t = new CustomerCompanyVO(); + BeanUtils.copyProperties(company, t); + tt = csService.queryCsByCompanyId(company.getCustomerId()); + if (tt.getCode().equals("0")) { + t.setServiceProviderId(tt.getData().getServiceProviderId()); + } + companyVOs.add(t); + } + result.setCode("0"); + result.setDataList(companyVOs); + result.setTotal(page.getTotal()); + result.setCurrent(current); + result.setSize(size); + } catch (Exception e) { } return result; @@ -249,9 +298,9 @@ public class CustomerCompanyServiceImpl implements CustomerCompanyService { @Override public PageResult getCompanyAuditsPage(Long current, Integer size) { - PageResult result= new PageResult<>(); + PageResult result = new PageResult<>(); Page page = new Page<>(current, size); - try{ + try { List companyAudits = customerCompanyMapper.selectCompanyAuditPage(page); List companyAuditVOList = new ArrayList<>(); CompanyAuditVO temp; @@ -265,7 +314,7 @@ public class CustomerCompanyServiceImpl implements CustomerCompanyService { result.setTotal(page.getTotal()); result.setCurrent(current); result.setSize(size); - }catch (Exception e){ + } catch (Exception e) { } return result; @@ -273,9 +322,9 @@ public class CustomerCompanyServiceImpl implements CustomerCompanyService { @Override public PageResult queryCompanysPageByNameAndStatusAndCreateTime(String name, Integer status, Date startTime, Date endTime, Long current, Integer size) { - PageResult result= new PageResult<>(); + PageResult result = new PageResult<>(); Page page = new Page<>(current, size); - try{ + try { List companyAudits = customerCompanyMapper.queryCompanyAuditPageByNameAndStatusAndCreateTime(page, name, status, startTime, endTime); List companyAuditVOList = new ArrayList<>(); @@ -290,18 +339,18 @@ public class CustomerCompanyServiceImpl implements CustomerCompanyService { result.setTotal(page.getTotal()); result.setCurrent(current); result.setSize(size); - }catch(Exception e){ + } catch (Exception e) { } return result; } @Override - public PageResult queryCluesPageOfContractUserByCreateTimeAndBusinessContactAndPhoneNumberAndFollowAndSourceAndPush(Date startTime, Date endTime, String businessContact, String phoneNumber, Integer follow, Integer resource, Integer push, Long current, Integer size) { - PageResult result= new PageResult<>(); + public PageResult queryCluesPageOfContractUserByCreateTimeAndBusinessContactAndPhoneNumberAndFollowAndSourceAndPush(Date startTime, Date endTime, String businessContact, String phoneNumber, Integer follow, Integer source, Integer push, Long current, Integer size) { + PageResult result = new PageResult<>(); Page page = new Page<>(current, size); - try{ - List companyAudits = customerCompanyMapper.queryCluesPageOfContractUserByCreateTimeAndNameAndPhoneAndFollowAndSourceAndPush(page,startTime,endTime,businessContact,phoneNumber,follow,resource,push); + try { + List companyAudits = customerCompanyMapper.queryCluesPageOfContractUserByCreateTimeAndNameAndPhoneAndFollowAndSourceAndPush(page, startTime, endTime, businessContact, phoneNumber, follow, source, push); List companyAuditVOList = new ArrayList<>(); CompanyAuditVO temp; for (CompanyAudit companyAudit : companyAudits) { @@ -314,7 +363,7 @@ public class CustomerCompanyServiceImpl implements CustomerCompanyService { result.setTotal(page.getTotal()); result.setCurrent(current); result.setSize(size); - }catch(Exception e){ + } catch (Exception e) { } return result; diff --git a/user-service/src/main/resources/mapper/CustomerCompanyMapper.xml b/user-service/src/main/resources/mapper/CustomerCompanyMapper.xml index 3f00c54..225ef07 100644 --- a/user-service/src/main/resources/mapper/CustomerCompanyMapper.xml +++ b/user-service/src/main/resources/mapper/CustomerCompanyMapper.xml @@ -36,7 +36,7 @@ and a.business_contact like concat('%', #{businessContact}, '%') and a.phone_number like concat('%', #{phoneNumber}, '%') and b.follow = #{follow} - and b.resource = #{resource} + and b.source = #{source} and b.push = #{push} and b.sys_create_time >= #{startTime} and b.sys_create_time <= #{endTime}