From 2015ac4d0c2e8362302607d9db8ff6ae2fb4bfe4 Mon Sep 17 00:00:00 2001 From: wxz Date: Tue, 26 May 2020 10:00:41 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=96=B0=E5=A2=9E=E5=AE=A2=E6=88=B7=EF=BC=9A?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0logo=E5=AD=97=E6=AE=B5=202.=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=9C=89=E6=95=88=E5=AE=A2=E6=88=B7=E5=88=97=E8=A1=A8=EF=BC=9A?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0logo=E5=AD=97=E6=AE=B5=E8=BF=94=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/dto/CustomerDTO.java | 5 +++ .../com/epmet/dto/form/CustomerFormDTO.java | 5 +++ .../dto/result/ValidCustomerResultDTO.java | 5 +++ .../epmet/controller/CustomerController.java | 2 +- .../java/com/epmet/entity/CustomerEntity.java | 5 +++ .../com/epmet/service/CustomerService.java | 3 +- .../service/impl/CustomerServiceImpl.java | 31 ++++++++++--------- .../src/main/resources/mapper/CustomerDao.xml | 4 ++- 8 files changed, 42 insertions(+), 18 deletions(-) diff --git a/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/dto/CustomerDTO.java b/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/dto/CustomerDTO.java index bd9ba0afa3..7a78fbb209 100644 --- a/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/dto/CustomerDTO.java +++ b/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/dto/CustomerDTO.java @@ -83,6 +83,11 @@ public class CustomerDTO implements Serializable { */ private String organizationLevel; + /** + * 客户logo + */ + private String logo; + /** * 删除标识：0.未删除 1.已删除 */ diff --git a/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/dto/form/CustomerFormDTO.java b/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/dto/form/CustomerFormDTO.java index daab4602dc..7cffb59d3f 100644 --- a/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/dto/form/CustomerFormDTO.java +++ b/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/dto/form/CustomerFormDTO.java @@ -39,5 +39,10 @@ public class CustomerFormDTO implements Serializable { @NotBlank(message = "客户ID", groups = {GetCustomerDetailGroup.class}) private String customerId; + + /** + * 客户LOGO + */ + private String logo; } diff --git a/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/dto/result/ValidCustomerResultDTO.java b/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/dto/result/ValidCustomerResultDTO.java index 666a45b69c..5b70f673ab 100644 --- a/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/dto/result/ValidCustomerResultDTO.java +++ b/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/dto/result/ValidCustomerResultDTO.java @@ -37,4 +37,9 @@ public class ValidCustomerResultDTO implements Serializable { * 根级组织ID */ private String rootAgencyId; + + /** + * 客户logo + */ + private String logo; } diff --git a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/controller/CustomerController.java b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/controller/CustomerController.java index 1caf84c054..70776b608b 100644 --- a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/controller/CustomerController.java +++ b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/controller/CustomerController.java @@ -177,7 +177,7 @@ public class CustomerController { @PostMapping("add") public Result> addCustomer(@RequestBody CustomerFormDTO form) { ValidatorUtils.validateEntity(form, CustomerFormDTO.AddCustomerGroup.class); - String customerId = customerService.addCustomer(form.getCustomerName(), form.getOrganizationLevel()); + String customerId = customerService.addCustomer(form.getCustomerName(), form.getOrganizationLevel(), form.getLogo()); Map resultmap = new HashMap<>(); resultmap.put("customerId", customerId); return new Result>().ok(resultmap); diff --git a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/entity/CustomerEntity.java b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/entity/CustomerEntity.java index 41ec253b2c..c5c511cbed 100644 --- a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/entity/CustomerEntity.java +++ b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/entity/CustomerEntity.java @@ -83,4 +83,9 @@ public class CustomerEntity extends BaseEpmetEntity { */ private String organizationLevel; + /** + * 客户logo + */ + private String logo; + } diff --git a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/CustomerService.java b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/CustomerService.java index 28b47d4af0..ad71749b9b 100644 --- a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/CustomerService.java +++ b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/CustomerService.java @@ -137,9 +137,10 @@ public interface CustomerService extends BaseService { * 新增客户 * @param customerName * @param organizationLevel + * @param logo logo * @return */ - String addCustomer(String customerName, String organizationLevel); + String addCustomer(String customerName, String organizationLevel, String logo); /** * 添加管理员 diff --git a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java index 0d2371163a..2e3791113e 100644 --- a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java +++ b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java @@ -160,7 +160,7 @@ public class CustomerServiceImpl extends BaseServiceImpl>> managersResult = epmetUserFeignClient.getStaffsInRoleOfOrgs(staffRoleFormDTO); if (managersResult.success()) { Map> rootAgencyManagerMap = managersResult.getData(); @@ -207,7 +207,7 @@ public class CustomerServiceImpl extends BaseServiceImpl + @@ -25,7 +26,8 @@