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 c6b3973..832517f 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 @@ -13,6 +13,8 @@ import com.casic.missiles.dto.business.order.OrderListRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.mapper.business.BusinessDealRecordMapper; +import com.casic.missiles.model.business.BusinessDealRecord; import com.casic.missiles.model.business.BusinessOrder; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessOrderService; @@ -27,6 +29,7 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; +import java.util.List; import java.util.Objects; /** @@ -43,79 +46,89 @@ @AllArgsConstructor public class BusinessOrderController extends ExportController { - private final IBusinessOrderService businessOrderService; + 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("/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("/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("/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("/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("/export") - public void exportAdvice(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) { - businessOrderService.orderExport(request, response); - } + @ApiOperation("委托书导出") + @PostMapping("/export") + public void exportAdvice(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) { + businessOrderService.orderExport(request, response); + } - @ApiOperation("委托书取消") - @PostMapping("/cancel") - public ReturnDTO cancelOrder(@RequestBody @Valid OrderCancelRequest orderCancelRequest) { - Assert.isFalse(Objects.isNull(orderCancelRequest.getOrderId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return businessOrderService.cancelOrder(orderCancelRequest); - } + @ApiOperation("委托书取消") + @PostMapping("/cancel") + public ReturnDTO cancelOrder(@RequestBody @Valid OrderCancelRequest orderCancelRequest) { + Assert.isFalse(Objects.isNull(orderCancelRequest.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return businessOrderService.cancelOrder(orderCancelRequest); + } - @ApiOperation("委托书接收") - @PostMapping("/receive") - public ReturnDTO receiveOrder(@RequestBody @Valid IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return businessOrderService.updateStatusById(idDTO.getId(),"2"); - } + @ApiOperation("操作记录") + @PostMapping("/optionRecord") + public ReturnDTO> optionRecord(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(businessOrderService.optionRecord(idDTO.getId())); + } - @ApiOperation("委托书退回") - @PostMapping("/back") - public ReturnDTO backOrder(@RequestBody @Valid IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return businessOrderService.updateStatusById(idDTO.getId(),"3"); - } + + @ApiOperation("委托书接收") + @PostMapping("/receive") + public ReturnDTO receiveOrder(@RequestBody @Valid OrderCancelRequest orderCancelRequest) { + Assert.isFalse(Objects.isNull(orderCancelRequest.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return businessOrderService.updateStatusById(orderCancelRequest, "2"); + } + + @ApiOperation("委托书退回") + @PostMapping("/back") + public ReturnDTO backOrder(@RequestBody @Valid OrderCancelRequest orderCancelRequest) { + Assert.isFalse(Objects.isNull(orderCancelRequest.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return businessOrderService.updateStatusById(orderCancelRequest, "3"); + } } 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 c6b3973..832517f 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 @@ -13,6 +13,8 @@ import com.casic.missiles.dto.business.order.OrderListRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.mapper.business.BusinessDealRecordMapper; +import com.casic.missiles.model.business.BusinessDealRecord; import com.casic.missiles.model.business.BusinessOrder; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessOrderService; @@ -27,6 +29,7 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; +import java.util.List; import java.util.Objects; /** @@ -43,79 +46,89 @@ @AllArgsConstructor public class BusinessOrderController extends ExportController { - private final IBusinessOrderService businessOrderService; + 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("/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("/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("/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("/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("/export") - public void exportAdvice(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) { - businessOrderService.orderExport(request, response); - } + @ApiOperation("委托书导出") + @PostMapping("/export") + public void exportAdvice(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) { + businessOrderService.orderExport(request, response); + } - @ApiOperation("委托书取消") - @PostMapping("/cancel") - public ReturnDTO cancelOrder(@RequestBody @Valid OrderCancelRequest orderCancelRequest) { - Assert.isFalse(Objects.isNull(orderCancelRequest.getOrderId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return businessOrderService.cancelOrder(orderCancelRequest); - } + @ApiOperation("委托书取消") + @PostMapping("/cancel") + public ReturnDTO cancelOrder(@RequestBody @Valid OrderCancelRequest orderCancelRequest) { + Assert.isFalse(Objects.isNull(orderCancelRequest.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return businessOrderService.cancelOrder(orderCancelRequest); + } - @ApiOperation("委托书接收") - @PostMapping("/receive") - public ReturnDTO receiveOrder(@RequestBody @Valid IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return businessOrderService.updateStatusById(idDTO.getId(),"2"); - } + @ApiOperation("操作记录") + @PostMapping("/optionRecord") + public ReturnDTO> optionRecord(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(businessOrderService.optionRecord(idDTO.getId())); + } - @ApiOperation("委托书退回") - @PostMapping("/back") - public ReturnDTO backOrder(@RequestBody @Valid IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return businessOrderService.updateStatusById(idDTO.getId(),"3"); - } + + @ApiOperation("委托书接收") + @PostMapping("/receive") + public ReturnDTO receiveOrder(@RequestBody @Valid OrderCancelRequest orderCancelRequest) { + Assert.isFalse(Objects.isNull(orderCancelRequest.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return businessOrderService.updateStatusById(orderCancelRequest, "2"); + } + + @ApiOperation("委托书退回") + @PostMapping("/back") + public ReturnDTO backOrder(@RequestBody @Valid OrderCancelRequest orderCancelRequest) { + Assert.isFalse(Objects.isNull(orderCancelRequest.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return businessOrderService.updateStatusById(orderCancelRequest, "3"); + } } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessDealRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessDealRecordMapper.java new file mode 100644 index 0000000..659f64b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessDealRecordMapper.java @@ -0,0 +1,20 @@ +package com.casic.missiles.mapper.business; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessDealRecord; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +public interface BusinessDealRecordMapper extends BaseMapper { + + + @Select("SELECT name " + + "FROM sys_dict sd " + + "JOIN( SELECT id " + + " FROM sys_dict " + + " WHERE CODE = 'cancelEntrust') sds ON sds.id=sd.pid " + + " AND code=#{reasonId} ") + String getDictContent(@Param("reasonId")String reasonId); + +} 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 c6b3973..832517f 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 @@ -13,6 +13,8 @@ import com.casic.missiles.dto.business.order.OrderListRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.mapper.business.BusinessDealRecordMapper; +import com.casic.missiles.model.business.BusinessDealRecord; import com.casic.missiles.model.business.BusinessOrder; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessOrderService; @@ -27,6 +29,7 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; +import java.util.List; import java.util.Objects; /** @@ -43,79 +46,89 @@ @AllArgsConstructor public class BusinessOrderController extends ExportController { - private final IBusinessOrderService businessOrderService; + 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("/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("/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("/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("/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("/export") - public void exportAdvice(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) { - businessOrderService.orderExport(request, response); - } + @ApiOperation("委托书导出") + @PostMapping("/export") + public void exportAdvice(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) { + businessOrderService.orderExport(request, response); + } - @ApiOperation("委托书取消") - @PostMapping("/cancel") - public ReturnDTO cancelOrder(@RequestBody @Valid OrderCancelRequest orderCancelRequest) { - Assert.isFalse(Objects.isNull(orderCancelRequest.getOrderId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return businessOrderService.cancelOrder(orderCancelRequest); - } + @ApiOperation("委托书取消") + @PostMapping("/cancel") + public ReturnDTO cancelOrder(@RequestBody @Valid OrderCancelRequest orderCancelRequest) { + Assert.isFalse(Objects.isNull(orderCancelRequest.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return businessOrderService.cancelOrder(orderCancelRequest); + } - @ApiOperation("委托书接收") - @PostMapping("/receive") - public ReturnDTO receiveOrder(@RequestBody @Valid IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return businessOrderService.updateStatusById(idDTO.getId(),"2"); - } + @ApiOperation("操作记录") + @PostMapping("/optionRecord") + public ReturnDTO> optionRecord(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(businessOrderService.optionRecord(idDTO.getId())); + } - @ApiOperation("委托书退回") - @PostMapping("/back") - public ReturnDTO backOrder(@RequestBody @Valid IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return businessOrderService.updateStatusById(idDTO.getId(),"3"); - } + + @ApiOperation("委托书接收") + @PostMapping("/receive") + public ReturnDTO receiveOrder(@RequestBody @Valid OrderCancelRequest orderCancelRequest) { + Assert.isFalse(Objects.isNull(orderCancelRequest.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return businessOrderService.updateStatusById(orderCancelRequest, "2"); + } + + @ApiOperation("委托书退回") + @PostMapping("/back") + public ReturnDTO backOrder(@RequestBody @Valid OrderCancelRequest orderCancelRequest) { + Assert.isFalse(Objects.isNull(orderCancelRequest.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return businessOrderService.updateStatusById(orderCancelRequest, "3"); + } } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessDealRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessDealRecordMapper.java new file mode 100644 index 0000000..659f64b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessDealRecordMapper.java @@ -0,0 +1,20 @@ +package com.casic.missiles.mapper.business; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessDealRecord; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +public interface BusinessDealRecordMapper extends BaseMapper { + + + @Select("SELECT name " + + "FROM sys_dict sd " + + "JOIN( SELECT id " + + " FROM sys_dict " + + " WHERE CODE = 'cancelEntrust') sds ON sds.id=sd.pid " + + " AND code=#{reasonId} ") + String getDictContent(@Param("reasonId")String reasonId); + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderCancelRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderCancelRequest.java index 3d1ac81..b06975f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderCancelRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderCancelRequest.java @@ -9,7 +9,7 @@ public class OrderCancelRequest { @ApiModelProperty(value = "委托书id", dataType = "Long") - private Long orderId; + private Long id; @ApiModelProperty(value = "操作原因（终止操作必填，其他无需填写）", dataType = "String") private String reason; 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 c6b3973..832517f 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 @@ -13,6 +13,8 @@ import com.casic.missiles.dto.business.order.OrderListRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.mapper.business.BusinessDealRecordMapper; +import com.casic.missiles.model.business.BusinessDealRecord; import com.casic.missiles.model.business.BusinessOrder; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessOrderService; @@ -27,6 +29,7 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; +import java.util.List; import java.util.Objects; /** @@ -43,79 +46,89 @@ @AllArgsConstructor public class BusinessOrderController extends ExportController { - private final IBusinessOrderService businessOrderService; + 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("/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("/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("/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("/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("/export") - public void exportAdvice(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) { - businessOrderService.orderExport(request, response); - } + @ApiOperation("委托书导出") + @PostMapping("/export") + public void exportAdvice(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) { + businessOrderService.orderExport(request, response); + } - @ApiOperation("委托书取消") - @PostMapping("/cancel") - public ReturnDTO cancelOrder(@RequestBody @Valid OrderCancelRequest orderCancelRequest) { - Assert.isFalse(Objects.isNull(orderCancelRequest.getOrderId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return businessOrderService.cancelOrder(orderCancelRequest); - } + @ApiOperation("委托书取消") + @PostMapping("/cancel") + public ReturnDTO cancelOrder(@RequestBody @Valid OrderCancelRequest orderCancelRequest) { + Assert.isFalse(Objects.isNull(orderCancelRequest.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return businessOrderService.cancelOrder(orderCancelRequest); + } - @ApiOperation("委托书接收") - @PostMapping("/receive") - public ReturnDTO receiveOrder(@RequestBody @Valid IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return businessOrderService.updateStatusById(idDTO.getId(),"2"); - } + @ApiOperation("操作记录") + @PostMapping("/optionRecord") + public ReturnDTO> optionRecord(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(businessOrderService.optionRecord(idDTO.getId())); + } - @ApiOperation("委托书退回") - @PostMapping("/back") - public ReturnDTO backOrder(@RequestBody @Valid IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return businessOrderService.updateStatusById(idDTO.getId(),"3"); - } + + @ApiOperation("委托书接收") + @PostMapping("/receive") + public ReturnDTO receiveOrder(@RequestBody @Valid OrderCancelRequest orderCancelRequest) { + Assert.isFalse(Objects.isNull(orderCancelRequest.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return businessOrderService.updateStatusById(orderCancelRequest, "2"); + } + + @ApiOperation("委托书退回") + @PostMapping("/back") + public ReturnDTO backOrder(@RequestBody @Valid OrderCancelRequest orderCancelRequest) { + Assert.isFalse(Objects.isNull(orderCancelRequest.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return businessOrderService.updateStatusById(orderCancelRequest, "3"); + } } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessDealRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessDealRecordMapper.java new file mode 100644 index 0000000..659f64b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessDealRecordMapper.java @@ -0,0 +1,20 @@ +package com.casic.missiles.mapper.business; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessDealRecord; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +public interface BusinessDealRecordMapper extends BaseMapper { + + + @Select("SELECT name " + + "FROM sys_dict sd " + + "JOIN( SELECT id " + + " FROM sys_dict " + + " WHERE CODE = 'cancelEntrust') sds ON sds.id=sd.pid " + + " AND code=#{reasonId} ") + String getDictContent(@Param("reasonId")String reasonId); + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderCancelRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderCancelRequest.java index 3d1ac81..b06975f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderCancelRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderCancelRequest.java @@ -9,7 +9,7 @@ public class OrderCancelRequest { @ApiModelProperty(value = "委托书id", dataType = "Long") - private Long orderId; + private Long id; @ApiModelProperty(value = "操作原因（终止操作必填，其他无需填写）", dataType = "String") private String reason; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessDealRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessDealRecord.java new file mode 100644 index 0000000..17e0770 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessDealRecord.java @@ -0,0 +1,37 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; + +@TableName("business_deal_record") +@ApiModel("委托书操作记录") +@AllArgsConstructor +@Builder +@Data +public class BusinessDealRecord { + + private Long id; + + @ApiModelProperty("委托书id") + private Long orderId; + + @ApiModelProperty("原因") + private String recordContent; + + private Long createUser; + + @ApiModelProperty("操作人名称") + private String createUserName; + + @ApiModelProperty("创建时间") + private String createTime; + + @ApiModelProperty("备注") + private String remark; + +} 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 c6b3973..832517f 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 @@ -13,6 +13,8 @@ import com.casic.missiles.dto.business.order.OrderListRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.mapper.business.BusinessDealRecordMapper; +import com.casic.missiles.model.business.BusinessDealRecord; import com.casic.missiles.model.business.BusinessOrder; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessOrderService; @@ -27,6 +29,7 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; +import java.util.List; import java.util.Objects; /** @@ -43,79 +46,89 @@ @AllArgsConstructor public class BusinessOrderController extends ExportController { - private final IBusinessOrderService businessOrderService; + 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("/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("/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("/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("/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("/export") - public void exportAdvice(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) { - businessOrderService.orderExport(request, response); - } + @ApiOperation("委托书导出") + @PostMapping("/export") + public void exportAdvice(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) { + businessOrderService.orderExport(request, response); + } - @ApiOperation("委托书取消") - @PostMapping("/cancel") - public ReturnDTO cancelOrder(@RequestBody @Valid OrderCancelRequest orderCancelRequest) { - Assert.isFalse(Objects.isNull(orderCancelRequest.getOrderId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return businessOrderService.cancelOrder(orderCancelRequest); - } + @ApiOperation("委托书取消") + @PostMapping("/cancel") + public ReturnDTO cancelOrder(@RequestBody @Valid OrderCancelRequest orderCancelRequest) { + Assert.isFalse(Objects.isNull(orderCancelRequest.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return businessOrderService.cancelOrder(orderCancelRequest); + } - @ApiOperation("委托书接收") - @PostMapping("/receive") - public ReturnDTO receiveOrder(@RequestBody @Valid IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return businessOrderService.updateStatusById(idDTO.getId(),"2"); - } + @ApiOperation("操作记录") + @PostMapping("/optionRecord") + public ReturnDTO> optionRecord(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(businessOrderService.optionRecord(idDTO.getId())); + } - @ApiOperation("委托书退回") - @PostMapping("/back") - public ReturnDTO backOrder(@RequestBody @Valid IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return businessOrderService.updateStatusById(idDTO.getId(),"3"); - } + + @ApiOperation("委托书接收") + @PostMapping("/receive") + public ReturnDTO receiveOrder(@RequestBody @Valid OrderCancelRequest orderCancelRequest) { + Assert.isFalse(Objects.isNull(orderCancelRequest.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return businessOrderService.updateStatusById(orderCancelRequest, "2"); + } + + @ApiOperation("委托书退回") + @PostMapping("/back") + public ReturnDTO backOrder(@RequestBody @Valid OrderCancelRequest orderCancelRequest) { + Assert.isFalse(Objects.isNull(orderCancelRequest.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return businessOrderService.updateStatusById(orderCancelRequest, "3"); + } } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessDealRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessDealRecordMapper.java new file mode 100644 index 0000000..659f64b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessDealRecordMapper.java @@ -0,0 +1,20 @@ +package com.casic.missiles.mapper.business; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessDealRecord; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +public interface BusinessDealRecordMapper extends BaseMapper { + + + @Select("SELECT name " + + "FROM sys_dict sd " + + "JOIN( SELECT id " + + " FROM sys_dict " + + " WHERE CODE = 'cancelEntrust') sds ON sds.id=sd.pid " + + " AND code=#{reasonId} ") + String getDictContent(@Param("reasonId")String reasonId); + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderCancelRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderCancelRequest.java index 3d1ac81..b06975f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderCancelRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderCancelRequest.java @@ -9,7 +9,7 @@ public class OrderCancelRequest { @ApiModelProperty(value = "委托书id", dataType = "Long") - private Long orderId; + private Long id; @ApiModelProperty(value = "操作原因（终止操作必填，其他无需填写）", dataType = "String") private String reason; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessDealRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessDealRecord.java new file mode 100644 index 0000000..17e0770 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessDealRecord.java @@ -0,0 +1,37 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; + +@TableName("business_deal_record") +@ApiModel("委托书操作记录") +@AllArgsConstructor +@Builder +@Data +public class BusinessDealRecord { + + private Long id; + + @ApiModelProperty("委托书id") + private Long orderId; + + @ApiModelProperty("原因") + private String recordContent; + + private Long createUser; + + @ApiModelProperty("操作人名称") + private String createUserName; + + @ApiModelProperty("创建时间") + private String createTime; + + @ApiModelProperty("备注") + private String remark; + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java index 9043960..48742b4 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java @@ -15,9 +15,11 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.mapper.business.BusinessDealRecordMapper; import com.casic.missiles.mapper.business.BusinessOrderListReponseMapper; import com.casic.missiles.mapper.business.BusinessOrderMapper; import com.casic.missiles.mapper.business.BusinessOrderSampleRelationMapper; +import com.casic.missiles.model.business.BusinessDealRecord; import com.casic.missiles.model.business.BusinessOrder; import com.casic.missiles.model.business.BusinessOrderSampleRelation; import com.casic.missiles.model.customer.CustomerSampleInfo; @@ -33,6 +35,7 @@ import javax.servlet.http.HttpServletResponse; import java.util.ArrayList; +import java.util.Date; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -53,13 +56,14 @@ private final IBaseExportService iBaseExportService; private final CustomerSampleService customerSampleService; private final BusinessOrderSampleRelationMapper sampleRelationMapper; + private final BusinessDealRecordMapper dealRecordMapper; /** * 1、分页查询 2、批量查询所有的委托书、样品关系 => 进行以sampleId为key主键map list 3、查询计算样品数量 */ @Override public Page orderListPage(Page page, OrderListRequest request) throws Exception { - QueryWrapper wrapper = listParamWrapper(request); + QueryWrapper wrapper = listParamWrapperBuilder(request); Page resultPage = this.orderListResponseMapper.selectPage(page, wrapper); List orderSampleList = sampleRelationMapper.selectList(null); Map> orderSampleMap = orderSampleList.stream().collect( @@ -154,7 +158,10 @@ } /** - * 如查询说明，补充对是否加急的excel文档表现 + * 1、判断是否存在ids，进行其他参数属性的初始化 + * 2、查询查询构建 + * 3、查询样品关系，构建委托书样品数量map集合 + * 4、字典值进行状态转化 */ @Override public void orderExport(OrderListRequest request, HttpServletResponse response) { @@ -163,9 +170,10 @@ if (!CollectionUtils.isEmpty(request.getIds())) { orderResponseList = orderListResponseMapper.selectBatchIds(request.getIds()); } else { - QueryWrapper wrapper = listParamWrapper(request); + QueryWrapper wrapper = listParamWrapperBuilder(request); orderResponseList = this.orderListResponseMapper.selectList(wrapper); } + //查询样品关系，构建委托书样品数量map集合， List orderSampleList = sampleRelationMapper.selectList(null); Map> orderSampleMap = orderSampleList.stream().collect( Collectors.groupingBy(BusinessOrderSampleRelation::getOrderId) @@ -173,6 +181,7 @@ orderResponseList.forEach( orderSample -> orderSample.setSampleCount(orderSampleMap.containsKey(orderSample.getId()) ? orderSampleMap.get(orderSample.getId()).size() : 0) ); + //字典转换 for (OrderListReponse orderListReponse : orderResponseList) { orderListReponse.setIsUrgent("1".equals(orderListReponse.getIsUrgent()) ? "是" : "否"); DictCodeUtils.convertDictCodeToName(orderListReponse); @@ -188,29 +197,80 @@ * 通过状态对委托书状态进行更新 */ @Override - public ReturnDTO updateStatusById(Long id, String status) { - BusinessOrder businessOrder = new BusinessOrder(); - businessOrder.setId(id); - businessOrder.setStatus(status); - AuthUser authUser = ShiroKit.getUser(); - businessOrder.setUpdateUser(authUser.getId()); - int updateFlag = this.baseMapper.updateById(businessOrder); - if (updateFlag > 0) { + public ReturnDTO updateStatusById(OrderCancelRequest orderCancelRequest, String status) { + int updateFlag = doUpdateStatusById(orderCancelRequest.getId(), status); + int addDealRecordFlag = addDealRecord(orderCancelRequest); + if (updateFlag > 0 && addDealRecordFlag > 0) { return ReturnUtil.success(); } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + /** + * 取消记录，修改委托书状态，同时生成委托书操作日志，供用户查询 + */ @Override @Transactional public ReturnDTO cancelOrder(OrderCancelRequest orderCancelRequest) { - ReturnDTO returnDTO = this.updateStatusById(orderCancelRequest.getOrderId(), "3"); - if (returnDTO.getCode().equals(200)) { + int updateFlag = this.doUpdateStatusById(orderCancelRequest.getId(), "3"); + int addDealRecordFlag = addDealRecord(orderCancelRequest); + if (updateFlag > 0 && addDealRecordFlag > 0) { return ReturnUtil.success(); } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + /** + * 操作记录的查询 + */ + @Override + public List optionRecord(Long id) { + QueryWrapper dealRecordQueryWrapper = new QueryWrapper() + .eq("order_id", id); + return dealRecordMapper.selectList(dealRecordQueryWrapper); + } + + /** + * 新增操作记录 + */ + private int addDealRecord(OrderCancelRequest orderCancelRequest) { + AuthUser authUser = ShiroKit.getUser(); + BusinessDealRecord businessDealRecord = BusinessDealRecord.builder() + .createUser(authUser.getId()) + .createUserName(authUser.getName()) + .recordContent(reasonConvert(orderCancelRequest.getReason())) + .orderId(orderCancelRequest.getId()) + .build(); + return dealRecordMapper.insert(businessDealRecord); + } + + /** + * 强调正在做状态更新 + */ + private int doUpdateStatusById(Long orderId, String status) { + BusinessOrder businessOrder = new BusinessOrder(); + businessOrder.setId(orderId); + businessOrder.setStatus(status); + AuthUser authUser = ShiroKit.getUser(); + businessOrder.setUpdateUser(authUser.getId()); + return this.baseMapper.updateById(businessOrder); + } + + /** + * 原因字典转化为相应的值 + */ + private String reasonConvert(String reasonIds) { + String reasonStr = ""; + if (StringUtils.isEmpty(reasonIds)) { + return reasonStr; + } + String[] reasonIdList = reasonIds.split(","); + for (String reasonId : reasonIdList) { + String reasonContent = dealRecordMapper.getDictContent(reasonId); + reasonStr = reasonStr + reasonContent + ","; + } + return reasonStr.substring(0, reasonStr.length() - 1); + } private void initOrderInfo(BusinessOrder businessOrder) { Long maxNo = this.baseMapper.selectMaxCOrderNo(); @@ -222,8 +282,10 @@ businessOrder.setStatus("1"); } - - private QueryWrapper listParamWrapper(OrderListRequest request) { + /** + * 委托书列表查询构建方法 + */ + private QueryWrapper listParamWrapperBuilder(OrderListRequest request) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.like(StringUtils.isNotBlank(request.getCustomerName()), "customer_name", request.getCustomerName()); queryWrapper.like(StringUtils.isNotBlank(request.getDeliverer()), "deliverer", request.getDeliverer()); @@ -244,7 +306,7 @@ private int deleteSampleById(Long orderId) { QueryWrapper sampleStatusRelationWrapper = new QueryWrapper() .eq("order_id", orderId); - return this.sampleRelationMapper.delete(sampleStatusRelationWrapper); + return this.sampleRelationMapper.delete(sampleStatusRelationWrapper); } private int sampleStatusCreator(Long orderId, String measureContent, Long sampleId) { @@ -265,4 +327,5 @@ } ); } + } 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 c6b3973..832517f 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 @@ -13,6 +13,8 @@ import com.casic.missiles.dto.business.order.OrderListRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.mapper.business.BusinessDealRecordMapper; +import com.casic.missiles.model.business.BusinessDealRecord; import com.casic.missiles.model.business.BusinessOrder; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessOrderService; @@ -27,6 +29,7 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; +import java.util.List; import java.util.Objects; /** @@ -43,79 +46,89 @@ @AllArgsConstructor public class BusinessOrderController extends ExportController { - private final IBusinessOrderService businessOrderService; + 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("/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("/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("/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("/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("/export") - public void exportAdvice(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) { - businessOrderService.orderExport(request, response); - } + @ApiOperation("委托书导出") + @PostMapping("/export") + public void exportAdvice(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) { + businessOrderService.orderExport(request, response); + } - @ApiOperation("委托书取消") - @PostMapping("/cancel") - public ReturnDTO cancelOrder(@RequestBody @Valid OrderCancelRequest orderCancelRequest) { - Assert.isFalse(Objects.isNull(orderCancelRequest.getOrderId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return businessOrderService.cancelOrder(orderCancelRequest); - } + @ApiOperation("委托书取消") + @PostMapping("/cancel") + public ReturnDTO cancelOrder(@RequestBody @Valid OrderCancelRequest orderCancelRequest) { + Assert.isFalse(Objects.isNull(orderCancelRequest.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return businessOrderService.cancelOrder(orderCancelRequest); + } - @ApiOperation("委托书接收") - @PostMapping("/receive") - public ReturnDTO receiveOrder(@RequestBody @Valid IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return businessOrderService.updateStatusById(idDTO.getId(),"2"); - } + @ApiOperation("操作记录") + @PostMapping("/optionRecord") + public ReturnDTO> optionRecord(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(businessOrderService.optionRecord(idDTO.getId())); + } - @ApiOperation("委托书退回") - @PostMapping("/back") - public ReturnDTO backOrder(@RequestBody @Valid IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return businessOrderService.updateStatusById(idDTO.getId(),"3"); - } + + @ApiOperation("委托书接收") + @PostMapping("/receive") + public ReturnDTO receiveOrder(@RequestBody @Valid OrderCancelRequest orderCancelRequest) { + Assert.isFalse(Objects.isNull(orderCancelRequest.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return businessOrderService.updateStatusById(orderCancelRequest, "2"); + } + + @ApiOperation("委托书退回") + @PostMapping("/back") + public ReturnDTO backOrder(@RequestBody @Valid OrderCancelRequest orderCancelRequest) { + Assert.isFalse(Objects.isNull(orderCancelRequest.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return businessOrderService.updateStatusById(orderCancelRequest, "3"); + } } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessDealRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessDealRecordMapper.java new file mode 100644 index 0000000..659f64b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessDealRecordMapper.java @@ -0,0 +1,20 @@ +package com.casic.missiles.mapper.business; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessDealRecord; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +public interface BusinessDealRecordMapper extends BaseMapper { + + + @Select("SELECT name " + + "FROM sys_dict sd " + + "JOIN( SELECT id " + + " FROM sys_dict " + + " WHERE CODE = 'cancelEntrust') sds ON sds.id=sd.pid " + + " AND code=#{reasonId} ") + String getDictContent(@Param("reasonId")String reasonId); + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderCancelRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderCancelRequest.java index 3d1ac81..b06975f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderCancelRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderCancelRequest.java @@ -9,7 +9,7 @@ public class OrderCancelRequest { @ApiModelProperty(value = "委托书id", dataType = "Long") - private Long orderId; + private Long id; @ApiModelProperty(value = "操作原因（终止操作必填，其他无需填写）", dataType = "String") private String reason; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessDealRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessDealRecord.java new file mode 100644 index 0000000..17e0770 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessDealRecord.java @@ -0,0 +1,37 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; + +@TableName("business_deal_record") +@ApiModel("委托书操作记录") +@AllArgsConstructor +@Builder +@Data +public class BusinessDealRecord { + + private Long id; + + @ApiModelProperty("委托书id") + private Long orderId; + + @ApiModelProperty("原因") + private String recordContent; + + private Long createUser; + + @ApiModelProperty("操作人名称") + private String createUserName; + + @ApiModelProperty("创建时间") + private String createTime; + + @ApiModelProperty("备注") + private String remark; + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java index 9043960..48742b4 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java @@ -15,9 +15,11 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.mapper.business.BusinessDealRecordMapper; import com.casic.missiles.mapper.business.BusinessOrderListReponseMapper; import com.casic.missiles.mapper.business.BusinessOrderMapper; import com.casic.missiles.mapper.business.BusinessOrderSampleRelationMapper; +import com.casic.missiles.model.business.BusinessDealRecord; import com.casic.missiles.model.business.BusinessOrder; import com.casic.missiles.model.business.BusinessOrderSampleRelation; import com.casic.missiles.model.customer.CustomerSampleInfo; @@ -33,6 +35,7 @@ import javax.servlet.http.HttpServletResponse; import java.util.ArrayList; +import java.util.Date; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -53,13 +56,14 @@ private final IBaseExportService iBaseExportService; private final CustomerSampleService customerSampleService; private final BusinessOrderSampleRelationMapper sampleRelationMapper; + private final BusinessDealRecordMapper dealRecordMapper; /** * 1、分页查询 2、批量查询所有的委托书、样品关系 => 进行以sampleId为key主键map list 3、查询计算样品数量 */ @Override public Page orderListPage(Page page, OrderListRequest request) throws Exception { - QueryWrapper wrapper = listParamWrapper(request); + QueryWrapper wrapper = listParamWrapperBuilder(request); Page resultPage = this.orderListResponseMapper.selectPage(page, wrapper); List orderSampleList = sampleRelationMapper.selectList(null); Map> orderSampleMap = orderSampleList.stream().collect( @@ -154,7 +158,10 @@ } /** - * 如查询说明，补充对是否加急的excel文档表现 + * 1、判断是否存在ids，进行其他参数属性的初始化 + * 2、查询查询构建 + * 3、查询样品关系，构建委托书样品数量map集合 + * 4、字典值进行状态转化 */ @Override public void orderExport(OrderListRequest request, HttpServletResponse response) { @@ -163,9 +170,10 @@ if (!CollectionUtils.isEmpty(request.getIds())) { orderResponseList = orderListResponseMapper.selectBatchIds(request.getIds()); } else { - QueryWrapper wrapper = listParamWrapper(request); + QueryWrapper wrapper = listParamWrapperBuilder(request); orderResponseList = this.orderListResponseMapper.selectList(wrapper); } + //查询样品关系，构建委托书样品数量map集合， List orderSampleList = sampleRelationMapper.selectList(null); Map> orderSampleMap = orderSampleList.stream().collect( Collectors.groupingBy(BusinessOrderSampleRelation::getOrderId) @@ -173,6 +181,7 @@ orderResponseList.forEach( orderSample -> orderSample.setSampleCount(orderSampleMap.containsKey(orderSample.getId()) ? orderSampleMap.get(orderSample.getId()).size() : 0) ); + //字典转换 for (OrderListReponse orderListReponse : orderResponseList) { orderListReponse.setIsUrgent("1".equals(orderListReponse.getIsUrgent()) ? "是" : "否"); DictCodeUtils.convertDictCodeToName(orderListReponse); @@ -188,29 +197,80 @@ * 通过状态对委托书状态进行更新 */ @Override - public ReturnDTO updateStatusById(Long id, String status) { - BusinessOrder businessOrder = new BusinessOrder(); - businessOrder.setId(id); - businessOrder.setStatus(status); - AuthUser authUser = ShiroKit.getUser(); - businessOrder.setUpdateUser(authUser.getId()); - int updateFlag = this.baseMapper.updateById(businessOrder); - if (updateFlag > 0) { + public ReturnDTO updateStatusById(OrderCancelRequest orderCancelRequest, String status) { + int updateFlag = doUpdateStatusById(orderCancelRequest.getId(), status); + int addDealRecordFlag = addDealRecord(orderCancelRequest); + if (updateFlag > 0 && addDealRecordFlag > 0) { return ReturnUtil.success(); } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + /** + * 取消记录，修改委托书状态，同时生成委托书操作日志，供用户查询 + */ @Override @Transactional public ReturnDTO cancelOrder(OrderCancelRequest orderCancelRequest) { - ReturnDTO returnDTO = this.updateStatusById(orderCancelRequest.getOrderId(), "3"); - if (returnDTO.getCode().equals(200)) { + int updateFlag = this.doUpdateStatusById(orderCancelRequest.getId(), "3"); + int addDealRecordFlag = addDealRecord(orderCancelRequest); + if (updateFlag > 0 && addDealRecordFlag > 0) { return ReturnUtil.success(); } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + /** + * 操作记录的查询 + */ + @Override + public List optionRecord(Long id) { + QueryWrapper dealRecordQueryWrapper = new QueryWrapper() + .eq("order_id", id); + return dealRecordMapper.selectList(dealRecordQueryWrapper); + } + + /** + * 新增操作记录 + */ + private int addDealRecord(OrderCancelRequest orderCancelRequest) { + AuthUser authUser = ShiroKit.getUser(); + BusinessDealRecord businessDealRecord = BusinessDealRecord.builder() + .createUser(authUser.getId()) + .createUserName(authUser.getName()) + .recordContent(reasonConvert(orderCancelRequest.getReason())) + .orderId(orderCancelRequest.getId()) + .build(); + return dealRecordMapper.insert(businessDealRecord); + } + + /** + * 强调正在做状态更新 + */ + private int doUpdateStatusById(Long orderId, String status) { + BusinessOrder businessOrder = new BusinessOrder(); + businessOrder.setId(orderId); + businessOrder.setStatus(status); + AuthUser authUser = ShiroKit.getUser(); + businessOrder.setUpdateUser(authUser.getId()); + return this.baseMapper.updateById(businessOrder); + } + + /** + * 原因字典转化为相应的值 + */ + private String reasonConvert(String reasonIds) { + String reasonStr = ""; + if (StringUtils.isEmpty(reasonIds)) { + return reasonStr; + } + String[] reasonIdList = reasonIds.split(","); + for (String reasonId : reasonIdList) { + String reasonContent = dealRecordMapper.getDictContent(reasonId); + reasonStr = reasonStr + reasonContent + ","; + } + return reasonStr.substring(0, reasonStr.length() - 1); + } private void initOrderInfo(BusinessOrder businessOrder) { Long maxNo = this.baseMapper.selectMaxCOrderNo(); @@ -222,8 +282,10 @@ businessOrder.setStatus("1"); } - - private QueryWrapper listParamWrapper(OrderListRequest request) { + /** + * 委托书列表查询构建方法 + */ + private QueryWrapper listParamWrapperBuilder(OrderListRequest request) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.like(StringUtils.isNotBlank(request.getCustomerName()), "customer_name", request.getCustomerName()); queryWrapper.like(StringUtils.isNotBlank(request.getDeliverer()), "deliverer", request.getDeliverer()); @@ -244,7 +306,7 @@ private int deleteSampleById(Long orderId) { QueryWrapper sampleStatusRelationWrapper = new QueryWrapper() .eq("order_id", orderId); - return this.sampleRelationMapper.delete(sampleStatusRelationWrapper); + return this.sampleRelationMapper.delete(sampleStatusRelationWrapper); } private int sampleStatusCreator(Long orderId, String measureContent, Long sampleId) { @@ -265,4 +327,5 @@ } ); } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOrderService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOrderService.java index 335ea1c..dea393f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOrderService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOrderService.java @@ -6,9 +6,11 @@ import com.casic.missiles.dto.business.order.OrderCancelRequest; import com.casic.missiles.dto.business.order.OrderListReponse; import com.casic.missiles.dto.business.order.OrderListRequest; +import com.casic.missiles.model.business.BusinessDealRecord; import com.casic.missiles.model.business.BusinessOrder; import javax.servlet.http.HttpServletResponse; +import java.util.List; /** *

@@ -30,9 +32,10 @@ void orderExport(OrderListRequest request, HttpServletResponse response); - ReturnDTO updateStatusById(Long id,String status); + ReturnDTO updateStatusById(OrderCancelRequest orderCancelRequest,String status); ReturnDTO cancelOrder(OrderCancelRequest orderCancelRequest); + List optionRecord(Long id); }