Merge remote-tracking branch 'origin/master'

master
river 4 years ago
commit 7b5ca8a11b
  1. 28
      dq-financial-crms/src/main/java/com/daqing/financial/crms/controller/CustomerWorkbenchController.java
  2. 104
      dq-financial-crms/src/main/java/com/daqing/financial/crms/model/request/CompanyCustomerRequest.java
  3. 6
      dq-financial-crms/src/main/java/com/daqing/financial/crms/service/CustomerService.java
  4. 5
      dq-financial-crms/src/main/java/com/daqing/financial/crms/service/CustomerWorkbenchService.java
  5. 59
      dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CustomerServiceImpl.java
  6. 25
      dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CustomerWorkbenchServiceImpl.java
  7. 14
      dq-financial-crms/src/main/resources/mapper/crms/CompanyCustomerDao.xml
  8. 8
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgApplyAmountInfoServiceImpl.java
  9. 9
      dq-financial-hrms/src/main/java/com/daqing/financial/hrms/controller/DeptController.java
  10. 2
      dq-financial-hrms/src/main/java/com/daqing/financial/hrms/dao/EmployeeDao.java
  11. 2
      dq-financial-hrms/src/main/java/com/daqing/financial/hrms/service/DeptService.java
  12. 24
      dq-financial-hrms/src/main/java/com/daqing/financial/hrms/service/impl/DeptServiceImpl.java
  13. 17
      dq-financial-hrms/src/main/resources/mapper/hrms/EmployeeDao.xml
  14. 169
      dq-framework-common/src/main/java/com/daqing/framework/util/ArraysUtil.java
  15. 44
      dq-framework-model/src/main/java/com/daqing/framework/domain/crms/CompanyCustomerEntity.java
  16. 8
      dq-framework-model/src/main/java/com/daqing/framework/domain/crms/CustomerEntity.java
  17. 43
      dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerCompanyDTO.java

@ -1,6 +1,7 @@
package com.daqing.financial.crms.controller;
import com.daqing.financial.crms.CustomerWorkbenchControllerApi;
import com.daqing.financial.crms.model.request.CompanyCustomerRequest;
import com.daqing.financial.crms.service.CustomerWorkbenchService;
import com.daqing.framework.domain.crms.ext.CustomerCompanyTOI;
import com.daqing.framework.domain.crms.ext.CustomerCompanyTOU;
@ -12,6 +13,8 @@ import com.daqing.framework.model.response.CommonCode;
import com.daqing.framework.model.response.PromptSuccess;
import com.daqing.framework.model.response.ResponseResult;
import com.daqing.framework.utils.PageUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@ -24,6 +27,7 @@ import java.util.Objects;
* @auther River
* @date 2020/10/19 10:05
*/
@Api(tags = {"工作台客户资源系统"})
@RestController
@RequestMapping("/crms/workbench")
public class CustomerWorkbenchController implements CustomerWorkbenchControllerApi {
@ -153,4 +157,28 @@ public class CustomerWorkbenchController implements CustomerWorkbenchControllerA
return new ResponseResult<List<EmployeeEntity>>().SUCCESS(customerWorkbenchService.getCustomerManager());
}
/**
* 新增企业()
*/
@ApiOperation(value = "新增企业(新)")
@PostMapping("/insertCompany")
public ResponseResult insertCompany(@RequestBody CompanyCustomerRequest companyCustomerReq) {
boolean result = customerWorkbenchService.insertCompany(companyCustomerReq);
return result ? ResponseResult.SUCCESS() : new ResponseResult(CommonCode.SAVE_FAIL);
}
/**
* 修改企业()
*/
@ApiOperation(value = "修改企业(新)")
@PostMapping("/updateCompanyNew")
public ResponseResult updateCompanyNew(@RequestBody CompanyCustomerRequest companyCustomerReq) {
Boolean result = customerWorkbenchService.updateCompanyNew(companyCustomerReq);
return result ? ResponseResult.SUCCESS() : new ResponseResult(CommonCode.UPDATE_FAIL);
}
}

@ -0,0 +1,104 @@
package com.daqing.financial.crms.model.request;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.ToString;
import javax.validation.constraints.Max;
import javax.validation.constraints.Min;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Pattern;
import java.io.Serializable;
import java.util.Date;
import java.util.List;
/**
* 企业类型客户信息新增
* @auther
* @date 2020/10/9 10:32
*/
@Data
@ToString
public class CompanyCustomerRequest implements Serializable {
@TableId(value = "id", type = IdType.INPUT)
private Long id;
@Min(value = 0,message = "客户类型格式有误")
@Max(value = 1,message = "客户类型格式有误")
@NotNull(message = "客户类型不能为空")
@ApiModelProperty(value = "客户类型")
private Integer type;
@NotNull(message = "客户经理人不能为空")
@ApiModelProperty(value = "客户经理人ids")
private String[] manager;
@NotNull(message = "客户名称不能为空")
@ApiModelProperty(value = "客户名称")
private String name;
@ApiModelProperty(value = "社会统一代码")
private String socialUnifiedCode;
@NotNull(message = "联系电话不能为空")
@Pattern(regexp = "^[0-9]*$",message = "联系电话格式错误")
@ApiModelProperty(value = "联系电话")
private String phone;
@ApiModelProperty(value = "注册时间")
private Date registerTime;
@Pattern(regexp = "^[0-9]+\\.{0,1}[0-9]{0,2}$",message = "注册资金格式有误")
@NotNull(message = "注册资金不能为空")
@ApiModelProperty(value = "注册资金")
private String registeredCapital;
@Pattern(regexp = "^[0-9]*$",message = "员工人数格式错误")
@NotNull(message = "员工人数不能为空")
@ApiModelProperty(value = "员工人数")
private String empNum;
@ApiModelProperty(value = "注册地址")
private String registerAddr;
@NotNull(message = "联系人不能为空")
@ApiModelProperty(value = "联系人")
private String linkman;
@ApiModelProperty(value = "联系人的联系电话")
private String linkPhone;
@ApiModelProperty(value = "经营地址")
private String businessAddr;
@NotNull(message = "业务来源不能为空")
@ApiModelProperty(value = "业务来源")
private String businessSource;
@ApiModelProperty(value = "经营范围")
private String businessScope;
@ApiModelProperty(value = "法人-姓名")
private String legalName;
@ApiModelProperty(value = "法人-性别 1、男,0、女")
private String legalGender;
@ApiModelProperty(value = "法人-身份证号")
private String legalIdNumber;
@ApiModelProperty(value = "法人-户口所在地")
private String legalHukouAddr;
@ApiModelProperty(value = "法人-联系电话")
private String legalPhone;
@ApiModelProperty(value = "法人-家庭住址")
private String legalHomeAddr;
@ApiModelProperty(value = "是否存在关联人 0->否;1->是")
private Integer isExistRelated;
}

@ -1,7 +1,7 @@
package com.daqing.financial.crms.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.daqing.framework.domain.crms.CompanyCustomerEntity;
import com.daqing.financial.crms.model.request.CompanyCustomerRequest;
import com.daqing.framework.domain.crms.ext.CustomerCompanyTOI;
import com.daqing.framework.domain.crms.ext.CustomerCompanyTOU;
import com.daqing.framework.domain.crms.ext.CustomerPersonalTOI;
@ -48,5 +48,9 @@ public interface CustomerService extends IService<CustomerEntity> {
ResponseResult queryCustomerInfoById(DgApplyAmountInfoRequest applyAmountInfo);
List<CustomerEntity> queryCompanyCodeAndName(int type);
boolean insertCompany(CompanyCustomerRequest companyCustomerReq);
boolean updateCompanyNew(CompanyCustomerRequest companyCustomerReq);
}

@ -1,6 +1,7 @@
package com.daqing.financial.crms.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.daqing.financial.crms.model.request.CompanyCustomerRequest;
import com.daqing.framework.domain.crms.CustomerEntity;
import com.daqing.framework.domain.crms.ext.CustomerCompanyTOI;
import com.daqing.framework.domain.crms.ext.CustomerCompanyTOU;
@ -39,4 +40,8 @@ public interface CustomerWorkbenchService extends IService<CustomerEntity> {
Boolean noPass(Long id,String cause);
List<EmployeeEntity> getCustomerManager();
Boolean insertCompany(CompanyCustomerRequest companyCustomerReq);
Boolean updateCompanyNew(CompanyCustomerRequest companyCustomerReq);
}

@ -2,13 +2,13 @@ package com.daqing.financial.crms.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.api.R;
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.model.request.CompanyCustomerRequest;
import com.daqing.financial.crms.service.CustomerService;
import com.daqing.framework.domain.crms.CompanyCustomerEntity;
import com.daqing.framework.domain.crms.CustomerEntity;
@ -18,13 +18,13 @@ import com.daqing.framework.domain.crms.request.CustomerRequest;
import com.daqing.framework.domain.crms.request.DgApplyAmountInfoRequest;
import com.daqing.framework.domain.crms.response.CompanyCustomerResponse;
import com.daqing.framework.domain.crms.response.CrmsCode;
import com.daqing.framework.domain.hrms.EmployeeEntity;
import com.daqing.framework.domain.hrms.ext.EmployeeTO;
import com.daqing.framework.domain.hrms.ext.EmployeeVO;
import com.daqing.framework.exception.ExceptionCast;
import com.daqing.framework.model.response.CommonCode;
import com.daqing.framework.model.response.PromptSuccess;
import com.daqing.framework.model.response.ResponseResult;
import com.daqing.framework.util.ArraysUtil;
import com.daqing.framework.utils.PageUtils;
import com.daqing.framework.utils.excel.ExcelUtil;
import org.springframework.beans.BeanUtils;
@ -34,7 +34,6 @@ import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import java.text.SimpleDateFormat;
import java.util.*;
@ -120,7 +119,9 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerDao, CustomerEntity
CustomerPersonalDTO customerPersonalDTO = this.setPersonal(customer,personalCustomerEntity);
return new ResponseResult<CustomerPersonalDTO>().SUCCESS(customerPersonalDTO);
} else if (Objects.equals(customer.getType(),CrmsConstant.CustomerType.COMPANY_CUSTOMER.getType())){
CompanyCustomerEntity companyCustomerEntity = companyCustomerDao.queryCompanyCustomerById(id);
// CompanyCustomerEntity companyCustomerEntity = companyCustomerDao.queryCompanyCustomerById(id);
CompanyCustomerEntity companyCustomerEntity = companyCustomerDao.selectOne(new QueryWrapper<CompanyCustomerEntity>()
.eq("customer_id",id));
// 封装企业类型客户信息
CustomerCompanyDTO customerCompanyDTO = this.setCompany(customer, companyCustomerEntity);
return new ResponseResult<CustomerCompanyDTO>().SUCCESS(customerCompanyDTO);
@ -134,7 +135,7 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerDao, CustomerEntity
*/
public ResponseResult getCustomerById(Long id) {
if (id == null){
/* if (id == null){
return new ResponseResult(CommonCode.INVALID_PARAM);
}
// 员工基本信息
@ -163,7 +164,8 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerDao, CustomerEntity
return new ResponseResult<CustomerCompanyVO>().SUCCESS(customerCompanyVO);
}else {
return new ResponseResult(CommonCode.INEXISTENCE);
}
}*/
return new ResponseResult(CommonCode.INEXISTENCE);
}
/**
@ -537,4 +539,49 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerDao, CustomerEntity
List<CustomerEntity>list = customerDao.queryCompanyCodeAndName(type);
return list;
}
/**
* 插入企业类型客户信息
*/
@Transactional
public boolean insertCompany(CompanyCustomerRequest companyCustomerReq) {
CustomerEntity customerEntity = new CustomerEntity();
CompanyCustomerEntity companyCustomerEntity = new CompanyCustomerEntity();
BeanUtils.copyProperties(companyCustomerReq,customerEntity);
BeanUtils.copyProperties(companyCustomerReq,companyCustomerEntity);
//TODO 设置客户编号
customerEntity.setCode(((int)(Math.random()*100+1))+"");
customerEntity.setMotifyTime(new Date());
customerEntity.setCreateTime(new Date());
customerEntity.setManager(ArraysUtil.toString(companyCustomerReq.getManager()));
customerEntity.setType(CrmsConstant.CustomerType.COMPANY_CUSTOMER.getType());
boolean customer = customerDao.saveCustomer(customerEntity);
companyCustomerEntity.setCustomerId(customerEntity.getId());
int company = companyCustomerDao.insert(companyCustomerEntity);
if(customer==true && company>0){
return true;
}
return false;
}
/**
* 更新企业类型客户信息
*/
@Transactional
public boolean updateCompanyNew(CompanyCustomerRequest companyCustomerReq) {
CustomerEntity customerEntity = new CustomerEntity();
CompanyCustomerEntity companyCustomerEntity = new CompanyCustomerEntity();
BeanUtils.copyProperties(companyCustomerReq,customerEntity);
BeanUtils.copyProperties(companyCustomerReq,companyCustomerEntity);
customerEntity.setMotifyTime(new Date());
customerEntity.setManager(ArraysUtil.toString(companyCustomerReq.getManager()));
boolean customer = customerDao.updateCustomer(customerEntity);
companyCustomerEntity.setCustomerId(customerEntity.getId());
int company = companyCustomerDao.update(companyCustomerEntity, new QueryWrapper<CompanyCustomerEntity>()
.eq("customer_id",companyCustomerEntity.getCustomerId()));
if(customer==true && company>0){
return true;
}
return false;
}
}

@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.daqing.financial.crms.dao.CustomerWorkbenchDao;
import com.daqing.financial.crms.feign.HrmsFeignService;
import com.daqing.financial.crms.model.request.CompanyCustomerRequest;
import com.daqing.financial.crms.service.CustomerService;
import com.daqing.financial.crms.service.CustomerWorkbenchService;
import com.daqing.framework.domain.crms.CustomerEntity;
@ -14,7 +15,6 @@ import com.daqing.framework.domain.crms.response.CustomerWorkbenchListVO;
import com.daqing.framework.domain.hrms.EmployeeEntity;
import com.daqing.framework.domain.hrms.ext.EmployeeTO;
import com.daqing.framework.exception.ExceptionCast;
import com.daqing.framework.exception.ExceptionCatch;
import com.daqing.framework.model.response.CommonCode;
import com.daqing.framework.model.response.ResponseResult;
import com.daqing.framework.util.RedisUtil;
@ -271,4 +271,27 @@ public class CustomerWorkbenchServiceImpl extends ServiceImpl<CustomerWorkbenchD
String token = request.getHeader("token");
return RedisUtil.get("dq:token:"+token);
}
/**
* 新增企业
*/
@Transactional
public Boolean insertCompany(CompanyCustomerRequest companyCustomerReq) {
//Long userId = Long.parseLong(this.getUserId());
//companyCustomerReq.setManager(userId); // 从redis获取当前登录用户
boolean result = customerService.insertCompany(companyCustomerReq);
return result;
}
/**
* 修改企业
*/
@Transactional
public Boolean updateCompanyNew(CompanyCustomerRequest companyCustomerReq) {
//Long userId = Long.parseLong(this.getUserId());
//companyCustomerReq.setManager(userId);
return customerService.updateCompanyNew(companyCustomerReq);
}
}

@ -7,6 +7,7 @@
<resultMap type="com.daqing.framework.domain.crms.CompanyCustomerEntity" id="companyCustomerMap">
<result property="id" column="id"/>
<result property="registeredCapital" column="registered_capital"/>
<result property="socialUnifiedCode" column="social_unified_code"/>
<result property="industry" column="industry"/>
<result property="years" column="years"/>
<result property="region" column="region"/>
@ -14,8 +15,19 @@
<result property="affiliatedCompany" column="affiliated_company"/>
<result property="empNum" column="emp_num"/>
<result property="linkman" column="linkman"/>
<result property="linkPhone" column="link_phone"/>
<result property="businessSource" column="business_source"/>
<result property="isExistRelated" column="is_exist_related"/>
<result property="businessScope" column="business_scope"/>
<result property="businessAddr" column="business_addr"/>
<result property="registerTime" column="register_time"/>
<result property="registerAddr" column="register_addr"/>
<result property="legalIdNumber" column="legal_id_number"/>
<result property="legalHukouAddr" column="legal_hukou_addr"/>
<result property="legalPhone" column="legal_phone"/>
<result property="legalHomeAddr" column="legal_home_addr"/>
<result property="legalGender" column="legal_gender"/>
<result property="legalName" column="legal_name"/>
<result property="isExistRelated" column="is_exist_related"/>
<result property="customerId" column="customer_id"/>
</resultMap>

@ -18,19 +18,14 @@ import com.daqing.financial.guarantee.util.ArraysUtil;
import com.daqing.financial.guarantee.util.AuditProcessUtil;
import com.daqing.framework.domain.crms.CrmsCustomerRelated;
import com.daqing.framework.domain.crms.request.DgApplyAmountInfoRequest;
import com.daqing.framework.domain.crms.response.CrmsCode;
import com.daqing.framework.domain.guarantee.*;
import com.daqing.framework.domain.guarantee.response.EmployeeMessageResponse;
import com.daqing.framework.exception.ExceptionCast;
import com.daqing.framework.model.StatusCode;
import com.daqing.framework.model.response.PromptSuccess;
import com.daqing.framework.model.response.ResponseResult;
import com.daqing.framework.util.RandomUtil;
import com.daqing.framework.util.RedisUtil;
import com.daqing.framework.utils.PageUtils;
import com.daqing.framework.utils.excel.ExcelUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.ArrayUtils;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@ -121,6 +116,7 @@ public class DgApplyAmountInfoServiceImpl extends ServiceImpl<DgApplyAmountInfoM
DgApplyAmountList dgApplyAmountList = new DgApplyAmountList();
dgApplyAmountList.setBusinessId(dgApplyAmountInfo.getId());
dgApplyAmountList.setPresenterId(Integer.parseInt(userId));
dgApplyAmountList.setEmpId(Integer.parseInt(userId));
dgApplyAmountList.setRoleId(PromptSuccess.DB_YWY_ID);
dgApplyAmountList.setType(1);//类型为担保业务员
@ -321,7 +317,7 @@ public class DgApplyAmountInfoServiceImpl extends ServiceImpl<DgApplyAmountInfoM
//同时将担保部经理状态改为审核中,操作状态改为待处理
DgApplyAmountList applyAmountList = dgApplyAmountListMapper.selectOne(new QueryWrapper<DgApplyAmountList>()
.eq("business_id", businessApplication.getBusinessId()).eq("type", 2));
applyAmountList.setId(dgApplyAmountList.getId());
applyAmountList.setId(applyAmountList.getId());
applyAmountList.setStatus(StatusCode.SP_IN_REVIEW);//审核中
applyAmountList.setOperatingStatus(StatusCode.CZ_ON_HAND);//待处理
dgApplyAmountListMapper.updateById(applyAmountList);

@ -106,6 +106,15 @@ public class DeptController implements DeptControllerApi {
return new ResponseResult<List<DepartmentVO>>().SUCCESS(deptService.listDepartmentAndEmployeeTree(account));
}
/**
*所有部门及员工
*/
@GetMapping("/empTrees")
public ResponseResult empTrees(@RequestParam(value = "account", required = false) String account) {
return new ResponseResult<List<DepartmentVO>>().SUCCESS(deptService.listEmployeeTrees(account));
}
/**
* 该部门下所有子部门及部门下员工
*/

@ -107,4 +107,6 @@ public interface EmployeeDao extends BaseMapper<EmployeeEntity> {
int saveUserRole(@Param("userId") Long userId, @Param("roleId") Long roleId);
List<EmployeeVO> listEmpNameByUserId(@Param("userIds") List<Long> userIds);
List<UserDeptVO> getListEmployeeTrees(@Param("id")Long id, @Param("account")String account);
}

@ -35,5 +35,7 @@ public interface DeptService extends IService<DeptEntity> {
List<EmployeeVO> listEmployeeById(Long id);
List<EmployeeVO> listEmployeeByDeptId(Long deptId);
List<DepartmentVO> listEmployeeTrees(String account);
}

@ -245,4 +245,28 @@ public class DeptServiceImpl extends ServiceImpl<DeptDao, DeptEntity> implements
return this.getBaseMapper().listEmployeeByDeptId(deptId);
}
/**
* 获取所有的部门及部门下的员工信息
*
* @return
*/
public List<DepartmentVO> listEmployeeTrees(String account) {
return this.getListEmployeeTrees(deptDao.listDepartment(), 0L, account);
}
private List<DepartmentVO> getListEmployeeTrees(List<DepartmentVO> list, Long parentId, String account) {
return list.stream()
.filter(dept -> parentId.equals(dept.getParentId())) // 过滤出部门id为所选id的部门信息(也为递归的结果条件,找不到所对应的部门id)
.peek(dept -> {
dept.setChildren(getListEmployeeTrees(list, dept.getId(), account)); // 设置该部门的子部门:递归调用
List<UserDeptVO> empList = employeeDao.getListEmployeeTrees(dept.getId(),account);
dept.setUserDept(employeeDao.getListEmployeeTrees(dept.getId(),account));
})
.sorted(Comparator.comparingInt(menu -> (menu.getSort() == null ? 0 : menu.getSort()))) // 根据所选排序信息进行排序
.collect(Collectors.toList());
}
}

@ -608,4 +608,21 @@
</foreach>
</select>
<select id="getListEmployeeTrees" parameterType="long" resultType="com.daqing.framework.domain.hrms.ext.UserDeptVO">
SELECT
u.id,
u.account
FROM
hrms_employee e
LEFT JOIN hrms_employee_dept ed ON e.id = ed.employee_id
LEFT JOIN hrms_dept d ON ed.dept_id = d.id
LEFT JOIN hrms_user u ON e.user_id = u.id
WHERE
u.del_or_not = 0
AND d.id = #{id}
<if test="account != null">
AND u.account LIKE CONCAT('%',#{account},'%')
</if>
</select>
</mapper>

@ -0,0 +1,169 @@
package com.daqing.framework.util;
/**
* @auther River
* @date 2020/11/9 15:53
*/
public class ArraysUtil {
public static String toString(long[] a) {
if (a == null)
return "null";
int iMax = a.length - 1;
if (iMax == -1)
return "[]";
StringBuilder b = new StringBuilder();
b.append('[');
for (int i = 0; ; i++) {
b.append(a[i]);
if (i == iMax)
return b.append(']').toString();
b.append(",");
}
}
public static String toString(int[] a) {
if (a == null)
return "null";
int iMax = a.length - 1;
if (iMax == -1)
return "[]";
StringBuilder b = new StringBuilder();
b.append('[');
for (int i = 0; ; i++) {
b.append(a[i]);
if (i == iMax)
return b.append(']').toString();
b.append(",");
}
}
public static String toString(short[] a) {
if (a == null)
return "null";
int iMax = a.length - 1;
if (iMax == -1)
return "[]";
StringBuilder b = new StringBuilder();
b.append('[');
for (int i = 0; ; i++) {
b.append(a[i]);
if (i == iMax)
return b.append(']').toString();
b.append(",");
}
}
public static String toString(char[] a) {
if (a == null)
return "null";
int iMax = a.length - 1;
if (iMax == -1)
return "[]";
StringBuilder b = new StringBuilder();
b.append('[');
for (int i = 0; ; i++) {
b.append(a[i]);
if (i == iMax)
return b.append(']').toString();
b.append(",");
}
}
public static String toString(byte[] a) {
if (a == null)
return "null";
int iMax = a.length - 1;
if (iMax == -1)
return "[]";
StringBuilder b = new StringBuilder();
b.append('[');
for (int i = 0; ; i++) {
b.append(a[i]);
if (i == iMax)
return b.append(']').toString();
b.append(",");
}
}
public static String toString(boolean[] a) {
if (a == null)
return "null";
int iMax = a.length - 1;
if (iMax == -1)
return "[]";
StringBuilder b = new StringBuilder();
b.append('[');
for (int i = 0; ; i++) {
b.append(a[i]);
if (i == iMax)
return b.append(']').toString();
b.append(",");
}
}
public static String toString(float[] a) {
if (a == null)
return "null";
int iMax = a.length - 1;
if (iMax == -1)
return "[]";
StringBuilder b = new StringBuilder();
b.append('[');
for (int i = 0; ; i++) {
b.append(a[i]);
if (i == iMax)
return b.append(']').toString();
b.append(",");
}
}
public static String toString(double[] a) {
if (a == null)
return "null";
int iMax = a.length - 1;
if (iMax == -1)
return "[]";
StringBuilder b = new StringBuilder();
b.append('[');
for (int i = 0; ; i++) {
b.append(a[i]);
if (i == iMax)
return b.append(']').toString();
b.append(",");
}
}
public static String toString(Object[] a) {
if (a == null)
return "null";
int iMax = a.length - 1;
if (iMax == -1)
return "[]";
StringBuilder b = new StringBuilder();
b.append('[');
for (int i = 0; ; i++) {
b.append(String.valueOf(a[i]));
if (i == iMax)
return b.append(']').toString();
b.append(",");
}
}
}

@ -36,6 +36,10 @@ public class CompanyCustomerEntity implements Serializable {
*/
@ApiModelProperty(value = "注册资金")
private String registeredCapital;
@ApiModelProperty(value = "社会统一代码")
private String socialUnifiedCode;
/**
* 所属行业
*/
@ -45,7 +49,7 @@ public class CompanyCustomerEntity implements Serializable {
* 成立年限
*/
@ApiModelProperty(value = "成立年限")
@Pattern(regexp = "^\\\\d+$",message = "成立年限只能为整形数字")
//@Pattern(regexp = "^\\\\d+$",message = "成立年限只能为整形数字")
private Integer years;
/**
* 所在区域
@ -65,22 +69,56 @@ public class CompanyCustomerEntity implements Serializable {
/**
* 员工个数
*/
@ApiModelProperty(value = "员工数")
@ApiModelProperty(value = "员工数")
private String empNum;
/**
* 联系人
*/
@ApiModelProperty(value = "联系人")
private String linkman;
@ApiModelProperty(value = "联系人的联系电话")
private String linkPhone;
/**
* 业务来源
*/
@ApiModelProperty(value = "业务来源")
private String businessSource;
@ApiModelProperty(value = "经营范围")
private String businessScope;
@ApiModelProperty(value = "经营地址")
private String businessAddr;
@ApiModelProperty(value = "注册时间")
private Date registerTime;
@ApiModelProperty(value = "注册地址")
private String registerAddr;
@ApiModelProperty(value = "法人-身份证号")
private Integer legalIdNumber;
@ApiModelProperty(value = "法人-户口所在地")
private String legalHukouAddr;
@ApiModelProperty(value = "法人-联系电话")
private String legalPhone;
@ApiModelProperty(value = "法人-家庭住址")
private String legalHomeAddr;
@ApiModelProperty(value = "法人-性别 1、男,0、女")
private Integer legalGender;
@ApiModelProperty(value = "法人-姓名")
private String legalName;
/**
* 客户基本信息表id
*/
//@Pattern(regexp = "^\\\\d+$",message = "成立年限只能为整形数字")
@ApiModelProperty(value = "客户基本信息表id")
private Long customerId;

@ -1,8 +1,6 @@
package com.daqing.framework.domain.crms;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.*;
import java.io.Serializable;
import java.util.Date;
@ -48,7 +46,7 @@ public class CustomerEntity implements Serializable {
* 客户的经理人id
*/
@ApiModelProperty(value = "客户经理人id")
private Long manager;
private String manager;
/**
* 客户名称
*/
@ -88,11 +86,13 @@ public class CustomerEntity implements Serializable {
/**
* 创建时间
*/
@TableField(fill = FieldFill.INSERT)
@ApiModelProperty(value = "创建时间")
private Date createTime;
/**
* 修改时间
*/
@TableField(fill = FieldFill.INSERT_UPDATE)
@ApiModelProperty(value = "修改时间")
private Date motifyTime;

@ -4,7 +4,9 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.ToString;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
import java.util.Date;
/**
* 客户信息详情(企业类型)
@ -90,4 +92,45 @@ public class CustomerCompanyDTO implements Serializable {
*/
@ApiModelProperty(value = "业务来源")
private String businessSource;
@ApiModelProperty(value = "社会统一代码")
private String socialUnifiedCode;
@ApiModelProperty(value = "注册时间")
private Date registerTime;
@ApiModelProperty(value = "注册地址")
private String registerAddr;
@ApiModelProperty(value = "联系人的联系电话")
private String linkPhone;
@ApiModelProperty(value = "经营地址")
private String businessAddr;
@ApiModelProperty(value = "经营范围")
private String businessScope;
@ApiModelProperty(value = "法人-姓名")
private String legalName;
@ApiModelProperty(value = "法人-性别 1、男,0、女")
private String legalGender;
@ApiModelProperty(value = "法人-身份证号")
private String legalIdNumber;
@ApiModelProperty(value = "法人-户口所在地")
private String legalHukouAddr;
@ApiModelProperty(value = "法人-联系电话")
private String legalPhone;
@ApiModelProperty(value = "法人-家庭住址")
private String legalHomeAddr;
@ApiModelProperty(value = "是否存在关联人 0->否;1->是")
private Integer isExistRelated;
}

Loading…
Cancel
Save