diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java index 2451100..04538a3 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java @@ -1,8 +1,32 @@ package com.casic.missiles.controller.business; +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.order.OrderListReponse; +import com.casic.missiles.dto.business.order.OrderListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.business.BusinessOrder; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.business.IBusinessOrderService; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + /** *

* 业务管理-委托书 前端控制器 @@ -13,6 +37,96 @@ */ @RestController @RequestMapping("/business/order") -public class BusinessOrderController { +@AllArgsConstructor +public class BusinessOrderController extends ExportController { + + private final IBusinessOrderService businessOrderService; + + @ApiOperation("委托书查询") + @PostMapping("/listPage") + public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request))); + } + + @ApiOperation("委托书详情") + @PostMapping("/detail") + public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(businessOrderService.orderDetail(idDTO.getId())); + } + + @ApiOperation("委托书更新") + @PostMapping("/update") + public ReturnDTO updateAdvice(@RequestBody @Valid BusinessOrder businessOrder, BindingResult bindingResult){ + Assert.isFalse(Objects.isNull(businessOrder.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(businessOrderService.updateOrder(businessOrder)); + } + + @ApiOperation("委托书新增") + @PostMapping("/add") + public ReturnDTO addAdvice(@RequestBody @Valid BusinessOrder businessOrder, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(businessOrderService.addOrder(businessOrder)); + } + + @ApiOperation("委托书删除（暂不使用，无此功能）") + @PostMapping("/delete") + public ReturnDTO deleteAdvice(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(businessOrderService.deleteOrder(idDTO.getId())); + } + + //*******************************************************************************************************************// + @ApiOperation("委托书导出") + @PostMapping("/export") + public void exportAdvice(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) { + businessOrderService.orderExport(request, response); + } + + + //*******************************************************************************************************************// + @ApiOperation("委托书取消") + @PostMapping("/cancel") + public ReturnDTO cancelOrder(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(businessOrderService.updateStatusById(idDTO.getId(),"3")); + } + + //*******************************************************************************************************************// + @ApiOperation("委托书接收") + @PostMapping("/receive") + public ReturnDTO receiveOrder(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(businessOrderService.updateStatusById(idDTO.getId(),"2")); + } + + //*******************************************************************************************************************// + @ApiOperation("委托书退回") + @PostMapping("/back") + public ReturnDTO backOrder(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(businessOrderService.updateStatusById(idDTO.getId(),"2")); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java index 2451100..04538a3 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java @@ -1,8 +1,32 @@ package com.casic.missiles.controller.business; +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.order.OrderListReponse; +import com.casic.missiles.dto.business.order.OrderListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.business.BusinessOrder; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.business.IBusinessOrderService; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + /** *

* 业务管理-委托书 前端控制器 @@ -13,6 +37,96 @@ */ @RestController @RequestMapping("/business/order") -public class BusinessOrderController { +@AllArgsConstructor +public class BusinessOrderController extends ExportController { + + private final IBusinessOrderService businessOrderService; + + @ApiOperation("委托书查询") + @PostMapping("/listPage") + public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request))); + } + + @ApiOperation("委托书详情") + @PostMapping("/detail") + public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(businessOrderService.orderDetail(idDTO.getId())); + } + + @ApiOperation("委托书更新") + @PostMapping("/update") + public ReturnDTO updateAdvice(@RequestBody @Valid BusinessOrder businessOrder, BindingResult bindingResult){ + Assert.isFalse(Objects.isNull(businessOrder.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(businessOrderService.updateOrder(businessOrder)); + } + + @ApiOperation("委托书新增") + @PostMapping("/add") + public ReturnDTO addAdvice(@RequestBody @Valid BusinessOrder businessOrder, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(businessOrderService.addOrder(businessOrder)); + } + + @ApiOperation("委托书删除（暂不使用，无此功能）") + @PostMapping("/delete") + public ReturnDTO deleteAdvice(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(businessOrderService.deleteOrder(idDTO.getId())); + } + + //*******************************************************************************************************************// + @ApiOperation("委托书导出") + @PostMapping("/export") + public void exportAdvice(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) { + businessOrderService.orderExport(request, response); + } + + + //*******************************************************************************************************************// + @ApiOperation("委托书取消") + @PostMapping("/cancel") + public ReturnDTO cancelOrder(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(businessOrderService.updateStatusById(idDTO.getId(),"3")); + } + + //*******************************************************************************************************************// + @ApiOperation("委托书接收") + @PostMapping("/receive") + public ReturnDTO receiveOrder(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(businessOrderService.updateStatusById(idDTO.getId(),"2")); + } + + //*******************************************************************************************************************// + @ApiOperation("委托书退回") + @PostMapping("/back") + public ReturnDTO backOrder(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(businessOrderService.updateStatusById(idDTO.getId(),"2")); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java index 8a02be1..077014f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java @@ -33,7 +33,7 @@ private final CustomerAdviceService customerAdviceService; @ApiOperation("客户投诉查询") - @RequestMapping("/listPage") + @PostMapping("/listPage") public ReturnDTO> adviceListPage(@RequestBody @Valid CustomerAdviceListRequest request, BindingResult bindingResult) throws Exception { if (bindingResult.hasErrors()) { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); @@ -43,7 +43,7 @@ } @ApiOperation("客户投诉详情") - @RequestMapping("/detail") + @PostMapping("/detail") public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); @@ -52,7 +52,7 @@ } @ApiOperation("客户投诉更新") - @RequestMapping("/update") + @PostMapping("/update") public ReturnDTO updateAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult){ Assert.isFalse(Objects.isNull(customerAdviceInfo.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); @@ -64,7 +64,7 @@ } @ApiOperation("客户投诉新增") - @RequestMapping("/add") + @PostMapping("/add") public ReturnDTO addAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { Assert.isFalse(bindingResult.hasErrors(), () -> { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); @@ -72,9 +72,18 @@ return ReturnUtil.success(customerAdviceService.addAdvice(customerAdviceInfo)); } + @ApiOperation("客户投诉删除") + @PostMapping("/delete") + public ReturnDTO deleteAdvice(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerAdviceService.deleteAdvice(idDTO.getId())); + } + //*******************************************************************************************************************// @ApiOperation("客户投诉导出") - @RequestMapping("/export") + @PostMapping("/export") public void exportAdvice(@RequestBody @Valid CustomerAdviceListRequest request, HttpServletResponse response) { customerAdviceService.adviceExport(request, response); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java index 2451100..04538a3 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java @@ -1,8 +1,32 @@ package com.casic.missiles.controller.business; +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.order.OrderListReponse; +import com.casic.missiles.dto.business.order.OrderListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.business.BusinessOrder; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.business.IBusinessOrderService; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + /** *

* 业务管理-委托书 前端控制器 @@ -13,6 +37,96 @@ */ @RestController @RequestMapping("/business/order") -public class BusinessOrderController { +@AllArgsConstructor +public class BusinessOrderController extends ExportController { + + private final IBusinessOrderService businessOrderService; + + @ApiOperation("委托书查询") + @PostMapping("/listPage") + public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request))); + } + + @ApiOperation("委托书详情") + @PostMapping("/detail") + public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(businessOrderService.orderDetail(idDTO.getId())); + } + + @ApiOperation("委托书更新") + @PostMapping("/update") + public ReturnDTO updateAdvice(@RequestBody @Valid BusinessOrder businessOrder, BindingResult bindingResult){ + Assert.isFalse(Objects.isNull(businessOrder.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(businessOrderService.updateOrder(businessOrder)); + } + + @ApiOperation("委托书新增") + @PostMapping("/add") + public ReturnDTO addAdvice(@RequestBody @Valid BusinessOrder businessOrder, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(businessOrderService.addOrder(businessOrder)); + } + + @ApiOperation("委托书删除（暂不使用，无此功能）") + @PostMapping("/delete") + public ReturnDTO deleteAdvice(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(businessOrderService.deleteOrder(idDTO.getId())); + } + + //*******************************************************************************************************************// + @ApiOperation("委托书导出") + @PostMapping("/export") + public void exportAdvice(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) { + businessOrderService.orderExport(request, response); + } + + + //*******************************************************************************************************************// + @ApiOperation("委托书取消") + @PostMapping("/cancel") + public ReturnDTO cancelOrder(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(businessOrderService.updateStatusById(idDTO.getId(),"3")); + } + + //*******************************************************************************************************************// + @ApiOperation("委托书接收") + @PostMapping("/receive") + public ReturnDTO receiveOrder(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(businessOrderService.updateStatusById(idDTO.getId(),"2")); + } + + //*******************************************************************************************************************// + @ApiOperation("委托书退回") + @PostMapping("/back") + public ReturnDTO backOrder(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(businessOrderService.updateStatusById(idDTO.getId(),"2")); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java index 8a02be1..077014f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java @@ -33,7 +33,7 @@ private final CustomerAdviceService customerAdviceService; @ApiOperation("客户投诉查询") - @RequestMapping("/listPage") + @PostMapping("/listPage") public ReturnDTO> adviceListPage(@RequestBody @Valid CustomerAdviceListRequest request, BindingResult bindingResult) throws Exception { if (bindingResult.hasErrors()) { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); @@ -43,7 +43,7 @@ } @ApiOperation("客户投诉详情") - @RequestMapping("/detail") + @PostMapping("/detail") public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); @@ -52,7 +52,7 @@ } @ApiOperation("客户投诉更新") - @RequestMapping("/update") + @PostMapping("/update") public ReturnDTO updateAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult){ Assert.isFalse(Objects.isNull(customerAdviceInfo.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); @@ -64,7 +64,7 @@ } @ApiOperation("客户投诉新增") - @RequestMapping("/add") + @PostMapping("/add") public ReturnDTO addAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { Assert.isFalse(bindingResult.hasErrors(), () -> { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); @@ -72,9 +72,18 @@ return ReturnUtil.success(customerAdviceService.addAdvice(customerAdviceInfo)); } + @ApiOperation("客户投诉删除") + @PostMapping("/delete") + public ReturnDTO deleteAdvice(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerAdviceService.deleteAdvice(idDTO.getId())); + } + //*******************************************************************************************************************// @ApiOperation("客户投诉导出") - @RequestMapping("/export") + @PostMapping("/export") public void exportAdvice(@RequestBody @Valid CustomerAdviceListRequest request, HttpServletResponse response) { customerAdviceService.adviceExport(request, response); } 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 c59faa6..cbcef48 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 @@ -21,6 +21,7 @@ import lombok.AllArgsConstructor; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -37,7 +38,7 @@ private final CustomerService customerService; @ApiOperation("客户基本信息列表") - @RequestMapping("/listPage") + @PostMapping("/listPage") public ReturnDTO> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception { if (bindingResult.hasErrors()) { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); @@ -47,7 +48,7 @@ } @ApiOperation("客户新增") - @RequestMapping("/add") + @PostMapping("/add") public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { if (bindingResult.hasErrors()) { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); @@ -56,7 +57,7 @@ } @ApiOperation("客户更新") - @RequestMapping("/update") + @PostMapping("/update") public ReturnDTO updateCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { if (bindingResult.hasErrors()) { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); @@ -65,7 +66,7 @@ } @ApiOperation("客户详情") - @RequestMapping("/detail") + @PostMapping("/detail") public ReturnDTO customerDetail(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); @@ -74,7 +75,7 @@ } @ApiOperation("根据客户id查询样品记录-分页") - @RequestMapping("/sampleRecords") + @PostMapping("/sampleRecords") public ReturnDTO> sampleRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); @@ -83,7 +84,7 @@ } @ApiOperation("根据客户id查询合同记录-分页") - @RequestMapping("/contractRecords") + @PostMapping("/contractRecords") public ReturnDTO> contractRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); @@ -92,7 +93,7 @@ } @ApiOperation("根据客户id查询检定记录-分页") - @RequestMapping("/mesureRecords") + @PostMapping("/mesureRecords") public ReturnDTO> mesureRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); @@ -100,8 +101,18 @@ return ReturnUtil.success(super.packForBT(customerService.mesureRecordsByCustomerId(idDTO.getId()))); } + + @ApiOperation("客户删除") + @PostMapping("/delete") + public ReturnDTO deleteCsutomer(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerService.deleteCustomer(idDTO.getId())); + } + @ApiOperation("根据客户id查询检定证书-分页") - @RequestMapping("/certificateRecords") + @PostMapping("/certificateRecords") public ReturnDTO> certificationByCustomerId(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); @@ -110,14 +121,14 @@ } @ApiOperation("客户导出") - @RequestMapping("/export") + @PostMapping("/export") public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response){ customerService.customerExport(request, response); } //*******************************************************************************************************************// // @ApiOperation("客户批量导入") -// @RequestMapping("/batchImport") +// @PostMapping("/batchImport") // public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { // Assert.isFalse(bindingResult.hasErrors(), () -> { // throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java index 2451100..04538a3 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java @@ -1,8 +1,32 @@ package com.casic.missiles.controller.business; +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.order.OrderListReponse; +import com.casic.missiles.dto.business.order.OrderListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.business.BusinessOrder; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.business.IBusinessOrderService; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + /** *

* 业务管理-委托书 前端控制器 @@ -13,6 +37,96 @@ */ @RestController @RequestMapping("/business/order") -public class BusinessOrderController { +@AllArgsConstructor +public class BusinessOrderController extends ExportController { + + private final IBusinessOrderService businessOrderService; + + @ApiOperation("委托书查询") + @PostMapping("/listPage") + public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request))); + } + + @ApiOperation("委托书详情") + @PostMapping("/detail") + public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(businessOrderService.orderDetail(idDTO.getId())); + } + + @ApiOperation("委托书更新") + @PostMapping("/update") + public ReturnDTO updateAdvice(@RequestBody @Valid BusinessOrder businessOrder, BindingResult bindingResult){ + Assert.isFalse(Objects.isNull(businessOrder.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(businessOrderService.updateOrder(businessOrder)); + } + + @ApiOperation("委托书新增") + @PostMapping("/add") + public ReturnDTO addAdvice(@RequestBody @Valid BusinessOrder businessOrder, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(businessOrderService.addOrder(businessOrder)); + } + + @ApiOperation("委托书删除（暂不使用，无此功能）") + @PostMapping("/delete") + public ReturnDTO deleteAdvice(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(businessOrderService.deleteOrder(idDTO.getId())); + } + + //*******************************************************************************************************************// + @ApiOperation("委托书导出") + @PostMapping("/export") + public void exportAdvice(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) { + businessOrderService.orderExport(request, response); + } + + + //*******************************************************************************************************************// + @ApiOperation("委托书取消") + @PostMapping("/cancel") + public ReturnDTO cancelOrder(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(businessOrderService.updateStatusById(idDTO.getId(),"3")); + } + + //*******************************************************************************************************************// + @ApiOperation("委托书接收") + @PostMapping("/receive") + public ReturnDTO receiveOrder(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(businessOrderService.updateStatusById(idDTO.getId(),"2")); + } + + //*******************************************************************************************************************// + @ApiOperation("委托书退回") + @PostMapping("/back") + public ReturnDTO backOrder(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(businessOrderService.updateStatusById(idDTO.getId(),"2")); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java index 8a02be1..077014f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java @@ -33,7 +33,7 @@ private final CustomerAdviceService customerAdviceService; @ApiOperation("客户投诉查询") - @RequestMapping("/listPage") + @PostMapping("/listPage") public ReturnDTO> adviceListPage(@RequestBody @Valid CustomerAdviceListRequest request, BindingResult bindingResult) throws Exception { if (bindingResult.hasErrors()) { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); @@ -43,7 +43,7 @@ } @ApiOperation("客户投诉详情") - @RequestMapping("/detail") + @PostMapping("/detail") public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); @@ -52,7 +52,7 @@ } @ApiOperation("客户投诉更新") - @RequestMapping("/update") + @PostMapping("/update") public ReturnDTO updateAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult){ Assert.isFalse(Objects.isNull(customerAdviceInfo.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); @@ -64,7 +64,7 @@ } @ApiOperation("客户投诉新增") - @RequestMapping("/add") + @PostMapping("/add") public ReturnDTO addAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { Assert.isFalse(bindingResult.hasErrors(), () -> { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); @@ -72,9 +72,18 @@ return ReturnUtil.success(customerAdviceService.addAdvice(customerAdviceInfo)); } + @ApiOperation("客户投诉删除") + @PostMapping("/delete") + public ReturnDTO deleteAdvice(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerAdviceService.deleteAdvice(idDTO.getId())); + } + //*******************************************************************************************************************// @ApiOperation("客户投诉导出") - @RequestMapping("/export") + @PostMapping("/export") public void exportAdvice(@RequestBody @Valid CustomerAdviceListRequest request, HttpServletResponse response) { customerAdviceService.adviceExport(request, response); } 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 c59faa6..cbcef48 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 @@ -21,6 +21,7 @@ import lombok.AllArgsConstructor; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -37,7 +38,7 @@ private final CustomerService customerService; @ApiOperation("客户基本信息列表") - @RequestMapping("/listPage") + @PostMapping("/listPage") public ReturnDTO> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception { if (bindingResult.hasErrors()) { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); @@ -47,7 +48,7 @@ } @ApiOperation("客户新增") - @RequestMapping("/add") + @PostMapping("/add") public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { if (bindingResult.hasErrors()) { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); @@ -56,7 +57,7 @@ } @ApiOperation("客户更新") - @RequestMapping("/update") + @PostMapping("/update") public ReturnDTO updateCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { if (bindingResult.hasErrors()) { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); @@ -65,7 +66,7 @@ } @ApiOperation("客户详情") - @RequestMapping("/detail") + @PostMapping("/detail") public ReturnDTO customerDetail(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); @@ -74,7 +75,7 @@ } @ApiOperation("根据客户id查询样品记录-分页") - @RequestMapping("/sampleRecords") + @PostMapping("/sampleRecords") public ReturnDTO> sampleRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); @@ -83,7 +84,7 @@ } @ApiOperation("根据客户id查询合同记录-分页") - @RequestMapping("/contractRecords") + @PostMapping("/contractRecords") public ReturnDTO> contractRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); @@ -92,7 +93,7 @@ } @ApiOperation("根据客户id查询检定记录-分页") - @RequestMapping("/mesureRecords") + @PostMapping("/mesureRecords") public ReturnDTO> mesureRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); @@ -100,8 +101,18 @@ return ReturnUtil.success(super.packForBT(customerService.mesureRecordsByCustomerId(idDTO.getId()))); } + + @ApiOperation("客户删除") + @PostMapping("/delete") + public ReturnDTO deleteCsutomer(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerService.deleteCustomer(idDTO.getId())); + } + @ApiOperation("根据客户id查询检定证书-分页") - @RequestMapping("/certificateRecords") + @PostMapping("/certificateRecords") public ReturnDTO> certificationByCustomerId(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); @@ -110,14 +121,14 @@ } @ApiOperation("客户导出") - @RequestMapping("/export") + @PostMapping("/export") public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response){ customerService.customerExport(request, response); } //*******************************************************************************************************************// // @ApiOperation("客户批量导入") -// @RequestMapping("/batchImport") +// @PostMapping("/batchImport") // public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { // Assert.isFalse(bindingResult.hasErrors(), () -> { // throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java index 0d7320f..609d1d0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java @@ -14,7 +14,6 @@ import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.customer.CustomerAdviceInfo; import com.casic.missiles.model.customer.CustomerSampleInfo; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.customer.CustomerSampleService; @@ -23,6 +22,7 @@ import lombok.AllArgsConstructor; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -39,7 +39,7 @@ private final CustomerSampleService customerSampleService; @ApiOperation("样品列表查询-分页") - @RequestMapping("/listPage") + @PostMapping("/listPage") public ReturnDTO> listPage(@RequestBody @Valid CustomerSampleListRequest request, BindingResult bindingResult) throws Exception { if (bindingResult.hasErrors()) { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); @@ -49,7 +49,7 @@ } @ApiOperation("样品新增") - @RequestMapping("/add") + @PostMapping("/add") public ReturnDTO addSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { if (bindingResult.hasErrors()) { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); @@ -58,7 +58,7 @@ } @ApiOperation("样品编辑") - @RequestMapping("/update") + @PostMapping("/update") public ReturnDTO updateSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { Assert.isFalse(Objects.isNull(customerSampleInfo.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); @@ -70,7 +70,7 @@ } @ApiOperation("样品详情") - @RequestMapping("/detail") + @PostMapping("/detail") public ReturnDTO sampleDetail(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); @@ -79,7 +79,7 @@ } @ApiOperation("列表数据删除") - @RequestMapping("/delete") + @PostMapping("/delete") public ReturnDTO deleteSample(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); @@ -88,13 +88,13 @@ } @ApiOperation("样品导出") - @RequestMapping("/export") + @PostMapping("/export") public void sampleExport(@RequestBody @Valid CustomerSampleListRequest request, HttpServletResponse response) { customerSampleService.sampleExport(request, response); } @ApiOperation("根据样品id查询检定记录") - @RequestMapping("/mesureRecordsBySampleId") + @PostMapping("/mesureRecordsBySampleId") public ReturnDTO> mesureRecordsBySampleId(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); @@ -103,7 +103,7 @@ } @ApiOperation("根据样品id查询检定证书") - @RequestMapping("/certificationBySampleId") + @PostMapping("/certificationBySampleId") public ReturnDTO> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); @@ -112,7 +112,7 @@ } // @ApiOperation("样品批量导入") -// @RequestMapping("/batchImport") +// @PostMapping("/batchImport") // public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { // Assert.isFalse(bindingResult.hasErrors(), () -> { // throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java index 2451100..04538a3 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java @@ -1,8 +1,32 @@ package com.casic.missiles.controller.business; +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.order.OrderListReponse; +import com.casic.missiles.dto.business.order.OrderListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.business.BusinessOrder; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.business.IBusinessOrderService; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + /** *

* 业务管理-委托书 前端控制器 @@ -13,6 +37,96 @@ */ @RestController @RequestMapping("/business/order") -public class BusinessOrderController { +@AllArgsConstructor +public class BusinessOrderController extends ExportController { + + private final IBusinessOrderService businessOrderService; + + @ApiOperation("委托书查询") + @PostMapping("/listPage") + public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request))); + } + + @ApiOperation("委托书详情") + @PostMapping("/detail") + public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(businessOrderService.orderDetail(idDTO.getId())); + } + + @ApiOperation("委托书更新") + @PostMapping("/update") + public ReturnDTO updateAdvice(@RequestBody @Valid BusinessOrder businessOrder, BindingResult bindingResult){ + Assert.isFalse(Objects.isNull(businessOrder.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(businessOrderService.updateOrder(businessOrder)); + } + + @ApiOperation("委托书新增") + @PostMapping("/add") + public ReturnDTO addAdvice(@RequestBody @Valid BusinessOrder businessOrder, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(businessOrderService.addOrder(businessOrder)); + } + + @ApiOperation("委托书删除（暂不使用，无此功能）") + @PostMapping("/delete") + public ReturnDTO deleteAdvice(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(businessOrderService.deleteOrder(idDTO.getId())); + } + + //*******************************************************************************************************************// + @ApiOperation("委托书导出") + @PostMapping("/export") + public void exportAdvice(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) { + businessOrderService.orderExport(request, response); + } + + + //*******************************************************************************************************************// + @ApiOperation("委托书取消") + @PostMapping("/cancel") + public ReturnDTO cancelOrder(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(businessOrderService.updateStatusById(idDTO.getId(),"3")); + } + + //*******************************************************************************************************************// + @ApiOperation("委托书接收") + @PostMapping("/receive") + public ReturnDTO receiveOrder(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(businessOrderService.updateStatusById(idDTO.getId(),"2")); + } + + //*******************************************************************************************************************// + @ApiOperation("委托书退回") + @PostMapping("/back") + public ReturnDTO backOrder(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(businessOrderService.updateStatusById(idDTO.getId(),"2")); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java index 8a02be1..077014f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java @@ -33,7 +33,7 @@ private final CustomerAdviceService customerAdviceService; @ApiOperation("客户投诉查询") - @RequestMapping("/listPage") + @PostMapping("/listPage") public ReturnDTO> adviceListPage(@RequestBody @Valid CustomerAdviceListRequest request, BindingResult bindingResult) throws Exception { if (bindingResult.hasErrors()) { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); @@ -43,7 +43,7 @@ } @ApiOperation("客户投诉详情") - @RequestMapping("/detail") + @PostMapping("/detail") public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); @@ -52,7 +52,7 @@ } @ApiOperation("客户投诉更新") - @RequestMapping("/update") + @PostMapping("/update") public ReturnDTO updateAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult){ Assert.isFalse(Objects.isNull(customerAdviceInfo.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); @@ -64,7 +64,7 @@ } @ApiOperation("客户投诉新增") - @RequestMapping("/add") + @PostMapping("/add") public ReturnDTO addAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { Assert.isFalse(bindingResult.hasErrors(), () -> { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); @@ -72,9 +72,18 @@ return ReturnUtil.success(customerAdviceService.addAdvice(customerAdviceInfo)); } + @ApiOperation("客户投诉删除") + @PostMapping("/delete") + public ReturnDTO deleteAdvice(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerAdviceService.deleteAdvice(idDTO.getId())); + } + //*******************************************************************************************************************// @ApiOperation("客户投诉导出") - @RequestMapping("/export") + @PostMapping("/export") public void exportAdvice(@RequestBody @Valid CustomerAdviceListRequest request, HttpServletResponse response) { customerAdviceService.adviceExport(request, response); } 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 c59faa6..cbcef48 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 @@ -21,6 +21,7 @@ import lombok.AllArgsConstructor; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -37,7 +38,7 @@ private final CustomerService customerService; @ApiOperation("客户基本信息列表") - @RequestMapping("/listPage") + @PostMapping("/listPage") public ReturnDTO> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception { if (bindingResult.hasErrors()) { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); @@ -47,7 +48,7 @@ } @ApiOperation("客户新增") - @RequestMapping("/add") + @PostMapping("/add") public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { if (bindingResult.hasErrors()) { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); @@ -56,7 +57,7 @@ } @ApiOperation("客户更新") - @RequestMapping("/update") + @PostMapping("/update") public ReturnDTO updateCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { if (bindingResult.hasErrors()) { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); @@ -65,7 +66,7 @@ } @ApiOperation("客户详情") - @RequestMapping("/detail") + @PostMapping("/detail") public ReturnDTO customerDetail(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); @@ -74,7 +75,7 @@ } @ApiOperation("根据客户id查询样品记录-分页") - @RequestMapping("/sampleRecords") + @PostMapping("/sampleRecords") public ReturnDTO> sampleRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); @@ -83,7 +84,7 @@ } @ApiOperation("根据客户id查询合同记录-分页") - @RequestMapping("/contractRecords") + @PostMapping("/contractRecords") public ReturnDTO> contractRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); @@ -92,7 +93,7 @@ } @ApiOperation("根据客户id查询检定记录-分页") - @RequestMapping("/mesureRecords") + @PostMapping("/mesureRecords") public ReturnDTO> mesureRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); @@ -100,8 +101,18 @@ return ReturnUtil.success(super.packForBT(customerService.mesureRecordsByCustomerId(idDTO.getId()))); } + + @ApiOperation("客户删除") + @PostMapping("/delete") + public ReturnDTO deleteCsutomer(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerService.deleteCustomer(idDTO.getId())); + } + @ApiOperation("根据客户id查询检定证书-分页") - @RequestMapping("/certificateRecords") + @PostMapping("/certificateRecords") public ReturnDTO> certificationByCustomerId(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); @@ -110,14 +121,14 @@ } @ApiOperation("客户导出") - @RequestMapping("/export") + @PostMapping("/export") public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response){ customerService.customerExport(request, response); } //*******************************************************************************************************************// // @ApiOperation("客户批量导入") -// @RequestMapping("/batchImport") +// @PostMapping("/batchImport") // public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { // Assert.isFalse(bindingResult.hasErrors(), () -> { // throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java index 0d7320f..609d1d0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java @@ -14,7 +14,6 @@ import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.customer.CustomerAdviceInfo; import com.casic.missiles.model.customer.CustomerSampleInfo; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.customer.CustomerSampleService; @@ -23,6 +22,7 @@ import lombok.AllArgsConstructor; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -39,7 +39,7 @@ private final CustomerSampleService customerSampleService; @ApiOperation("样品列表查询-分页") - @RequestMapping("/listPage") + @PostMapping("/listPage") public ReturnDTO> listPage(@RequestBody @Valid CustomerSampleListRequest request, BindingResult bindingResult) throws Exception { if (bindingResult.hasErrors()) { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); @@ -49,7 +49,7 @@ } @ApiOperation("样品新增") - @RequestMapping("/add") + @PostMapping("/add") public ReturnDTO addSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { if (bindingResult.hasErrors()) { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); @@ -58,7 +58,7 @@ } @ApiOperation("样品编辑") - @RequestMapping("/update") + @PostMapping("/update") public ReturnDTO updateSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { Assert.isFalse(Objects.isNull(customerSampleInfo.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); @@ -70,7 +70,7 @@ } @ApiOperation("样品详情") - @RequestMapping("/detail") + @PostMapping("/detail") public ReturnDTO sampleDetail(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); @@ -79,7 +79,7 @@ } @ApiOperation("列表数据删除") - @RequestMapping("/delete") + @PostMapping("/delete") public ReturnDTO deleteSample(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); @@ -88,13 +88,13 @@ } @ApiOperation("样品导出") - @RequestMapping("/export") + @PostMapping("/export") public void sampleExport(@RequestBody @Valid CustomerSampleListRequest request, HttpServletResponse response) { customerSampleService.sampleExport(request, response); } @ApiOperation("根据样品id查询检定记录") - @RequestMapping("/mesureRecordsBySampleId") + @PostMapping("/mesureRecordsBySampleId") public ReturnDTO> mesureRecordsBySampleId(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); @@ -103,7 +103,7 @@ } @ApiOperation("根据样品id查询检定证书") - @RequestMapping("/certificationBySampleId") + @PostMapping("/certificationBySampleId") public ReturnDTO> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); @@ -112,7 +112,7 @@ } // @ApiOperation("样品批量导入") -// @RequestMapping("/batchImport") +// @PostMapping("/batchImport") // public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { // Assert.isFalse(bindingResult.hasErrors(), () -> { // throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java index 7747976..1acf525 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java @@ -7,6 +7,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -19,25 +20,25 @@ private final CustomerWorkbenchService customerWorkbenchService; @ApiOperation("样品新增趋势") - @RequestMapping("/sample/increaseTrend") + @PostMapping("/sample/increaseTrend") public ReturnDTO increaseTrend() { return ReturnUtil.success(customerWorkbenchService.sampleIncreaseTrend()); } @ApiOperation("样品到期趋势") - @RequestMapping("/sample/expireTrend") + @PostMapping("/sample/expireTrend") public ReturnDTOquerySampleExpireTrend() { return ReturnUtil.success(customerWorkbenchService.querySampleExpireTrend()); } @ApiOperation("客户新增趋势") - @RequestMapping("/increaseTrend") + @PostMapping("/increaseTrend") public ReturnDTO customerIncreaseTrend() { return ReturnUtil.success(customerWorkbenchService.customerIncreaseTrend()); } @ApiOperation("优质客户名单") - @RequestMapping("/excellentList") + @PostMapping("/excellentList") public ReturnDTO customerExcellentList() { return ReturnUtil.success(customerWorkbenchService.customerExcellentList()); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java index 2451100..04538a3 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java @@ -1,8 +1,32 @@ package com.casic.missiles.controller.business; +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.order.OrderListReponse; +import com.casic.missiles.dto.business.order.OrderListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.business.BusinessOrder; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.business.IBusinessOrderService; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + /** *

* 业务管理-委托书 前端控制器 @@ -13,6 +37,96 @@ */ @RestController @RequestMapping("/business/order") -public class BusinessOrderController { +@AllArgsConstructor +public class BusinessOrderController extends ExportController { + + private final IBusinessOrderService businessOrderService; + + @ApiOperation("委托书查询") + @PostMapping("/listPage") + public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request))); + } + + @ApiOperation("委托书详情") + @PostMapping("/detail") + public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(businessOrderService.orderDetail(idDTO.getId())); + } + + @ApiOperation("委托书更新") + @PostMapping("/update") + public ReturnDTO updateAdvice(@RequestBody @Valid BusinessOrder businessOrder, BindingResult bindingResult){ + Assert.isFalse(Objects.isNull(businessOrder.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(businessOrderService.updateOrder(businessOrder)); + } + + @ApiOperation("委托书新增") + @PostMapping("/add") + public ReturnDTO addAdvice(@RequestBody @Valid BusinessOrder businessOrder, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(businessOrderService.addOrder(businessOrder)); + } + + @ApiOperation("委托书删除（暂不使用，无此功能）") + @PostMapping("/delete") + public ReturnDTO deleteAdvice(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(businessOrderService.deleteOrder(idDTO.getId())); + } + + //*******************************************************************************************************************// + @ApiOperation("委托书导出") + @PostMapping("/export") + public void exportAdvice(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) { + businessOrderService.orderExport(request, response); + } + + + //*******************************************************************************************************************// + @ApiOperation("委托书取消") + @PostMapping("/cancel") + public ReturnDTO cancelOrder(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(businessOrderService.updateStatusById(idDTO.getId(),"3")); + } + + //*******************************************************************************************************************// + @ApiOperation("委托书接收") + @PostMapping("/receive") + public ReturnDTO receiveOrder(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(businessOrderService.updateStatusById(idDTO.getId(),"2")); + } + + //*******************************************************************************************************************// + @ApiOperation("委托书退回") + @PostMapping("/back") + public ReturnDTO backOrder(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(businessOrderService.updateStatusById(idDTO.getId(),"2")); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java index 8a02be1..077014f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java @@ -33,7 +33,7 @@ private final CustomerAdviceService customerAdviceService; @ApiOperation("客户投诉查询") - @RequestMapping("/listPage") + @PostMapping("/listPage") public ReturnDTO> adviceListPage(@RequestBody @Valid CustomerAdviceListRequest request, BindingResult bindingResult) throws Exception { if (bindingResult.hasErrors()) { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); @@ -43,7 +43,7 @@ } @ApiOperation("客户投诉详情") - @RequestMapping("/detail") + @PostMapping("/detail") public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); @@ -52,7 +52,7 @@ } @ApiOperation("客户投诉更新") - @RequestMapping("/update") + @PostMapping("/update") public ReturnDTO updateAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult){ Assert.isFalse(Objects.isNull(customerAdviceInfo.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); @@ -64,7 +64,7 @@ } @ApiOperation("客户投诉新增") - @RequestMapping("/add") + @PostMapping("/add") public ReturnDTO addAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { Assert.isFalse(bindingResult.hasErrors(), () -> { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); @@ -72,9 +72,18 @@ return ReturnUtil.success(customerAdviceService.addAdvice(customerAdviceInfo)); } + @ApiOperation("客户投诉删除") + @PostMapping("/delete") + public ReturnDTO deleteAdvice(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerAdviceService.deleteAdvice(idDTO.getId())); + } + //*******************************************************************************************************************// @ApiOperation("客户投诉导出") - @RequestMapping("/export") + @PostMapping("/export") public void exportAdvice(@RequestBody @Valid CustomerAdviceListRequest request, HttpServletResponse response) { customerAdviceService.adviceExport(request, response); } 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 c59faa6..cbcef48 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 @@ -21,6 +21,7 @@ import lombok.AllArgsConstructor; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -37,7 +38,7 @@ private final CustomerService customerService; @ApiOperation("客户基本信息列表") - @RequestMapping("/listPage") + @PostMapping("/listPage") public ReturnDTO> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception { if (bindingResult.hasErrors()) { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); @@ -47,7 +48,7 @@ } @ApiOperation("客户新增") - @RequestMapping("/add") + @PostMapping("/add") public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { if (bindingResult.hasErrors()) { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); @@ -56,7 +57,7 @@ } @ApiOperation("客户更新") - @RequestMapping("/update") + @PostMapping("/update") public ReturnDTO updateCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { if (bindingResult.hasErrors()) { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); @@ -65,7 +66,7 @@ } @ApiOperation("客户详情") - @RequestMapping("/detail") + @PostMapping("/detail") public ReturnDTO customerDetail(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); @@ -74,7 +75,7 @@ } @ApiOperation("根据客户id查询样品记录-分页") - @RequestMapping("/sampleRecords") + @PostMapping("/sampleRecords") public ReturnDTO> sampleRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); @@ -83,7 +84,7 @@ } @ApiOperation("根据客户id查询合同记录-分页") - @RequestMapping("/contractRecords") + @PostMapping("/contractRecords") public ReturnDTO> contractRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); @@ -92,7 +93,7 @@ } @ApiOperation("根据客户id查询检定记录-分页") - @RequestMapping("/mesureRecords") + @PostMapping("/mesureRecords") public ReturnDTO> mesureRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); @@ -100,8 +101,18 @@ return ReturnUtil.success(super.packForBT(customerService.mesureRecordsByCustomerId(idDTO.getId()))); } + + @ApiOperation("客户删除") + @PostMapping("/delete") + public ReturnDTO deleteCsutomer(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerService.deleteCustomer(idDTO.getId())); + } + @ApiOperation("根据客户id查询检定证书-分页") - @RequestMapping("/certificateRecords") + @PostMapping("/certificateRecords") public ReturnDTO> certificationByCustomerId(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); @@ -110,14 +121,14 @@ } @ApiOperation("客户导出") - @RequestMapping("/export") + @PostMapping("/export") public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response){ customerService.customerExport(request, response); } //*******************************************************************************************************************// // @ApiOperation("客户批量导入") -// @RequestMapping("/batchImport") +// @PostMapping("/batchImport") // public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { // Assert.isFalse(bindingResult.hasErrors(), () -> { // throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java index 0d7320f..609d1d0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java @@ -14,7 +14,6 @@ import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.customer.CustomerAdviceInfo; import com.casic.missiles.model.customer.CustomerSampleInfo; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.customer.CustomerSampleService; @@ -23,6 +22,7 @@ import lombok.AllArgsConstructor; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -39,7 +39,7 @@ private final CustomerSampleService customerSampleService; @ApiOperation("样品列表查询-分页") - @RequestMapping("/listPage") + @PostMapping("/listPage") public ReturnDTO> listPage(@RequestBody @Valid CustomerSampleListRequest request, BindingResult bindingResult) throws Exception { if (bindingResult.hasErrors()) { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); @@ -49,7 +49,7 @@ } @ApiOperation("样品新增") - @RequestMapping("/add") + @PostMapping("/add") public ReturnDTO addSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { if (bindingResult.hasErrors()) { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); @@ -58,7 +58,7 @@ } @ApiOperation("样品编辑") - @RequestMapping("/update") + @PostMapping("/update") public ReturnDTO updateSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { Assert.isFalse(Objects.isNull(customerSampleInfo.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); @@ -70,7 +70,7 @@ } @ApiOperation("样品详情") - @RequestMapping("/detail") + @PostMapping("/detail") public ReturnDTO sampleDetail(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); @@ -79,7 +79,7 @@ } @ApiOperation("列表数据删除") - @RequestMapping("/delete") + @PostMapping("/delete") public ReturnDTO deleteSample(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); @@ -88,13 +88,13 @@ } @ApiOperation("样品导出") - @RequestMapping("/export") + @PostMapping("/export") public void sampleExport(@RequestBody @Valid CustomerSampleListRequest request, HttpServletResponse response) { customerSampleService.sampleExport(request, response); } @ApiOperation("根据样品id查询检定记录") - @RequestMapping("/mesureRecordsBySampleId") + @PostMapping("/mesureRecordsBySampleId") public ReturnDTO> mesureRecordsBySampleId(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); @@ -103,7 +103,7 @@ } @ApiOperation("根据样品id查询检定证书") - @RequestMapping("/certificationBySampleId") + @PostMapping("/certificationBySampleId") public ReturnDTO> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); @@ -112,7 +112,7 @@ } // @ApiOperation("样品批量导入") -// @RequestMapping("/batchImport") +// @PostMapping("/batchImport") // public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { // Assert.isFalse(bindingResult.hasErrors(), () -> { // throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java index 7747976..1acf525 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java @@ -7,6 +7,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -19,25 +20,25 @@ private final CustomerWorkbenchService customerWorkbenchService; @ApiOperation("样品新增趋势") - @RequestMapping("/sample/increaseTrend") + @PostMapping("/sample/increaseTrend") public ReturnDTO increaseTrend() { return ReturnUtil.success(customerWorkbenchService.sampleIncreaseTrend()); } @ApiOperation("样品到期趋势") - @RequestMapping("/sample/expireTrend") + @PostMapping("/sample/expireTrend") public ReturnDTOquerySampleExpireTrend() { return ReturnUtil.success(customerWorkbenchService.querySampleExpireTrend()); } @ApiOperation("客户新增趋势") - @RequestMapping("/increaseTrend") + @PostMapping("/increaseTrend") public ReturnDTO customerIncreaseTrend() { return ReturnUtil.success(customerWorkbenchService.customerIncreaseTrend()); } @ApiOperation("优质客户名单") - @RequestMapping("/excellentList") + @PostMapping("/excellentList") public ReturnDTO customerExcellentList() { return ReturnUtil.success(customerWorkbenchService.customerExcellentList()); } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index b139d8a..47b5dd7 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -29,6 +29,7 @@ STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"), METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"), CUSTOMER_EXPORT("customerData", "customerData", "客户信息"), + ORDER_EXPORT("orderData", "orderData", "委托书信息"), SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"), ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java index 2451100..04538a3 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java @@ -1,8 +1,32 @@ package com.casic.missiles.controller.business; +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.order.OrderListReponse; +import com.casic.missiles.dto.business.order.OrderListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.business.BusinessOrder; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.business.IBusinessOrderService; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + /** *

* 业务管理-委托书 前端控制器 @@ -13,6 +37,96 @@ */ @RestController @RequestMapping("/business/order") -public class BusinessOrderController { +@AllArgsConstructor +public class BusinessOrderController extends ExportController { + + private final IBusinessOrderService businessOrderService; + + @ApiOperation("委托书查询") + @PostMapping("/listPage") + public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request))); + } + + @ApiOperation("委托书详情") + @PostMapping("/detail") + public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(businessOrderService.orderDetail(idDTO.getId())); + } + + @ApiOperation("委托书更新") + @PostMapping("/update") + public ReturnDTO updateAdvice(@RequestBody @Valid BusinessOrder businessOrder, BindingResult bindingResult){ + Assert.isFalse(Objects.isNull(businessOrder.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(businessOrderService.updateOrder(businessOrder)); + } + + @ApiOperation("委托书新增") + @PostMapping("/add") + public ReturnDTO addAdvice(@RequestBody @Valid BusinessOrder businessOrder, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(businessOrderService.addOrder(businessOrder)); + } + + @ApiOperation("委托书删除（暂不使用，无此功能）") + @PostMapping("/delete") + public ReturnDTO deleteAdvice(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(businessOrderService.deleteOrder(idDTO.getId())); + } + + //*******************************************************************************************************************// + @ApiOperation("委托书导出") + @PostMapping("/export") + public void exportAdvice(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) { + businessOrderService.orderExport(request, response); + } + + + //*******************************************************************************************************************// + @ApiOperation("委托书取消") + @PostMapping("/cancel") + public ReturnDTO cancelOrder(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(businessOrderService.updateStatusById(idDTO.getId(),"3")); + } + + //*******************************************************************************************************************// + @ApiOperation("委托书接收") + @PostMapping("/receive") + public ReturnDTO receiveOrder(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(businessOrderService.updateStatusById(idDTO.getId(),"2")); + } + + //*******************************************************************************************************************// + @ApiOperation("委托书退回") + @PostMapping("/back") + public ReturnDTO backOrder(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(businessOrderService.updateStatusById(idDTO.getId(),"2")); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java index 8a02be1..077014f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java @@ -33,7 +33,7 @@ private final CustomerAdviceService customerAdviceService; @ApiOperation("客户投诉查询") - @RequestMapping("/listPage") + @PostMapping("/listPage") public ReturnDTO> adviceListPage(@RequestBody @Valid CustomerAdviceListRequest request, BindingResult bindingResult) throws Exception { if (bindingResult.hasErrors()) { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); @@ -43,7 +43,7 @@ } @ApiOperation("客户投诉详情") - @RequestMapping("/detail") + @PostMapping("/detail") public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); @@ -52,7 +52,7 @@ } @ApiOperation("客户投诉更新") - @RequestMapping("/update") + @PostMapping("/update") public ReturnDTO updateAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult){ Assert.isFalse(Objects.isNull(customerAdviceInfo.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); @@ -64,7 +64,7 @@ } @ApiOperation("客户投诉新增") - @RequestMapping("/add") + @PostMapping("/add") public ReturnDTO addAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { Assert.isFalse(bindingResult.hasErrors(), () -> { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); @@ -72,9 +72,18 @@ return ReturnUtil.success(customerAdviceService.addAdvice(customerAdviceInfo)); } + @ApiOperation("客户投诉删除") + @PostMapping("/delete") + public ReturnDTO deleteAdvice(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerAdviceService.deleteAdvice(idDTO.getId())); + } + //*******************************************************************************************************************// @ApiOperation("客户投诉导出") - @RequestMapping("/export") + @PostMapping("/export") public void exportAdvice(@RequestBody @Valid CustomerAdviceListRequest request, HttpServletResponse response) { customerAdviceService.adviceExport(request, response); } 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 c59faa6..cbcef48 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 @@ -21,6 +21,7 @@ import lombok.AllArgsConstructor; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -37,7 +38,7 @@ private final CustomerService customerService; @ApiOperation("客户基本信息列表") - @RequestMapping("/listPage") + @PostMapping("/listPage") public ReturnDTO> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception { if (bindingResult.hasErrors()) { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); @@ -47,7 +48,7 @@ } @ApiOperation("客户新增") - @RequestMapping("/add") + @PostMapping("/add") public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { if (bindingResult.hasErrors()) { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); @@ -56,7 +57,7 @@ } @ApiOperation("客户更新") - @RequestMapping("/update") + @PostMapping("/update") public ReturnDTO updateCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { if (bindingResult.hasErrors()) { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); @@ -65,7 +66,7 @@ } @ApiOperation("客户详情") - @RequestMapping("/detail") + @PostMapping("/detail") public ReturnDTO customerDetail(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); @@ -74,7 +75,7 @@ } @ApiOperation("根据客户id查询样品记录-分页") - @RequestMapping("/sampleRecords") + @PostMapping("/sampleRecords") public ReturnDTO> sampleRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); @@ -83,7 +84,7 @@ } @ApiOperation("根据客户id查询合同记录-分页") - @RequestMapping("/contractRecords") + @PostMapping("/contractRecords") public ReturnDTO> contractRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); @@ -92,7 +93,7 @@ } @ApiOperation("根据客户id查询检定记录-分页") - @RequestMapping("/mesureRecords") + @PostMapping("/mesureRecords") public ReturnDTO> mesureRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); @@ -100,8 +101,18 @@ return ReturnUtil.success(super.packForBT(customerService.mesureRecordsByCustomerId(idDTO.getId()))); } + + @ApiOperation("客户删除") + @PostMapping("/delete") + public ReturnDTO deleteCsutomer(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerService.deleteCustomer(idDTO.getId())); + } + @ApiOperation("根据客户id查询检定证书-分页") - @RequestMapping("/certificateRecords") + @PostMapping("/certificateRecords") public ReturnDTO> certificationByCustomerId(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); @@ -110,14 +121,14 @@ } @ApiOperation("客户导出") - @RequestMapping("/export") + @PostMapping("/export") public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response){ customerService.customerExport(request, response); } //*******************************************************************************************************************// // @ApiOperation("客户批量导入") -// @RequestMapping("/batchImport") +// @PostMapping("/batchImport") // public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { // Assert.isFalse(bindingResult.hasErrors(), () -> { // throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java index 0d7320f..609d1d0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java @@ -14,7 +14,6 @@ import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.customer.CustomerAdviceInfo; import com.casic.missiles.model.customer.CustomerSampleInfo; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.customer.CustomerSampleService; @@ -23,6 +22,7 @@ import lombok.AllArgsConstructor; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -39,7 +39,7 @@ private final CustomerSampleService customerSampleService; @ApiOperation("样品列表查询-分页") - @RequestMapping("/listPage") + @PostMapping("/listPage") public ReturnDTO> listPage(@RequestBody @Valid CustomerSampleListRequest request, BindingResult bindingResult) throws Exception { if (bindingResult.hasErrors()) { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); @@ -49,7 +49,7 @@ } @ApiOperation("样品新增") - @RequestMapping("/add") + @PostMapping("/add") public ReturnDTO addSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { if (bindingResult.hasErrors()) { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); @@ -58,7 +58,7 @@ } @ApiOperation("样品编辑") - @RequestMapping("/update") + @PostMapping("/update") public ReturnDTO updateSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { Assert.isFalse(Objects.isNull(customerSampleInfo.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); @@ -70,7 +70,7 @@ } @ApiOperation("样品详情") - @RequestMapping("/detail") + @PostMapping("/detail") public ReturnDTO sampleDetail(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); @@ -79,7 +79,7 @@ } @ApiOperation("列表数据删除") - @RequestMapping("/delete") + @PostMapping("/delete") public ReturnDTO deleteSample(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); @@ -88,13 +88,13 @@ } @ApiOperation("样品导出") - @RequestMapping("/export") + @PostMapping("/export") public void sampleExport(@RequestBody @Valid CustomerSampleListRequest request, HttpServletResponse response) { customerSampleService.sampleExport(request, response); } @ApiOperation("根据样品id查询检定记录") - @RequestMapping("/mesureRecordsBySampleId") + @PostMapping("/mesureRecordsBySampleId") public ReturnDTO> mesureRecordsBySampleId(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); @@ -103,7 +103,7 @@ } @ApiOperation("根据样品id查询检定证书") - @RequestMapping("/certificationBySampleId") + @PostMapping("/certificationBySampleId") public ReturnDTO> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); @@ -112,7 +112,7 @@ } // @ApiOperation("样品批量导入") -// @RequestMapping("/batchImport") +// @PostMapping("/batchImport") // public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { // Assert.isFalse(bindingResult.hasErrors(), () -> { // throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java index 7747976..1acf525 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java @@ -7,6 +7,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -19,25 +20,25 @@ private final CustomerWorkbenchService customerWorkbenchService; @ApiOperation("样品新增趋势") - @RequestMapping("/sample/increaseTrend") + @PostMapping("/sample/increaseTrend") public ReturnDTO increaseTrend() { return ReturnUtil.success(customerWorkbenchService.sampleIncreaseTrend()); } @ApiOperation("样品到期趋势") - @RequestMapping("/sample/expireTrend") + @PostMapping("/sample/expireTrend") public ReturnDTOquerySampleExpireTrend() { return ReturnUtil.success(customerWorkbenchService.querySampleExpireTrend()); } @ApiOperation("客户新增趋势") - @RequestMapping("/increaseTrend") + @PostMapping("/increaseTrend") public ReturnDTO customerIncreaseTrend() { return ReturnUtil.success(customerWorkbenchService.customerIncreaseTrend()); } @ApiOperation("优质客户名单") - @RequestMapping("/excellentList") + @PostMapping("/excellentList") public ReturnDTO customerExcellentList() { return ReturnUtil.success(customerWorkbenchService.customerExcellentList()); } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index b139d8a..47b5dd7 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -29,6 +29,7 @@ STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"), METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"), CUSTOMER_EXPORT("customerData", "customerData", "客户信息"), + ORDER_EXPORT("orderData", "orderData", "委托书信息"), SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"), ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderListReponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderListReponseMapper.java new file mode 100644 index 0000000..b064ac2 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderListReponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.business.order.OrderListReponse; + +public interface BusinessOrderListReponseMapper extends BaseMapper { +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java index 2451100..04538a3 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java @@ -1,8 +1,32 @@ package com.casic.missiles.controller.business; +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.order.OrderListReponse; +import com.casic.missiles.dto.business.order.OrderListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.business.BusinessOrder; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.business.IBusinessOrderService; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + /** *

* 业务管理-委托书 前端控制器 @@ -13,6 +37,96 @@ */ @RestController @RequestMapping("/business/order") -public class BusinessOrderController { +@AllArgsConstructor +public class BusinessOrderController extends ExportController { + + private final IBusinessOrderService businessOrderService; + + @ApiOperation("委托书查询") + @PostMapping("/listPage") + public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request))); + } + + @ApiOperation("委托书详情") + @PostMapping("/detail") + public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(businessOrderService.orderDetail(idDTO.getId())); + } + + @ApiOperation("委托书更新") + @PostMapping("/update") + public ReturnDTO updateAdvice(@RequestBody @Valid BusinessOrder businessOrder, BindingResult bindingResult){ + Assert.isFalse(Objects.isNull(businessOrder.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(businessOrderService.updateOrder(businessOrder)); + } + + @ApiOperation("委托书新增") + @PostMapping("/add") + public ReturnDTO addAdvice(@RequestBody @Valid BusinessOrder businessOrder, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(businessOrderService.addOrder(businessOrder)); + } + + @ApiOperation("委托书删除（暂不使用，无此功能）") + @PostMapping("/delete") + public ReturnDTO deleteAdvice(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(businessOrderService.deleteOrder(idDTO.getId())); + } + + //*******************************************************************************************************************// + @ApiOperation("委托书导出") + @PostMapping("/export") + public void exportAdvice(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) { + businessOrderService.orderExport(request, response); + } + + + //*******************************************************************************************************************// + @ApiOperation("委托书取消") + @PostMapping("/cancel") + public ReturnDTO cancelOrder(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(businessOrderService.updateStatusById(idDTO.getId(),"3")); + } + + //*******************************************************************************************************************// + @ApiOperation("委托书接收") + @PostMapping("/receive") + public ReturnDTO receiveOrder(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(businessOrderService.updateStatusById(idDTO.getId(),"2")); + } + + //*******************************************************************************************************************// + @ApiOperation("委托书退回") + @PostMapping("/back") + public ReturnDTO backOrder(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(businessOrderService.updateStatusById(idDTO.getId(),"2")); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java index 8a02be1..077014f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java @@ -33,7 +33,7 @@ private final CustomerAdviceService customerAdviceService; @ApiOperation("客户投诉查询") - @RequestMapping("/listPage") + @PostMapping("/listPage") public ReturnDTO> adviceListPage(@RequestBody @Valid CustomerAdviceListRequest request, BindingResult bindingResult) throws Exception { if (bindingResult.hasErrors()) { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); @@ -43,7 +43,7 @@ } @ApiOperation("客户投诉详情") - @RequestMapping("/detail") + @PostMapping("/detail") public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); @@ -52,7 +52,7 @@ } @ApiOperation("客户投诉更新") - @RequestMapping("/update") + @PostMapping("/update") public ReturnDTO updateAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult){ Assert.isFalse(Objects.isNull(customerAdviceInfo.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); @@ -64,7 +64,7 @@ } @ApiOperation("客户投诉新增") - @RequestMapping("/add") + @PostMapping("/add") public ReturnDTO addAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { Assert.isFalse(bindingResult.hasErrors(), () -> { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); @@ -72,9 +72,18 @@ return ReturnUtil.success(customerAdviceService.addAdvice(customerAdviceInfo)); } + @ApiOperation("客户投诉删除") + @PostMapping("/delete") + public ReturnDTO deleteAdvice(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerAdviceService.deleteAdvice(idDTO.getId())); + } + //*******************************************************************************************************************// @ApiOperation("客户投诉导出") - @RequestMapping("/export") + @PostMapping("/export") public void exportAdvice(@RequestBody @Valid CustomerAdviceListRequest request, HttpServletResponse response) { customerAdviceService.adviceExport(request, response); } 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 c59faa6..cbcef48 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 @@ -21,6 +21,7 @@ import lombok.AllArgsConstructor; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -37,7 +38,7 @@ private final CustomerService customerService; @ApiOperation("客户基本信息列表") - @RequestMapping("/listPage") + @PostMapping("/listPage") public ReturnDTO> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception { if (bindingResult.hasErrors()) { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); @@ -47,7 +48,7 @@ } @ApiOperation("客户新增") - @RequestMapping("/add") + @PostMapping("/add") public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { if (bindingResult.hasErrors()) { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); @@ -56,7 +57,7 @@ } @ApiOperation("客户更新") - @RequestMapping("/update") + @PostMapping("/update") public ReturnDTO updateCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { if (bindingResult.hasErrors()) { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); @@ -65,7 +66,7 @@ } @ApiOperation("客户详情") - @RequestMapping("/detail") + @PostMapping("/detail") public ReturnDTO customerDetail(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); @@ -74,7 +75,7 @@ } @ApiOperation("根据客户id查询样品记录-分页") - @RequestMapping("/sampleRecords") + @PostMapping("/sampleRecords") public ReturnDTO> sampleRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); @@ -83,7 +84,7 @@ } @ApiOperation("根据客户id查询合同记录-分页") - @RequestMapping("/contractRecords") + @PostMapping("/contractRecords") public ReturnDTO> contractRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); @@ -92,7 +93,7 @@ } @ApiOperation("根据客户id查询检定记录-分页") - @RequestMapping("/mesureRecords") + @PostMapping("/mesureRecords") public ReturnDTO> mesureRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); @@ -100,8 +101,18 @@ return ReturnUtil.success(super.packForBT(customerService.mesureRecordsByCustomerId(idDTO.getId()))); } + + @ApiOperation("客户删除") + @PostMapping("/delete") + public ReturnDTO deleteCsutomer(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerService.deleteCustomer(idDTO.getId())); + } + @ApiOperation("根据客户id查询检定证书-分页") - @RequestMapping("/certificateRecords") + @PostMapping("/certificateRecords") public ReturnDTO> certificationByCustomerId(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); @@ -110,14 +121,14 @@ } @ApiOperation("客户导出") - @RequestMapping("/export") + @PostMapping("/export") public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response){ customerService.customerExport(request, response); } //*******************************************************************************************************************// // @ApiOperation("客户批量导入") -// @RequestMapping("/batchImport") +// @PostMapping("/batchImport") // public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { // Assert.isFalse(bindingResult.hasErrors(), () -> { // throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java index 0d7320f..609d1d0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java @@ -14,7 +14,6 @@ import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.customer.CustomerAdviceInfo; import com.casic.missiles.model.customer.CustomerSampleInfo; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.customer.CustomerSampleService; @@ -23,6 +22,7 @@ import lombok.AllArgsConstructor; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -39,7 +39,7 @@ private final CustomerSampleService customerSampleService; @ApiOperation("样品列表查询-分页") - @RequestMapping("/listPage") + @PostMapping("/listPage") public ReturnDTO> listPage(@RequestBody @Valid CustomerSampleListRequest request, BindingResult bindingResult) throws Exception { if (bindingResult.hasErrors()) { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); @@ -49,7 +49,7 @@ } @ApiOperation("样品新增") - @RequestMapping("/add") + @PostMapping("/add") public ReturnDTO addSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { if (bindingResult.hasErrors()) { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); @@ -58,7 +58,7 @@ } @ApiOperation("样品编辑") - @RequestMapping("/update") + @PostMapping("/update") public ReturnDTO updateSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { Assert.isFalse(Objects.isNull(customerSampleInfo.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); @@ -70,7 +70,7 @@ } @ApiOperation("样品详情") - @RequestMapping("/detail") + @PostMapping("/detail") public ReturnDTO sampleDetail(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); @@ -79,7 +79,7 @@ } @ApiOperation("列表数据删除") - @RequestMapping("/delete") + @PostMapping("/delete") public ReturnDTO deleteSample(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); @@ -88,13 +88,13 @@ } @ApiOperation("样品导出") - @RequestMapping("/export") + @PostMapping("/export") public void sampleExport(@RequestBody @Valid CustomerSampleListRequest request, HttpServletResponse response) { customerSampleService.sampleExport(request, response); } @ApiOperation("根据样品id查询检定记录") - @RequestMapping("/mesureRecordsBySampleId") + @PostMapping("/mesureRecordsBySampleId") public ReturnDTO> mesureRecordsBySampleId(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); @@ -103,7 +103,7 @@ } @ApiOperation("根据样品id查询检定证书") - @RequestMapping("/certificationBySampleId") + @PostMapping("/certificationBySampleId") public ReturnDTO> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); @@ -112,7 +112,7 @@ } // @ApiOperation("样品批量导入") -// @RequestMapping("/batchImport") +// @PostMapping("/batchImport") // public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { // Assert.isFalse(bindingResult.hasErrors(), () -> { // throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java index 7747976..1acf525 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java @@ -7,6 +7,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -19,25 +20,25 @@ private final CustomerWorkbenchService customerWorkbenchService; @ApiOperation("样品新增趋势") - @RequestMapping("/sample/increaseTrend") + @PostMapping("/sample/increaseTrend") public ReturnDTO increaseTrend() { return ReturnUtil.success(customerWorkbenchService.sampleIncreaseTrend()); } @ApiOperation("样品到期趋势") - @RequestMapping("/sample/expireTrend") + @PostMapping("/sample/expireTrend") public ReturnDTOquerySampleExpireTrend() { return ReturnUtil.success(customerWorkbenchService.querySampleExpireTrend()); } @ApiOperation("客户新增趋势") - @RequestMapping("/increaseTrend") + @PostMapping("/increaseTrend") public ReturnDTO customerIncreaseTrend() { return ReturnUtil.success(customerWorkbenchService.customerIncreaseTrend()); } @ApiOperation("优质客户名单") - @RequestMapping("/excellentList") + @PostMapping("/excellentList") public ReturnDTO customerExcellentList() { return ReturnUtil.success(customerWorkbenchService.customerExcellentList()); } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index b139d8a..47b5dd7 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -29,6 +29,7 @@ STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"), METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"), CUSTOMER_EXPORT("customerData", "customerData", "客户信息"), + ORDER_EXPORT("orderData", "orderData", "委托书信息"), SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"), ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderListReponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderListReponseMapper.java new file mode 100644 index 0000000..b064ac2 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderListReponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.business.order.OrderListReponse; + +public interface BusinessOrderListReponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java index 7182641..6eeb513 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.model.business.BusinessOrder; +import org.apache.ibatis.annotations.Select; /** *

@@ -13,4 +14,7 @@ */ public interface BusinessOrderMapper extends BaseMapper { + @Select("SELECT IFNULL(max(RIGHT(order_code, 12)), 0) from business_order") + Long selectMaxCOrderNo(); + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java index 2451100..04538a3 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java @@ -1,8 +1,32 @@ package com.casic.missiles.controller.business; +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.order.OrderListReponse; +import com.casic.missiles.dto.business.order.OrderListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.business.BusinessOrder; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.business.IBusinessOrderService; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + /** *

* 业务管理-委托书 前端控制器 @@ -13,6 +37,96 @@ */ @RestController @RequestMapping("/business/order") -public class BusinessOrderController { +@AllArgsConstructor +public class BusinessOrderController extends ExportController { + + private final IBusinessOrderService businessOrderService; + + @ApiOperation("委托书查询") + @PostMapping("/listPage") + public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request))); + } + + @ApiOperation("委托书详情") + @PostMapping("/detail") + public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(businessOrderService.orderDetail(idDTO.getId())); + } + + @ApiOperation("委托书更新") + @PostMapping("/update") + public ReturnDTO updateAdvice(@RequestBody @Valid BusinessOrder businessOrder, BindingResult bindingResult){ + Assert.isFalse(Objects.isNull(businessOrder.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(businessOrderService.updateOrder(businessOrder)); + } + + @ApiOperation("委托书新增") + @PostMapping("/add") + public ReturnDTO addAdvice(@RequestBody @Valid BusinessOrder businessOrder, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(businessOrderService.addOrder(businessOrder)); + } + + @ApiOperation("委托书删除（暂不使用，无此功能）") + @PostMapping("/delete") + public ReturnDTO deleteAdvice(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(businessOrderService.deleteOrder(idDTO.getId())); + } + + //*******************************************************************************************************************// + @ApiOperation("委托书导出") + @PostMapping("/export") + public void exportAdvice(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) { + businessOrderService.orderExport(request, response); + } + + + //*******************************************************************************************************************// + @ApiOperation("委托书取消") + @PostMapping("/cancel") + public ReturnDTO cancelOrder(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(businessOrderService.updateStatusById(idDTO.getId(),"3")); + } + + //*******************************************************************************************************************// + @ApiOperation("委托书接收") + @PostMapping("/receive") + public ReturnDTO receiveOrder(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(businessOrderService.updateStatusById(idDTO.getId(),"2")); + } + + //*******************************************************************************************************************// + @ApiOperation("委托书退回") + @PostMapping("/back") + public ReturnDTO backOrder(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(businessOrderService.updateStatusById(idDTO.getId(),"2")); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java index 8a02be1..077014f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java @@ -33,7 +33,7 @@ private final CustomerAdviceService customerAdviceService; @ApiOperation("客户投诉查询") - @RequestMapping("/listPage") + @PostMapping("/listPage") public ReturnDTO> adviceListPage(@RequestBody @Valid CustomerAdviceListRequest request, BindingResult bindingResult) throws Exception { if (bindingResult.hasErrors()) { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); @@ -43,7 +43,7 @@ } @ApiOperation("客户投诉详情") - @RequestMapping("/detail") + @PostMapping("/detail") public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); @@ -52,7 +52,7 @@ } @ApiOperation("客户投诉更新") - @RequestMapping("/update") + @PostMapping("/update") public ReturnDTO updateAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult){ Assert.isFalse(Objects.isNull(customerAdviceInfo.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); @@ -64,7 +64,7 @@ } @ApiOperation("客户投诉新增") - @RequestMapping("/add") + @PostMapping("/add") public ReturnDTO addAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { Assert.isFalse(bindingResult.hasErrors(), () -> { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); @@ -72,9 +72,18 @@ return ReturnUtil.success(customerAdviceService.addAdvice(customerAdviceInfo)); } + @ApiOperation("客户投诉删除") + @PostMapping("/delete") + public ReturnDTO deleteAdvice(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerAdviceService.deleteAdvice(idDTO.getId())); + } + //*******************************************************************************************************************// @ApiOperation("客户投诉导出") - @RequestMapping("/export") + @PostMapping("/export") public void exportAdvice(@RequestBody @Valid CustomerAdviceListRequest request, HttpServletResponse response) { customerAdviceService.adviceExport(request, response); } 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 c59faa6..cbcef48 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 @@ -21,6 +21,7 @@ import lombok.AllArgsConstructor; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -37,7 +38,7 @@ private final CustomerService customerService; @ApiOperation("客户基本信息列表") - @RequestMapping("/listPage") + @PostMapping("/listPage") public ReturnDTO> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception { if (bindingResult.hasErrors()) { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); @@ -47,7 +48,7 @@ } @ApiOperation("客户新增") - @RequestMapping("/add") + @PostMapping("/add") public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { if (bindingResult.hasErrors()) { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); @@ -56,7 +57,7 @@ } @ApiOperation("客户更新") - @RequestMapping("/update") + @PostMapping("/update") public ReturnDTO updateCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { if (bindingResult.hasErrors()) { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); @@ -65,7 +66,7 @@ } @ApiOperation("客户详情") - @RequestMapping("/detail") + @PostMapping("/detail") public ReturnDTO customerDetail(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); @@ -74,7 +75,7 @@ } @ApiOperation("根据客户id查询样品记录-分页") - @RequestMapping("/sampleRecords") + @PostMapping("/sampleRecords") public ReturnDTO> sampleRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); @@ -83,7 +84,7 @@ } @ApiOperation("根据客户id查询合同记录-分页") - @RequestMapping("/contractRecords") + @PostMapping("/contractRecords") public ReturnDTO> contractRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); @@ -92,7 +93,7 @@ } @ApiOperation("根据客户id查询检定记录-分页") - @RequestMapping("/mesureRecords") + @PostMapping("/mesureRecords") public ReturnDTO> mesureRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); @@ -100,8 +101,18 @@ return ReturnUtil.success(super.packForBT(customerService.mesureRecordsByCustomerId(idDTO.getId()))); } + + @ApiOperation("客户删除") + @PostMapping("/delete") + public ReturnDTO deleteCsutomer(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerService.deleteCustomer(idDTO.getId())); + } + @ApiOperation("根据客户id查询检定证书-分页") - @RequestMapping("/certificateRecords") + @PostMapping("/certificateRecords") public ReturnDTO> certificationByCustomerId(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); @@ -110,14 +121,14 @@ } @ApiOperation("客户导出") - @RequestMapping("/export") + @PostMapping("/export") public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response){ customerService.customerExport(request, response); } //*******************************************************************************************************************// // @ApiOperation("客户批量导入") -// @RequestMapping("/batchImport") +// @PostMapping("/batchImport") // public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { // Assert.isFalse(bindingResult.hasErrors(), () -> { // throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java index 0d7320f..609d1d0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java @@ -14,7 +14,6 @@ import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.customer.CustomerAdviceInfo; import com.casic.missiles.model.customer.CustomerSampleInfo; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.customer.CustomerSampleService; @@ -23,6 +22,7 @@ import lombok.AllArgsConstructor; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -39,7 +39,7 @@ private final CustomerSampleService customerSampleService; @ApiOperation("样品列表查询-分页") - @RequestMapping("/listPage") + @PostMapping("/listPage") public ReturnDTO> listPage(@RequestBody @Valid CustomerSampleListRequest request, BindingResult bindingResult) throws Exception { if (bindingResult.hasErrors()) { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); @@ -49,7 +49,7 @@ } @ApiOperation("样品新增") - @RequestMapping("/add") + @PostMapping("/add") public ReturnDTO addSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { if (bindingResult.hasErrors()) { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); @@ -58,7 +58,7 @@ } @ApiOperation("样品编辑") - @RequestMapping("/update") + @PostMapping("/update") public ReturnDTO updateSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { Assert.isFalse(Objects.isNull(customerSampleInfo.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); @@ -70,7 +70,7 @@ } @ApiOperation("样品详情") - @RequestMapping("/detail") + @PostMapping("/detail") public ReturnDTO sampleDetail(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); @@ -79,7 +79,7 @@ } @ApiOperation("列表数据删除") - @RequestMapping("/delete") + @PostMapping("/delete") public ReturnDTO deleteSample(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); @@ -88,13 +88,13 @@ } @ApiOperation("样品导出") - @RequestMapping("/export") + @PostMapping("/export") public void sampleExport(@RequestBody @Valid CustomerSampleListRequest request, HttpServletResponse response) { customerSampleService.sampleExport(request, response); } @ApiOperation("根据样品id查询检定记录") - @RequestMapping("/mesureRecordsBySampleId") + @PostMapping("/mesureRecordsBySampleId") public ReturnDTO> mesureRecordsBySampleId(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); @@ -103,7 +103,7 @@ } @ApiOperation("根据样品id查询检定证书") - @RequestMapping("/certificationBySampleId") + @PostMapping("/certificationBySampleId") public ReturnDTO> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); @@ -112,7 +112,7 @@ } // @ApiOperation("样品批量导入") -// @RequestMapping("/batchImport") +// @PostMapping("/batchImport") // public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { // Assert.isFalse(bindingResult.hasErrors(), () -> { // throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java index 7747976..1acf525 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java @@ -7,6 +7,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -19,25 +20,25 @@ private final CustomerWorkbenchService customerWorkbenchService; @ApiOperation("样品新增趋势") - @RequestMapping("/sample/increaseTrend") + @PostMapping("/sample/increaseTrend") public ReturnDTO increaseTrend() { return ReturnUtil.success(customerWorkbenchService.sampleIncreaseTrend()); } @ApiOperation("样品到期趋势") - @RequestMapping("/sample/expireTrend") + @PostMapping("/sample/expireTrend") public ReturnDTOquerySampleExpireTrend() { return ReturnUtil.success(customerWorkbenchService.querySampleExpireTrend()); } @ApiOperation("客户新增趋势") - @RequestMapping("/increaseTrend") + @PostMapping("/increaseTrend") public ReturnDTO customerIncreaseTrend() { return ReturnUtil.success(customerWorkbenchService.customerIncreaseTrend()); } @ApiOperation("优质客户名单") - @RequestMapping("/excellentList") + @PostMapping("/excellentList") public ReturnDTO customerExcellentList() { return ReturnUtil.success(customerWorkbenchService.customerExcellentList()); } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index b139d8a..47b5dd7 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -29,6 +29,7 @@ STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"), METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"), CUSTOMER_EXPORT("customerData", "customerData", "客户信息"), + ORDER_EXPORT("orderData", "orderData", "委托书信息"), SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"), ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderListReponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderListReponseMapper.java new file mode 100644 index 0000000..b064ac2 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderListReponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.business.order.OrderListReponse; + +public interface BusinessOrderListReponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java index 7182641..6eeb513 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.model.business.BusinessOrder; +import org.apache.ibatis.annotations.Select; /** *

@@ -13,4 +14,7 @@ */ public interface BusinessOrderMapper extends BaseMapper { + @Select("SELECT IFNULL(max(RIGHT(order_code, 12)), 0) from business_order") + Long selectMaxCOrderNo(); + } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java index 76055e1..1bb682e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java @@ -2,11 +2,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.model.customer.CustomerSampleInfo; -import org.apache.ibatis.annotations.Select; public interface CustomerSampleMapper extends BaseMapper { - @Select("SELECT IFNULL(max(RIGHT(sample_no, 12)), 0) from customer_sample_info ") Long selectMaxSampleNo(); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java index 2451100..04538a3 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java @@ -1,8 +1,32 @@ package com.casic.missiles.controller.business; +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.order.OrderListReponse; +import com.casic.missiles.dto.business.order.OrderListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.business.BusinessOrder; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.business.IBusinessOrderService; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + /** *

* 业务管理-委托书 前端控制器 @@ -13,6 +37,96 @@ */ @RestController @RequestMapping("/business/order") -public class BusinessOrderController { +@AllArgsConstructor +public class BusinessOrderController extends ExportController { + + private final IBusinessOrderService businessOrderService; + + @ApiOperation("委托书查询") + @PostMapping("/listPage") + public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request))); + } + + @ApiOperation("委托书详情") + @PostMapping("/detail") + public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(businessOrderService.orderDetail(idDTO.getId())); + } + + @ApiOperation("委托书更新") + @PostMapping("/update") + public ReturnDTO updateAdvice(@RequestBody @Valid BusinessOrder businessOrder, BindingResult bindingResult){ + Assert.isFalse(Objects.isNull(businessOrder.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(businessOrderService.updateOrder(businessOrder)); + } + + @ApiOperation("委托书新增") + @PostMapping("/add") + public ReturnDTO addAdvice(@RequestBody @Valid BusinessOrder businessOrder, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(businessOrderService.addOrder(businessOrder)); + } + + @ApiOperation("委托书删除（暂不使用，无此功能）") + @PostMapping("/delete") + public ReturnDTO deleteAdvice(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(businessOrderService.deleteOrder(idDTO.getId())); + } + + //*******************************************************************************************************************// + @ApiOperation("委托书导出") + @PostMapping("/export") + public void exportAdvice(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) { + businessOrderService.orderExport(request, response); + } + + + //*******************************************************************************************************************// + @ApiOperation("委托书取消") + @PostMapping("/cancel") + public ReturnDTO cancelOrder(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(businessOrderService.updateStatusById(idDTO.getId(),"3")); + } + + //*******************************************************************************************************************// + @ApiOperation("委托书接收") + @PostMapping("/receive") + public ReturnDTO receiveOrder(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(businessOrderService.updateStatusById(idDTO.getId(),"2")); + } + + //*******************************************************************************************************************// + @ApiOperation("委托书退回") + @PostMapping("/back") + public ReturnDTO backOrder(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(businessOrderService.updateStatusById(idDTO.getId(),"2")); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java index 8a02be1..077014f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java @@ -33,7 +33,7 @@ private final CustomerAdviceService customerAdviceService; @ApiOperation("客户投诉查询") - @RequestMapping("/listPage") + @PostMapping("/listPage") public ReturnDTO> adviceListPage(@RequestBody @Valid CustomerAdviceListRequest request, BindingResult bindingResult) throws Exception { if (bindingResult.hasErrors()) { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); @@ -43,7 +43,7 @@ } @ApiOperation("客户投诉详情") - @RequestMapping("/detail") + @PostMapping("/detail") public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); @@ -52,7 +52,7 @@ } @ApiOperation("客户投诉更新") - @RequestMapping("/update") + @PostMapping("/update") public ReturnDTO updateAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult){ Assert.isFalse(Objects.isNull(customerAdviceInfo.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); @@ -64,7 +64,7 @@ } @ApiOperation("客户投诉新增") - @RequestMapping("/add") + @PostMapping("/add") public ReturnDTO addAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { Assert.isFalse(bindingResult.hasErrors(), () -> { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); @@ -72,9 +72,18 @@ return ReturnUtil.success(customerAdviceService.addAdvice(customerAdviceInfo)); } + @ApiOperation("客户投诉删除") + @PostMapping("/delete") + public ReturnDTO deleteAdvice(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerAdviceService.deleteAdvice(idDTO.getId())); + } + //*******************************************************************************************************************// @ApiOperation("客户投诉导出") - @RequestMapping("/export") + @PostMapping("/export") public void exportAdvice(@RequestBody @Valid CustomerAdviceListRequest request, HttpServletResponse response) { customerAdviceService.adviceExport(request, response); } 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 c59faa6..cbcef48 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 @@ -21,6 +21,7 @@ import lombok.AllArgsConstructor; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -37,7 +38,7 @@ private final CustomerService customerService; @ApiOperation("客户基本信息列表") - @RequestMapping("/listPage") + @PostMapping("/listPage") public ReturnDTO> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception { if (bindingResult.hasErrors()) { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); @@ -47,7 +48,7 @@ } @ApiOperation("客户新增") - @RequestMapping("/add") + @PostMapping("/add") public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { if (bindingResult.hasErrors()) { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); @@ -56,7 +57,7 @@ } @ApiOperation("客户更新") - @RequestMapping("/update") + @PostMapping("/update") public ReturnDTO updateCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { if (bindingResult.hasErrors()) { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); @@ -65,7 +66,7 @@ } @ApiOperation("客户详情") - @RequestMapping("/detail") + @PostMapping("/detail") public ReturnDTO customerDetail(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); @@ -74,7 +75,7 @@ } @ApiOperation("根据客户id查询样品记录-分页") - @RequestMapping("/sampleRecords") + @PostMapping("/sampleRecords") public ReturnDTO> sampleRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); @@ -83,7 +84,7 @@ } @ApiOperation("根据客户id查询合同记录-分页") - @RequestMapping("/contractRecords") + @PostMapping("/contractRecords") public ReturnDTO> contractRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); @@ -92,7 +93,7 @@ } @ApiOperation("根据客户id查询检定记录-分页") - @RequestMapping("/mesureRecords") + @PostMapping("/mesureRecords") public ReturnDTO> mesureRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); @@ -100,8 +101,18 @@ return ReturnUtil.success(super.packForBT(customerService.mesureRecordsByCustomerId(idDTO.getId()))); } + + @ApiOperation("客户删除") + @PostMapping("/delete") + public ReturnDTO deleteCsutomer(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerService.deleteCustomer(idDTO.getId())); + } + @ApiOperation("根据客户id查询检定证书-分页") - @RequestMapping("/certificateRecords") + @PostMapping("/certificateRecords") public ReturnDTO> certificationByCustomerId(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); @@ -110,14 +121,14 @@ } @ApiOperation("客户导出") - @RequestMapping("/export") + @PostMapping("/export") public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response){ customerService.customerExport(request, response); } //*******************************************************************************************************************// // @ApiOperation("客户批量导入") -// @RequestMapping("/batchImport") +// @PostMapping("/batchImport") // public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { // Assert.isFalse(bindingResult.hasErrors(), () -> { // throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java index 0d7320f..609d1d0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java @@ -14,7 +14,6 @@ import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.customer.CustomerAdviceInfo; import com.casic.missiles.model.customer.CustomerSampleInfo; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.customer.CustomerSampleService; @@ -23,6 +22,7 @@ import lombok.AllArgsConstructor; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -39,7 +39,7 @@ private final CustomerSampleService customerSampleService; @ApiOperation("样品列表查询-分页") - @RequestMapping("/listPage") + @PostMapping("/listPage") public ReturnDTO> listPage(@RequestBody @Valid CustomerSampleListRequest request, BindingResult bindingResult) throws Exception { if (bindingResult.hasErrors()) { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); @@ -49,7 +49,7 @@ } @ApiOperation("样品新增") - @RequestMapping("/add") + @PostMapping("/add") public ReturnDTO addSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { if (bindingResult.hasErrors()) { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); @@ -58,7 +58,7 @@ } @ApiOperation("样品编辑") - @RequestMapping("/update") + @PostMapping("/update") public ReturnDTO updateSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { Assert.isFalse(Objects.isNull(customerSampleInfo.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); @@ -70,7 +70,7 @@ } @ApiOperation("样品详情") - @RequestMapping("/detail") + @PostMapping("/detail") public ReturnDTO sampleDetail(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); @@ -79,7 +79,7 @@ } @ApiOperation("列表数据删除") - @RequestMapping("/delete") + @PostMapping("/delete") public ReturnDTO deleteSample(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); @@ -88,13 +88,13 @@ } @ApiOperation("样品导出") - @RequestMapping("/export") + @PostMapping("/export") public void sampleExport(@RequestBody @Valid CustomerSampleListRequest request, HttpServletResponse response) { customerSampleService.sampleExport(request, response); } @ApiOperation("根据样品id查询检定记录") - @RequestMapping("/mesureRecordsBySampleId") + @PostMapping("/mesureRecordsBySampleId") public ReturnDTO> mesureRecordsBySampleId(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); @@ -103,7 +103,7 @@ } @ApiOperation("根据样品id查询检定证书") - @RequestMapping("/certificationBySampleId") + @PostMapping("/certificationBySampleId") public ReturnDTO> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); @@ -112,7 +112,7 @@ } // @ApiOperation("样品批量导入") -// @RequestMapping("/batchImport") +// @PostMapping("/batchImport") // public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { // Assert.isFalse(bindingResult.hasErrors(), () -> { // throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java index 7747976..1acf525 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java @@ -7,6 +7,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -19,25 +20,25 @@ private final CustomerWorkbenchService customerWorkbenchService; @ApiOperation("样品新增趋势") - @RequestMapping("/sample/increaseTrend") + @PostMapping("/sample/increaseTrend") public ReturnDTO increaseTrend() { return ReturnUtil.success(customerWorkbenchService.sampleIncreaseTrend()); } @ApiOperation("样品到期趋势") - @RequestMapping("/sample/expireTrend") + @PostMapping("/sample/expireTrend") public ReturnDTOquerySampleExpireTrend() { return ReturnUtil.success(customerWorkbenchService.querySampleExpireTrend()); } @ApiOperation("客户新增趋势") - @RequestMapping("/increaseTrend") + @PostMapping("/increaseTrend") public ReturnDTO customerIncreaseTrend() { return ReturnUtil.success(customerWorkbenchService.customerIncreaseTrend()); } @ApiOperation("优质客户名单") - @RequestMapping("/excellentList") + @PostMapping("/excellentList") public ReturnDTO customerExcellentList() { return ReturnUtil.success(customerWorkbenchService.customerExcellentList()); } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index b139d8a..47b5dd7 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -29,6 +29,7 @@ STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"), METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"), CUSTOMER_EXPORT("customerData", "customerData", "客户信息"), + ORDER_EXPORT("orderData", "orderData", "委托书信息"), SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"), ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderListReponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderListReponseMapper.java new file mode 100644 index 0000000..b064ac2 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderListReponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.business.order.OrderListReponse; + +public interface BusinessOrderListReponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java index 7182641..6eeb513 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.model.business.BusinessOrder; +import org.apache.ibatis.annotations.Select; /** *

@@ -13,4 +14,7 @@ */ public interface BusinessOrderMapper extends BaseMapper { + @Select("SELECT IFNULL(max(RIGHT(order_code, 12)), 0) from business_order") + Long selectMaxCOrderNo(); + } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java index 76055e1..1bb682e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java @@ -2,11 +2,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.model.customer.CustomerSampleInfo; -import org.apache.ibatis.annotations.Select; public interface CustomerSampleMapper extends BaseMapper { - @Select("SELECT IFNULL(max(RIGHT(sample_no, 12)), 0) from customer_sample_info ") Long selectMaxSampleNo(); } diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml new file mode 100644 index 0000000..e67c097 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml @@ -0,0 +1,10 @@ + + + + + + + diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java index 2451100..04538a3 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java @@ -1,8 +1,32 @@ package com.casic.missiles.controller.business; +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.order.OrderListReponse; +import com.casic.missiles.dto.business.order.OrderListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.business.BusinessOrder; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.business.IBusinessOrderService; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + /** *

* 业务管理-委托书 前端控制器 @@ -13,6 +37,96 @@ */ @RestController @RequestMapping("/business/order") -public class BusinessOrderController { +@AllArgsConstructor +public class BusinessOrderController extends ExportController { + + private final IBusinessOrderService businessOrderService; + + @ApiOperation("委托书查询") + @PostMapping("/listPage") + public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request))); + } + + @ApiOperation("委托书详情") + @PostMapping("/detail") + public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(businessOrderService.orderDetail(idDTO.getId())); + } + + @ApiOperation("委托书更新") + @PostMapping("/update") + public ReturnDTO updateAdvice(@RequestBody @Valid BusinessOrder businessOrder, BindingResult bindingResult){ + Assert.isFalse(Objects.isNull(businessOrder.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(businessOrderService.updateOrder(businessOrder)); + } + + @ApiOperation("委托书新增") + @PostMapping("/add") + public ReturnDTO addAdvice(@RequestBody @Valid BusinessOrder businessOrder, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(businessOrderService.addOrder(businessOrder)); + } + + @ApiOperation("委托书删除（暂不使用，无此功能）") + @PostMapping("/delete") + public ReturnDTO deleteAdvice(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(businessOrderService.deleteOrder(idDTO.getId())); + } + + //*******************************************************************************************************************// + @ApiOperation("委托书导出") + @PostMapping("/export") + public void exportAdvice(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) { + businessOrderService.orderExport(request, response); + } + + + //*******************************************************************************************************************// + @ApiOperation("委托书取消") + @PostMapping("/cancel") + public ReturnDTO cancelOrder(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(businessOrderService.updateStatusById(idDTO.getId(),"3")); + } + + //*******************************************************************************************************************// + @ApiOperation("委托书接收") + @PostMapping("/receive") + public ReturnDTO receiveOrder(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(businessOrderService.updateStatusById(idDTO.getId(),"2")); + } + + //*******************************************************************************************************************// + @ApiOperation("委托书退回") + @PostMapping("/back") + public ReturnDTO backOrder(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(businessOrderService.updateStatusById(idDTO.getId(),"2")); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java index 8a02be1..077014f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java @@ -33,7 +33,7 @@ private final CustomerAdviceService customerAdviceService; @ApiOperation("客户投诉查询") - @RequestMapping("/listPage") + @PostMapping("/listPage") public ReturnDTO> adviceListPage(@RequestBody @Valid CustomerAdviceListRequest request, BindingResult bindingResult) throws Exception { if (bindingResult.hasErrors()) { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); @@ -43,7 +43,7 @@ } @ApiOperation("客户投诉详情") - @RequestMapping("/detail") + @PostMapping("/detail") public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); @@ -52,7 +52,7 @@ } @ApiOperation("客户投诉更新") - @RequestMapping("/update") + @PostMapping("/update") public ReturnDTO updateAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult){ Assert.isFalse(Objects.isNull(customerAdviceInfo.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); @@ -64,7 +64,7 @@ } @ApiOperation("客户投诉新增") - @RequestMapping("/add") + @PostMapping("/add") public ReturnDTO addAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { Assert.isFalse(bindingResult.hasErrors(), () -> { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); @@ -72,9 +72,18 @@ return ReturnUtil.success(customerAdviceService.addAdvice(customerAdviceInfo)); } + @ApiOperation("客户投诉删除") + @PostMapping("/delete") + public ReturnDTO deleteAdvice(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerAdviceService.deleteAdvice(idDTO.getId())); + } + //*******************************************************************************************************************// @ApiOperation("客户投诉导出") - @RequestMapping("/export") + @PostMapping("/export") public void exportAdvice(@RequestBody @Valid CustomerAdviceListRequest request, HttpServletResponse response) { customerAdviceService.adviceExport(request, response); } 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 c59faa6..cbcef48 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 @@ -21,6 +21,7 @@ import lombok.AllArgsConstructor; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -37,7 +38,7 @@ private final CustomerService customerService; @ApiOperation("客户基本信息列表") - @RequestMapping("/listPage") + @PostMapping("/listPage") public ReturnDTO> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception { if (bindingResult.hasErrors()) { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); @@ -47,7 +48,7 @@ } @ApiOperation("客户新增") - @RequestMapping("/add") + @PostMapping("/add") public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { if (bindingResult.hasErrors()) { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); @@ -56,7 +57,7 @@ } @ApiOperation("客户更新") - @RequestMapping("/update") + @PostMapping("/update") public ReturnDTO updateCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { if (bindingResult.hasErrors()) { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); @@ -65,7 +66,7 @@ } @ApiOperation("客户详情") - @RequestMapping("/detail") + @PostMapping("/detail") public ReturnDTO customerDetail(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); @@ -74,7 +75,7 @@ } @ApiOperation("根据客户id查询样品记录-分页") - @RequestMapping("/sampleRecords") + @PostMapping("/sampleRecords") public ReturnDTO> sampleRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); @@ -83,7 +84,7 @@ } @ApiOperation("根据客户id查询合同记录-分页") - @RequestMapping("/contractRecords") + @PostMapping("/contractRecords") public ReturnDTO> contractRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); @@ -92,7 +93,7 @@ } @ApiOperation("根据客户id查询检定记录-分页") - @RequestMapping("/mesureRecords") + @PostMapping("/mesureRecords") public ReturnDTO> mesureRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); @@ -100,8 +101,18 @@ return ReturnUtil.success(super.packForBT(customerService.mesureRecordsByCustomerId(idDTO.getId()))); } + + @ApiOperation("客户删除") + @PostMapping("/delete") + public ReturnDTO deleteCsutomer(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerService.deleteCustomer(idDTO.getId())); + } + @ApiOperation("根据客户id查询检定证书-分页") - @RequestMapping("/certificateRecords") + @PostMapping("/certificateRecords") public ReturnDTO> certificationByCustomerId(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); @@ -110,14 +121,14 @@ } @ApiOperation("客户导出") - @RequestMapping("/export") + @PostMapping("/export") public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response){ customerService.customerExport(request, response); } //*******************************************************************************************************************// // @ApiOperation("客户批量导入") -// @RequestMapping("/batchImport") +// @PostMapping("/batchImport") // public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { // Assert.isFalse(bindingResult.hasErrors(), () -> { // throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java index 0d7320f..609d1d0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java @@ -14,7 +14,6 @@ import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.customer.CustomerAdviceInfo; import com.casic.missiles.model.customer.CustomerSampleInfo; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.customer.CustomerSampleService; @@ -23,6 +22,7 @@ import lombok.AllArgsConstructor; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -39,7 +39,7 @@ private final CustomerSampleService customerSampleService; @ApiOperation("样品列表查询-分页") - @RequestMapping("/listPage") + @PostMapping("/listPage") public ReturnDTO> listPage(@RequestBody @Valid CustomerSampleListRequest request, BindingResult bindingResult) throws Exception { if (bindingResult.hasErrors()) { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); @@ -49,7 +49,7 @@ } @ApiOperation("样品新增") - @RequestMapping("/add") + @PostMapping("/add") public ReturnDTO addSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { if (bindingResult.hasErrors()) { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); @@ -58,7 +58,7 @@ } @ApiOperation("样品编辑") - @RequestMapping("/update") + @PostMapping("/update") public ReturnDTO updateSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { Assert.isFalse(Objects.isNull(customerSampleInfo.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); @@ -70,7 +70,7 @@ } @ApiOperation("样品详情") - @RequestMapping("/detail") + @PostMapping("/detail") public ReturnDTO sampleDetail(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); @@ -79,7 +79,7 @@ } @ApiOperation("列表数据删除") - @RequestMapping("/delete") + @PostMapping("/delete") public ReturnDTO deleteSample(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); @@ -88,13 +88,13 @@ } @ApiOperation("样品导出") - @RequestMapping("/export") + @PostMapping("/export") public void sampleExport(@RequestBody @Valid CustomerSampleListRequest request, HttpServletResponse response) { customerSampleService.sampleExport(request, response); } @ApiOperation("根据样品id查询检定记录") - @RequestMapping("/mesureRecordsBySampleId") + @PostMapping("/mesureRecordsBySampleId") public ReturnDTO> mesureRecordsBySampleId(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); @@ -103,7 +103,7 @@ } @ApiOperation("根据样品id查询检定证书") - @RequestMapping("/certificationBySampleId") + @PostMapping("/certificationBySampleId") public ReturnDTO> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); @@ -112,7 +112,7 @@ } // @ApiOperation("样品批量导入") -// @RequestMapping("/batchImport") +// @PostMapping("/batchImport") // public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { // Assert.isFalse(bindingResult.hasErrors(), () -> { // throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java index 7747976..1acf525 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java @@ -7,6 +7,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -19,25 +20,25 @@ private final CustomerWorkbenchService customerWorkbenchService; @ApiOperation("样品新增趋势") - @RequestMapping("/sample/increaseTrend") + @PostMapping("/sample/increaseTrend") public ReturnDTO increaseTrend() { return ReturnUtil.success(customerWorkbenchService.sampleIncreaseTrend()); } @ApiOperation("样品到期趋势") - @RequestMapping("/sample/expireTrend") + @PostMapping("/sample/expireTrend") public ReturnDTOquerySampleExpireTrend() { return ReturnUtil.success(customerWorkbenchService.querySampleExpireTrend()); } @ApiOperation("客户新增趋势") - @RequestMapping("/increaseTrend") + @PostMapping("/increaseTrend") public ReturnDTO customerIncreaseTrend() { return ReturnUtil.success(customerWorkbenchService.customerIncreaseTrend()); } @ApiOperation("优质客户名单") - @RequestMapping("/excellentList") + @PostMapping("/excellentList") public ReturnDTO customerExcellentList() { return ReturnUtil.success(customerWorkbenchService.customerExcellentList()); } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index b139d8a..47b5dd7 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -29,6 +29,7 @@ STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"), METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"), CUSTOMER_EXPORT("customerData", "customerData", "客户信息"), + ORDER_EXPORT("orderData", "orderData", "委托书信息"), SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"), ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderListReponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderListReponseMapper.java new file mode 100644 index 0000000..b064ac2 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderListReponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.business.order.OrderListReponse; + +public interface BusinessOrderListReponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java index 7182641..6eeb513 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.model.business.BusinessOrder; +import org.apache.ibatis.annotations.Select; /** *

@@ -13,4 +14,7 @@ */ public interface BusinessOrderMapper extends BaseMapper { + @Select("SELECT IFNULL(max(RIGHT(order_code, 12)), 0) from business_order") + Long selectMaxCOrderNo(); + } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java index 76055e1..1bb682e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java @@ -2,11 +2,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.model.customer.CustomerSampleInfo; -import org.apache.ibatis.annotations.Select; public interface CustomerSampleMapper extends BaseMapper { - @Select("SELECT IFNULL(max(RIGHT(sample_no, 12)), 0) from customer_sample_info ") Long selectMaxSampleNo(); } diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml new file mode 100644 index 0000000..e67c097 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml @@ -0,0 +1,10 @@ + + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml index b0d7272..4f7e524 100644 --- a/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml @@ -4,7 +4,7 @@ SELECT expireTime,count(expireTimes) AS "count" - from ( + FROM ( SELECT DATE_FORMAT(update_time, '%Y%m' ) AS expireTime,COUNT(*) AS expireTimes,update_time FROM customer_sample_info WHERE TIMESTAMPDIFF(MONTH,now(),update_time) 12 @@ -29,7 +29,7 @@ + SELECT IFNULL(MAX(RIGHT(sample_no, 12)), 0) + FROM customer_sample_info + + + diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml index b0d7272..4f7e524 100644 --- a/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml @@ -4,7 +4,7 @@ SELECT expireTime,count(expireTimes) AS "count" - from ( + FROM ( SELECT DATE_FORMAT(update_time, '%Y%m' ) AS expireTime,COUNT(*) AS expireTimes,update_time FROM customer_sample_info WHERE TIMESTAMPDIFF(MONTH,now(),update_time) 12 @@ -29,7 +29,7 @@ + SELECT IFNULL(MAX(RIGHT(sample_no, 12)), 0) + FROM customer_sample_info + + + diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml index b0d7272..4f7e524 100644 --- a/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml @@ -4,7 +4,7 @@ SELECT expireTime,count(expireTimes) AS "count" - from ( + FROM ( SELECT DATE_FORMAT(update_time, '%Y%m' ) AS expireTime,COUNT(*) AS expireTimes,update_time FROM customer_sample_info WHERE TIMESTAMPDIFF(MONTH,now(),update_time) 12 @@ -29,7 +29,7 @@ + SELECT IFNULL(MAX(RIGHT(sample_no, 12)), 0) + FROM customer_sample_info + + + diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml index b0d7272..4f7e524 100644 --- a/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml @@ -4,7 +4,7 @@ SELECT expireTime,count(expireTimes) AS "count" - from ( + FROM ( SELECT DATE_FORMAT(update_time, '%Y%m' ) AS expireTime,COUNT(*) AS expireTimes,update_time FROM customer_sample_info WHERE TIMESTAMPDIFF(MONTH,now(),update_time) 12 @@ -29,7 +29,7 @@ + SELECT IFNULL(MAX(RIGHT(sample_no, 12)), 0) + FROM customer_sample_info + + + diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml index b0d7272..4f7e524 100644 --- a/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml @@ -4,7 +4,7 @@ SELECT expireTime,count(expireTimes) AS "count" - from ( + FROM ( SELECT DATE_FORMAT(update_time, '%Y%m' ) AS expireTime,COUNT(*) AS expireTimes,update_time FROM customer_sample_info WHERE TIMESTAMPDIFF(MONTH,now(),update_time) 12 @@ -29,7 +29,7 @@ + SELECT IFNULL(MAX(RIGHT(sample_no, 12)), 0) + FROM customer_sample_info + + + diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml index b0d7272..4f7e524 100644 --- a/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml @@ -4,7 +4,7 @@ SELECT expireTime,count(expireTimes) AS "count" - from ( + FROM ( SELECT DATE_FORMAT(update_time, '%Y%m' ) AS expireTime,COUNT(*) AS expireTimes,update_time FROM customer_sample_info WHERE TIMESTAMPDIFF(MONTH,now(),update_time) 12 @@ -29,7 +29,7 @@ + SELECT IFNULL(MAX(RIGHT(sample_no, 12)), 0) + FROM customer_sample_info + + + diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml index b0d7272..4f7e524 100644 --- a/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml @@ -4,7 +4,7 @@ SELECT expireTime,count(expireTimes) AS "count" - from ( + FROM ( SELECT DATE_FORMAT(update_time, '%Y%m' ) AS expireTime,COUNT(*) AS expireTimes,update_time FROM customer_sample_info WHERE TIMESTAMPDIFF(MONTH,now(),update_time) 12 @@ -29,7 +29,7 @@ + SELECT IFNULL(MAX(RIGHT(sample_no, 12)), 0) + FROM customer_sample_info + + + diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml index b0d7272..4f7e524 100644 --- a/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml @@ -4,7 +4,7 @@ SELECT expireTime,count(expireTimes) AS "count" - from ( + FROM ( SELECT DATE_FORMAT(update_time, '%Y%m' ) AS expireTime,COUNT(*) AS expireTimes,update_time FROM customer_sample_info WHERE TIMESTAMPDIFF(MONTH,now(),update_time) 12 @@ -29,7 +29,7 @@ + SELECT IFNULL(MAX(RIGHT(sample_no, 12)), 0) + FROM customer_sample_info + + + diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml index b0d7272..4f7e524 100644 --- a/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml @@ -4,7 +4,7 @@ SELECT expireTime,count(expireTimes) AS "count" - from ( + FROM ( SELECT DATE_FORMAT(update_time, '%Y%m' ) AS expireTime,COUNT(*) AS expireTimes,update_time FROM customer_sample_info WHERE TIMESTAMPDIFF(MONTH,now(),update_time) 12 @@ -29,7 +29,7 @@ + SELECT IFNULL(MAX(RIGHT(sample_no, 12)), 0) + FROM customer_sample_info + + + diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml index b0d7272..4f7e524 100644 --- a/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml @@ -4,7 +4,7 @@ SELECT expireTime,count(expireTimes) AS "count" - from ( + FROM ( SELECT DATE_FORMAT(update_time, '%Y%m' ) AS expireTime,COUNT(*) AS expireTimes,update_time FROM customer_sample_info WHERE TIMESTAMPDIFF(MONTH,now(),update_time) 12 @@ -29,7 +29,7 @@ + SELECT IFNULL(MAX(RIGHT(sample_no, 12)), 0) + FROM customer_sample_info + + + diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml index b0d7272..4f7e524 100644 --- a/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml @@ -4,7 +4,7 @@ SELECT expireTime,count(expireTimes) AS "count" - from ( + FROM ( SELECT DATE_FORMAT(update_time, '%Y%m' ) AS expireTime,COUNT(*) AS expireTimes,update_time FROM customer_sample_info WHERE TIMESTAMPDIFF(MONTH,now(),update_time) 12 @@ -29,7 +29,7 @@ + SELECT IFNULL(MAX(RIGHT(sample_no, 12)), 0) + FROM customer_sample_info + + + diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml index b0d7272..4f7e524 100644 --- a/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml @@ -4,7 +4,7 @@ SELECT expireTime,count(expireTimes) AS "count" - from ( + FROM ( SELECT DATE_FORMAT(update_time, '%Y%m' ) AS expireTime,COUNT(*) AS expireTimes,update_time FROM customer_sample_info WHERE TIMESTAMPDIFF(MONTH,now(),update_time) 12 @@ -29,7 +29,7 @@ + SELECT IFNULL(MAX(RIGHT(sample_no, 12)), 0) + FROM customer_sample_info + + + diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml index b0d7272..4f7e524 100644 --- a/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml @@ -4,7 +4,7 @@ SELECT expireTime,count(expireTimes) AS "count" - from ( + FROM ( SELECT DATE_FORMAT(update_time, '%Y%m' ) AS expireTime,COUNT(*) AS expireTimes,update_time FROM customer_sample_info WHERE TIMESTAMPDIFF(MONTH,now(),update_time) 12 @@ -29,7 +29,7 @@ + SELECT IFNULL(MAX(RIGHT(sample_no, 12)), 0) + FROM customer_sample_info + + + diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml index b0d7272..4f7e524 100644 --- a/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml @@ -4,7 +4,7 @@ SELECT expireTime,count(expireTimes) AS "count" - from ( + FROM ( SELECT DATE_FORMAT(update_time, '%Y%m' ) AS expireTime,COUNT(*) AS expireTimes,update_time FROM customer_sample_info WHERE TIMESTAMPDIFF(MONTH,now(),update_time) 12 @@ -29,7 +29,7 @@ + SELECT IFNULL(MAX(RIGHT(sample_no, 12)), 0) + FROM customer_sample_info + + + diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml index b0d7272..4f7e524 100644 --- a/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml @@ -4,7 +4,7 @@ SELECT expireTime,count(expireTimes) AS "count" - from ( + FROM ( SELECT DATE_FORMAT(update_time, '%Y%m' ) AS expireTime,COUNT(*) AS expireTimes,update_time FROM customer_sample_info WHERE TIMESTAMPDIFF(MONTH,now(),update_time) 12 @@ -29,7 +29,7 @@ + SELECT IFNULL(MAX(RIGHT(sample_no, 12)), 0) + FROM customer_sample_info + + + diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml index b0d7272..4f7e524 100644 --- a/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml @@ -4,7 +4,7 @@ SELECT expireTime,count(expireTimes) AS "count" - from ( + FROM ( SELECT DATE_FORMAT(update_time, '%Y%m' ) AS expireTime,COUNT(*) AS expireTimes,update_time FROM customer_sample_info WHERE TIMESTAMPDIFF(MONTH,now(),update_time) 12 @@ -29,7 +29,7 @@ + SELECT IFNULL(MAX(RIGHT(sample_no, 12)), 0) + FROM customer_sample_info + + + diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml index b0d7272..4f7e524 100644 --- a/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml @@ -4,7 +4,7 @@ SELECT expireTime,count(expireTimes) AS "count" - from ( + FROM ( SELECT DATE_FORMAT(update_time, '%Y%m' ) AS expireTime,COUNT(*) AS expireTimes,update_time FROM customer_sample_info WHERE TIMESTAMPDIFF(MONTH,now(),update_time) 12 @@ -29,7 +29,7 @@ + SELECT IFNULL(MAX(RIGHT(sample_no, 12)), 0) + FROM customer_sample_info + + + diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml index b0d7272..4f7e524 100644 --- a/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml @@ -4,7 +4,7 @@ SELECT expireTime,count(expireTimes) AS "count" - from ( + FROM ( SELECT DATE_FORMAT(update_time, '%Y%m' ) AS expireTime,COUNT(*) AS expireTimes,update_time FROM customer_sample_info WHERE TIMESTAMPDIFF(MONTH,now(),update_time) 12 @@ -29,7 +29,7 @@