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 685de46e..588ac3a6 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,7 @@ package com.daqing.financial.crms; -import com.daqing.framework.domain.crms.ext.CustomerCompanyTO; -import com.daqing.framework.domain.crms.ext.CustomerPersonalTO; -import com.daqing.framework.domain.crms.ext.CustomerTO; +import com.daqing.framework.domain.crms.ext.*; import com.daqing.framework.domain.crms.request.CustomerRequest; import com.daqing.framework.model.response.ResponseResult; import io.swagger.annotations.Api; @@ -11,7 +9,6 @@ import io.swagger.annotations.ApiOperation; import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletResponse; -import javax.validation.Valid; /** * @Author: gongsj. @@ -44,25 +41,25 @@ public interface CustomerControllerApi { * 新增个人类型客户信息 */ @ApiOperation(value = "新增个人类型客户信息", notes = "新增个人类型客户信息") - ResponseResult savePersonal(CustomerPersonalTO customerPersonalTO); + ResponseResult savePersonal(CustomerPersonalTOI customerPersonalTOI); /** * 新增企业类型客户信息 */ @ApiOperation(value = "新增企业类型客户信息", notes = "新增企业类型客户信息") - ResponseResult saveCompany(CustomerCompanyTO customerCompanyTO); + ResponseResult saveCompany(CustomerCompanyTOI customerCompanyTOI); /** * 更新个人类型客户信息 */ @ApiOperation(value = "更新个人类型客户信息", notes = "更新个人类型客户信息") - ResponseResult updatePersonal(CustomerPersonalTO customerPersonalTO); + ResponseResult updatePersonal(CustomerPersonalTOU customerPersonalTOU); /** * 更新企业类型客户信息 */ @ApiOperation(value = "更新企业类型客户信息", notes = "更新企业类型客户信息") - ResponseResult updateCompany(CustomerCompanyTO customerCompanyTO); + ResponseResult updateCompany(CustomerCompanyTOU customerCompanyTOU); /** * 导入excel数据 diff --git a/dq-financial-api/target/classes/com/daqing/financial/DqFinancialApiApplication.class b/dq-financial-api/target/classes/com/daqing/financial/DqFinancialApiApplication.class new file mode 100644 index 00000000..38b18cb5 Binary files /dev/null and b/dq-financial-api/target/classes/com/daqing/financial/DqFinancialApiApplication.class differ diff --git a/dq-financial-api/target/classes/com/daqing/financial/crms/CustomerControllerApi.class b/dq-financial-api/target/classes/com/daqing/financial/crms/CustomerControllerApi.class index 8ba8864b..4edb2409 100644 Binary files a/dq-financial-api/target/classes/com/daqing/financial/crms/CustomerControllerApi.class and b/dq-financial-api/target/classes/com/daqing/financial/crms/CustomerControllerApi.class differ diff --git a/dq-financial-api/target/classes/com/daqing/financial/hrauth/UserLoginControllerApi.class b/dq-financial-api/target/classes/com/daqing/financial/hrauth/UserLoginControllerApi.class new file mode 100644 index 00000000..ce4e2fc4 Binary files /dev/null and b/dq-financial-api/target/classes/com/daqing/financial/hrauth/UserLoginControllerApi.class differ 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 b6b75c61..44630e25 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 @@ -2,22 +2,23 @@ package com.daqing.financial.crms.controller; import com.daqing.financial.crms.CustomerControllerApi; import com.daqing.financial.crms.service.CustomerService; -import com.daqing.framework.domain.crms.ext.CustomerCompanyTO; -import com.daqing.framework.domain.crms.ext.CustomerPersonalTO; +import com.daqing.framework.domain.crms.ext.CustomerCompanyTOI; +import com.daqing.framework.domain.crms.ext.CustomerCompanyTOU; +import com.daqing.framework.domain.crms.ext.CustomerPersonalTOI; +import com.daqing.framework.domain.crms.ext.CustomerPersonalTOU; import com.daqing.framework.domain.crms.request.CustomerRequest; 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.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.List; -import java.util.Objects; +import java.util.*; /** @@ -73,9 +74,9 @@ public class CustomerController implements CustomerControllerApi { List list = customerService.updateCustomerById(ids); if (list == null){ return new ResponseResult(CommonCode.INVALID_PARAM); - }else if (Objects.equals(list.get(0),PromptSuccess.getDeleteSuccess())){ + }else if (Objects.equals(list.get(0),PromptSuccess.DELETE_SUCCESS)){ return ResponseResult.SUCCESS(); - }else if (Objects.equals(list.get(0),PromptSuccess.getDeleteFail())){ + }else if (Objects.equals(list.get(0),PromptSuccess.DELETE_FAIL)){ return new ResponseResult(CommonCode.DELETE_FAIL); } else { @@ -87,8 +88,8 @@ public class CustomerController implements CustomerControllerApi { * 保存个人类型客户信息 */ @PostMapping("/savePersonal") - public ResponseResult savePersonal(@RequestBody @Valid CustomerPersonalTO customerPersonalTO) { - boolean result = customerService.saveCustomerPersonal(customerPersonalTO.getCustomerEntity(), customerPersonalTO.getPersonalCustomerEntity()); + public ResponseResult savePersonal(@RequestBody @Valid CustomerPersonalTOI customerPersonalTOI) { + boolean result = customerService.saveCustomerPersonal(customerPersonalTOI); return result ? ResponseResult.SUCCESS() : new ResponseResult(CommonCode.SAVE_FAIL); } @@ -96,8 +97,8 @@ public class CustomerController implements CustomerControllerApi { * 保存企业类型客户信息 */ @PostMapping("/saveCompany") - public ResponseResult saveCompany(@RequestBody @Valid CustomerCompanyTO customerCompanyTO) { - boolean result = customerService.saveCustomerCompany(customerCompanyTO.getCustomerEntity(), customerCompanyTO.getCompanyCustomerEntity()); + public ResponseResult saveCompany(@RequestBody @Valid CustomerCompanyTOI customerCompanyTOI) { + boolean result = customerService.saveCustomerCompany(customerCompanyTOI); return result ? ResponseResult.SUCCESS() : new ResponseResult(CommonCode.SAVE_FAIL); } @@ -105,8 +106,8 @@ public class CustomerController implements CustomerControllerApi { * 更新个人类型客户信息 */ @PostMapping("/updatePersonal") - public ResponseResult updatePersonal(@RequestBody CustomerPersonalTO customerPersonalTO) { - boolean result = customerService.updateCustomerPersonal(customerPersonalTO.getCustomerEntity(), customerPersonalTO.getPersonalCustomerEntity()); + public ResponseResult updatePersonal(@RequestBody @Valid CustomerPersonalTOU customerPersonalTOU) { + boolean result = customerService.updateCustomerPersonal(customerPersonalTOU); return result ? ResponseResult.SUCCESS() : new ResponseResult(CommonCode.UPDATE_FAIL); } @@ -114,8 +115,8 @@ public class CustomerController implements CustomerControllerApi { * 更新企业类型客户信息 */ @PostMapping("/updateCompany") - public ResponseResult updateCompany(@RequestBody CustomerCompanyTO customerCompanyTO) { - boolean result = customerService.updateCustomerCompany(customerCompanyTO.getCustomerEntity(), customerCompanyTO.getCompanyCustomerEntity()); + public ResponseResult updateCompany(@RequestBody @Valid CustomerCompanyTOU customerCompanyTOU) { + boolean result = customerService.updateCustomerCompany(customerCompanyTOU); return result ? ResponseResult.SUCCESS() : new ResponseResult(CommonCode.UPDATE_FAIL); } @@ -143,7 +144,6 @@ public class CustomerController implements CustomerControllerApi { @PostMapping("/excelImport") public ResponseResult excelImportCustomer(MultipartFile file){ - boolean result = customerService.excelImportCustomer(file); - return result ? ResponseResult.SUCCESS() : new ResponseResult(CommonCode.IMPORT_ERROR); + return customerService.excelImportCustomer(file); } } 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 cfbcd4d5..1b27c409 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 @@ -1,8 +1,10 @@ package com.daqing.financial.crms.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.daqing.framework.domain.crms.CompanyCustomerEntity; -import com.daqing.framework.domain.crms.PersonalCustomerEntity; +import com.daqing.framework.domain.crms.ext.CustomerCompanyTOI; +import com.daqing.framework.domain.crms.ext.CustomerCompanyTOU; +import com.daqing.framework.domain.crms.ext.CustomerPersonalTOI; +import com.daqing.framework.domain.crms.ext.CustomerPersonalTOU; import com.daqing.framework.domain.crms.request.CustomerRequest; import com.daqing.framework.model.response.ResponseResult; import com.daqing.framework.utils.PageUtils; @@ -10,9 +12,7 @@ import com.daqing.framework.domain.crms.CustomerEntity; import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletResponse; -import java.io.IOException; import java.util.List; -import java.util.Map; /** * 记录客户基本信息 @@ -29,17 +29,17 @@ public interface CustomerService extends IService { List updateCustomerById(Long[] ids); - boolean saveCustomerPersonal(CustomerEntity customerEntity, PersonalCustomerEntity personalCustomerEntity); + boolean saveCustomerPersonal(CustomerPersonalTOI customerPersonalTOI); - boolean saveCustomerCompany(CustomerEntity customerEntity, CompanyCustomerEntity companyCustomerEntity); + boolean saveCustomerCompany(CustomerCompanyTOI customerCompanyTOI); - boolean updateCustomerPersonal(CustomerEntity customerEntity, PersonalCustomerEntity personalCustomerEntity); + boolean updateCustomerPersonal(CustomerPersonalTOU customerPersonalTOU); - boolean updateCustomerCompany(CustomerEntity customerEntity, CompanyCustomerEntity companyCustomerEntity); + boolean updateCustomerCompany(CustomerCompanyTOU customerCompanyTOU); void excelExportCustomer(HttpServletResponse response); - boolean excelImportCustomer(MultipartFile excel); + ResponseResult excelImportCustomer(MultipartFile excel); void excelTemplate(HttpServletResponse response); } 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 5c6aabc6..b071dcd1 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 @@ -2,6 +2,7 @@ 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; @@ -31,6 +32,7 @@ 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.*; @@ -76,13 +78,17 @@ public class CustomerServiceImpl extends ServiceImpl employeeTO = (List) responseResult.getData(); - // 将客户信息和客户经理及部门信息拼装起来 - List customerTOS = this.jointCustomerEmployee(customers, employeeTO); - // 属性拷贝,将泛型为CustomerEntity类型的IPage的属性拷贝给泛型为CustomerTO类型的IPage,才能赋值给PageUtils - IPage iPage = new Page<>(); - BeanUtils.copyProperties(customerEntityIPage, iPage); - iPage.setRecords(customerTOS); - return new PageUtils(iPage); + if (employeeTO != null){ + // 将客户信息和客户经理及部门信息拼装起来 + List customerTOS = this.jointCustomerEmployee(customers, employeeTO); + // 属性拷贝,将泛型为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); + } } else { return new PageUtils(customerEntityIPage); } @@ -111,11 +117,13 @@ public class CustomerServiceImpl extends ServiceImpl().SUCCESS(customerPersonalDTO); - } else { + } else if (Objects.equals(customer.getType(),CrmsConstant.CustomerType.COMPANY_CUSTOMER.getType())){ CompanyCustomerEntity companyCustomerEntity = companyCustomerDao.queryCompanyCustomerById(id); // 封装企业类型客户信息 CustomerCompanyDTO customerCompanyDTO = this.setCompany(customer, companyCustomerEntity); return new ResponseResult().SUCCESS(customerCompanyDTO); + }else { + return new ResponseResult(CommonCode.INEXISTENCE); } } @@ -132,7 +140,7 @@ public class CustomerServiceImpl extends ServiceImpl employee = hrmsFeignService.getEmployeeById(customer.getManager()); if (employee.getData() != null){ @@ -146,11 +154,13 @@ public class CustomerServiceImpl extends ServiceImpl().SUCCESS(customerPersonalVO); - } else { + } else if (Objects.equals(customer.getType(),CrmsConstant.CustomerType.COMPANY_CUSTOMER.getType())){ CompanyCustomerEntity companyCustomerEntity = companyCustomerDao.queryCompanyCustomerById(id); // 封装企业类型客户信息 CustomerCompanyVO customerCompanyVO = this.setCompany(customer, name, companyCustomerEntity); return new ResponseResult().SUCCESS(customerCompanyVO); + }else { + return new ResponseResult(CommonCode.INEXISTENCE); } } @@ -170,9 +180,9 @@ public class CustomerServiceImpl extends ServiceImpl success = new ArrayList<>(); - success.add(PromptSuccess.getDeleteSuccess()); + success.add(PromptSuccess.DELETE_SUCCESS); List fail = new ArrayList<>(); - fail.add(PromptSuccess.getDeleteFail()); + fail.add(PromptSuccess.DELETE_FAIL); return customer ? success : fail; } else { return customerDao.queryCustomerNameById(idArray); @@ -181,13 +191,14 @@ public class CustomerServiceImpl extends ServiceImpl companyList = new ArrayList<>(); List personalList = new ArrayList<>(); List longList = customerDao.listCustomerId(); - for (Long id : longList) { - ResponseResult responseResult = this.getCustomerById(id); - if ((responseResult.getData()).getClass() == CustomerCompanyVO.class){ - companyList.add((CustomerCompanyVO) responseResult.getData()); - }else { - personalList.add((CustomerPersonalVO) responseResult.getData()); + if (longList != null){ + for (Long id : longList) { + ResponseResult responseResult = this.getCustomerById(id); + if ((responseResult.getData()).getClass() == CustomerCompanyVO.class){ + companyList.add((CustomerCompanyVO) responseResult.getData()); + }else { + personalList.add((CustomerPersonalVO) responseResult.getData()); + } } } ExcelUtil.writeExcelWithSheets(response,personalList,"客户资源信息一览表","个人类型",new CustomerPersonalVO()) @@ -289,10 +302,10 @@ public class CustomerServiceImpl extends ServiceImpl companyList = new ArrayList<>(); - List personalList = new ArrayList<>(); - ExcelUtil.writeExcelWithSheets(response,personalList,"客户资源信息表模板","个人类型",new CustomerPersonalVO()) - .write(companyList,"企业类型",new CustomerCompanyVO()) + List companyTemplates = new ArrayList<>(); + List personalTemplates = new ArrayList<>(); + ExcelUtil.writeExcelWithSheets(response,personalTemplates,"客户资源信息表模板","个人类型",new PersonalTemplate()) + .write(companyTemplates,"企业类型",new CompanyTemplate()) .finish(); }catch (Exception e){ ExceptionCast.cast(CrmsCode.CUSTOMER_EXPORTTEMPLATE_EXSIT); @@ -305,55 +318,60 @@ public class CustomerServiceImpl extends ServiceImpl personalList = ExcelUtil.readExcel(excel, new CustomerPersonalVO(), 1); - List companyList = ExcelUtil.readExcel(excel, new CustomerCompanyVO(), 2); + List personalList = ExcelUtil.readExcel(excel,new PersonalTemplate(), 1); + List companyList = ExcelUtil.readExcel(excel, new CompanyTemplate(), 2); List nameList = hrmsFeignService.listEmployeeName().getData(); - CustomerEntity customer; // 客户基本信息 - PersonalCustomerEntity pc; // 个人类型信息 - CompanyCustomerEntity cc; // 企业类型信息 + CustomerPersonalTOI customerPersonalTOI; ManagerName manager; // 客户名称 // 个人类型 for (Object personal : personalList) { - customer = new CustomerEntity(); + customerPersonalTOI = new CustomerPersonalTOI(); + customerPersonalTOI.setType(0); + BeanUtils.copyProperties(personal,customerPersonalTOI); manager = new ManagerName(); - pc = new PersonalCustomerEntity(); - BeanUtils.copyProperties(personal,customer); - BeanUtils.copyProperties(personal,pc); BeanUtils.copyProperties(personal,manager); // 根据客户经理名称找到对应的员工id - for (EmployeeVO employeeVO : nameList){ - if (Objects.equals(manager.getManager(),employeeVO.getName())){ - customer.setManager(employeeVO.getId()); + if (nameList != null && manager.getManager() != null){ + for (EmployeeVO employeeVO : nameList){ + if (Objects.equals(manager.getManager(),employeeVO.getName())){ + customerPersonalTOI.setManager(employeeVO.getId()); + } + } + if (customerPersonalTOI.getManager() == null){ + ExceptionCast.cast(CrmsCode.CUSTOMER_IS_NULL); } } - this.saveCustomerPersonal(customer,pc); + this.saveCustomerPersonal(customerPersonalTOI); } // 企业类型 for (Object company : companyList){ - customer = new CustomerEntity(); + CustomerCompanyTOI customerCompanyTOI = new CustomerCompanyTOI(); manager = new ManagerName(); - cc = new CompanyCustomerEntity(); - BeanUtils.copyProperties(company,customer); - BeanUtils.copyProperties(company,cc); + customerCompanyTOI.setType(1); + BeanUtils.copyProperties(company,customerCompanyTOI); BeanUtils.copyProperties(company,manager); // 根据客户经理名称找到对应的员工id - for (EmployeeVO employeeVO : nameList){ - if (Objects.equals(manager.getManager(),employeeVO.getName())){ - customer.setManager(employeeVO.getId()); + if (nameList != null && manager.getManager() != null){ + for (EmployeeVO employeeVO : nameList){ + if (Objects.equals(manager.getManager(),employeeVO.getName())){ + customerCompanyTOI.setManager(employeeVO.getId()); + } + } + if (customerCompanyTOI.getManager() == null){ + return new ResponseResult().SUCCESS("导入数据失败,"+manager.getManager()+"员工不存在"); } } - this.saveCustomerCompany(customer,cc); + this.saveCustomerCompany(customerCompanyTOI); } - return true; + return ResponseResult.SUCCESS(); }catch (Exception e){ - ExceptionCast.cast(CrmsCode.CUSTOMER_IMPORT_EXSIT); - return false; + return new ResponseResult().SUCCESS("导入数据失败,请检查文件和数据格式或稍后再试"); } } diff --git a/dq-financial-crms/target/classes/com/daqing/financial/crms/controller/CustomerController.class b/dq-financial-crms/target/classes/com/daqing/financial/crms/controller/CustomerController.class index d58c2bf4..8dfdaae2 100644 Binary files a/dq-financial-crms/target/classes/com/daqing/financial/crms/controller/CustomerController.class and b/dq-financial-crms/target/classes/com/daqing/financial/crms/controller/CustomerController.class differ diff --git a/dq-financial-crms/target/classes/com/daqing/financial/crms/service/CustomerService.class b/dq-financial-crms/target/classes/com/daqing/financial/crms/service/CustomerService.class index 35b86f13..c7838668 100644 Binary files a/dq-financial-crms/target/classes/com/daqing/financial/crms/service/CustomerService.class and b/dq-financial-crms/target/classes/com/daqing/financial/crms/service/CustomerService.class differ diff --git a/dq-financial-crms/target/classes/com/daqing/financial/crms/service/impl/CustomerServiceImpl.class b/dq-financial-crms/target/classes/com/daqing/financial/crms/service/impl/CustomerServiceImpl.class index a68be868..cb384b7c 100644 Binary files a/dq-financial-crms/target/classes/com/daqing/financial/crms/service/impl/CustomerServiceImpl.class and b/dq-financial-crms/target/classes/com/daqing/financial/crms/service/impl/CustomerServiceImpl.class differ diff --git a/dq-financial-hrms-auth/target/classes/bootstrap.properties b/dq-financial-hrms-auth/target/classes/bootstrap.properties new file mode 100644 index 00000000..3187c1a2 --- /dev/null +++ b/dq-financial-hrms-auth/target/classes/bootstrap.properties @@ -0,0 +1,29 @@ + +#�������� +spring.application.name=dq-financial-hrms-auth +#�������ĵ�ַ +spring.cloud.nacos.config.server-addr=192.168.31.142:8848 +spring.cloud.nacos.config.namespace=7632bdaa-3381-4669-b3f9-2fc73be451e8 +#spring.cloud.nacos.config.group=prod + +spring.cloud.nacos.config.ext-config[0].data-id=datasource.yml +spring.cloud.nacos.config.ext-config[0].group=dev +spring.cloud.nacos.config.ext-config[0].refresh=true + +spring.cloud.nacos.config.ext-config[1].data-id=mybatis.yml +spring.cloud.nacos.config.ext-config[1].group=dev +spring.cloud.nacos.config.ext-config[1].refresh=true + +spring.cloud.nacos.config.ext-config[2].data-id=other.yml +spring.cloud.nacos.config.ext-config[2].group=dev +spring.cloud.nacos.config.ext-config[2].refresh=true + +spring.redis.host=192.168.232.128 +spring.redis.port=6379 +spring.redis.password= +spring.redis.database=0 +spring.redis.timeout=30000 +spring.redis.jedis.pool.max-active=8 +spring.redis.jedis.pool.max-wait=-1 +spring.redis.jedis.pool.max-idle=8 +spring.redis.jedis.pool.min-idle=0 diff --git a/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/DqFinancialHrmsAuthApplication.class b/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/DqFinancialHrmsAuthApplication.class new file mode 100644 index 00000000..e321ab41 Binary files /dev/null and b/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/DqFinancialHrmsAuthApplication.class differ diff --git a/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/annotation/Log.class b/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/annotation/Log.class new file mode 100644 index 00000000..8ff99f05 Binary files /dev/null and b/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/annotation/Log.class differ diff --git a/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/aspect/Operation.class b/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/aspect/Operation.class new file mode 100644 index 00000000..3ebaf4a1 Binary files /dev/null and b/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/aspect/Operation.class differ diff --git a/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/aspect/SysLogAspect.class b/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/aspect/SysLogAspect.class new file mode 100644 index 00000000..be705675 Binary files /dev/null and b/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/aspect/SysLogAspect.class differ diff --git a/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/controller/UserLoginController.class b/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/controller/UserLoginController.class new file mode 100644 index 00000000..801167bd Binary files /dev/null and b/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/controller/UserLoginController.class differ diff --git a/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/dao/LoginLogMapper.class b/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/dao/LoginLogMapper.class new file mode 100644 index 00000000..82809c1e Binary files /dev/null and b/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/dao/LoginLogMapper.class differ diff --git a/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/dao/SystemLogMapper.class b/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/dao/SystemLogMapper.class new file mode 100644 index 00000000..dee69d4e Binary files /dev/null and b/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/dao/SystemLogMapper.class differ diff --git a/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/dao/TokenMapper.class b/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/dao/TokenMapper.class new file mode 100644 index 00000000..6d75291f Binary files /dev/null and b/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/dao/TokenMapper.class differ diff --git a/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/dao/UserLoginDao.class b/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/dao/UserLoginDao.class new file mode 100644 index 00000000..59edb131 Binary files /dev/null and b/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/dao/UserLoginDao.class differ diff --git a/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/enums/BusinessType$1.class b/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/enums/BusinessType$1.class new file mode 100644 index 00000000..07355707 Binary files /dev/null and b/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/enums/BusinessType$1.class differ diff --git a/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/enums/BusinessType.class b/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/enums/BusinessType.class new file mode 100644 index 00000000..0e7073a0 Binary files /dev/null and b/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/enums/BusinessType.class differ diff --git a/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/enums/OperationType$1.class b/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/enums/OperationType$1.class new file mode 100644 index 00000000..abec9b15 Binary files /dev/null and b/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/enums/OperationType$1.class differ diff --git a/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/enums/OperationType.class b/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/enums/OperationType.class new file mode 100644 index 00000000..b632f4e1 Binary files /dev/null and b/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/enums/OperationType.class differ diff --git a/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/enums/OperationUnit.class b/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/enums/OperationUnit.class new file mode 100644 index 00000000..046b0705 Binary files /dev/null and b/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/enums/OperationUnit.class differ diff --git a/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/service/LoginLogService.class b/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/service/LoginLogService.class new file mode 100644 index 00000000..1cc34945 Binary files /dev/null and b/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/service/LoginLogService.class differ diff --git a/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/service/TokenService.class b/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/service/TokenService.class new file mode 100644 index 00000000..6fad0520 Binary files /dev/null and b/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/service/TokenService.class differ diff --git a/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/service/UserLoginService.class b/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/service/UserLoginService.class new file mode 100644 index 00000000..47578bf1 Binary files /dev/null and b/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/service/UserLoginService.class differ diff --git a/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/service/impl/LoginLogServiceImpl.class b/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/service/impl/LoginLogServiceImpl.class new file mode 100644 index 00000000..d71db32d Binary files /dev/null and b/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/service/impl/LoginLogServiceImpl.class differ diff --git a/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/service/impl/TokenServiceImpl.class b/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/service/impl/TokenServiceImpl.class new file mode 100644 index 00000000..610dbac3 Binary files /dev/null and b/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/service/impl/TokenServiceImpl.class differ diff --git a/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/service/impl/UserLoginServiceImpl.class b/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/service/impl/UserLoginServiceImpl.class new file mode 100644 index 00000000..cb47481a Binary files /dev/null and b/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/service/impl/UserLoginServiceImpl.class differ diff --git a/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/util/IpUtils.class b/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/util/IpUtils.class new file mode 100644 index 00000000..07f13442 Binary files /dev/null and b/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/util/IpUtils.class differ diff --git a/dq-financial-hrms-auth/target/classes/logback-spring.xml b/dq-financial-hrms-auth/target/classes/logback-spring.xml new file mode 100644 index 00000000..7b7fb229 --- /dev/null +++ b/dq-financial-hrms-auth/target/classes/logback-spring.xml @@ -0,0 +1,47 @@ + + + + + + + + + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + utf8 + + + + + + + + ${LOG_HOME}/hrms_auth.%d{yyyy-MM-dd}.log + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + + + + + + 0 + + 512 + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/dq-financial-hrms-auth/target/classes/mapper/hrmsauth/UserLoginMapper.xml b/dq-financial-hrms-auth/target/classes/mapper/hrmsauth/UserLoginMapper.xml new file mode 100644 index 00000000..9a66957d --- /dev/null +++ b/dq-financial-hrms-auth/target/classes/mapper/hrmsauth/UserLoginMapper.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + update hrms_user set password = #{password} where phone_account = #{phoneAccount} + + + + + + + + + \ No newline at end of file diff --git a/dq-financial-hrms/src/main/resources/mapper/hrms/EmployeeDao.xml b/dq-financial-hrms/src/main/resources/mapper/hrms/EmployeeDao.xml index 69baabd7..0988e6e1 100644 --- a/dq-financial-hrms/src/main/resources/mapper/hrms/EmployeeDao.xml +++ b/dq-financial-hrms/src/main/resources/mapper/hrms/EmployeeDao.xml @@ -95,6 +95,7 @@ AND e.job_number = #{employee.jobNumber} + AND u.del_or_not = 0 \ No newline at end of file diff --git a/dq-financial-hrms/src/main/resources/mapper/hrms/PositionDao.xml b/dq-financial-hrms/src/main/resources/mapper/hrms/PositionDao.xml index 343ac5b5..88fb9584 100644 --- a/dq-financial-hrms/src/main/resources/mapper/hrms/PositionDao.xml +++ b/dq-financial-hrms/src/main/resources/mapper/hrms/PositionDao.xml @@ -34,6 +34,7 @@ INNER JOIN hrms_dept_position dp ON p.id = dp.position_id INNER JOIN hrms_dept d ON dp.dept_id = d.id INNER JOIN hrms_employee e ON p.create_user = e.id + INNER JOIN hrms_user u ON e.user_id = u.id WHERE ( @@ -41,6 +42,7 @@ OR p.`name` LIKE CONCAT('%',#{queryMsg},'%') ) + AND u.del_or_not = 0 GROUP BY p.id ORDER BY diff --git a/dq-financial-hrms/target/classes/application.yml b/dq-financial-hrms/target/classes/application.yml new file mode 100644 index 00000000..30e77ef2 --- /dev/null +++ b/dq-financial-hrms/target/classes/application.yml @@ -0,0 +1,12 @@ +#security: +# oauth2: +# client: +# client-id: user-client +# client-secret: user-secret-8888 +# user-authorization-uri: http://localhost:7000/oauth/authorize +# access-token-uri: http://localhost:7000/oauth/token +# resource: +# id: user-client +# user-info-uri: user-info +# authorization: +# check-token-access: http://localhost:7000/oauth/check_token \ No newline at end of file diff --git a/dq-financial-hrms/target/classes/bootstrap.properties b/dq-financial-hrms/target/classes/bootstrap.properties index d1c6bdec..b5a7eb56 100644 --- a/dq-financial-hrms/target/classes/bootstrap.properties +++ b/dq-financial-hrms/target/classes/bootstrap.properties @@ -15,4 +15,14 @@ spring.cloud.nacos.config.ext-config[1].refresh=true spring.cloud.nacos.config.ext-config[2].data-id=other.yml spring.cloud.nacos.config.ext-config[2].group=dev -spring.cloud.nacos.config.ext-config[2].refresh=true \ No newline at end of file +spring.cloud.nacos.config.ext-config[2].refresh=true + +#spring.redis.host=127.0.0.1 +#spring.redis.port=6379 +#spring.redis.password=123456 +#spring.redis.database=0 +#spring.redis.timeout=30000 +#spring.redis.jedis.pool.max-active=8 +#spring.redis.jedis.pool.max-wait=-1 +#spring.redis.jedis.pool.max-idle=8 +#spring.redis.jedis.pool.min-idle=0 \ No newline at end of file diff --git a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/controller/EmployeeController.class b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/controller/EmployeeController.class index 528d4b0a..f33da307 100644 Binary files a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/controller/EmployeeController.class and b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/controller/EmployeeController.class differ diff --git a/dq-financial-hrms/target/classes/mapper/hrms/EmployeeDao.xml b/dq-financial-hrms/target/classes/mapper/hrms/EmployeeDao.xml index 69baabd7..0988e6e1 100644 --- a/dq-financial-hrms/target/classes/mapper/hrms/EmployeeDao.xml +++ b/dq-financial-hrms/target/classes/mapper/hrms/EmployeeDao.xml @@ -95,6 +95,7 @@ AND e.job_number = #{employee.jobNumber} + AND u.del_or_not = 0 \ No newline at end of file diff --git a/dq-financial-hrms/target/classes/mapper/hrms/PositionDao.xml b/dq-financial-hrms/target/classes/mapper/hrms/PositionDao.xml index 343ac5b5..88fb9584 100644 --- a/dq-financial-hrms/target/classes/mapper/hrms/PositionDao.xml +++ b/dq-financial-hrms/target/classes/mapper/hrms/PositionDao.xml @@ -34,6 +34,7 @@ INNER JOIN hrms_dept_position dp ON p.id = dp.position_id INNER JOIN hrms_dept d ON dp.dept_id = d.id INNER JOIN hrms_employee e ON p.create_user = e.id + INNER JOIN hrms_user u ON e.user_id = u.id WHERE ( @@ -41,6 +42,7 @@ OR p.`name` LIKE CONCAT('%',#{queryMsg},'%') ) + AND u.del_or_not = 0 GROUP BY p.id ORDER BY diff --git a/dq-framework-common/src/main/java/com/daqing/framework/exception/ExceptionCatch.java b/dq-framework-common/src/main/java/com/daqing/framework/exception/ExceptionCatch.java index 742da376..ee80102e 100644 --- a/dq-framework-common/src/main/java/com/daqing/framework/exception/ExceptionCatch.java +++ b/dq-framework-common/src/main/java/com/daqing/framework/exception/ExceptionCatch.java @@ -46,10 +46,10 @@ public class ExceptionCatch { return new ResponseResult(CommonCode.SERVER_ERROR); } - static { + /*static { //定义异常类型所对应的错误代码 builder.put(HttpMessageNotReadableException.class, CommonCode.INVALID_PARAM); - } + }*/ @ExceptionHandler(CustomException.class)//捕获CustomException类型异常 @ResponseBody diff --git a/dq-framework-common/src/main/java/com/daqing/framework/model/response/PromptSuccess.java b/dq-framework-common/src/main/java/com/daqing/framework/model/response/PromptSuccess.java index 4e293dbf..55e79037 100644 --- a/dq-framework-common/src/main/java/com/daqing/framework/model/response/PromptSuccess.java +++ b/dq-framework-common/src/main/java/com/daqing/framework/model/response/PromptSuccess.java @@ -8,25 +8,10 @@ package com.daqing.framework.model.response; */ public class PromptSuccess { - private static final String DELETE_SUCCESS = "删除成功!"; + public static final String DELETE_SUCCESS = "删除成功!"; - private static final String DELETE_FAIL = "删除失败!"; + public static final String DELETE_FAIL = "删除失败!"; - private static final String NO_BEING = "该员工已不存在"; - - public static String getDeleteSuccess(){ - - return PromptSuccess.DELETE_SUCCESS; - } - - public static String getDeleteFail(){ - - return PromptSuccess.DELETE_FAIL; - } - - public static String getNoBeing(){ - - return PromptSuccess.NO_BEING; - } + public static final String NOT_BEING = "该员工已不存在"; } diff --git a/dq-framework-common/src/main/java/com/daqing/framework/util/Md5Util.java b/dq-framework-common/src/main/java/com/daqing/framework/util/Md5Util.java index 870f5e5a..06d39348 100644 --- a/dq-framework-common/src/main/java/com/daqing/framework/util/Md5Util.java +++ b/dq-framework-common/src/main/java/com/daqing/framework/util/Md5Util.java @@ -25,5 +25,6 @@ public class Md5Util { //System.out.printf(md5("1234561")); String s = URLEncoder.encode("www.occupationlab.com", "utf-8"); System.out.println(s); + System.out.println(md5("1234564")); } } diff --git a/dq-framework-common/target/classes/com/daqing/framework/SpringContextHolder.class b/dq-framework-common/target/classes/com/daqing/framework/SpringContextHolder.class new file mode 100644 index 00000000..50fa758b Binary files /dev/null and b/dq-framework-common/target/classes/com/daqing/framework/SpringContextHolder.class differ diff --git a/dq-framework-common/target/classes/com/daqing/framework/exception/ExceptionCatch.class b/dq-framework-common/target/classes/com/daqing/framework/exception/ExceptionCatch.class index f9d340bb..5433d84a 100644 Binary files a/dq-framework-common/target/classes/com/daqing/framework/exception/ExceptionCatch.class and b/dq-framework-common/target/classes/com/daqing/framework/exception/ExceptionCatch.class differ diff --git a/dq-framework-common/target/classes/com/daqing/framework/model/response/PromptSuccess.class b/dq-framework-common/target/classes/com/daqing/framework/model/response/PromptSuccess.class index ac2567ba..41b580d3 100644 Binary files a/dq-framework-common/target/classes/com/daqing/framework/model/response/PromptSuccess.class and b/dq-framework-common/target/classes/com/daqing/framework/model/response/PromptSuccess.class differ diff --git a/dq-framework-common/target/classes/com/daqing/framework/util/BasePage.class b/dq-framework-common/target/classes/com/daqing/framework/util/BasePage.class new file mode 100644 index 00000000..99fe907f Binary files /dev/null and b/dq-framework-common/target/classes/com/daqing/framework/util/BasePage.class differ diff --git a/dq-framework-common/target/classes/com/daqing/framework/util/JwtUtils.class b/dq-framework-common/target/classes/com/daqing/framework/util/JwtUtils.class new file mode 100644 index 00000000..a23983f9 Binary files /dev/null and b/dq-framework-common/target/classes/com/daqing/framework/util/JwtUtils.class differ diff --git a/dq-framework-common/target/classes/com/daqing/framework/util/Md5Util.class b/dq-framework-common/target/classes/com/daqing/framework/util/Md5Util.class new file mode 100644 index 00000000..e1ec5d74 Binary files /dev/null and b/dq-framework-common/target/classes/com/daqing/framework/util/Md5Util.class differ diff --git a/dq-framework-common/target/classes/com/daqing/framework/util/RandomUtil.class b/dq-framework-common/target/classes/com/daqing/framework/util/RandomUtil.class new file mode 100644 index 00000000..4bcf751f Binary files /dev/null and b/dq-framework-common/target/classes/com/daqing/framework/util/RandomUtil.class differ diff --git a/dq-framework-common/target/classes/com/daqing/framework/util/RedisUtil.class b/dq-framework-common/target/classes/com/daqing/framework/util/RedisUtil.class new file mode 100644 index 00000000..2987d6f7 Binary files /dev/null and b/dq-framework-common/target/classes/com/daqing/framework/util/RedisUtil.class differ diff --git a/dq-framework-common/target/classes/com/daqing/framework/util/SendSMS.class b/dq-framework-common/target/classes/com/daqing/framework/util/SendSMS.class new file mode 100644 index 00000000..31d46661 Binary files /dev/null and b/dq-framework-common/target/classes/com/daqing/framework/util/SendSMS.class differ diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/CompanyCustomerEntity.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/CompanyCustomerEntity.java index 068eed16..a56b57f8 100644 --- a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/CompanyCustomerEntity.java +++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/CompanyCustomerEntity.java @@ -10,6 +10,8 @@ import java.util.Date; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.Pattern; + /** * 企业类型客户信息表 * @@ -25,6 +27,7 @@ public class CompanyCustomerEntity implements Serializable { /** * 主键 */ + //@Pattern(regexp = "^\\\\d+$",message = "成立年限只能为整形数字") @ApiModelProperty(value = "id") @TableId(value = "id", type = IdType.INPUT) private Long id; @@ -42,6 +45,7 @@ public class CompanyCustomerEntity implements Serializable { * 成立年限 */ @ApiModelProperty(value = "成立年限") + @Pattern(regexp = "^\\\\d+$",message = "成立年限只能为整形数字") private Integer years; /** * 所在区域 @@ -76,6 +80,7 @@ public class CompanyCustomerEntity implements Serializable { /** * 客户基本信息表id */ + //@Pattern(regexp = "^\\\\d+$",message = "成立年限只能为整形数字") @ApiModelProperty(value = "客户基本信息表id") private Long customerId; diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/CustomerEntity.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/CustomerEntity.java index 9a30c284..c145a93a 100644 --- a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/CustomerEntity.java +++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/CustomerEntity.java @@ -11,6 +11,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.validation.constraints.NotNull; +import javax.validation.constraints.Pattern; /** * 记录客户基本信息 @@ -41,6 +42,7 @@ public class CustomerEntity implements Serializable { */ @NotNull(message = "客户类型不能为空") @ApiModelProperty(value = "客户类型") + //@Pattern(regexp = "^\\\\d+$",message = "成立年限只能为整形数字") private Integer type; /** * 客户的经理人id 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 d4004855..10980dfc 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 @@ -10,6 +10,8 @@ import java.util.Date; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.ToString; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Pattern; /** * 个人类型客户信息表 @@ -38,6 +40,7 @@ public class PersonalCustomerEntity implements Serializable { /** * 身份证号 */ + @NotNull(message = "身份证号不能为空") @ApiModelProperty(value = "身份证号") private String idCard; /** @@ -73,6 +76,7 @@ public class PersonalCustomerEntity implements Serializable { /** * 工作年限 */ + @Pattern(regexp = "^\\d+$",message = "工作年限只能为数字") @ApiModelProperty(value = "工作年限") private Integer workingYears; /** diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CompanyTemplate.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CompanyTemplate.java new file mode 100644 index 00000000..f8f732b5 --- /dev/null +++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CompanyTemplate.java @@ -0,0 +1,83 @@ +package com.daqing.framework.domain.crms.ext; + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.metadata.BaseRowModel; +import lombok.Data; +import lombok.ToString; + +import java.io.Serializable; + +/** + * 导出excel模板(企业类型) + * @auther River + * @date 2020/10/9 11:38 + */ +@Data +@ToString +public class CompanyTemplate extends BaseRowModel implements Serializable { + /** + * 客户经理 + */ + @ExcelProperty(value = "客户经理(请填写本公司存在的员工姓名)",index = 0) + private String manager; + /** + * 客户名称 + */ + @ExcelProperty(value = "姓名",index = 1) + private String name; + /** + * 联系地址 + */ + @ExcelProperty(value = "地址",index = 2) + private String addr; + /** + * 联系电话 + */ + @ExcelProperty(value = "电话",index = 3) + private String phone; + /** + * 注册资金 + */ + @ExcelProperty(value = "注册资金",index = 4) + private String registeredCapital; + /** + * 所属行业 + */ + @ExcelProperty(value = "所属行业",index = 5) + private String industry; + /** + * 成立年限 + */ + @ExcelProperty(value = "成立年限",index = 6) + private Integer years; + /** + * 所在区域 + */ + @ExcelProperty(value = "所在区域",index = 7) + private String region; + /** + * 股东名称 + */ + @ExcelProperty(value = "股东名称",index = 8) + private String shareholder; + /** + * 关联企业 + */ + @ExcelProperty(value = "关联企业",index = 9) + private String affiliatedCompany; + /** + * 员工个数 + */ + @ExcelProperty(value = "员工个数",index = 10) + private String empNum; + /** + * 联系人 + */ + @ExcelProperty(value = "联系人",index = 11) + private String linkman; + /** + * 业务来源 + */ + @ExcelProperty(value = "业务来源",index = 12) + private String businessSource; +} diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerCompanyDTO.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerCompanyDTO.java index 3e7ce1b5..18281a58 100644 --- a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerCompanyDTO.java +++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerCompanyDTO.java @@ -7,6 +7,7 @@ import lombok.ToString; import java.io.Serializable; /** + * 客户信息详情(企业类型) * @auther River * @date 2020/9/29 11:00 */ diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerCompanyTO.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerCompanyTO.java deleted file mode 100644 index 82166d16..00000000 --- a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerCompanyTO.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.daqing.framework.domain.crms.ext; - -import com.daqing.framework.domain.crms.CompanyCustomerEntity; -import com.daqing.framework.domain.crms.CustomerEntity; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.ToString; - -import java.io.Serializable; - -/** - * @auther River - * @date 2020/9/15 20:20 - */ -@Data -@ToString -public class CustomerCompanyTO implements Serializable { - - /** - * 客户基本信息 - */ - @ApiModelProperty(value = "客户基本信息") - private CustomerEntity customerEntity; - /** - * 企业类型信息 - */ - @ApiModelProperty(value = "客户企业信息") - private CompanyCustomerEntity companyCustomerEntity; -} diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerCompanyTOI.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerCompanyTOI.java new file mode 100644 index 00000000..8a28b8ca --- /dev/null +++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerCompanyTOI.java @@ -0,0 +1,107 @@ +package com.daqing.framework.domain.crms.ext; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.ToString; + +import javax.validation.constraints.*; +import java.io.Serializable; + +/** + * 企业类型客户信息新增 + * @auther River + * @date 2020/10/9 10:32 + */ +@Data +@ToString +public class CustomerCompanyTOI implements Serializable { + /** + * 客户类型：1、企业类型，0：个人类型 + */ + @Min(value = 0,message = "客户类型格式有误") + @Max(value = 1,message = "客户类型格式有误") + @NotNull(message = "客户类型不能为空") + @ApiModelProperty(value = "客户类型") + private Integer type; + /** + * 客户的经理人id + */ + @NotNull(message = "客户经理人不能为空") + @ApiModelProperty(value = "客户经理人id") + private Long manager; + /** + * 客户名称 + */ + @NotNull(message = "客户名称不能为空") + @ApiModelProperty(value = "客户名称") + private String name; + /** + * 联系地址 + */ + @NotNull(message = "联系地址不能为空") + @ApiModelProperty(value = "联系地址") + private String addr; + /** + * 联系电话 + */ + @NotNull(message = "联系电话不能为空") + @Pattern(regexp = "^[0-9]*$",message = "联系电话格式错误") + @ApiModelProperty(value = "联系电话") + private String phone; + /** + * 注册资金 + */ + @Pattern(regexp = "^[0-9]+\\.{0,1}[0-9]{0,2}$",message = "注册资金格式有误") + @NotNull(message = "注册资金不能为空") + @ApiModelProperty(value = "注册资金") + private String registeredCapital; + /** + * 所属行业 + */ + @NotNull(message = "所属行业不能为空") + @ApiModelProperty(value = "所属行业") + private String industry; + /** + * 成立年限 + */ + @NotNull(message = "成立年限不能为空") + @ApiModelProperty(value = "成立年限") + private Integer years; + /** + * 所在区域 + */ + @NotNull(message = "所在区域不能为空") + @ApiModelProperty(value = "所在区域") + private String region; + /** + * 股东名称 + */ + @NotNull(message = "股东名称不能为空") + @ApiModelProperty(value = "股东名称") + private String shareholder; + /** + * 关联企业 + */ + @NotNull(message = "关联企业不能为空") + @ApiModelProperty(value = "关联企业") + private String affiliatedCompany; + /** + * 员工个数 + */ + @Pattern(regexp = "^[0-9]*$",message = "员工个数格式错误") + @NotNull(message = "员工个数不能为空") + @ApiModelProperty(value = "员工个数") + private String empNum; + /** + * 联系人 + */ + @NotNull(message = "联系人不能为空") + @ApiModelProperty(value = "联系人") + private String linkman; + /** + * 业务来源 + */ + @NotNull(message = "业务来源不能为空") + @ApiModelProperty(value = "业务来源") + private String businessSource; +} diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerCompanyTOU.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerCompanyTOU.java new file mode 100644 index 00000000..4ebd2268 --- /dev/null +++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerCompanyTOU.java @@ -0,0 +1,128 @@ +package com.daqing.framework.domain.crms.ext; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.daqing.framework.domain.crms.CompanyCustomerEntity; +import com.daqing.framework.domain.crms.CustomerEntity; +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; + +/** + * 企业类型客户信息更新 + * @auther River + * @date 2020/9/15 20:20 + */ +@Data +@ToString +public class CustomerCompanyTOU implements Serializable { + + /** + * 主键 + */ + @NotNull(message = "id不能为空") + @ApiModelProperty(value = "id") + @TableId(value = "id", type = IdType.INPUT) + private Long id; + /** + * 客户编号 + */ + @NotNull(message = "客户编号不能为空") + @ApiModelProperty(value = "客户编号") + private String code; + /** + * 客户类型：1、企业类型，0：个人类型 + */ + @Min(value = 0,message = "客户类型格式有误") + @Max(value = 1,message = "客户类型格式有误") + @NotNull(message = "客户类型不能为空") + @ApiModelProperty(value = "客户类型") + private Integer type; + /** + * 客户的经理人id + */ + @NotNull(message = "客户经理人不能为空") + @ApiModelProperty(value = "客户经理人id") + private Long manager; + /** + * 客户名称 + */ + @NotNull(message = "客户名称不能为空") + @ApiModelProperty(value = "客户名称") + private String name; + /** + * 联系地址 + */ + @NotNull(message = "联系地址不能为空") + @ApiModelProperty(value = "联系地址") + private String addr; + /** + * 联系电话 + */ + @Pattern(regexp = "^[0-9]*$",message = "联系电话格式错误") + @NotNull(message = "联系电话不能为空") + @ApiModelProperty(value = "联系电话") + private String phone; + /** + * 注册资金 + */ + @Pattern(regexp = "^[0-9]+\\.{0,1}[0-9]{0,2}$",message = "注册资金格式有误") + @NotNull(message = "注册资金不能为空") + @ApiModelProperty(value = "注册资金") + private String registeredCapital; + /** + * 所属行业 + */ + @NotNull(message = "所属行业不能为空") + @ApiModelProperty(value = "所属行业") + private String industry; + /** + * 成立年限 + */ + @NotNull(message = "成立年限不能为空") + @ApiModelProperty(value = "成立年限") + private Integer years; + /** + * 所在区域 + */ + @NotNull(message = "所在区域不能为空") + @ApiModelProperty(value = "所在区域") + private String region; + /** + * 股东名称 + */ + @NotNull(message = "股东名称不能为空") + @ApiModelProperty(value = "股东名称") + private String shareholder; + /** + * 关联企业 + */ + @NotNull(message = "关联企业不能为空") + @ApiModelProperty(value = "关联企业") + private String affiliatedCompany; + /** + * 员工个数 + */ + @Pattern(regexp = "^[0-9]*$",message = "员工个数格式错误") + @NotNull(message = "员工个数不能为空") + @ApiModelProperty(value = "员工个数") + private String empNum; + /** + * 联系人 + */ + @NotNull(message = "联系人不能为空") + @ApiModelProperty(value = "联系人") + private String linkman; + /** + * 业务来源 + */ + @NotNull(message = "业务来源不能为空") + @ApiModelProperty(value = "业务来源") + private String businessSource; +} diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerCompanyVO.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerCompanyVO.java index 1c19f6b3..0980fcc9 100644 --- a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerCompanyVO.java +++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerCompanyVO.java @@ -24,74 +24,69 @@ public class CustomerCompanyVO extends BaseRowModel implements Serializable { */ @ExcelProperty(value = "编号",index = 0) private String code; - /** - * 客户类型：1、企业类型，0：个人类型 - */ - @ExcelProperty(value = "企业类型",index = 1) - private Integer type; /** * 客户经理 */ - @ExcelProperty(value = "客户经理",index = 2) + @ExcelProperty(value = "客户经理",index = 1) private String manager; /** * 客户名称 */ - @ExcelProperty(value = "姓名",index = 3) + @ExcelProperty(value = "姓名",index = 2) private String name; /** * 联系地址 */ - @ExcelProperty(value = "地址",index = 4) + @ExcelProperty(value = "地址",index = 3) private String addr; /** * 联系电话 */ - @ExcelProperty(value = "电话",index = 5) + @ExcelProperty(value = "电话",index = 4) private String phone; /** * 注册资金 */ - @ExcelProperty(value = "注册资金",index = 6) + @ExcelProperty(value = "注册资金",index = 5) private String registeredCapital; /** * 所属行业 */ - @ExcelProperty(value = "所属行业",index = 7) + @ExcelProperty(value = "所属行业",index = 6) private String industry; /** * 成立年限 */ - @ExcelProperty(value = "成立年限",index = 8) + @ExcelProperty(value = "成立年限",index = 7) private Integer years; /** * 所在区域 */ - @ExcelProperty(value = "所在区域",index = 9) + @ExcelProperty(value = "所在区域",index = 8) private String region; /** * 股东名称 */ - @ExcelProperty(value = "股东名称",index = 10) + @ExcelProperty(value = "股东名称",index = 9) private String shareholder; /** * 关联企业 */ - @ExcelProperty(value = "关联企业",index = 11) + @ExcelProperty(value = "关联企业",index = 10) private String affiliatedCompany; /** * 员工个数 */ - @ExcelProperty(value = "员工个数",index = 12) + @ExcelProperty(value = "员工个数",index = 11) private String empNum; /** * 联系人 */ - @ExcelProperty(value = "联系人",index = 13) + @ExcelProperty(value = "联系人",index = 12) private String linkman; /** * 业务来源 */ - @ExcelProperty(value = "业务来源",index = 14) + @ExcelProperty(value = "业务来源",index = 13) private String businessSource; } diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerPersonalDTO.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerPersonalDTO.java index 5dbbadec..03a45af1 100644 --- a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerPersonalDTO.java +++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerPersonalDTO.java @@ -6,6 +6,7 @@ import lombok.ToString; import java.io.Serializable; /** + * 客户信息详情(个人类型) * @auther River * @date 2020/9/29 11:01 */ diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerPersonalTO.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerPersonalTO.java deleted file mode 100644 index b8ae1334..00000000 --- a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerPersonalTO.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.daqing.framework.domain.crms.ext; - -import com.daqing.framework.domain.crms.CustomerEntity; -import com.daqing.framework.domain.crms.PersonalCustomerEntity; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.ToString; - -import java.io.Serializable; - -/** - * @auther River - * @date 2020/9/15 19:57 - */ -@Data -@ToString -public class CustomerPersonalTO implements Serializable { - - /** - * 客户基本信息 - */ - @ApiModelProperty(value = "客户基本信息") - private CustomerEntity customerEntity; - - /** - * 客户个人信息 - */ - @ApiModelProperty(value = "客户个人信息") - private PersonalCustomerEntity personalCustomerEntity; -} diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerPersonalTOI.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerPersonalTOI.java new file mode 100644 index 00000000..5796f32e --- /dev/null +++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerPersonalTOI.java @@ -0,0 +1,152 @@ +package com.daqing.framework.domain.crms.ext; + +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; + +/** + * 个人类型客户信息新增 + * @auther River + * @date 2020/10/9 10:32 + */ +@Data +@ToString +public class CustomerPersonalTOI implements Serializable { + + /** + * 客户类型：1、企业类型，0：个人类型 + */ + @Min(value = 0,message = "客户类型格式有误") + @Max(value = 1,message = "客户类型格式有误") + @NotNull(message = "客户类型不能为空") + @ApiModelProperty(value = "客户类型") + private Integer type; + /** + * 客户的经理人id + */ + @NotNull(message = "客户经理人不能为空") + @ApiModelProperty(value = "客户经理人id") + private Long manager; + /** + * 客户名称 + */ + @NotNull(message = "客户名称不能为空") + @ApiModelProperty(value = "客户名称") + private String name; + /** + * 联系地址 + */ + @NotNull(message = "联系地址不能为空") + @ApiModelProperty(value = "联系地址") + private String addr; + /** + * 联系电话 + */ + @Pattern(regexp = "^[0-9]*$",message = "联系电话格式错误") + @NotNull(message = "联系电话不能为空") + @ApiModelProperty(value = "联系电话") + private String phone; + /** + * 身份证号 + */ + @NotNull(message = "身份证号不能为空") + @ApiModelProperty(value = "身份证号") + private String idCard; + /** + * 年龄 + */ + @NotNull(message = "年龄不能为空") + @ApiModelProperty(value = "年龄") + private Integer age; + /** + * 性别：1、男，0、女 + */ + @Min(value = 0,message = "性别格式有误") + @Max(value = 1,message = "性别格式有误") + @NotNull(message = "性别不能为空") + @ApiModelProperty(value = "性别") + private Integer gender; + /** + * 婚姻状况,0:未婚,1:已婚,2:离异,3:再婚 + */ + @Min(value = 0,message = "婚姻状况格式有误") + @Max(value = 3,message = "婚姻状况格式有误") + @NotNull(message = "婚姻状况不能为空") + @ApiModelProperty(value = "婚姻状况") + private Integer maritalStatus; + /** + * 学历,0:本科,1:大专,2:高职,3:中专,4:其他 + */ + @Min(value = 0,message = "学历格式有误") + @Max(value = 4,message = "学历格式有误") + @NotNull(message = "学历不能为空") + @ApiModelProperty(value = "学历") + private Integer education; + /** + * 工作单位 + */ + @NotNull(message = "工作单位不能为空") + @ApiModelProperty(value = "工作单位") + private String employer; + /** + * 职务 + */ + @NotNull(message = "职务不能为空") + @ApiModelProperty(value = "职务") + private String position; + /** + * 工作年限 + */ + @NotNull(message = "工作年限不能为空") + @ApiModelProperty(value = "工作年限") + private Integer workingYears; + /** + * 社保账号 + */ + @NotNull(message = "社保账号不能为空") + @ApiModelProperty(value = "社保账号") + private String socialSecurityNum; + /** + * 居住情况 + */ + @NotNull(message = "居住情况不能为空") + @ApiModelProperty(value = "居住情况") + private String livingSituation; + /** + * 户籍地址 + */ + @NotNull(message = "户籍地址不能为空") + @ApiModelProperty(value = "户籍地址") + private String residenceAddr; + /** + * 业务来源 + */ + @NotNull(message = "业务来源不能为空") + @ApiModelProperty(value = "业务来源") + private String businessSource; + /** + * 紧急联系人 + */ + @NotNull(message = "紧急联系人不能为空") + @ApiModelProperty(value = "紧急联系人") + private String emergencyLinkman; + /** + * 紧急联系人关系 + */ + @NotNull(message = "紧急联系人关系不能为空") + @ApiModelProperty(value = "紧急联系人关系") + private String emergencyLinkmanRelationship; + /** + * 紧急联系人电话 + */ + @Pattern(regexp = "^[0-9]*$",message = "紧急联系人电话格式错误") + @NotNull(message = "紧急联系人电话不能为空") + @ApiModelProperty(value = "紧急联系人电话") + private String emergencyLinkmanPhone; +} diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerPersonalTOU.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerPersonalTOU.java new file mode 100644 index 00000000..928bbe6a --- /dev/null +++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerPersonalTOU.java @@ -0,0 +1,167 @@ +package com.daqing.framework.domain.crms.ext; + +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; + +/** + * 个人类型客户信息更新 + * @auther River + * @date 2020/9/15 19:57 + */ +@Data +@ToString +public class CustomerPersonalTOU implements Serializable { + + /** + * 主键 + */ + @NotNull(message = "id不能为空") + @ApiModelProperty(value = "id") + @TableId(value = "id", type = IdType.INPUT) + private Long id; + /** + * 客户编号 + */ + @NotNull(message = "客户编号不能为空") + @ApiModelProperty(value = "客户编号") + private String code; + /** + * 客户类型：1、企业类型，0：个人类型 + */ + @Min(value = 0,message = "客户类型格式有误") + @Max(value = 1,message = "客户类型格式有误") + @NotNull(message = "客户类型不能为空") + @ApiModelProperty(value = "客户类型") + private Integer type; + /** + * 客户的经理人id + */ + @NotNull(message = "客户经理人不能为空") + @ApiModelProperty(value = "客户经理人id") + private Long manager; + /** + * 客户名称 + */ + @NotNull(message = "客户名称不能为空") + @ApiModelProperty(value = "客户名称") + private String name; + /** + * 联系地址 + */ + @NotNull(message = "联系地址不能为空") + @ApiModelProperty(value = "联系地址") + private String addr; + /** + * 联系电话 + */ + @Pattern(regexp = "^[0-9]*$",message = "联系电话格式错误") + @NotNull(message = "联系电话不能为空") + @ApiModelProperty(value = "联系电话") + private String phone; + /** + * 身份证号 + */ + @NotNull(message = "身份证号不能为空") + @ApiModelProperty(value = "身份证号") + private String idCard; + /** + * 年龄 + */ + @NotNull(message = "年龄不能为空") + @ApiModelProperty(value = "年龄") + private Integer age; + /** + * 性别：1、男，0、女 + */ + @Min(value = 0,message = "性别格式有误") + @Max(value = 1,message = "性别格式有误") + @NotNull(message = "性别不能为空") + @ApiModelProperty(value = "性别") + private Integer gender; + /** + * 婚姻状况,0:未婚,1:已婚,2:离异,3:再婚 + */ + @Min(value = 0,message = "婚姻状况格式有误") + @Max(value = 3,message = "婚姻状况格式有误") + @NotNull(message = "婚姻状况不能为空") + @ApiModelProperty(value = "婚姻状况") + private Integer maritalStatus; + /** + * 学历,0:本科,1:大专,2:高职,3:中专,4:其他 + */ + @Min(value = 0,message = "学历格式有误") + @Max(value = 4,message = "学历格式有误") + @NotNull(message = "学历不能为空") + @ApiModelProperty(value = "学历") + private Integer education; + /** + * 工作单位 + */ + @NotNull(message = "工作单位不能为空") + @ApiModelProperty(value = "工作单位") + private String employer; + /** + * 职务 + */ + @NotNull(message = "职务不能为空") + @ApiModelProperty(value = "职务") + private String position; + /** + * 工作年限 + */ + @NotNull(message = "工作年限不能为空") + @ApiModelProperty(value = "工作年限") + private Integer workingYears; + /** + * 社保账号 + */ + @NotNull(message = "社保账号不能为空") + @ApiModelProperty(value = "社保账号") + private String socialSecurityNum; + /** + * 居住情况 + */ + @NotNull(message = "居住情况不能为空") + @ApiModelProperty(value = "居住情况") + private String livingSituation; + /** + * 户籍地址 + */ + @NotNull(message = "户籍地址不能为空") + @ApiModelProperty(value = "户籍地址") + private String residenceAddr; + /** + * 业务来源 + */ + @NotNull(message = "业务来源不能为空") + @ApiModelProperty(value = "业务来源") + private String businessSource; + /** + * 紧急联系人 + */ + @NotNull(message = "紧急联系人不能为空") + @ApiModelProperty(value = "紧急联系人") + private String emergencyLinkman; + /** + * 紧急联系人关系 + */ + @NotNull(message = "紧急联系人关系不能为空") + @ApiModelProperty(value = "紧急联系人关系") + private String emergencyLinkmanRelationship; + /** + * 紧急联系人电话 + */ + @Pattern(regexp = "^[0-9]*$",message = "紧急联系人电话格式错误") + @NotNull(message = "紧急联系人电话不能为空") + @ApiModelProperty(value = "紧急联系人电话") + private String emergencyLinkmanPhone; +} diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerPersonalVO.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerPersonalVO.java index 411c3799..daa100f4 100644 --- a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerPersonalVO.java +++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerPersonalVO.java @@ -5,6 +5,8 @@ import com.alibaba.excel.metadata.BaseRowModel; import lombok.Data; import lombok.ToString; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Pattern; import java.io.Serializable; /** @@ -22,104 +24,99 @@ public class CustomerPersonalVO extends BaseRowModel implements Serializable { */ @ExcelProperty(value = "编号",index = 0) private String code; - /** - * 客户类型：1、企业类型，0：个人类型 - */ - @ExcelProperty(value = "个人类型",index = 1) - private Integer type; /** * 客户经理 */ - @ExcelProperty(value = "客户经理",index = 2) + @ExcelProperty(value = "客户经理",index = 1) private String manager; /** * 客户名称 */ - @ExcelProperty(value = "姓名",index = 3) + @ExcelProperty(value = "姓名",index = 2) private String name; /** * 联系地址 */ - @ExcelProperty(value = "地址",index = 4) + @ExcelProperty(value = "地址",index = 3) private String addr; /** * 联系电话 */ - @ExcelProperty(value = "电话",index = 5) + @ExcelProperty(value = "电话",index = 4) private String phone; /** * 身份证号 */ - @ExcelProperty(value = "身份证号",index = 6) + @ExcelProperty(value = "身份证号",index = 5) private String idCard; /** * 年龄 */ - @ExcelProperty(value = "年龄",index = 7) + @ExcelProperty(value = "年龄",index = 6) private Integer age; /** * 性别：1、男，0、女 */ - @ExcelProperty(value = "性别(1:男,0:女)",index = 8) + @ExcelProperty(value = "性别(1:男,0:女)",index = 7) private Integer gender; /** * 婚姻状况：1、已婚，0、未婚 */ - @ExcelProperty(value = "婚姻状况(0:未婚,1:已婚,2:离异,3:再婚)",index = 9) + @ExcelProperty(value = "婚姻状况(0:未婚,1:已婚,2:离异,3:再婚)",index = 8) private Integer maritalStatus; /** * 学历 */ - @ExcelProperty(value = "学历(0:本科,1:大专,2:高职,3:中专,4:其他)",index = 10) + @ExcelProperty(value = "学历(0:本科,1:大专,2:高职,3:中专,4:其他)",index = 9) private Integer education; /** * 工作单位 */ - @ExcelProperty(value = "工作单位",index = 11) + @ExcelProperty(value = "工作单位",index = 10) private String employer; /** * 职务 */ - @ExcelProperty(value = "职务",index = 12) + @ExcelProperty(value = "职务",index = 11) private String position; /** * 工作年限 */ - @ExcelProperty(value = "工作年限",index = 13) + @ExcelProperty(value = "工作年限",index = 12) private Integer workingYears; /** * 社保账号 */ - @ExcelProperty(value = "社保账号",index = 14) + @ExcelProperty(value = "社保账号",index = 13) private String socialSecurityNum; /** * 居住情况 */ - @ExcelProperty(value = "居住情况",index = 15) + @ExcelProperty(value = "居住情况",index = 14) private String livingSituation; /** * 户籍地址 */ - @ExcelProperty(value = "户籍地址",index = 16) + @ExcelProperty(value = "户籍地址",index = 15) private String residenceAddr; /** * 业务来源 */ - @ExcelProperty(value = "业务来源",index = 17) + @ExcelProperty(value = "业务来源",index = 16) private String businessSource; /** * 紧急联系人 */ - @ExcelProperty(value = "紧急联系人",index = 18) + @ExcelProperty(value = "紧急联系人",index = 17) private String emergencyLinkman; /** * 紧急联系人关系 */ - @ExcelProperty(value = "紧急联系人关系",index = 19) + @ExcelProperty(value = "紧急联系人关系",index = 18) private String emergencyLinkmanRelationship; /** * 紧急联系人电话 */ - @ExcelProperty(value = "紧急联系人电话",index = 20) + @ExcelProperty(value = "紧急联系人电话",index = 19) private String emergencyLinkmanPhone; } diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/PersonalTemplate.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/PersonalTemplate.java new file mode 100644 index 00000000..702584c8 --- /dev/null +++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/PersonalTemplate.java @@ -0,0 +1,133 @@ +package com.daqing.framework.domain.crms.ext; + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.metadata.BaseRowModel; +import lombok.Data; +import lombok.ToString; + +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + * 导出excel模板(个人类型) + * @auther River + * @date 2020/10/9 11:32 + */ +@Data +@ToString +public class PersonalTemplate extends BaseRowModel implements Serializable { + /** + * 客户经理 + */ + @NotNull(message = "客户经理不能为空") + @ExcelProperty(value = "客户经理(请填写本公司存在的员工姓名)",index = 0) + private String manager; + /** + * 客户名称 + */ + @NotNull(message = "客户名称不能为空") + @ExcelProperty(value = "姓名",index = 1) + private String name; + /** + * 联系地址 + */ + @NotNull(message = "联系地址不能为空") + @ExcelProperty(value = "地址",index = 2) + private String addr; + /** + * 联系电话 + */ + @NotNull(message = "联系电话不能为空") + @ExcelProperty(value = "电话",index = 3) + private String phone; + /** + * 身份证号 + */ + @NotNull(message = "身份证号不能为空") + @ExcelProperty(value = "身份证号",index = 4) + private String idCard; + /** + * 年龄 + */ + @NotNull(message = "年龄不能为空") + @ExcelProperty(value = "年龄",index = 5) + private Integer age; + /** + * 性别：1、男，0、女 + */ + @NotNull(message = "性别不能为空") + @ExcelProperty(value = "性别(1:男,0:女)",index = 6) + private Integer gender; + /** + * 婚姻状况：1、已婚，0、未婚 + */ + @NotNull(message = "婚姻状况不能为空") + @ExcelProperty(value = "婚姻状况(0:未婚,1:已婚,2:离异,3:再婚)",index = 7) + private Integer maritalStatus; + /** + * 学历 + */ + @NotNull(message = "学历不能为空") + @ExcelProperty(value = "学历(0:本科,1:大专,2:高职,3:中专,4:其他)",index = 8) + private Integer education; + /** + * 工作单位 + */ + @NotNull(message = "工作单位不能为空") + @ExcelProperty(value = "工作单位",index = 9) + private String employer; + /** + * 职务 + */ + @NotNull(message = "职务不能为空") + @ExcelProperty(value = "职务",index = 10) + private String position; + /** + * 工作年限 + */ + @NotNull(message = "工作年限不能为空") + @ExcelProperty(value = "工作年限",index = 11) + private Integer workingYears; + /** + * 社保账号 + */ + @NotNull(message = "社保账号不能为空") + @ExcelProperty(value = "社保账号",index = 12) + private String socialSecurityNum; + /** + * 居住情况 + */ + @NotNull(message = "居住情况不能为空") + @ExcelProperty(value = "居住情况",index = 13) + private String livingSituation; + /** + * 户籍地址 + */ + @NotNull(message = "户籍地址不能为空") + @ExcelProperty(value = "户籍地址",index = 14) + private String residenceAddr; + /** + * 业务来源 + */ + @NotNull(message = "业务来源不能为空") + @ExcelProperty(value = "业务来源",index = 15) + private String businessSource; + /** + * 紧急联系人 + */ + @NotNull(message = "紧急联系人不能为空") + @ExcelProperty(value = "紧急联系人",index = 16) + private String emergencyLinkman; + /** + * 紧急联系人关系 + */ + @NotNull(message = "紧急联系人关系不能为空") + @ExcelProperty(value = "紧急联系人关系",index = 17) + private String emergencyLinkmanRelationship; + /** + * 紧急联系人电话 + */ + @NotNull(message = "紧急联系人电话不能为空") + @ExcelProperty(value = "紧急联系人电话",index = 18) + private String emergencyLinkmanPhone; +} diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/response/CrmsCode.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/response/CrmsCode.java index c4e8e7fb..9e91ff7e 100644 --- a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/response/CrmsCode.java +++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/response/CrmsCode.java @@ -18,7 +18,9 @@ public enum CrmsCode implements ResultCode { CUSTOMER_IMPORT_EXSIT(false,20001,"导入数据失败,请检查文件和数据格式或稍后再试!"), CUSTOMER_EXPORT_EXSIT(false,20002,"导出数据失败,请稍后再试!"), CUSTOMER_EXPORTTEMPLATE_EXSIT(false,20003,"导出excel模板失败,请稍后再试!"), - NOT_NULL(false,20004,"上传的文件不能为空"); + NOT_NULL(false,20004,"上传的文件不能为空"), + CUSTOMER_IS_NULL(false,20005,"导入数据失败,当前员工不存在!"); + /** * 操作是否成功 diff --git a/dq-framework-model/target/classes/META-INF/dq-framework-model.kotlin_module b/dq-framework-model/target/classes/META-INF/dq-framework-model.kotlin_module new file mode 100644 index 00000000..8fb60192 Binary files /dev/null and b/dq-framework-model/target/classes/META-INF/dq-framework-model.kotlin_module differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/CompanyCustomerEntity.class b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/CompanyCustomerEntity.class index 38424ed8..2a0b2e08 100644 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/CompanyCustomerEntity.class and b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/CompanyCustomerEntity.class differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/CustomerEntity.class b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/CustomerEntity.class index 8eff526a..3174291e 100644 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/CustomerEntity.class and b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/CustomerEntity.class differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/PersonalCustomerEntity.class b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/PersonalCustomerEntity.class index ba4648c3..1ef94e7f 100644 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/PersonalCustomerEntity.class and b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/PersonalCustomerEntity.class differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CompanyTemplate.class b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CompanyTemplate.class new file mode 100644 index 00000000..e5f520da Binary files /dev/null and b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CompanyTemplate.class differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerCompanyDTO.class b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerCompanyDTO.class new file mode 100644 index 00000000..bb996577 Binary files /dev/null and b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerCompanyDTO.class differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerCompanyTO.class b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerCompanyTO.class deleted file mode 100644 index 4d6d7b5f..00000000 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerCompanyTO.class and /dev/null differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerCompanyTOI.class b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerCompanyTOI.class new file mode 100644 index 00000000..25db8717 Binary files /dev/null and b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerCompanyTOI.class differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerCompanyTOU.class b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerCompanyTOU.class new file mode 100644 index 00000000..ea46e049 Binary files /dev/null and b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerCompanyTOU.class differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerCompanyVO.class b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerCompanyVO.class index 8c46cd04..05a31562 100644 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerCompanyVO.class and b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerCompanyVO.class differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerPersonalDTO.class b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerPersonalDTO.class new file mode 100644 index 00000000..a931c967 Binary files /dev/null and b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerPersonalDTO.class differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerPersonalTO.class b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerPersonalTO.class deleted file mode 100644 index c0448edd..00000000 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerPersonalTO.class and /dev/null differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerPersonalTOI.class b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerPersonalTOI.class new file mode 100644 index 00000000..80516b0c Binary files /dev/null and b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerPersonalTOI.class differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerPersonalTOU.class b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerPersonalTOU.class new file mode 100644 index 00000000..144e2e34 Binary files /dev/null and b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerPersonalTOU.class differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerPersonalVO.class b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerPersonalVO.class index 3de4bb98..c94c638f 100644 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerPersonalVO.class and b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerPersonalVO.class differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/PersonalTemplate.class b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/PersonalTemplate.class new file mode 100644 index 00000000..c790d53f Binary files /dev/null and b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/PersonalTemplate.class differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/response/CrmsCode.class b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/response/CrmsCode.class index 8780f9f8..a7c673ce 100644 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/response/CrmsCode.class and b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/response/CrmsCode.class differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/LoginLog.class b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/LoginLog.class new file mode 100644 index 00000000..38fc931f Binary files /dev/null and b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/LoginLog.class differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/SystemLog$SystemLogBuilder.class b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/SystemLog$SystemLogBuilder.class new file mode 100644 index 00000000..87c86c97 Binary files /dev/null and b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/SystemLog$SystemLogBuilder.class differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/SystemLog.class b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/SystemLog.class new file mode 100644 index 00000000..2cb77e8e Binary files /dev/null and b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/SystemLog.class differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/Token.class b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/Token.class new file mode 100644 index 00000000..379db14b Binary files /dev/null and b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/Token.class differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/request/LoginRequest.class b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/request/LoginRequest.class new file mode 100644 index 00000000..9a71d19f Binary files /dev/null and b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/request/LoginRequest.class differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/request/UserLoginRequest.class b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/request/UserLoginRequest.class new file mode 100644 index 00000000..03da341a Binary files /dev/null and b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/request/UserLoginRequest.class differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/response/LoginResponse.class b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/response/LoginResponse.class new file mode 100644 index 00000000..1fbbece8 Binary files /dev/null and b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/response/LoginResponse.class differ diff --git a/dq-govern-gateway/target/classes/com/daqing/financial/gateway/DqGovernGatewayApplication.class b/dq-govern-gateway/target/classes/com/daqing/financial/gateway/DqGovernGatewayApplication.class new file mode 100644 index 00000000..105ccc69 Binary files /dev/null and b/dq-govern-gateway/target/classes/com/daqing/financial/gateway/DqGovernGatewayApplication.class differ diff --git a/dq-govern-gateway/target/classes/com/daqing/financial/gateway/SpringContextHolder.class b/dq-govern-gateway/target/classes/com/daqing/financial/gateway/SpringContextHolder.class new file mode 100644 index 00000000..0aa2faf1 Binary files /dev/null and b/dq-govern-gateway/target/classes/com/daqing/financial/gateway/SpringContextHolder.class differ diff --git a/dq-govern-gateway/target/classes/com/daqing/financial/gateway/config/ApiGlobalFilter.class b/dq-govern-gateway/target/classes/com/daqing/financial/gateway/config/ApiGlobalFilter.class new file mode 100644 index 00000000..1cf99757 Binary files /dev/null and b/dq-govern-gateway/target/classes/com/daqing/financial/gateway/config/ApiGlobalFilter.class differ diff --git a/dq-govern-gateway/target/classes/com/daqing/financial/gateway/config/FinancialCorsConfiguration.class b/dq-govern-gateway/target/classes/com/daqing/financial/gateway/config/FinancialCorsConfiguration.class new file mode 100644 index 00000000..3e2d9348 Binary files /dev/null and b/dq-govern-gateway/target/classes/com/daqing/financial/gateway/config/FinancialCorsConfiguration.class differ diff --git a/dq-govern-gateway/target/classes/com/daqing/financial/gateway/util/OdcProperties$Async.class b/dq-govern-gateway/target/classes/com/daqing/financial/gateway/util/OdcProperties$Async.class new file mode 100644 index 00000000..ece560c0 Binary files /dev/null and b/dq-govern-gateway/target/classes/com/daqing/financial/gateway/util/OdcProperties$Async.class differ diff --git a/dq-govern-gateway/target/classes/com/daqing/financial/gateway/util/OdcProperties$Config.class b/dq-govern-gateway/target/classes/com/daqing/financial/gateway/util/OdcProperties$Config.class new file mode 100644 index 00000000..c261cefb Binary files /dev/null and b/dq-govern-gateway/target/classes/com/daqing/financial/gateway/util/OdcProperties$Config.class differ diff --git a/dq-govern-gateway/target/classes/com/daqing/financial/gateway/util/OdcProperties$Oss.class b/dq-govern-gateway/target/classes/com/daqing/financial/gateway/util/OdcProperties$Oss.class new file mode 100644 index 00000000..b46391e2 Binary files /dev/null and b/dq-govern-gateway/target/classes/com/daqing/financial/gateway/util/OdcProperties$Oss.class differ diff --git a/dq-govern-gateway/target/classes/com/daqing/financial/gateway/util/OdcProperties.class b/dq-govern-gateway/target/classes/com/daqing/financial/gateway/util/OdcProperties.class new file mode 100644 index 00000000..0503c0ac Binary files /dev/null and b/dq-govern-gateway/target/classes/com/daqing/financial/gateway/util/OdcProperties.class differ diff --git a/dq-govern-gateway/target/classes/com/daqing/financial/gateway/util/RedisUtil.class b/dq-govern-gateway/target/classes/com/daqing/financial/gateway/util/RedisUtil.class new file mode 100644 index 00000000..768d5eb3 Binary files /dev/null and b/dq-govern-gateway/target/classes/com/daqing/financial/gateway/util/RedisUtil.class differ diff --git a/客户资源信息一览表.xlsx b/客户资源信息一览表.xlsx new file mode 100644 index 00000000..e69de29b diff --git a/客户资源信息表模板.xlsx b/客户资源信息表模板.xlsx new file mode 100644 index 00000000..e69de29b