From 3b6e6b1fa33feda2842c5cbffda8c3a07d0d9fb1 Mon Sep 17 00:00:00 2001 From: river <1376754470@qq.com> Date: Mon, 14 Sep 2020 18:07:33 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E8=B5=84=E6=BA=90=E5=90=8E?= =?UTF-8?q?=E5=8F=B0=E6=9F=A5=E7=9C=8B=E5=92=8C=E6=89=B9=E9=87=8F=E5=88=A0?= =?UTF-8?q?=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../financial/crms/CustomerControllerApi.java | 20 +- .../financial/hrms/EmployeeControllerApi.java | 2 + .../crms/controller/CustomerController.java | 21 ++- .../crms/dao/CompanyCustomerDao.java | 3 +- .../financial/crms/dao/CustomerDao.java | 9 + .../crms/dao/PersonalCustomerDao.java | 3 +- .../crms/feign/HrmsFeignService.java | 8 +- .../crms/service/CustomerService.java | 5 + .../service/impl/CustomerServiceImpl.java | 178 +++++++++++++++--- .../mapper/crms/CompanyCustomerDao.xml | 7 + .../resources/mapper/crms/CustomerDao.xml | 34 +++- .../mapper/crms/PersonalCustomerDao.xml | 8 + .../hrms/controller/EmployeeController.java | 18 +- .../financial/hrms/dao/EmployeeDao.java | 2 + .../hrms/service/EmployeeService.java | 2 + .../service/impl/EmployeeServiceImpl.java | 10 + .../resources/mapper/hrms/EmployeeDao.xml | 5 + .../domain/crms/PersonalCustomerEntity.java | 24 +-- .../domain/crms/ext/CrmsConstant.java | 4 +- .../domain/crms/ext/CustomerVOCompany.java | 76 ++++++++ .../domain/crms/ext/CustomerVOPersonal.java | 100 ++++++++++ 21 files changed, 490 insertions(+), 49 deletions(-) create mode 100644 dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerVOCompany.java create mode 100644 dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerVOPersonal.java diff --git a/dq-financial-api/src/main/java/com/daqing/financial/crms/CustomerControllerApi.java b/dq-financial-api/src/main/java/com/daqing/financial/crms/CustomerControllerApi.java index 226cedd3..8db793db 100644 --- a/dq-financial-api/src/main/java/com/daqing/financial/crms/CustomerControllerApi.java +++ b/dq-financial-api/src/main/java/com/daqing/financial/crms/CustomerControllerApi.java @@ -1,9 +1,13 @@ package com.daqing.financial.crms; +import com.daqing.framework.domain.crms.request.CustomerRequest; import com.daqing.framework.model.response.ResponseResult; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestParam; +import java.util.List; import java.util.Map; /** @@ -18,7 +22,19 @@ public interface CustomerControllerApi { /** * 列表展示 */ - /*@ApiOperation(value = "客户信息列表展示", notes = "客户信息列表展示") - ResponseResult list(Map params);*/ + @ApiOperation(value = "客户信息列表展示", notes = "客户信息列表展示") + ResponseResult queryList(Integer page, Integer size, CustomerRequest customerRequest); + + /** + * 客户的详细信息 + */ + @ApiOperation(value = "客户的详细信息", notes = "客户的详细信息") + ResponseResult queryDetails(Long id); + + /** + * 删除所选客户 + */ + @ApiOperation(value = "删除所选客户", notes = "删除所选客户") + ResponseResult deleteCustomer(Long[] ids); } diff --git a/dq-financial-api/src/main/java/com/daqing/financial/hrms/EmployeeControllerApi.java b/dq-financial-api/src/main/java/com/daqing/financial/hrms/EmployeeControllerApi.java index 633801ae..32963993 100644 --- a/dq-financial-api/src/main/java/com/daqing/financial/hrms/EmployeeControllerApi.java +++ b/dq-financial-api/src/main/java/com/daqing/financial/hrms/EmployeeControllerApi.java @@ -19,4 +19,6 @@ public interface EmployeeControllerApi { */ @ApiOperation(value = "根据id查询员工的基本信息和部门信息", notes = "根据id查询员工的基本信息和部门信息") ResponseResult getEmployeeAndDeptById(Long[] ids); + + ResponseResult getEmployeeById(Long id); } diff --git a/dq-financial-crms/src/main/java/com/daqing/financial/crms/controller/CustomerController.java b/dq-financial-crms/src/main/java/com/daqing/financial/crms/controller/CustomerController.java index 0548df72..1550dbdd 100644 --- a/dq-financial-crms/src/main/java/com/daqing/financial/crms/controller/CustomerController.java +++ b/dq-financial-crms/src/main/java/com/daqing/financial/crms/controller/CustomerController.java @@ -46,8 +46,25 @@ public class CustomerController implements CustomerControllerApi { @GetMapping("/queryList") public ResponseResult queryList(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, CustomerRequest customerRequest) { - PageUtils list = customerService.queryList(page, size, customerRequest); + return new ResponseResult().SUCCESS(customerService.queryList(page, size, customerRequest)); + } + + /** + * 根据客户id查询客户的详细信息 + */ + @GetMapping("/queryDetails") + public ResponseResult queryDetails(@RequestParam("id") Long id){ + + return customerService.queryCustomerById(id); + } + + /** + * 根据客户id删除所选客户 + */ + @Override + @DeleteMapping("/deleteCustomer") + public ResponseResult deleteCustomer(@RequestBody Long[] ids){ - return new ResponseResult().SUCCESS(list); + return new ResponseResult>().SUCCESS(customerService.updateCustomerById(ids)); } } diff --git a/dq-financial-crms/src/main/java/com/daqing/financial/crms/dao/CompanyCustomerDao.java b/dq-financial-crms/src/main/java/com/daqing/financial/crms/dao/CompanyCustomerDao.java index 5019530e..850175a1 100644 --- a/dq-financial-crms/src/main/java/com/daqing/financial/crms/dao/CompanyCustomerDao.java +++ b/dq-financial-crms/src/main/java/com/daqing/financial/crms/dao/CompanyCustomerDao.java @@ -13,5 +13,6 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface CompanyCustomerDao extends BaseMapper { - + + CompanyCustomerEntity queryCompanyCustomerById(Long id); } diff --git a/dq-financial-crms/src/main/java/com/daqing/financial/crms/dao/CustomerDao.java b/dq-financial-crms/src/main/java/com/daqing/financial/crms/dao/CustomerDao.java index 0a449c43..8c3416f3 100644 --- a/dq-financial-crms/src/main/java/com/daqing/financial/crms/dao/CustomerDao.java +++ b/dq-financial-crms/src/main/java/com/daqing/financial/crms/dao/CustomerDao.java @@ -4,10 +4,13 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.daqing.framework.domain.crms.CustomerEntity; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.daqing.framework.domain.crms.PersonalCustomerEntity; import com.daqing.framework.domain.crms.request.CustomerRequest; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.util.List; + /** * 记录客户基本信息 * @@ -19,4 +22,10 @@ import org.apache.ibatis.annotations.Param; public interface CustomerDao extends BaseMapper { IPage queryList(Page page, @Param("cr") CustomerRequest customerRequest); + + CustomerEntity queryCustomerById(Long id); + + void updateCustomerById(@Param("ids") List ids); + + List queryCustomerNameById(@Param("ids") List ids); } diff --git a/dq-financial-crms/src/main/java/com/daqing/financial/crms/dao/PersonalCustomerDao.java b/dq-financial-crms/src/main/java/com/daqing/financial/crms/dao/PersonalCustomerDao.java index 224346c5..70d26017 100644 --- a/dq-financial-crms/src/main/java/com/daqing/financial/crms/dao/PersonalCustomerDao.java +++ b/dq-financial-crms/src/main/java/com/daqing/financial/crms/dao/PersonalCustomerDao.java @@ -13,5 +13,6 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface PersonalCustomerDao extends BaseMapper { - + + PersonalCustomerEntity queryPersonalCustomerById(Long id); } diff --git a/dq-financial-crms/src/main/java/com/daqing/financial/crms/feign/HrmsFeignService.java b/dq-financial-crms/src/main/java/com/daqing/financial/crms/feign/HrmsFeignService.java index c0403738..5454b05d 100644 --- a/dq-financial-crms/src/main/java/com/daqing/financial/crms/feign/HrmsFeignService.java +++ b/dq-financial-crms/src/main/java/com/daqing/financial/crms/feign/HrmsFeignService.java @@ -1,5 +1,6 @@ package com.daqing.financial.crms.feign; +import com.daqing.framework.domain.hrms.EmployeeEntity; import com.daqing.framework.domain.hrms.ext.EmployeeTO; import com.daqing.framework.model.response.ResponseResult; import org.springframework.cloud.openfeign.FeignClient; @@ -18,6 +19,9 @@ public interface HrmsFeignService { @GetMapping("/hrms/dept/list") ResponseResult list(@RequestParam Map params); - @GetMapping("/hrms/employee/getEmployeeAndDeptById/{ids}") // 远程调用传递集合类型的参数必须以数组封装，不然会导致数据接收不完整 - ResponseResult> getEmployeeAndDeptById(@PathVariable("ids") Long[] ids); + @GetMapping("/hrms/employee/getEmployeeAndDeptById") // 远程调用传递集合类型的参数必须以数组封装，不然会导致数据接收不完整 + ResponseResult> getEmployeeAndDeptById(@RequestParam("ids") Long[] ids); + + @GetMapping("/hrms/employee/getEmployeeById") + ResponseResult getEmployeeById(@RequestParam("id") Long id); } diff --git a/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/CustomerService.java b/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/CustomerService.java index 0e0ee700..86c06314 100644 --- a/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/CustomerService.java +++ b/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/CustomerService.java @@ -2,9 +2,11 @@ package com.daqing.financial.crms.service; import com.baomidou.mybatisplus.extension.service.IService; import com.daqing.framework.domain.crms.request.CustomerRequest; +import com.daqing.framework.model.response.ResponseResult; import com.daqing.framework.utils.PageUtils; import com.daqing.framework.domain.crms.CustomerEntity; +import java.util.List; import java.util.Map; /** @@ -18,5 +20,8 @@ public interface CustomerService extends IService { PageUtils queryList(Integer page, Integer size, CustomerRequest customerRequest); + ResponseResult queryCustomerById(Long id); + + List updateCustomerById(Long[] ids); } diff --git a/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CustomerServiceImpl.java b/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CustomerServiceImpl.java index a348a508..a716ba9f 100644 --- a/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CustomerServiceImpl.java +++ b/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CustomerServiceImpl.java @@ -4,13 +4,20 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.daqing.financial.crms.dao.CompanyCustomerDao; import com.daqing.financial.crms.dao.CustomerDao; +import com.daqing.financial.crms.dao.PersonalCustomerDao; import com.daqing.financial.crms.feign.HrmsFeignService; import com.daqing.financial.crms.service.CustomerService; +import com.daqing.framework.domain.crms.CompanyCustomerEntity; import com.daqing.framework.domain.crms.CustomerEntity; +import com.daqing.framework.domain.crms.PersonalCustomerEntity; import com.daqing.framework.domain.crms.ext.CrmsConstant; import com.daqing.framework.domain.crms.ext.CustomerTO; +import com.daqing.framework.domain.crms.ext.CustomerVOCompany; +import com.daqing.framework.domain.crms.ext.CustomerVOPersonal; import com.daqing.framework.domain.crms.request.CustomerRequest; +import com.daqing.framework.domain.hrms.EmployeeEntity; import com.daqing.framework.domain.hrms.ext.EmployeeTO; import com.daqing.framework.model.response.ResponseResult; import com.daqing.framework.utils.PageUtils; @@ -18,6 +25,7 @@ import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import javax.annotation.Resource; import java.text.SimpleDateFormat; import java.util.*; @@ -28,6 +36,12 @@ public class CustomerServiceImpl extends ServiceImpl pages = pageCheckout(page, size); - //查询所有客户的基本信息 + // 分页参数校验 + Page pages = this.pageCheckout(page, size); + // 查询所有客户的基本信息 IPage customerEntityIPage = customerDao.queryList(pages, customerRequest); // 获取所有的客户基本信息 @@ -55,33 +69,88 @@ public class CustomerServiceImpl extends ServiceImpl employeeTO = (List) responseResult.getData(); + if (ids != null && ids.length != 0) { + //TODO 远程调用查询客户经理信息的接口 + ResponseResult responseResult = hrmsFeignService.getEmployeeAndDeptById(ids); + List employeeTO = (List) responseResult.getData(); - // 将客户信息和客户经理及部门信息拼装起来 - List customerTOS = jointCustomerEmployee(customers, employeeTO); + // 将客户信息和客户经理及部门信息拼装起来 + List customerTOS = this.jointCustomerEmployee(customers, employeeTO); - // 属性拷贝,将泛型为CustomerEntity类型的IPage的属性拷贝给泛型为CustomerTO类型的IPage,才能赋值给PageUtils - IPage iPage = new Page<>(); - BeanUtils.copyProperties(customerEntityIPage, iPage); - iPage.setRecords(customerTOS); + // 属性拷贝,将泛型为CustomerEntity类型的IPage的属性拷贝给泛型为CustomerTO类型的IPage,才能赋值给PageUtils + IPage iPage = new Page<>(); + BeanUtils.copyProperties(customerEntityIPage, iPage); + iPage.setRecords(customerTOS); + return new PageUtils(iPage); + } else { + return new PageUtils(customerEntityIPage); + } + } + + /** + * 根据id查询客户的信息 + * + * @param id 客户id + * @return + */ + @Override + public ResponseResult queryCustomerById(Long id) { - return new PageUtils(iPage); + // 员工基本信息 + CustomerEntity customer = customerDao.queryCustomerById(id); + if (customer == null) { + return new ResponseResult().SUCCESS(null); + } + // 客户经理姓名 + String name = hrmsFeignService.getEmployeeById(customer.getManager()).getData().getName(); + // 判断该客户的类型 + if (Objects.equals(customer.getType(), CrmsConstant.CustomerType.PERSONAL_CUSTOMER.getType())) { + PersonalCustomerEntity personalCustomerEntity = personalCustomerDao.queryPersonalCustomerById(id); + //封装个人类型客户信息 + CustomerVOPersonal customerVOPersonal = this.setPersonal(customer, name, personalCustomerEntity); + return new ResponseResult().SUCCESS(customerVOPersonal); + } else { + CompanyCustomerEntity companyCustomerEntity = companyCustomerDao.queryCompanyCustomerById(id); + //封装企业类型客户信息 + CustomerVOCompany customerVOCompany = this.setCompany(customer, name, companyCustomerEntity); + return new ResponseResult().SUCCESS(customerVOCompany); + } + } + + /** + * 根据id更新是否删除字段 + * + * @param ids 客户id集合 + * @return + */ + @Override + public List updateCustomerById(Long[] ids) { + + //TODO 远程调用审批模块判断所选客户是否在审批,返回正在审批的客户的id集合Long[] idArray + List idArray = new ArrayList<>();// 假设为返回的正在审批的客户id集合 + if (idArray.size() == 0 || idArray == null) { + customerDao.updateCustomerById(Arrays.asList(ids)); + return new ArrayList<>(); + } else { + return customerDao.queryCustomerNameById(idArray); + } } /** * 选择某段时间内客户信息的时间参数校验 + * * @param createTime 创建时间 * @param startTime 起始时间 - * @param endTime 结束时间 + * @param endTime 结束时间 */ - private void timeCheckout(Integer createTime, String startTime, String endTime, CustomerRequest customerRequest){ + private void timeCheckout(Integer createTime, String startTime, String endTime, CustomerRequest customerRequest) { // 没有选择自定义时间且选择了固定的"3个月内、6个月内、9个月内...."时间 if (startTime == null && endTime == null && createTime != null) { - if (createTime != 0) { - String pastTime = pastTime(createTime); + if (createTime == 3 || createTime == 6 || createTime == 9 || createTime == 12) { + String pastTime = this.pastTime(createTime); customerRequest.setStartTime(pastTime); + } else { + customerRequest.setStartTime(null); } } // 选择了自定义时间且选择了固定时间则固定时间无效 @@ -107,10 +176,11 @@ public class CustomerServiceImpl extends ServiceImpl pageCheckout(Integer page, Integer size){ + private Page pageCheckout(Integer page, Integer size) { Integer count = this.count(new QueryWrapper().eq("del_or_not", CrmsConstant.NOT_DELETE));//查询客户有效总条数 if (size == null || size < 1) { size = 10; @@ -128,11 +198,12 @@ public class CustomerServiceImpl extends ServiceImpl jointCustomerEmployee(List customers, List employeeTO){ + private List jointCustomerEmployee(List customers, List employeeTO) { List customerTOS = new ArrayList<>();// 用于拼装客户信息和员工及部门信息的集合 CustomerTO customerTO; @@ -163,4 +234,67 @@ public class CustomerServiceImpl extends ServiceImpl + + + \ No newline at end of file diff --git a/dq-financial-crms/src/main/resources/mapper/crms/CustomerDao.xml b/dq-financial-crms/src/main/resources/mapper/crms/CustomerDao.xml index 7f80a833..f0c501b6 100644 --- a/dq-financial-crms/src/main/resources/mapper/crms/CustomerDao.xml +++ b/dq-financial-crms/src/main/resources/mapper/crms/CustomerDao.xml @@ -26,10 +26,9 @@ FROM crms_customer WHERE del_or_not = 0 - AND name LIKE CONCAT('%',#{cr.codeOrName},'%') - OR code LIKE CONCAT('%',#{cr.codeOrName},'%') + AND (name LIKE CONCAT('%',#{cr.codeOrName},'%') OR code LIKE CONCAT('%',#{cr.codeOrName},'%')) - + AND type = #{cr.customerType} @@ -41,4 +40,33 @@ ORDER BY create_time DESC + + + + + + UPDATE crms_customer + SET del_or_not = 1 + WHERE id IN + + #{id} + + + + + + \ No newline at end of file diff --git a/dq-financial-crms/src/main/resources/mapper/crms/PersonalCustomerDao.xml b/dq-financial-crms/src/main/resources/mapper/crms/PersonalCustomerDao.xml index 1b94dbb9..1879e96e 100644 --- a/dq-financial-crms/src/main/resources/mapper/crms/PersonalCustomerDao.xml +++ b/dq-financial-crms/src/main/resources/mapper/crms/PersonalCustomerDao.xml @@ -24,5 +24,13 @@ + + \ No newline at end of file diff --git a/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/controller/EmployeeController.java b/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/controller/EmployeeController.java index c7d1d566..023517d5 100644 --- a/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/controller/EmployeeController.java +++ b/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/controller/EmployeeController.java @@ -22,7 +22,7 @@ import java.util.Map; */ @RestController @RequestMapping("hrms/employee") -public class EmployeeController implements EmployeeControllerApi{ +public class EmployeeController implements EmployeeControllerApi { @Autowired private EmployeeService employeeService; @@ -78,13 +78,25 @@ public class EmployeeController implements EmployeeControllerApi{ /** * 根据id查询员工的基本信息和部门信息 + * * @param ids * @return */ @Override - @GetMapping("/getEmployeeAndDeptById/{ids}") - public ResponseResult getEmployeeAndDeptById(@RequestBody @PathVariable("ids") Long[] ids) { + @GetMapping("/getEmployeeAndDeptById") + public ResponseResult getEmployeeAndDeptById(@RequestParam("ids") Long[] ids) { List employeeTO = employeeService.getEmployeeAndDeptById(Arrays.asList(ids)); return new ResponseResult>().SUCCESS(employeeTO); } + + /** + * 根据id查询员工姓名 + * @param id + * @return + */ + @Override + @GetMapping("/getEmployeeById") + public ResponseResult getEmployeeById(@RequestParam("id") Long id) { + return new ResponseResult().SUCCESS(employeeService.getEmployeeById(id)); + } } diff --git a/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/dao/EmployeeDao.java b/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/dao/EmployeeDao.java index 43190108..329918f7 100644 --- a/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/dao/EmployeeDao.java +++ b/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/dao/EmployeeDao.java @@ -19,4 +19,6 @@ import java.util.List; public interface EmployeeDao extends BaseMapper { List getEmployeeAndDeptById(@Param("ids") List ids); + + EmployeeEntity getEmployeeById(Long id); } diff --git a/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/service/EmployeeService.java b/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/service/EmployeeService.java index ec23351c..766a6f0c 100644 --- a/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/service/EmployeeService.java +++ b/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/service/EmployeeService.java @@ -18,5 +18,7 @@ import java.util.Map; public interface EmployeeService extends IService { List getEmployeeAndDeptById(List ids); + + EmployeeEntity getEmployeeById(Long id); } diff --git a/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/service/impl/EmployeeServiceImpl.java b/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/service/impl/EmployeeServiceImpl.java index c4ec6b44..c2972dbc 100644 --- a/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/service/impl/EmployeeServiceImpl.java +++ b/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/service/impl/EmployeeServiceImpl.java @@ -22,4 +22,14 @@ public class EmployeeServiceImpl extends ServiceImpl + + + \ No newline at end of file diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/PersonalCustomerEntity.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/PersonalCustomerEntity.java index 4a1aea87..a1d6e1d1 100644 --- a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/PersonalCustomerEntity.java +++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/PersonalCustomerEntity.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; import java.util.Date; import lombok.Data; +import lombok.ToString; /** * 个人类型客户信息表 @@ -17,6 +18,7 @@ import lombok.Data; */ @Data @TableName("crms_personal_customer") +@ToString public class PersonalCustomerEntity implements Serializable { private static final long serialVersionUID = 1L; @@ -46,47 +48,47 @@ public class PersonalCustomerEntity implements Serializable { */ private Integer maritalStatus; /** - * + * 学历 */ private String education; /** - * + * 工作单位 */ private String employer; /** - * + * 职务 */ private String position; /** - * + * 工作年限 */ private Integer workingYears; /** - * + * 社保账号 */ private String socialSecurityNum; /** - * + * 居住情况 */ private String livingSituation; /** - * + * 户籍地址 */ private String residenceAddr; /** - * + * 业务来源 */ private String businessSource; /** - * + * 紧急联系人 */ private String emergencyLinkman; /** - * + * 紧急联系人关系 */ private String emergencyLinkmanRelationship; /** - * + * 紧急联系人电话 */ private String emergencyLinkmanPhone; diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CrmsConstant.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CrmsConstant.java index 1f7fcfff..00372c3d 100644 --- a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CrmsConstant.java +++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CrmsConstant.java @@ -50,11 +50,11 @@ public class CrmsConstant { * 客户类型：1、企业类型，0：个人类型 */ @AllArgsConstructor - public enum customerType { + public enum CustomerType { /** * 个人类型 */ - PONSONAL_CUSTOMER(0, "个人类型"), + PERSONAL_CUSTOMER(0, "个人类型"), /** * 企业类型 */ diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerVOCompany.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerVOCompany.java new file mode 100644 index 00000000..9b0692bd --- /dev/null +++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerVOCompany.java @@ -0,0 +1,76 @@ +package com.daqing.framework.domain.crms.ext; + +import lombok.Data; +import lombok.ToString; + +import java.io.Serializable; + +/** + * @auther River + * @date 2020/9/14 10:48 + */ +@Data +@ToString +public class CustomerVOCompany implements Serializable { + + /** + * 客户编号 + */ + private String code; + /** + * 客户类型：1、企业类型，0：个人类型 + */ + private Integer type; + /** + * 客户经理 + */ + private String manager; + /** + * 客户名称 + */ + private String name; + /** + * 联系地址 + */ + private String address; + /** + * 联系电话 + */ + private String phone; + /** + * 注册资金 + */ + private String registeredCapital; + /** + * 所属行业 + */ + private String industry; + /** + * 成立年限 + */ + private Integer years; + /** + * 所在区域 + */ + private String region; + /** + * 股东名称 + */ + private String shareholder; + /** + * 关联企业 + */ + private String affiliatedCompany; + /** + * 员工个数 + */ + private String employeeNumber; + /** + * 联系人 + */ + private String linkman; + /** + * 业务来源 + */ + private String businessSource; +} diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerVOPersonal.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerVOPersonal.java new file mode 100644 index 00000000..3162f4eb --- /dev/null +++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerVOPersonal.java @@ -0,0 +1,100 @@ +package com.daqing.framework.domain.crms.ext; + +import lombok.Data; +import lombok.ToString; + +import java.io.Serializable; + +/** + * @auther River + * @date 2020/9/11 17:28 + */ +@Data +@ToString +public class CustomerVOPersonal implements Serializable { + + /** + * 客户编号 + */ + private String code; + /** + * 客户类型：1、企业类型，0：个人类型 + */ + private Integer type; + /** + * 客户经理 + */ + private String manager; + /** + * 客户名称 + */ + private String name; + /** + * 联系地址 + */ + private String address; + /** + * 联系电话 + */ + private String phone; + /** + * 身份证号 + */ + private String idCard; + /** + * 年龄 + */ + private Integer age; + /** + * 性别：1、男，0、女 + */ + private Integer gender; + /** + * 婚姻状况：1、已婚，0、未婚 + */ + private Integer maritalStatus; + /** + * 学历 + */ + private String education; + /** + * 工作单位 + */ + private String employer; + /** + * 职务 + */ + private String position; + /** + * 工作年限 + */ + private Integer workingYears; + /** + * 社保账号 + */ + private String socialSecurityNum; + /** + * 居住情况 + */ + private String livingSituation; + /** + * 户籍地址 + */ + private String residenceAddr; + /** + * 业务来源 + */ + private String businessSource; + /** + * 紧急联系人 + */ + private String emergencyLinkman; + /** + * 紧急联系人关系 + */ + private String emergencyLinkmanRelationship; + /** + * 紧急联系人电话 + */ + private String emergencyLinkmanPhone; +}