diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java index 7d5e4a0..36f3c61 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java @@ -27,6 +27,7 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; +import java.util.List; import java.util.Objects; @Api(tags = "客户基础信息模块") @@ -37,7 +38,7 @@ private final CustomerService customerService; - @ApiOperation("客户基本信息列表") + @ApiOperation("客户基本信息分页列表") @PostMapping("/listPage") public ReturnDTO> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception { if (bindingResult.hasErrors()) { @@ -47,6 +48,15 @@ return ReturnUtil.success(super.packForBT(customerService.listPage(page, request))); } + @ApiOperation("客户基本信息不分页列表") + @PostMapping("/list") + public ReturnDTO> customerList(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.customerList(request)); + } + @ApiOperation("客户新增") @PostMapping("/add") public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java index 7d5e4a0..36f3c61 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java @@ -27,6 +27,7 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; +import java.util.List; import java.util.Objects; @Api(tags = "客户基础信息模块") @@ -37,7 +38,7 @@ private final CustomerService customerService; - @ApiOperation("客户基本信息列表") + @ApiOperation("客户基本信息分页列表") @PostMapping("/listPage") public ReturnDTO> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception { if (bindingResult.hasErrors()) { @@ -47,6 +48,15 @@ return ReturnUtil.success(super.packForBT(customerService.listPage(page, request))); } + @ApiOperation("客户基本信息不分页列表") + @PostMapping("/list") + public ReturnDTO> customerList(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.customerList(request)); + } + @ApiOperation("客户新增") @PostMapping("/add") public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java index 2e86a7d..ef32d16 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java @@ -12,7 +12,6 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.interchange.InterchangeListRequest; import com.casic.missiles.dto.business.interchange.InterchangeListResponse; -import com.casic.missiles.dto.business.order.OrderListReponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java index 7d5e4a0..36f3c61 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java @@ -27,6 +27,7 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; +import java.util.List; import java.util.Objects; @Api(tags = "客户基础信息模块") @@ -37,7 +38,7 @@ private final CustomerService customerService; - @ApiOperation("客户基本信息列表") + @ApiOperation("客户基本信息分页列表") @PostMapping("/listPage") public ReturnDTO> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception { if (bindingResult.hasErrors()) { @@ -47,6 +48,15 @@ return ReturnUtil.success(super.packForBT(customerService.listPage(page, request))); } + @ApiOperation("客户基本信息不分页列表") + @PostMapping("/list") + public ReturnDTO> customerList(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.customerList(request)); + } + @ApiOperation("客户新增") @PostMapping("/add") public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java index 2e86a7d..ef32d16 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java @@ -12,7 +12,6 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.interchange.InterchangeListRequest; import com.casic.missiles.dto.business.interchange.InterchangeListResponse; -import com.casic.missiles.dto.business.order.OrderListReponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerServiceImpl.java index 70b2d1a..85956f5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerServiceImpl.java @@ -57,6 +57,16 @@ } @Override + public List customerList( CustomerListRequest request) throws Exception { + QueryWrapper wrapper = listParamWrapper(request); + List resultList = customerInfoResponseMapper.selectList(wrapper); + for (CustomerInfoResponse customerInfo : resultList) { + DictCodeUtils.convertDictCodeToName(customerInfo); + } + return resultList; + } + + @Override @Transactional public ReturnDTO addCustomer(CustomerInfo customerInfo) { initCustomerInfo(customerInfo); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java index 7d5e4a0..36f3c61 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java @@ -27,6 +27,7 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; +import java.util.List; import java.util.Objects; @Api(tags = "客户基础信息模块") @@ -37,7 +38,7 @@ private final CustomerService customerService; - @ApiOperation("客户基本信息列表") + @ApiOperation("客户基本信息分页列表") @PostMapping("/listPage") public ReturnDTO> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception { if (bindingResult.hasErrors()) { @@ -47,6 +48,15 @@ return ReturnUtil.success(super.packForBT(customerService.listPage(page, request))); } + @ApiOperation("客户基本信息不分页列表") + @PostMapping("/list") + public ReturnDTO> customerList(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.customerList(request)); + } + @ApiOperation("客户新增") @PostMapping("/add") public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java index 2e86a7d..ef32d16 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java @@ -12,7 +12,6 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.interchange.InterchangeListRequest; import com.casic.missiles.dto.business.interchange.InterchangeListResponse; -import com.casic.missiles.dto.business.order.OrderListReponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerServiceImpl.java index 70b2d1a..85956f5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerServiceImpl.java @@ -57,6 +57,16 @@ } @Override + public List customerList( CustomerListRequest request) throws Exception { + QueryWrapper wrapper = listParamWrapper(request); + List resultList = customerInfoResponseMapper.selectList(wrapper); + for (CustomerInfoResponse customerInfo : resultList) { + DictCodeUtils.convertDictCodeToName(customerInfo); + } + return resultList; + } + + @Override @Transactional public ReturnDTO addCustomer(CustomerInfo customerInfo) { initCustomerInfo(customerInfo); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/customer/CustomerService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/customer/CustomerService.java index 31766cf..5d096e2 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/customer/CustomerService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/customer/CustomerService.java @@ -8,11 +8,15 @@ import com.casic.missiles.model.customer.CustomerInfo; import javax.servlet.http.HttpServletResponse; +import java.util.List; public interface CustomerService { Page listPage(Page page, CustomerListRequest request) throws Exception; + List customerList(CustomerListRequest request) throws Exception; + + ReturnDTO addCustomer(CustomerInfo customerInfo); ReturnDTO updateCustomer(CustomerInfo customerInfo);