diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java index 97c39e6..b062ecd 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java @@ -5,10 +5,14 @@ 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.BaseApprovalSubmitRequest; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.print.CertificateListRequest; import com.casic.missiles.dto.business.print.CertificateListResponse; +import com.casic.missiles.dto.business.print.CertificateRefusePrintRequest; +import com.casic.missiles.dto.flowable.ApprovalAgreeRequest; +import com.casic.missiles.dto.flowable.ApprovalRefuseRequest; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessCertificatePrintService; @@ -19,6 +23,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; /** @@ -40,16 +45,61 @@ /** * 证书打印列表，除了基本的列表的信息，需要判断证书打印审批中的状态，进而达到权限的控制 */ - @ApiOperation("设备列表-分页") + @ApiOperation("证书打印-分页") @PostMapping("/listPage") - public ReturnDTO> CertificatePrintlistPage(@RequestBody @Valid CertificateListRequest request, BindingResult bindingResult) throws Exception { + public ReturnDTO> certificatePrintListPage(@RequestBody @Valid CertificateListRequest 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(certificatePrintService.CertificatePrintlistPage(request,page))); + return ReturnUtil.success(super.packForBT(certificatePrintService.certificatePrintListPage(request, page))); } - //同意 拒绝 请求审批 + + /** + * 证书打印列表，除了基本的列表的信息，需要判断证书打印审批中的状态，进而达到权限的控制 + */ + @ApiOperation("证书打印导出") + @PostMapping("/export") + public void certificatePrintExport(@RequestBody @Valid CertificateListRequest request, HttpServletResponse response) throws Exception { + Page page = PageFactory.defaultPage(); + certificatePrintService.certificatePrintExport(request, response, page); + } + + /** + * 证书打印列表，除了基本的列表的信息，需要判断证书打印审批中的状态，进而达到权限的控制 + */ + @ApiOperation("证书审批-同意") + @PostMapping("/agree") + public void agreeAginPrint(@RequestBody @Valid ApprovalAgreeRequest request,BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + certificatePrintService.agreeAginPrint(request); + } + + /** + * 证书审批拒绝 + */ + @ApiOperation("证书审批-拒绝") + @PostMapping("/refuse") + public void refuseAgainPrint(@RequestBody @Valid CertificateRefusePrintRequest request, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + certificatePrintService.refuseAgainPrint(request); + } +// + /** + * 申请再次打印 + */ + @ApiOperation("证书审批-发起申请") + @PostMapping("/submitApproval") + public ReturnDTO submitAgainPrint(@RequestBody @Valid BaseApprovalSubmitRequest request,BindingResult bindingResult){ + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return certificatePrintService.submitAgainPrint(request); + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java index 97c39e6..b062ecd 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java @@ -5,10 +5,14 @@ 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.BaseApprovalSubmitRequest; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.print.CertificateListRequest; import com.casic.missiles.dto.business.print.CertificateListResponse; +import com.casic.missiles.dto.business.print.CertificateRefusePrintRequest; +import com.casic.missiles.dto.flowable.ApprovalAgreeRequest; +import com.casic.missiles.dto.flowable.ApprovalRefuseRequest; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessCertificatePrintService; @@ -19,6 +23,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; /** @@ -40,16 +45,61 @@ /** * 证书打印列表，除了基本的列表的信息，需要判断证书打印审批中的状态，进而达到权限的控制 */ - @ApiOperation("设备列表-分页") + @ApiOperation("证书打印-分页") @PostMapping("/listPage") - public ReturnDTO> CertificatePrintlistPage(@RequestBody @Valid CertificateListRequest request, BindingResult bindingResult) throws Exception { + public ReturnDTO> certificatePrintListPage(@RequestBody @Valid CertificateListRequest 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(certificatePrintService.CertificatePrintlistPage(request,page))); + return ReturnUtil.success(super.packForBT(certificatePrintService.certificatePrintListPage(request, page))); } - //同意 拒绝 请求审批 + + /** + * 证书打印列表，除了基本的列表的信息，需要判断证书打印审批中的状态，进而达到权限的控制 + */ + @ApiOperation("证书打印导出") + @PostMapping("/export") + public void certificatePrintExport(@RequestBody @Valid CertificateListRequest request, HttpServletResponse response) throws Exception { + Page page = PageFactory.defaultPage(); + certificatePrintService.certificatePrintExport(request, response, page); + } + + /** + * 证书打印列表，除了基本的列表的信息，需要判断证书打印审批中的状态，进而达到权限的控制 + */ + @ApiOperation("证书审批-同意") + @PostMapping("/agree") + public void agreeAginPrint(@RequestBody @Valid ApprovalAgreeRequest request,BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + certificatePrintService.agreeAginPrint(request); + } + + /** + * 证书审批拒绝 + */ + @ApiOperation("证书审批-拒绝") + @PostMapping("/refuse") + public void refuseAgainPrint(@RequestBody @Valid CertificateRefusePrintRequest request, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + certificatePrintService.refuseAgainPrint(request); + } +// + /** + * 申请再次打印 + */ + @ApiOperation("证书审批-发起申请") + @PostMapping("/submitApproval") + public ReturnDTO submitAgainPrint(@RequestBody @Valid BaseApprovalSubmitRequest request,BindingResult bindingResult){ + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return certificatePrintService.submitAgainPrint(request); + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java index 4094bf1..f21769e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java @@ -78,7 +78,7 @@ */ @ApiOperation("设备终止") @PostMapping("/terminate") - public ReturnDTO forcedTerminate(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) { + public ReturnDTO forcedTerminate(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) { Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId()) || Objects.isNull(deviceReceiveDTO.getSampleId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); @@ -88,7 +88,7 @@ /** * 催办会产生催办消息，对相关操作人员进行消息提示 */ - @ApiOperation("催办") + @ApiOperation("催办（暂时未开发）") @PostMapping("/rushDoProcess") public ReturnDTO rushDoProcess(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) { Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId()) || Objects.isNull(deviceReceiveDTO.getSampleId()), () -> { diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java index 97c39e6..b062ecd 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java @@ -5,10 +5,14 @@ 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.BaseApprovalSubmitRequest; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.print.CertificateListRequest; import com.casic.missiles.dto.business.print.CertificateListResponse; +import com.casic.missiles.dto.business.print.CertificateRefusePrintRequest; +import com.casic.missiles.dto.flowable.ApprovalAgreeRequest; +import com.casic.missiles.dto.flowable.ApprovalRefuseRequest; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessCertificatePrintService; @@ -19,6 +23,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; /** @@ -40,16 +45,61 @@ /** * 证书打印列表，除了基本的列表的信息，需要判断证书打印审批中的状态，进而达到权限的控制 */ - @ApiOperation("设备列表-分页") + @ApiOperation("证书打印-分页") @PostMapping("/listPage") - public ReturnDTO> CertificatePrintlistPage(@RequestBody @Valid CertificateListRequest request, BindingResult bindingResult) throws Exception { + public ReturnDTO> certificatePrintListPage(@RequestBody @Valid CertificateListRequest 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(certificatePrintService.CertificatePrintlistPage(request,page))); + return ReturnUtil.success(super.packForBT(certificatePrintService.certificatePrintListPage(request, page))); } - //同意 拒绝 请求审批 + + /** + * 证书打印列表，除了基本的列表的信息，需要判断证书打印审批中的状态，进而达到权限的控制 + */ + @ApiOperation("证书打印导出") + @PostMapping("/export") + public void certificatePrintExport(@RequestBody @Valid CertificateListRequest request, HttpServletResponse response) throws Exception { + Page page = PageFactory.defaultPage(); + certificatePrintService.certificatePrintExport(request, response, page); + } + + /** + * 证书打印列表，除了基本的列表的信息，需要判断证书打印审批中的状态，进而达到权限的控制 + */ + @ApiOperation("证书审批-同意") + @PostMapping("/agree") + public void agreeAginPrint(@RequestBody @Valid ApprovalAgreeRequest request,BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + certificatePrintService.agreeAginPrint(request); + } + + /** + * 证书审批拒绝 + */ + @ApiOperation("证书审批-拒绝") + @PostMapping("/refuse") + public void refuseAgainPrint(@RequestBody @Valid CertificateRefusePrintRequest request, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + certificatePrintService.refuseAgainPrint(request); + } +// + /** + * 申请再次打印 + */ + @ApiOperation("证书审批-发起申请") + @PostMapping("/submitApproval") + public ReturnDTO submitAgainPrint(@RequestBody @Valid BaseApprovalSubmitRequest request,BindingResult bindingResult){ + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return certificatePrintService.submitAgainPrint(request); + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java index 4094bf1..f21769e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java @@ -78,7 +78,7 @@ */ @ApiOperation("设备终止") @PostMapping("/terminate") - public ReturnDTO forcedTerminate(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) { + public ReturnDTO forcedTerminate(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) { Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId()) || Objects.isNull(deviceReceiveDTO.getSampleId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); @@ -88,7 +88,7 @@ /** * 催办会产生催办消息，对相关操作人员进行消息提示 */ - @ApiOperation("催办") + @ApiOperation("催办（暂时未开发）") @PostMapping("/rushDoProcess") public ReturnDTO rushDoProcess(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) { Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId()) || Objects.isNull(deviceReceiveDTO.getSampleId()), () -> { diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java index 1fee737..78af9c4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java @@ -10,6 +10,8 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.interchange.InterchangeListRequest; import com.casic.missiles.dto.business.interchange.InterchangeListResponse; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BusinessInterchange; @@ -94,11 +96,21 @@ return ReturnUtil.success(bizExchangeService.deleteExchange(idDTO.getId())); } - //*******************************************************************************************************************// @ApiOperation("设备交接单导出") @PostMapping("/export") public void exportExchange(@RequestBody @Valid InterchangeListRequest request, HttpServletResponse response) { bizExchangeService.exportExchange(request, response); } + + @ApiOperation("样品列表") + @PostMapping("/sampleList") + public ReturnDTO> exchangeSampleList(@RequestBody @Valid InterchangeSampleListRequest 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(bizExchangeService.exchangeSampleList(page, request))); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java index 97c39e6..b062ecd 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java @@ -5,10 +5,14 @@ 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.BaseApprovalSubmitRequest; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.print.CertificateListRequest; import com.casic.missiles.dto.business.print.CertificateListResponse; +import com.casic.missiles.dto.business.print.CertificateRefusePrintRequest; +import com.casic.missiles.dto.flowable.ApprovalAgreeRequest; +import com.casic.missiles.dto.flowable.ApprovalRefuseRequest; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessCertificatePrintService; @@ -19,6 +23,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; /** @@ -40,16 +45,61 @@ /** * 证书打印列表，除了基本的列表的信息，需要判断证书打印审批中的状态，进而达到权限的控制 */ - @ApiOperation("设备列表-分页") + @ApiOperation("证书打印-分页") @PostMapping("/listPage") - public ReturnDTO> CertificatePrintlistPage(@RequestBody @Valid CertificateListRequest request, BindingResult bindingResult) throws Exception { + public ReturnDTO> certificatePrintListPage(@RequestBody @Valid CertificateListRequest 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(certificatePrintService.CertificatePrintlistPage(request,page))); + return ReturnUtil.success(super.packForBT(certificatePrintService.certificatePrintListPage(request, page))); } - //同意 拒绝 请求审批 + + /** + * 证书打印列表，除了基本的列表的信息，需要判断证书打印审批中的状态，进而达到权限的控制 + */ + @ApiOperation("证书打印导出") + @PostMapping("/export") + public void certificatePrintExport(@RequestBody @Valid CertificateListRequest request, HttpServletResponse response) throws Exception { + Page page = PageFactory.defaultPage(); + certificatePrintService.certificatePrintExport(request, response, page); + } + + /** + * 证书打印列表，除了基本的列表的信息，需要判断证书打印审批中的状态，进而达到权限的控制 + */ + @ApiOperation("证书审批-同意") + @PostMapping("/agree") + public void agreeAginPrint(@RequestBody @Valid ApprovalAgreeRequest request,BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + certificatePrintService.agreeAginPrint(request); + } + + /** + * 证书审批拒绝 + */ + @ApiOperation("证书审批-拒绝") + @PostMapping("/refuse") + public void refuseAgainPrint(@RequestBody @Valid CertificateRefusePrintRequest request, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + certificatePrintService.refuseAgainPrint(request); + } +// + /** + * 申请再次打印 + */ + @ApiOperation("证书审批-发起申请") + @PostMapping("/submitApproval") + public ReturnDTO submitAgainPrint(@RequestBody @Valid BaseApprovalSubmitRequest request,BindingResult bindingResult){ + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return certificatePrintService.submitAgainPrint(request); + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java index 4094bf1..f21769e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java @@ -78,7 +78,7 @@ */ @ApiOperation("设备终止") @PostMapping("/terminate") - public ReturnDTO forcedTerminate(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) { + public ReturnDTO forcedTerminate(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) { Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId()) || Objects.isNull(deviceReceiveDTO.getSampleId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); @@ -88,7 +88,7 @@ /** * 催办会产生催办消息，对相关操作人员进行消息提示 */ - @ApiOperation("催办") + @ApiOperation("催办（暂时未开发）") @PostMapping("/rushDoProcess") public ReturnDTO rushDoProcess(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) { Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId()) || Objects.isNull(deviceReceiveDTO.getSampleId()), () -> { diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java index 1fee737..78af9c4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java @@ -10,6 +10,8 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.interchange.InterchangeListRequest; import com.casic.missiles.dto.business.interchange.InterchangeListResponse; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BusinessInterchange; @@ -94,11 +96,21 @@ return ReturnUtil.success(bizExchangeService.deleteExchange(idDTO.getId())); } - //*******************************************************************************************************************// @ApiOperation("设备交接单导出") @PostMapping("/export") public void exportExchange(@RequestBody @Valid InterchangeListRequest request, HttpServletResponse response) { bizExchangeService.exportExchange(request, response); } + + @ApiOperation("样品列表") + @PostMapping("/sampleList") + public ReturnDTO> exchangeSampleList(@RequestBody @Valid InterchangeSampleListRequest 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(bizExchangeService.exchangeSampleList(page, request))); + } + } 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 077014f..2c0697d 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 @@ -44,7 +44,7 @@ @ApiOperation("客户投诉详情") @PostMapping("/detail") - public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { + public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO)throws Exception { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java index 97c39e6..b062ecd 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java @@ -5,10 +5,14 @@ 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.BaseApprovalSubmitRequest; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.print.CertificateListRequest; import com.casic.missiles.dto.business.print.CertificateListResponse; +import com.casic.missiles.dto.business.print.CertificateRefusePrintRequest; +import com.casic.missiles.dto.flowable.ApprovalAgreeRequest; +import com.casic.missiles.dto.flowable.ApprovalRefuseRequest; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessCertificatePrintService; @@ -19,6 +23,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; /** @@ -40,16 +45,61 @@ /** * 证书打印列表，除了基本的列表的信息，需要判断证书打印审批中的状态，进而达到权限的控制 */ - @ApiOperation("设备列表-分页") + @ApiOperation("证书打印-分页") @PostMapping("/listPage") - public ReturnDTO> CertificatePrintlistPage(@RequestBody @Valid CertificateListRequest request, BindingResult bindingResult) throws Exception { + public ReturnDTO> certificatePrintListPage(@RequestBody @Valid CertificateListRequest 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(certificatePrintService.CertificatePrintlistPage(request,page))); + return ReturnUtil.success(super.packForBT(certificatePrintService.certificatePrintListPage(request, page))); } - //同意 拒绝 请求审批 + + /** + * 证书打印列表，除了基本的列表的信息，需要判断证书打印审批中的状态，进而达到权限的控制 + */ + @ApiOperation("证书打印导出") + @PostMapping("/export") + public void certificatePrintExport(@RequestBody @Valid CertificateListRequest request, HttpServletResponse response) throws Exception { + Page page = PageFactory.defaultPage(); + certificatePrintService.certificatePrintExport(request, response, page); + } + + /** + * 证书打印列表，除了基本的列表的信息，需要判断证书打印审批中的状态，进而达到权限的控制 + */ + @ApiOperation("证书审批-同意") + @PostMapping("/agree") + public void agreeAginPrint(@RequestBody @Valid ApprovalAgreeRequest request,BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + certificatePrintService.agreeAginPrint(request); + } + + /** + * 证书审批拒绝 + */ + @ApiOperation("证书审批-拒绝") + @PostMapping("/refuse") + public void refuseAgainPrint(@RequestBody @Valid CertificateRefusePrintRequest request, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + certificatePrintService.refuseAgainPrint(request); + } +// + /** + * 申请再次打印 + */ + @ApiOperation("证书审批-发起申请") + @PostMapping("/submitApproval") + public ReturnDTO submitAgainPrint(@RequestBody @Valid BaseApprovalSubmitRequest request,BindingResult bindingResult){ + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return certificatePrintService.submitAgainPrint(request); + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java index 4094bf1..f21769e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java @@ -78,7 +78,7 @@ */ @ApiOperation("设备终止") @PostMapping("/terminate") - public ReturnDTO forcedTerminate(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) { + public ReturnDTO forcedTerminate(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) { Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId()) || Objects.isNull(deviceReceiveDTO.getSampleId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); @@ -88,7 +88,7 @@ /** * 催办会产生催办消息，对相关操作人员进行消息提示 */ - @ApiOperation("催办") + @ApiOperation("催办（暂时未开发）") @PostMapping("/rushDoProcess") public ReturnDTO rushDoProcess(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) { Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId()) || Objects.isNull(deviceReceiveDTO.getSampleId()), () -> { diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java index 1fee737..78af9c4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java @@ -10,6 +10,8 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.interchange.InterchangeListRequest; import com.casic.missiles.dto.business.interchange.InterchangeListResponse; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BusinessInterchange; @@ -94,11 +96,21 @@ return ReturnUtil.success(bizExchangeService.deleteExchange(idDTO.getId())); } - //*******************************************************************************************************************// @ApiOperation("设备交接单导出") @PostMapping("/export") public void exportExchange(@RequestBody @Valid InterchangeListRequest request, HttpServletResponse response) { bizExchangeService.exportExchange(request, response); } + + @ApiOperation("样品列表") + @PostMapping("/sampleList") + public ReturnDTO> exchangeSampleList(@RequestBody @Valid InterchangeSampleListRequest 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(bizExchangeService.exchangeSampleList(page, request))); + } + } 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 077014f..2c0697d 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 @@ -44,7 +44,7 @@ @ApiOperation("客户投诉详情") @PostMapping("/detail") - public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { + public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO)throws Exception { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ApplyFromIdEnum.java index 863f37e..e5aeca4 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ApplyFromIdEnum.java @@ -18,4 +18,6 @@ String DEVICE_BORROW_APPROVAL = "clsbjysp"; // 设备借用申请 String DEVICE_FIX_APPROVAL = "sbglsbjxsq"; // 设备检修申请 String DEVICE_FIX_ACCEPTANCE = "sbglsbjxbyysd"; // 设备检修保养验收单 + + String CERTIFICATE_PRINT_APPROVAL = "sbglbzzzcxsqssd"; // 证书打印通过，暂定************ } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java index 97c39e6..b062ecd 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java @@ -5,10 +5,14 @@ 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.BaseApprovalSubmitRequest; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.print.CertificateListRequest; import com.casic.missiles.dto.business.print.CertificateListResponse; +import com.casic.missiles.dto.business.print.CertificateRefusePrintRequest; +import com.casic.missiles.dto.flowable.ApprovalAgreeRequest; +import com.casic.missiles.dto.flowable.ApprovalRefuseRequest; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessCertificatePrintService; @@ -19,6 +23,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; /** @@ -40,16 +45,61 @@ /** * 证书打印列表，除了基本的列表的信息，需要判断证书打印审批中的状态，进而达到权限的控制 */ - @ApiOperation("设备列表-分页") + @ApiOperation("证书打印-分页") @PostMapping("/listPage") - public ReturnDTO> CertificatePrintlistPage(@RequestBody @Valid CertificateListRequest request, BindingResult bindingResult) throws Exception { + public ReturnDTO> certificatePrintListPage(@RequestBody @Valid CertificateListRequest 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(certificatePrintService.CertificatePrintlistPage(request,page))); + return ReturnUtil.success(super.packForBT(certificatePrintService.certificatePrintListPage(request, page))); } - //同意 拒绝 请求审批 + + /** + * 证书打印列表，除了基本的列表的信息，需要判断证书打印审批中的状态，进而达到权限的控制 + */ + @ApiOperation("证书打印导出") + @PostMapping("/export") + public void certificatePrintExport(@RequestBody @Valid CertificateListRequest request, HttpServletResponse response) throws Exception { + Page page = PageFactory.defaultPage(); + certificatePrintService.certificatePrintExport(request, response, page); + } + + /** + * 证书打印列表，除了基本的列表的信息，需要判断证书打印审批中的状态，进而达到权限的控制 + */ + @ApiOperation("证书审批-同意") + @PostMapping("/agree") + public void agreeAginPrint(@RequestBody @Valid ApprovalAgreeRequest request,BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + certificatePrintService.agreeAginPrint(request); + } + + /** + * 证书审批拒绝 + */ + @ApiOperation("证书审批-拒绝") + @PostMapping("/refuse") + public void refuseAgainPrint(@RequestBody @Valid CertificateRefusePrintRequest request, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + certificatePrintService.refuseAgainPrint(request); + } +// + /** + * 申请再次打印 + */ + @ApiOperation("证书审批-发起申请") + @PostMapping("/submitApproval") + public ReturnDTO submitAgainPrint(@RequestBody @Valid BaseApprovalSubmitRequest request,BindingResult bindingResult){ + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return certificatePrintService.submitAgainPrint(request); + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java index 4094bf1..f21769e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java @@ -78,7 +78,7 @@ */ @ApiOperation("设备终止") @PostMapping("/terminate") - public ReturnDTO forcedTerminate(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) { + public ReturnDTO forcedTerminate(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) { Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId()) || Objects.isNull(deviceReceiveDTO.getSampleId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); @@ -88,7 +88,7 @@ /** * 催办会产生催办消息，对相关操作人员进行消息提示 */ - @ApiOperation("催办") + @ApiOperation("催办（暂时未开发）") @PostMapping("/rushDoProcess") public ReturnDTO rushDoProcess(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) { Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId()) || Objects.isNull(deviceReceiveDTO.getSampleId()), () -> { diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java index 1fee737..78af9c4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java @@ -10,6 +10,8 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.interchange.InterchangeListRequest; import com.casic.missiles.dto.business.interchange.InterchangeListResponse; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BusinessInterchange; @@ -94,11 +96,21 @@ return ReturnUtil.success(bizExchangeService.deleteExchange(idDTO.getId())); } - //*******************************************************************************************************************// @ApiOperation("设备交接单导出") @PostMapping("/export") public void exportExchange(@RequestBody @Valid InterchangeListRequest request, HttpServletResponse response) { bizExchangeService.exportExchange(request, response); } + + @ApiOperation("样品列表") + @PostMapping("/sampleList") + public ReturnDTO> exchangeSampleList(@RequestBody @Valid InterchangeSampleListRequest 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(bizExchangeService.exchangeSampleList(page, request))); + } + } 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 077014f..2c0697d 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 @@ -44,7 +44,7 @@ @ApiOperation("客户投诉详情") @PostMapping("/detail") - public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { + public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO)throws Exception { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ApplyFromIdEnum.java index 863f37e..e5aeca4 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ApplyFromIdEnum.java @@ -18,4 +18,6 @@ String DEVICE_BORROW_APPROVAL = "clsbjysp"; // 设备借用申请 String DEVICE_FIX_APPROVAL = "sbglsbjxsq"; // 设备检修申请 String DEVICE_FIX_ACCEPTANCE = "sbglsbjxbyysd"; // 设备检修保养验收单 + + String CERTIFICATE_PRINT_APPROVAL = "sbglbzzzcxsqssd"; // 证书打印通过，暂定************ } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java index 9e3d9fd..dafb69c 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java @@ -48,12 +48,14 @@ TRACE_SUPPLIER_SAVE_FAILED(2404, "溯源供方保存至草稿箱失败"), TRACE_SUPPLIER_SUBMIT_FAILED(2405, "溯源供方提交处理失败"), TRAIN_PLAN_SUBMIT_FAILED(2406, "培训计划提交处理失败"), + FILE_SUBMIT_FAILED(2407, "文件提交处理失败"), FLOW_NO_JOIN_FLOWABLE(2408, "该流程暂未接入Flowable,请重试"), HANDLE_FAILED(500, "操作失败"), QRCODE_FAILED(2409, "二维码生成失败"), RECEIVE_SAMPLE_NOT_EXIST(2410, "待检测中不存在扫描收入的样品"), - COMPLETE_SAMPLE_NOT_EXIST(2411, "检测中不存在扫描收入的样品"); + COMPLETE_SAMPLE_NOT_EXIST(2411, "检测中不存在扫描收入的样品"), + AGAIN_PRINT_SUBMIT_FAILED(2412, "证书再次打印提交处理失败"); private Integer code; private String message; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java index 97c39e6..b062ecd 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java @@ -5,10 +5,14 @@ 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.BaseApprovalSubmitRequest; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.print.CertificateListRequest; import com.casic.missiles.dto.business.print.CertificateListResponse; +import com.casic.missiles.dto.business.print.CertificateRefusePrintRequest; +import com.casic.missiles.dto.flowable.ApprovalAgreeRequest; +import com.casic.missiles.dto.flowable.ApprovalRefuseRequest; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessCertificatePrintService; @@ -19,6 +23,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; /** @@ -40,16 +45,61 @@ /** * 证书打印列表，除了基本的列表的信息，需要判断证书打印审批中的状态，进而达到权限的控制 */ - @ApiOperation("设备列表-分页") + @ApiOperation("证书打印-分页") @PostMapping("/listPage") - public ReturnDTO> CertificatePrintlistPage(@RequestBody @Valid CertificateListRequest request, BindingResult bindingResult) throws Exception { + public ReturnDTO> certificatePrintListPage(@RequestBody @Valid CertificateListRequest 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(certificatePrintService.CertificatePrintlistPage(request,page))); + return ReturnUtil.success(super.packForBT(certificatePrintService.certificatePrintListPage(request, page))); } - //同意 拒绝 请求审批 + + /** + * 证书打印列表，除了基本的列表的信息，需要判断证书打印审批中的状态，进而达到权限的控制 + */ + @ApiOperation("证书打印导出") + @PostMapping("/export") + public void certificatePrintExport(@RequestBody @Valid CertificateListRequest request, HttpServletResponse response) throws Exception { + Page page = PageFactory.defaultPage(); + certificatePrintService.certificatePrintExport(request, response, page); + } + + /** + * 证书打印列表，除了基本的列表的信息，需要判断证书打印审批中的状态，进而达到权限的控制 + */ + @ApiOperation("证书审批-同意") + @PostMapping("/agree") + public void agreeAginPrint(@RequestBody @Valid ApprovalAgreeRequest request,BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + certificatePrintService.agreeAginPrint(request); + } + + /** + * 证书审批拒绝 + */ + @ApiOperation("证书审批-拒绝") + @PostMapping("/refuse") + public void refuseAgainPrint(@RequestBody @Valid CertificateRefusePrintRequest request, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + certificatePrintService.refuseAgainPrint(request); + } +// + /** + * 申请再次打印 + */ + @ApiOperation("证书审批-发起申请") + @PostMapping("/submitApproval") + public ReturnDTO submitAgainPrint(@RequestBody @Valid BaseApprovalSubmitRequest request,BindingResult bindingResult){ + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return certificatePrintService.submitAgainPrint(request); + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java index 4094bf1..f21769e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java @@ -78,7 +78,7 @@ */ @ApiOperation("设备终止") @PostMapping("/terminate") - public ReturnDTO forcedTerminate(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) { + public ReturnDTO forcedTerminate(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) { Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId()) || Objects.isNull(deviceReceiveDTO.getSampleId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); @@ -88,7 +88,7 @@ /** * 催办会产生催办消息，对相关操作人员进行消息提示 */ - @ApiOperation("催办") + @ApiOperation("催办（暂时未开发）") @PostMapping("/rushDoProcess") public ReturnDTO rushDoProcess(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) { Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId()) || Objects.isNull(deviceReceiveDTO.getSampleId()), () -> { diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java index 1fee737..78af9c4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java @@ -10,6 +10,8 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.interchange.InterchangeListRequest; import com.casic.missiles.dto.business.interchange.InterchangeListResponse; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BusinessInterchange; @@ -94,11 +96,21 @@ return ReturnUtil.success(bizExchangeService.deleteExchange(idDTO.getId())); } - //*******************************************************************************************************************// @ApiOperation("设备交接单导出") @PostMapping("/export") public void exportExchange(@RequestBody @Valid InterchangeListRequest request, HttpServletResponse response) { bizExchangeService.exportExchange(request, response); } + + @ApiOperation("样品列表") + @PostMapping("/sampleList") + public ReturnDTO> exchangeSampleList(@RequestBody @Valid InterchangeSampleListRequest 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(bizExchangeService.exchangeSampleList(page, request))); + } + } 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 077014f..2c0697d 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 @@ -44,7 +44,7 @@ @ApiOperation("客户投诉详情") @PostMapping("/detail") - public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { + public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO)throws Exception { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ApplyFromIdEnum.java index 863f37e..e5aeca4 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ApplyFromIdEnum.java @@ -18,4 +18,6 @@ String DEVICE_BORROW_APPROVAL = "clsbjysp"; // 设备借用申请 String DEVICE_FIX_APPROVAL = "sbglsbjxsq"; // 设备检修申请 String DEVICE_FIX_ACCEPTANCE = "sbglsbjxbyysd"; // 设备检修保养验收单 + + String CERTIFICATE_PRINT_APPROVAL = "sbglbzzzcxsqssd"; // 证书打印通过，暂定************ } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java index 9e3d9fd..dafb69c 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java @@ -48,12 +48,14 @@ TRACE_SUPPLIER_SAVE_FAILED(2404, "溯源供方保存至草稿箱失败"), TRACE_SUPPLIER_SUBMIT_FAILED(2405, "溯源供方提交处理失败"), TRAIN_PLAN_SUBMIT_FAILED(2406, "培训计划提交处理失败"), + FILE_SUBMIT_FAILED(2407, "文件提交处理失败"), FLOW_NO_JOIN_FLOWABLE(2408, "该流程暂未接入Flowable,请重试"), HANDLE_FAILED(500, "操作失败"), QRCODE_FAILED(2409, "二维码生成失败"), RECEIVE_SAMPLE_NOT_EXIST(2410, "待检测中不存在扫描收入的样品"), - COMPLETE_SAMPLE_NOT_EXIST(2411, "检测中不存在扫描收入的样品"); + COMPLETE_SAMPLE_NOT_EXIST(2411, "检测中不存在扫描收入的样品"), + AGAIN_PRINT_SUBMIT_FAILED(2412, "证书再次打印提交处理失败"); private Integer code; private String message; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java index e7c492b..e000734 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java @@ -1,15 +1,19 @@ package com.casic.missiles.listeners.flowable; +import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.casic.missiles.enums.ApplyFromIdEnum; +import com.casic.missiles.enums.ApprovalStatusEnum; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.EquipmentApplyProcessEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.MeterFixedAssetsMapper; +import com.casic.missiles.mapper.business.BusinessCertificateReportMapper; import com.casic.missiles.mapper.equipment.EquipmentApplyEquipmentMapper; import com.casic.missiles.mapper.equipment.EquipmentApplyMapper; import com.casic.missiles.mapper.system.SystemFlowFormMapper; +import com.casic.missiles.model.business.BusinessCertificateReport; import com.casic.missiles.model.equipment.EquipmentApply; import com.casic.missiles.model.equipment.EquipmentApplyEquipment; import com.casic.missiles.model.equipment.EquipmentFixedAssets; @@ -21,8 +25,10 @@ import org.flowable.engine.delegate.ExecutionListener; import org.flowable.engine.repository.ProcessDefinition; import org.springframework.stereotype.Component; +import org.springframework.util.ObjectUtils; import java.util.List; +import java.util.Objects; import java.util.stream.Collectors; @Slf4j @@ -32,27 +38,51 @@ public void notify(DelegateExecution execution) { RepositoryService repositoryService = SpringContextUtil.getBean(RepositoryService.class); SystemFlowFormMapper flowFormMapper = SpringContextUtil.getBean(SystemFlowFormMapper.class); - System.err.println("审批通过触发监听器:"+execution); + System.err.println("审批通过触发监听器:" + execution); ProcessDefinition processDefinition = repositoryService.getProcessDefinition(execution.getProcessDefinitionId()); QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("pro_def_id", processDefinition.getKey()); wrapper.eq("is_del", 0); SystemFlowForm systemFlowForm = flowFormMapper.selectOne(wrapper); String id = execution.getProcessInstanceBusinessKey(); - switch (systemFlowForm.getFormId()){ + switch (systemFlowForm.getFormId()) { // 标准装置申请 - case ApplyFromIdEnum.STANDARD_REVERT_APPROVAL:updateStandardState(id, EquipmentApplyProcessEnum.STANDARD_USE);break; - case ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL: updateStandardState(id, EquipmentApplyProcessEnum.STOP);break; - case ApplyFromIdEnum.STANDARD_RESUME_APPROVAL: updateStandardState(id, EquipmentApplyProcessEnum.REVOKE);break; + case ApplyFromIdEnum.STANDARD_REVERT_APPROVAL: + updateStandardState(id, EquipmentApplyProcessEnum.STANDARD_USE); + break; + case ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL: + updateStandardState(id, EquipmentApplyProcessEnum.STOP); + break; + case ApplyFromIdEnum.STANDARD_RESUME_APPROVAL: + updateStandardState(id, EquipmentApplyProcessEnum.REVOKE); + break; // 设备状态管理申请 - case ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.IDLE);break; - case ApplyFromIdEnum.DEVICE_SEALED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.SEALED);break; - case ApplyFromIdEnum.DEVICE_UNSEALED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.USE);break; - case ApplyFromIdEnum.DEVICE_SCRAPPED_ROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.SCRAP);break; - case ApplyFromIdEnum.DEVICE_HANDLE_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.MANAGEMENT);break; + case ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL: + updateEquipmentState(id, EquipmentApplyProcessEnum.IDLE); + break; + case ApplyFromIdEnum.DEVICE_SEALED_APPROVAL: + updateEquipmentState(id, EquipmentApplyProcessEnum.SEALED); + break; + case ApplyFromIdEnum.DEVICE_UNSEALED_APPROVAL: + updateEquipmentState(id, EquipmentApplyProcessEnum.USE); + break; + case ApplyFromIdEnum.DEVICE_SCRAPPED_ROVAL: + updateEquipmentState(id, EquipmentApplyProcessEnum.SCRAP); + break; + case ApplyFromIdEnum.DEVICE_HANDLE_APPROVAL: + updateEquipmentState(id, EquipmentApplyProcessEnum.MANAGEMENT); + break; // 设备借用领用申请 - case ApplyFromIdEnum.DEVICE_CONSUMING_APPROVAL: updateEquipmentApplyState(id, EquipmentApplyProcessEnum.WAIT_COLLECTING);break; - case ApplyFromIdEnum.DEVICE_BORROW_APPROVAL: updateEquipmentApplyState(id, EquipmentApplyProcessEnum.WAIT_BORROWED);break; + case ApplyFromIdEnum.DEVICE_CONSUMING_APPROVAL: + updateEquipmentApplyState(id, EquipmentApplyProcessEnum.WAIT_COLLECTING); + break; + case ApplyFromIdEnum.DEVICE_BORROW_APPROVAL: + updateEquipmentApplyState(id, EquipmentApplyProcessEnum.WAIT_BORROWED); + break; + //证书打印审批通过状态回填 + case ApplyFromIdEnum.CERTIFICATE_PRINT_APPROVAL: + updateCertificateState(Long.valueOf(id)); + break; } } @@ -60,8 +90,8 @@ EquipmentApplyMapper equipmentApplyMapper = SpringContextUtil.getBean(EquipmentApplyMapper.class); UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.eq("id",id).set("process_result", state); - if(equipmentApplyMapper.update(null, updateWrapper)<=0){ + updateWrapper.eq("id", id).set("process_result", state); + if (equipmentApplyMapper.update(null, updateWrapper) <= 0) { throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } } @@ -74,17 +104,32 @@ List equipmentApplyEquipments = equipmentMapper.selectList(wrapper); List equipmentIds = equipmentApplyEquipments.stream().map(EquipmentApplyEquipment::getEquipmentId).collect(Collectors.toList()); UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.in("id",equipmentIds).set("manager_state",state); - if(meterFixedAssetsMapper.update(null,updateWrapper)<=0){ + updateWrapper.in("id", equipmentIds).set("manager_state", state); + if (meterFixedAssetsMapper.update(null, updateWrapper) <= 0) { throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } } - private void updateStandardState(String id,String state) { + private void updateStandardState(String id, String state) { MeterFixedAssetsMapper meterFixedAssetsMapper = SpringContextUtil.getBean(MeterFixedAssetsMapper.class); UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.in("id",id).set("manager_state",state); - if(meterFixedAssetsMapper.update(null,updateWrapper)<=0){ + updateWrapper.in("id", id).set("manager_state", state); + if (meterFixedAssetsMapper.update(null, updateWrapper) <= 0) { + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + } + + private void updateCertificateState(Long id) { + Assert.isFalse(Objects.isNull(id), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + BusinessCertificateReportMapper certificateReportMapper = SpringContextUtil.getBean(BusinessCertificateReportMapper.class); + BusinessCertificateReport certificateReport = new BusinessCertificateReport(); + certificateReport.setId(id); + certificateReport.setApprovalStatus(ApprovalStatusEnum.PASSED); //审批状态为审批中 + certificateReport.setPrintStatus("1"); //打印状态可打印 + int row = certificateReportMapper.updateById(certificateReport); + if (row <= 0) { throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java index 97c39e6..b062ecd 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java @@ -5,10 +5,14 @@ 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.BaseApprovalSubmitRequest; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.print.CertificateListRequest; import com.casic.missiles.dto.business.print.CertificateListResponse; +import com.casic.missiles.dto.business.print.CertificateRefusePrintRequest; +import com.casic.missiles.dto.flowable.ApprovalAgreeRequest; +import com.casic.missiles.dto.flowable.ApprovalRefuseRequest; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessCertificatePrintService; @@ -19,6 +23,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; /** @@ -40,16 +45,61 @@ /** * 证书打印列表，除了基本的列表的信息，需要判断证书打印审批中的状态，进而达到权限的控制 */ - @ApiOperation("设备列表-分页") + @ApiOperation("证书打印-分页") @PostMapping("/listPage") - public ReturnDTO> CertificatePrintlistPage(@RequestBody @Valid CertificateListRequest request, BindingResult bindingResult) throws Exception { + public ReturnDTO> certificatePrintListPage(@RequestBody @Valid CertificateListRequest 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(certificatePrintService.CertificatePrintlistPage(request,page))); + return ReturnUtil.success(super.packForBT(certificatePrintService.certificatePrintListPage(request, page))); } - //同意 拒绝 请求审批 + + /** + * 证书打印列表，除了基本的列表的信息，需要判断证书打印审批中的状态，进而达到权限的控制 + */ + @ApiOperation("证书打印导出") + @PostMapping("/export") + public void certificatePrintExport(@RequestBody @Valid CertificateListRequest request, HttpServletResponse response) throws Exception { + Page page = PageFactory.defaultPage(); + certificatePrintService.certificatePrintExport(request, response, page); + } + + /** + * 证书打印列表，除了基本的列表的信息，需要判断证书打印审批中的状态，进而达到权限的控制 + */ + @ApiOperation("证书审批-同意") + @PostMapping("/agree") + public void agreeAginPrint(@RequestBody @Valid ApprovalAgreeRequest request,BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + certificatePrintService.agreeAginPrint(request); + } + + /** + * 证书审批拒绝 + */ + @ApiOperation("证书审批-拒绝") + @PostMapping("/refuse") + public void refuseAgainPrint(@RequestBody @Valid CertificateRefusePrintRequest request, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + certificatePrintService.refuseAgainPrint(request); + } +// + /** + * 申请再次打印 + */ + @ApiOperation("证书审批-发起申请") + @PostMapping("/submitApproval") + public ReturnDTO submitAgainPrint(@RequestBody @Valid BaseApprovalSubmitRequest request,BindingResult bindingResult){ + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return certificatePrintService.submitAgainPrint(request); + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java index 4094bf1..f21769e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java @@ -78,7 +78,7 @@ */ @ApiOperation("设备终止") @PostMapping("/terminate") - public ReturnDTO forcedTerminate(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) { + public ReturnDTO forcedTerminate(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) { Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId()) || Objects.isNull(deviceReceiveDTO.getSampleId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); @@ -88,7 +88,7 @@ /** * 催办会产生催办消息，对相关操作人员进行消息提示 */ - @ApiOperation("催办") + @ApiOperation("催办（暂时未开发）") @PostMapping("/rushDoProcess") public ReturnDTO rushDoProcess(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) { Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId()) || Objects.isNull(deviceReceiveDTO.getSampleId()), () -> { diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java index 1fee737..78af9c4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java @@ -10,6 +10,8 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.interchange.InterchangeListRequest; import com.casic.missiles.dto.business.interchange.InterchangeListResponse; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BusinessInterchange; @@ -94,11 +96,21 @@ return ReturnUtil.success(bizExchangeService.deleteExchange(idDTO.getId())); } - //*******************************************************************************************************************// @ApiOperation("设备交接单导出") @PostMapping("/export") public void exportExchange(@RequestBody @Valid InterchangeListRequest request, HttpServletResponse response) { bizExchangeService.exportExchange(request, response); } + + @ApiOperation("样品列表") + @PostMapping("/sampleList") + public ReturnDTO> exchangeSampleList(@RequestBody @Valid InterchangeSampleListRequest 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(bizExchangeService.exchangeSampleList(page, request))); + } + } 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 077014f..2c0697d 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 @@ -44,7 +44,7 @@ @ApiOperation("客户投诉详情") @PostMapping("/detail") - public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { + public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO)throws Exception { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ApplyFromIdEnum.java index 863f37e..e5aeca4 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ApplyFromIdEnum.java @@ -18,4 +18,6 @@ String DEVICE_BORROW_APPROVAL = "clsbjysp"; // 设备借用申请 String DEVICE_FIX_APPROVAL = "sbglsbjxsq"; // 设备检修申请 String DEVICE_FIX_ACCEPTANCE = "sbglsbjxbyysd"; // 设备检修保养验收单 + + String CERTIFICATE_PRINT_APPROVAL = "sbglbzzzcxsqssd"; // 证书打印通过，暂定************ } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java index 9e3d9fd..dafb69c 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java @@ -48,12 +48,14 @@ TRACE_SUPPLIER_SAVE_FAILED(2404, "溯源供方保存至草稿箱失败"), TRACE_SUPPLIER_SUBMIT_FAILED(2405, "溯源供方提交处理失败"), TRAIN_PLAN_SUBMIT_FAILED(2406, "培训计划提交处理失败"), + FILE_SUBMIT_FAILED(2407, "文件提交处理失败"), FLOW_NO_JOIN_FLOWABLE(2408, "该流程暂未接入Flowable,请重试"), HANDLE_FAILED(500, "操作失败"), QRCODE_FAILED(2409, "二维码生成失败"), RECEIVE_SAMPLE_NOT_EXIST(2410, "待检测中不存在扫描收入的样品"), - COMPLETE_SAMPLE_NOT_EXIST(2411, "检测中不存在扫描收入的样品"); + COMPLETE_SAMPLE_NOT_EXIST(2411, "检测中不存在扫描收入的样品"), + AGAIN_PRINT_SUBMIT_FAILED(2412, "证书再次打印提交处理失败"); private Integer code; private String message; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java index e7c492b..e000734 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java @@ -1,15 +1,19 @@ package com.casic.missiles.listeners.flowable; +import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.casic.missiles.enums.ApplyFromIdEnum; +import com.casic.missiles.enums.ApprovalStatusEnum; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.EquipmentApplyProcessEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.MeterFixedAssetsMapper; +import com.casic.missiles.mapper.business.BusinessCertificateReportMapper; import com.casic.missiles.mapper.equipment.EquipmentApplyEquipmentMapper; import com.casic.missiles.mapper.equipment.EquipmentApplyMapper; import com.casic.missiles.mapper.system.SystemFlowFormMapper; +import com.casic.missiles.model.business.BusinessCertificateReport; import com.casic.missiles.model.equipment.EquipmentApply; import com.casic.missiles.model.equipment.EquipmentApplyEquipment; import com.casic.missiles.model.equipment.EquipmentFixedAssets; @@ -21,8 +25,10 @@ import org.flowable.engine.delegate.ExecutionListener; import org.flowable.engine.repository.ProcessDefinition; import org.springframework.stereotype.Component; +import org.springframework.util.ObjectUtils; import java.util.List; +import java.util.Objects; import java.util.stream.Collectors; @Slf4j @@ -32,27 +38,51 @@ public void notify(DelegateExecution execution) { RepositoryService repositoryService = SpringContextUtil.getBean(RepositoryService.class); SystemFlowFormMapper flowFormMapper = SpringContextUtil.getBean(SystemFlowFormMapper.class); - System.err.println("审批通过触发监听器:"+execution); + System.err.println("审批通过触发监听器:" + execution); ProcessDefinition processDefinition = repositoryService.getProcessDefinition(execution.getProcessDefinitionId()); QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("pro_def_id", processDefinition.getKey()); wrapper.eq("is_del", 0); SystemFlowForm systemFlowForm = flowFormMapper.selectOne(wrapper); String id = execution.getProcessInstanceBusinessKey(); - switch (systemFlowForm.getFormId()){ + switch (systemFlowForm.getFormId()) { // 标准装置申请 - case ApplyFromIdEnum.STANDARD_REVERT_APPROVAL:updateStandardState(id, EquipmentApplyProcessEnum.STANDARD_USE);break; - case ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL: updateStandardState(id, EquipmentApplyProcessEnum.STOP);break; - case ApplyFromIdEnum.STANDARD_RESUME_APPROVAL: updateStandardState(id, EquipmentApplyProcessEnum.REVOKE);break; + case ApplyFromIdEnum.STANDARD_REVERT_APPROVAL: + updateStandardState(id, EquipmentApplyProcessEnum.STANDARD_USE); + break; + case ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL: + updateStandardState(id, EquipmentApplyProcessEnum.STOP); + break; + case ApplyFromIdEnum.STANDARD_RESUME_APPROVAL: + updateStandardState(id, EquipmentApplyProcessEnum.REVOKE); + break; // 设备状态管理申请 - case ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.IDLE);break; - case ApplyFromIdEnum.DEVICE_SEALED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.SEALED);break; - case ApplyFromIdEnum.DEVICE_UNSEALED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.USE);break; - case ApplyFromIdEnum.DEVICE_SCRAPPED_ROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.SCRAP);break; - case ApplyFromIdEnum.DEVICE_HANDLE_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.MANAGEMENT);break; + case ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL: + updateEquipmentState(id, EquipmentApplyProcessEnum.IDLE); + break; + case ApplyFromIdEnum.DEVICE_SEALED_APPROVAL: + updateEquipmentState(id, EquipmentApplyProcessEnum.SEALED); + break; + case ApplyFromIdEnum.DEVICE_UNSEALED_APPROVAL: + updateEquipmentState(id, EquipmentApplyProcessEnum.USE); + break; + case ApplyFromIdEnum.DEVICE_SCRAPPED_ROVAL: + updateEquipmentState(id, EquipmentApplyProcessEnum.SCRAP); + break; + case ApplyFromIdEnum.DEVICE_HANDLE_APPROVAL: + updateEquipmentState(id, EquipmentApplyProcessEnum.MANAGEMENT); + break; // 设备借用领用申请 - case ApplyFromIdEnum.DEVICE_CONSUMING_APPROVAL: updateEquipmentApplyState(id, EquipmentApplyProcessEnum.WAIT_COLLECTING);break; - case ApplyFromIdEnum.DEVICE_BORROW_APPROVAL: updateEquipmentApplyState(id, EquipmentApplyProcessEnum.WAIT_BORROWED);break; + case ApplyFromIdEnum.DEVICE_CONSUMING_APPROVAL: + updateEquipmentApplyState(id, EquipmentApplyProcessEnum.WAIT_COLLECTING); + break; + case ApplyFromIdEnum.DEVICE_BORROW_APPROVAL: + updateEquipmentApplyState(id, EquipmentApplyProcessEnum.WAIT_BORROWED); + break; + //证书打印审批通过状态回填 + case ApplyFromIdEnum.CERTIFICATE_PRINT_APPROVAL: + updateCertificateState(Long.valueOf(id)); + break; } } @@ -60,8 +90,8 @@ EquipmentApplyMapper equipmentApplyMapper = SpringContextUtil.getBean(EquipmentApplyMapper.class); UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.eq("id",id).set("process_result", state); - if(equipmentApplyMapper.update(null, updateWrapper)<=0){ + updateWrapper.eq("id", id).set("process_result", state); + if (equipmentApplyMapper.update(null, updateWrapper) <= 0) { throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } } @@ -74,17 +104,32 @@ List equipmentApplyEquipments = equipmentMapper.selectList(wrapper); List equipmentIds = equipmentApplyEquipments.stream().map(EquipmentApplyEquipment::getEquipmentId).collect(Collectors.toList()); UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.in("id",equipmentIds).set("manager_state",state); - if(meterFixedAssetsMapper.update(null,updateWrapper)<=0){ + updateWrapper.in("id", equipmentIds).set("manager_state", state); + if (meterFixedAssetsMapper.update(null, updateWrapper) <= 0) { throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } } - private void updateStandardState(String id,String state) { + private void updateStandardState(String id, String state) { MeterFixedAssetsMapper meterFixedAssetsMapper = SpringContextUtil.getBean(MeterFixedAssetsMapper.class); UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.in("id",id).set("manager_state",state); - if(meterFixedAssetsMapper.update(null,updateWrapper)<=0){ + updateWrapper.in("id", id).set("manager_state", state); + if (meterFixedAssetsMapper.update(null, updateWrapper) <= 0) { + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + } + + private void updateCertificateState(Long id) { + Assert.isFalse(Objects.isNull(id), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + BusinessCertificateReportMapper certificateReportMapper = SpringContextUtil.getBean(BusinessCertificateReportMapper.class); + BusinessCertificateReport certificateReport = new BusinessCertificateReport(); + certificateReport.setId(id); + certificateReport.setApprovalStatus(ApprovalStatusEnum.PASSED); //审批状态为审批中 + certificateReport.setPrintStatus("1"); //打印状态可打印 + int row = certificateReportMapper.updateById(certificateReport); + if (row <= 0) { throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java index d00db2e..bcbb996 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java @@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.business.interchange.InterchangeListRequest; import com.casic.missiles.dto.business.interchange.InterchangeListResponse; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListResponse; import com.casic.missiles.model.business.BusinessInterchange; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -20,8 +22,10 @@ */ public interface BusinessInterchangeMapper extends BaseMapper { - List selectInterchangeListPage(@Param("page") Page page, @Param("request") InterchangeListRequest request); + List selectInterchangeListPage(@Param("page") Page page, @Param("request") InterchangeListRequest request); - Long selectMaxExchangeNo(); + List exchangeSampleList(@Param("page") Page page, @Param("request") InterchangeSampleListRequest request); + + Long selectMaxExchangeNo(); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java index 97c39e6..b062ecd 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java @@ -5,10 +5,14 @@ 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.BaseApprovalSubmitRequest; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.print.CertificateListRequest; import com.casic.missiles.dto.business.print.CertificateListResponse; +import com.casic.missiles.dto.business.print.CertificateRefusePrintRequest; +import com.casic.missiles.dto.flowable.ApprovalAgreeRequest; +import com.casic.missiles.dto.flowable.ApprovalRefuseRequest; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessCertificatePrintService; @@ -19,6 +23,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; /** @@ -40,16 +45,61 @@ /** * 证书打印列表，除了基本的列表的信息，需要判断证书打印审批中的状态，进而达到权限的控制 */ - @ApiOperation("设备列表-分页") + @ApiOperation("证书打印-分页") @PostMapping("/listPage") - public ReturnDTO> CertificatePrintlistPage(@RequestBody @Valid CertificateListRequest request, BindingResult bindingResult) throws Exception { + public ReturnDTO> certificatePrintListPage(@RequestBody @Valid CertificateListRequest 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(certificatePrintService.CertificatePrintlistPage(request,page))); + return ReturnUtil.success(super.packForBT(certificatePrintService.certificatePrintListPage(request, page))); } - //同意 拒绝 请求审批 + + /** + * 证书打印列表，除了基本的列表的信息，需要判断证书打印审批中的状态，进而达到权限的控制 + */ + @ApiOperation("证书打印导出") + @PostMapping("/export") + public void certificatePrintExport(@RequestBody @Valid CertificateListRequest request, HttpServletResponse response) throws Exception { + Page page = PageFactory.defaultPage(); + certificatePrintService.certificatePrintExport(request, response, page); + } + + /** + * 证书打印列表，除了基本的列表的信息，需要判断证书打印审批中的状态，进而达到权限的控制 + */ + @ApiOperation("证书审批-同意") + @PostMapping("/agree") + public void agreeAginPrint(@RequestBody @Valid ApprovalAgreeRequest request,BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + certificatePrintService.agreeAginPrint(request); + } + + /** + * 证书审批拒绝 + */ + @ApiOperation("证书审批-拒绝") + @PostMapping("/refuse") + public void refuseAgainPrint(@RequestBody @Valid CertificateRefusePrintRequest request, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + certificatePrintService.refuseAgainPrint(request); + } +// + /** + * 申请再次打印 + */ + @ApiOperation("证书审批-发起申请") + @PostMapping("/submitApproval") + public ReturnDTO submitAgainPrint(@RequestBody @Valid BaseApprovalSubmitRequest request,BindingResult bindingResult){ + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return certificatePrintService.submitAgainPrint(request); + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java index 4094bf1..f21769e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java @@ -78,7 +78,7 @@ */ @ApiOperation("设备终止") @PostMapping("/terminate") - public ReturnDTO forcedTerminate(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) { + public ReturnDTO forcedTerminate(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) { Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId()) || Objects.isNull(deviceReceiveDTO.getSampleId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); @@ -88,7 +88,7 @@ /** * 催办会产生催办消息，对相关操作人员进行消息提示 */ - @ApiOperation("催办") + @ApiOperation("催办（暂时未开发）") @PostMapping("/rushDoProcess") public ReturnDTO rushDoProcess(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) { Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId()) || Objects.isNull(deviceReceiveDTO.getSampleId()), () -> { diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java index 1fee737..78af9c4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java @@ -10,6 +10,8 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.interchange.InterchangeListRequest; import com.casic.missiles.dto.business.interchange.InterchangeListResponse; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BusinessInterchange; @@ -94,11 +96,21 @@ return ReturnUtil.success(bizExchangeService.deleteExchange(idDTO.getId())); } - //*******************************************************************************************************************// @ApiOperation("设备交接单导出") @PostMapping("/export") public void exportExchange(@RequestBody @Valid InterchangeListRequest request, HttpServletResponse response) { bizExchangeService.exportExchange(request, response); } + + @ApiOperation("样品列表") + @PostMapping("/sampleList") + public ReturnDTO> exchangeSampleList(@RequestBody @Valid InterchangeSampleListRequest 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(bizExchangeService.exchangeSampleList(page, request))); + } + } 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 077014f..2c0697d 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 @@ -44,7 +44,7 @@ @ApiOperation("客户投诉详情") @PostMapping("/detail") - public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { + public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO)throws Exception { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ApplyFromIdEnum.java index 863f37e..e5aeca4 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ApplyFromIdEnum.java @@ -18,4 +18,6 @@ String DEVICE_BORROW_APPROVAL = "clsbjysp"; // 设备借用申请 String DEVICE_FIX_APPROVAL = "sbglsbjxsq"; // 设备检修申请 String DEVICE_FIX_ACCEPTANCE = "sbglsbjxbyysd"; // 设备检修保养验收单 + + String CERTIFICATE_PRINT_APPROVAL = "sbglbzzzcxsqssd"; // 证书打印通过，暂定************ } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java index 9e3d9fd..dafb69c 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java @@ -48,12 +48,14 @@ TRACE_SUPPLIER_SAVE_FAILED(2404, "溯源供方保存至草稿箱失败"), TRACE_SUPPLIER_SUBMIT_FAILED(2405, "溯源供方提交处理失败"), TRAIN_PLAN_SUBMIT_FAILED(2406, "培训计划提交处理失败"), + FILE_SUBMIT_FAILED(2407, "文件提交处理失败"), FLOW_NO_JOIN_FLOWABLE(2408, "该流程暂未接入Flowable,请重试"), HANDLE_FAILED(500, "操作失败"), QRCODE_FAILED(2409, "二维码生成失败"), RECEIVE_SAMPLE_NOT_EXIST(2410, "待检测中不存在扫描收入的样品"), - COMPLETE_SAMPLE_NOT_EXIST(2411, "检测中不存在扫描收入的样品"); + COMPLETE_SAMPLE_NOT_EXIST(2411, "检测中不存在扫描收入的样品"), + AGAIN_PRINT_SUBMIT_FAILED(2412, "证书再次打印提交处理失败"); private Integer code; private String message; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java index e7c492b..e000734 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java @@ -1,15 +1,19 @@ package com.casic.missiles.listeners.flowable; +import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.casic.missiles.enums.ApplyFromIdEnum; +import com.casic.missiles.enums.ApprovalStatusEnum; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.EquipmentApplyProcessEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.MeterFixedAssetsMapper; +import com.casic.missiles.mapper.business.BusinessCertificateReportMapper; import com.casic.missiles.mapper.equipment.EquipmentApplyEquipmentMapper; import com.casic.missiles.mapper.equipment.EquipmentApplyMapper; import com.casic.missiles.mapper.system.SystemFlowFormMapper; +import com.casic.missiles.model.business.BusinessCertificateReport; import com.casic.missiles.model.equipment.EquipmentApply; import com.casic.missiles.model.equipment.EquipmentApplyEquipment; import com.casic.missiles.model.equipment.EquipmentFixedAssets; @@ -21,8 +25,10 @@ import org.flowable.engine.delegate.ExecutionListener; import org.flowable.engine.repository.ProcessDefinition; import org.springframework.stereotype.Component; +import org.springframework.util.ObjectUtils; import java.util.List; +import java.util.Objects; import java.util.stream.Collectors; @Slf4j @@ -32,27 +38,51 @@ public void notify(DelegateExecution execution) { RepositoryService repositoryService = SpringContextUtil.getBean(RepositoryService.class); SystemFlowFormMapper flowFormMapper = SpringContextUtil.getBean(SystemFlowFormMapper.class); - System.err.println("审批通过触发监听器:"+execution); + System.err.println("审批通过触发监听器:" + execution); ProcessDefinition processDefinition = repositoryService.getProcessDefinition(execution.getProcessDefinitionId()); QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("pro_def_id", processDefinition.getKey()); wrapper.eq("is_del", 0); SystemFlowForm systemFlowForm = flowFormMapper.selectOne(wrapper); String id = execution.getProcessInstanceBusinessKey(); - switch (systemFlowForm.getFormId()){ + switch (systemFlowForm.getFormId()) { // 标准装置申请 - case ApplyFromIdEnum.STANDARD_REVERT_APPROVAL:updateStandardState(id, EquipmentApplyProcessEnum.STANDARD_USE);break; - case ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL: updateStandardState(id, EquipmentApplyProcessEnum.STOP);break; - case ApplyFromIdEnum.STANDARD_RESUME_APPROVAL: updateStandardState(id, EquipmentApplyProcessEnum.REVOKE);break; + case ApplyFromIdEnum.STANDARD_REVERT_APPROVAL: + updateStandardState(id, EquipmentApplyProcessEnum.STANDARD_USE); + break; + case ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL: + updateStandardState(id, EquipmentApplyProcessEnum.STOP); + break; + case ApplyFromIdEnum.STANDARD_RESUME_APPROVAL: + updateStandardState(id, EquipmentApplyProcessEnum.REVOKE); + break; // 设备状态管理申请 - case ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.IDLE);break; - case ApplyFromIdEnum.DEVICE_SEALED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.SEALED);break; - case ApplyFromIdEnum.DEVICE_UNSEALED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.USE);break; - case ApplyFromIdEnum.DEVICE_SCRAPPED_ROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.SCRAP);break; - case ApplyFromIdEnum.DEVICE_HANDLE_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.MANAGEMENT);break; + case ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL: + updateEquipmentState(id, EquipmentApplyProcessEnum.IDLE); + break; + case ApplyFromIdEnum.DEVICE_SEALED_APPROVAL: + updateEquipmentState(id, EquipmentApplyProcessEnum.SEALED); + break; + case ApplyFromIdEnum.DEVICE_UNSEALED_APPROVAL: + updateEquipmentState(id, EquipmentApplyProcessEnum.USE); + break; + case ApplyFromIdEnum.DEVICE_SCRAPPED_ROVAL: + updateEquipmentState(id, EquipmentApplyProcessEnum.SCRAP); + break; + case ApplyFromIdEnum.DEVICE_HANDLE_APPROVAL: + updateEquipmentState(id, EquipmentApplyProcessEnum.MANAGEMENT); + break; // 设备借用领用申请 - case ApplyFromIdEnum.DEVICE_CONSUMING_APPROVAL: updateEquipmentApplyState(id, EquipmentApplyProcessEnum.WAIT_COLLECTING);break; - case ApplyFromIdEnum.DEVICE_BORROW_APPROVAL: updateEquipmentApplyState(id, EquipmentApplyProcessEnum.WAIT_BORROWED);break; + case ApplyFromIdEnum.DEVICE_CONSUMING_APPROVAL: + updateEquipmentApplyState(id, EquipmentApplyProcessEnum.WAIT_COLLECTING); + break; + case ApplyFromIdEnum.DEVICE_BORROW_APPROVAL: + updateEquipmentApplyState(id, EquipmentApplyProcessEnum.WAIT_BORROWED); + break; + //证书打印审批通过状态回填 + case ApplyFromIdEnum.CERTIFICATE_PRINT_APPROVAL: + updateCertificateState(Long.valueOf(id)); + break; } } @@ -60,8 +90,8 @@ EquipmentApplyMapper equipmentApplyMapper = SpringContextUtil.getBean(EquipmentApplyMapper.class); UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.eq("id",id).set("process_result", state); - if(equipmentApplyMapper.update(null, updateWrapper)<=0){ + updateWrapper.eq("id", id).set("process_result", state); + if (equipmentApplyMapper.update(null, updateWrapper) <= 0) { throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } } @@ -74,17 +104,32 @@ List equipmentApplyEquipments = equipmentMapper.selectList(wrapper); List equipmentIds = equipmentApplyEquipments.stream().map(EquipmentApplyEquipment::getEquipmentId).collect(Collectors.toList()); UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.in("id",equipmentIds).set("manager_state",state); - if(meterFixedAssetsMapper.update(null,updateWrapper)<=0){ + updateWrapper.in("id", equipmentIds).set("manager_state", state); + if (meterFixedAssetsMapper.update(null, updateWrapper) <= 0) { throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } } - private void updateStandardState(String id,String state) { + private void updateStandardState(String id, String state) { MeterFixedAssetsMapper meterFixedAssetsMapper = SpringContextUtil.getBean(MeterFixedAssetsMapper.class); UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.in("id",id).set("manager_state",state); - if(meterFixedAssetsMapper.update(null,updateWrapper)<=0){ + updateWrapper.in("id", id).set("manager_state", state); + if (meterFixedAssetsMapper.update(null, updateWrapper) <= 0) { + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + } + + private void updateCertificateState(Long id) { + Assert.isFalse(Objects.isNull(id), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + BusinessCertificateReportMapper certificateReportMapper = SpringContextUtil.getBean(BusinessCertificateReportMapper.class); + BusinessCertificateReport certificateReport = new BusinessCertificateReport(); + certificateReport.setId(id); + certificateReport.setApprovalStatus(ApprovalStatusEnum.PASSED); //审批状态为审批中 + certificateReport.setPrintStatus("1"); //打印状态可打印 + int row = certificateReportMapper.updateById(certificateReport); + if (row <= 0) { throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java index d00db2e..bcbb996 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java @@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.business.interchange.InterchangeListRequest; import com.casic.missiles.dto.business.interchange.InterchangeListResponse; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListResponse; import com.casic.missiles.model.business.BusinessInterchange; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -20,8 +22,10 @@ */ public interface BusinessInterchangeMapper extends BaseMapper { - List selectInterchangeListPage(@Param("page") Page page, @Param("request") InterchangeListRequest request); + List selectInterchangeListPage(@Param("page") Page page, @Param("request") InterchangeListRequest request); - Long selectMaxExchangeNo(); + List exchangeSampleList(@Param("page") Page page, @Param("request") InterchangeSampleListRequest request); + + Long selectMaxExchangeNo(); } diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml index 94760a8..718e628 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml @@ -33,10 +33,10 @@ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java index 97c39e6..b062ecd 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java @@ -5,10 +5,14 @@ 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.BaseApprovalSubmitRequest; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.print.CertificateListRequest; import com.casic.missiles.dto.business.print.CertificateListResponse; +import com.casic.missiles.dto.business.print.CertificateRefusePrintRequest; +import com.casic.missiles.dto.flowable.ApprovalAgreeRequest; +import com.casic.missiles.dto.flowable.ApprovalRefuseRequest; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessCertificatePrintService; @@ -19,6 +23,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; /** @@ -40,16 +45,61 @@ /** * 证书打印列表，除了基本的列表的信息，需要判断证书打印审批中的状态，进而达到权限的控制 */ - @ApiOperation("设备列表-分页") + @ApiOperation("证书打印-分页") @PostMapping("/listPage") - public ReturnDTO> CertificatePrintlistPage(@RequestBody @Valid CertificateListRequest request, BindingResult bindingResult) throws Exception { + public ReturnDTO> certificatePrintListPage(@RequestBody @Valid CertificateListRequest 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(certificatePrintService.CertificatePrintlistPage(request,page))); + return ReturnUtil.success(super.packForBT(certificatePrintService.certificatePrintListPage(request, page))); } - //同意 拒绝 请求审批 + + /** + * 证书打印列表，除了基本的列表的信息，需要判断证书打印审批中的状态，进而达到权限的控制 + */ + @ApiOperation("证书打印导出") + @PostMapping("/export") + public void certificatePrintExport(@RequestBody @Valid CertificateListRequest request, HttpServletResponse response) throws Exception { + Page page = PageFactory.defaultPage(); + certificatePrintService.certificatePrintExport(request, response, page); + } + + /** + * 证书打印列表，除了基本的列表的信息，需要判断证书打印审批中的状态，进而达到权限的控制 + */ + @ApiOperation("证书审批-同意") + @PostMapping("/agree") + public void agreeAginPrint(@RequestBody @Valid ApprovalAgreeRequest request,BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + certificatePrintService.agreeAginPrint(request); + } + + /** + * 证书审批拒绝 + */ + @ApiOperation("证书审批-拒绝") + @PostMapping("/refuse") + public void refuseAgainPrint(@RequestBody @Valid CertificateRefusePrintRequest request, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + certificatePrintService.refuseAgainPrint(request); + } +// + /** + * 申请再次打印 + */ + @ApiOperation("证书审批-发起申请") + @PostMapping("/submitApproval") + public ReturnDTO submitAgainPrint(@RequestBody @Valid BaseApprovalSubmitRequest request,BindingResult bindingResult){ + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return certificatePrintService.submitAgainPrint(request); + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java index 4094bf1..f21769e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java @@ -78,7 +78,7 @@ */ @ApiOperation("设备终止") @PostMapping("/terminate") - public ReturnDTO forcedTerminate(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) { + public ReturnDTO forcedTerminate(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) { Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId()) || Objects.isNull(deviceReceiveDTO.getSampleId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); @@ -88,7 +88,7 @@ /** * 催办会产生催办消息，对相关操作人员进行消息提示 */ - @ApiOperation("催办") + @ApiOperation("催办（暂时未开发）") @PostMapping("/rushDoProcess") public ReturnDTO rushDoProcess(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) { Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId()) || Objects.isNull(deviceReceiveDTO.getSampleId()), () -> { diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java index 1fee737..78af9c4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java @@ -10,6 +10,8 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.interchange.InterchangeListRequest; import com.casic.missiles.dto.business.interchange.InterchangeListResponse; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BusinessInterchange; @@ -94,11 +96,21 @@ return ReturnUtil.success(bizExchangeService.deleteExchange(idDTO.getId())); } - //*******************************************************************************************************************// @ApiOperation("设备交接单导出") @PostMapping("/export") public void exportExchange(@RequestBody @Valid InterchangeListRequest request, HttpServletResponse response) { bizExchangeService.exportExchange(request, response); } + + @ApiOperation("样品列表") + @PostMapping("/sampleList") + public ReturnDTO> exchangeSampleList(@RequestBody @Valid InterchangeSampleListRequest 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(bizExchangeService.exchangeSampleList(page, request))); + } + } 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 077014f..2c0697d 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 @@ -44,7 +44,7 @@ @ApiOperation("客户投诉详情") @PostMapping("/detail") - public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { + public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO)throws Exception { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ApplyFromIdEnum.java index 863f37e..e5aeca4 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ApplyFromIdEnum.java @@ -18,4 +18,6 @@ String DEVICE_BORROW_APPROVAL = "clsbjysp"; // 设备借用申请 String DEVICE_FIX_APPROVAL = "sbglsbjxsq"; // 设备检修申请 String DEVICE_FIX_ACCEPTANCE = "sbglsbjxbyysd"; // 设备检修保养验收单 + + String CERTIFICATE_PRINT_APPROVAL = "sbglbzzzcxsqssd"; // 证书打印通过，暂定************ } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java index 9e3d9fd..dafb69c 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java @@ -48,12 +48,14 @@ TRACE_SUPPLIER_SAVE_FAILED(2404, "溯源供方保存至草稿箱失败"), TRACE_SUPPLIER_SUBMIT_FAILED(2405, "溯源供方提交处理失败"), TRAIN_PLAN_SUBMIT_FAILED(2406, "培训计划提交处理失败"), + FILE_SUBMIT_FAILED(2407, "文件提交处理失败"), FLOW_NO_JOIN_FLOWABLE(2408, "该流程暂未接入Flowable,请重试"), HANDLE_FAILED(500, "操作失败"), QRCODE_FAILED(2409, "二维码生成失败"), RECEIVE_SAMPLE_NOT_EXIST(2410, "待检测中不存在扫描收入的样品"), - COMPLETE_SAMPLE_NOT_EXIST(2411, "检测中不存在扫描收入的样品"); + COMPLETE_SAMPLE_NOT_EXIST(2411, "检测中不存在扫描收入的样品"), + AGAIN_PRINT_SUBMIT_FAILED(2412, "证书再次打印提交处理失败"); private Integer code; private String message; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java index e7c492b..e000734 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java @@ -1,15 +1,19 @@ package com.casic.missiles.listeners.flowable; +import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.casic.missiles.enums.ApplyFromIdEnum; +import com.casic.missiles.enums.ApprovalStatusEnum; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.EquipmentApplyProcessEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.MeterFixedAssetsMapper; +import com.casic.missiles.mapper.business.BusinessCertificateReportMapper; import com.casic.missiles.mapper.equipment.EquipmentApplyEquipmentMapper; import com.casic.missiles.mapper.equipment.EquipmentApplyMapper; import com.casic.missiles.mapper.system.SystemFlowFormMapper; +import com.casic.missiles.model.business.BusinessCertificateReport; import com.casic.missiles.model.equipment.EquipmentApply; import com.casic.missiles.model.equipment.EquipmentApplyEquipment; import com.casic.missiles.model.equipment.EquipmentFixedAssets; @@ -21,8 +25,10 @@ import org.flowable.engine.delegate.ExecutionListener; import org.flowable.engine.repository.ProcessDefinition; import org.springframework.stereotype.Component; +import org.springframework.util.ObjectUtils; import java.util.List; +import java.util.Objects; import java.util.stream.Collectors; @Slf4j @@ -32,27 +38,51 @@ public void notify(DelegateExecution execution) { RepositoryService repositoryService = SpringContextUtil.getBean(RepositoryService.class); SystemFlowFormMapper flowFormMapper = SpringContextUtil.getBean(SystemFlowFormMapper.class); - System.err.println("审批通过触发监听器:"+execution); + System.err.println("审批通过触发监听器:" + execution); ProcessDefinition processDefinition = repositoryService.getProcessDefinition(execution.getProcessDefinitionId()); QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("pro_def_id", processDefinition.getKey()); wrapper.eq("is_del", 0); SystemFlowForm systemFlowForm = flowFormMapper.selectOne(wrapper); String id = execution.getProcessInstanceBusinessKey(); - switch (systemFlowForm.getFormId()){ + switch (systemFlowForm.getFormId()) { // 标准装置申请 - case ApplyFromIdEnum.STANDARD_REVERT_APPROVAL:updateStandardState(id, EquipmentApplyProcessEnum.STANDARD_USE);break; - case ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL: updateStandardState(id, EquipmentApplyProcessEnum.STOP);break; - case ApplyFromIdEnum.STANDARD_RESUME_APPROVAL: updateStandardState(id, EquipmentApplyProcessEnum.REVOKE);break; + case ApplyFromIdEnum.STANDARD_REVERT_APPROVAL: + updateStandardState(id, EquipmentApplyProcessEnum.STANDARD_USE); + break; + case ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL: + updateStandardState(id, EquipmentApplyProcessEnum.STOP); + break; + case ApplyFromIdEnum.STANDARD_RESUME_APPROVAL: + updateStandardState(id, EquipmentApplyProcessEnum.REVOKE); + break; // 设备状态管理申请 - case ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.IDLE);break; - case ApplyFromIdEnum.DEVICE_SEALED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.SEALED);break; - case ApplyFromIdEnum.DEVICE_UNSEALED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.USE);break; - case ApplyFromIdEnum.DEVICE_SCRAPPED_ROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.SCRAP);break; - case ApplyFromIdEnum.DEVICE_HANDLE_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.MANAGEMENT);break; + case ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL: + updateEquipmentState(id, EquipmentApplyProcessEnum.IDLE); + break; + case ApplyFromIdEnum.DEVICE_SEALED_APPROVAL: + updateEquipmentState(id, EquipmentApplyProcessEnum.SEALED); + break; + case ApplyFromIdEnum.DEVICE_UNSEALED_APPROVAL: + updateEquipmentState(id, EquipmentApplyProcessEnum.USE); + break; + case ApplyFromIdEnum.DEVICE_SCRAPPED_ROVAL: + updateEquipmentState(id, EquipmentApplyProcessEnum.SCRAP); + break; + case ApplyFromIdEnum.DEVICE_HANDLE_APPROVAL: + updateEquipmentState(id, EquipmentApplyProcessEnum.MANAGEMENT); + break; // 设备借用领用申请 - case ApplyFromIdEnum.DEVICE_CONSUMING_APPROVAL: updateEquipmentApplyState(id, EquipmentApplyProcessEnum.WAIT_COLLECTING);break; - case ApplyFromIdEnum.DEVICE_BORROW_APPROVAL: updateEquipmentApplyState(id, EquipmentApplyProcessEnum.WAIT_BORROWED);break; + case ApplyFromIdEnum.DEVICE_CONSUMING_APPROVAL: + updateEquipmentApplyState(id, EquipmentApplyProcessEnum.WAIT_COLLECTING); + break; + case ApplyFromIdEnum.DEVICE_BORROW_APPROVAL: + updateEquipmentApplyState(id, EquipmentApplyProcessEnum.WAIT_BORROWED); + break; + //证书打印审批通过状态回填 + case ApplyFromIdEnum.CERTIFICATE_PRINT_APPROVAL: + updateCertificateState(Long.valueOf(id)); + break; } } @@ -60,8 +90,8 @@ EquipmentApplyMapper equipmentApplyMapper = SpringContextUtil.getBean(EquipmentApplyMapper.class); UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.eq("id",id).set("process_result", state); - if(equipmentApplyMapper.update(null, updateWrapper)<=0){ + updateWrapper.eq("id", id).set("process_result", state); + if (equipmentApplyMapper.update(null, updateWrapper) <= 0) { throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } } @@ -74,17 +104,32 @@ List equipmentApplyEquipments = equipmentMapper.selectList(wrapper); List equipmentIds = equipmentApplyEquipments.stream().map(EquipmentApplyEquipment::getEquipmentId).collect(Collectors.toList()); UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.in("id",equipmentIds).set("manager_state",state); - if(meterFixedAssetsMapper.update(null,updateWrapper)<=0){ + updateWrapper.in("id", equipmentIds).set("manager_state", state); + if (meterFixedAssetsMapper.update(null, updateWrapper) <= 0) { throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } } - private void updateStandardState(String id,String state) { + private void updateStandardState(String id, String state) { MeterFixedAssetsMapper meterFixedAssetsMapper = SpringContextUtil.getBean(MeterFixedAssetsMapper.class); UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.in("id",id).set("manager_state",state); - if(meterFixedAssetsMapper.update(null,updateWrapper)<=0){ + updateWrapper.in("id", id).set("manager_state", state); + if (meterFixedAssetsMapper.update(null, updateWrapper) <= 0) { + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + } + + private void updateCertificateState(Long id) { + Assert.isFalse(Objects.isNull(id), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + BusinessCertificateReportMapper certificateReportMapper = SpringContextUtil.getBean(BusinessCertificateReportMapper.class); + BusinessCertificateReport certificateReport = new BusinessCertificateReport(); + certificateReport.setId(id); + certificateReport.setApprovalStatus(ApprovalStatusEnum.PASSED); //审批状态为审批中 + certificateReport.setPrintStatus("1"); //打印状态可打印 + int row = certificateReportMapper.updateById(certificateReport); + if (row <= 0) { throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java index d00db2e..bcbb996 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java @@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.business.interchange.InterchangeListRequest; import com.casic.missiles.dto.business.interchange.InterchangeListResponse; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListResponse; import com.casic.missiles.model.business.BusinessInterchange; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -20,8 +22,10 @@ */ public interface BusinessInterchangeMapper extends BaseMapper { - List selectInterchangeListPage(@Param("page") Page page, @Param("request") InterchangeListRequest request); + List selectInterchangeListPage(@Param("page") Page page, @Param("request") InterchangeListRequest request); - Long selectMaxExchangeNo(); + List exchangeSampleList(@Param("page") Page page, @Param("request") InterchangeSampleListRequest request); + + Long selectMaxExchangeNo(); } diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml index 94760a8..718e628 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml @@ -33,10 +33,10 @@ diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml index fd5562c..2342e79 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml @@ -35,45 +35,49 @@ id, interchange_code, order_id, certification_company, certification_company_fex, certification_company_email, reciever, reciever_phone, certification_company_address, customer_id, require_over_time, deliver_time, mesure_category, secrecy, appearance, rely_file, deliverer_sign_file, deliverer_sign_time, reciever_sign_file, remark, is_del, create_user, create_time, update_time - + SELECT + bif.id,deliverer,customerNo,customerName,delivererTel,orderId,id,interchangeCode,remark,deliverTime,bo.orderId,isUrgent,orderNo,requireOverTime,reciever FROM ( - SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS "deliverTime" - FROM business_interchange - WHERE is_del = 0 - - AND interchange_Code=#{request.interchangeCode} - - - AND reciever=#{request.reciever} - + SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS + "deliverTime",reciever,deliverer,deliverer_tel AS "delivererTel" + FROM business_interchange + WHERE is_del = 0 + + AND interchange_Code=#{request.interchangeCode} + + + AND reciever=#{request.reciever} + - - AND #{request.startTime} DATE_FORMAT(deliver_time,'%Y-%m-%d') - - - AND #{request.endTime} = ]]> DATE_FORMAT(deliver_time,'%Y-%m-%d') - - - and id in - - #{id} - - + + AND #{request.startTime} DATE_FORMAT(deliver_time,'%Y-%m-%d') + + + AND #{request.endTime} = ]]> DATE_FORMAT(deliver_time,'%Y-%m-%d') + + + and id in + + #{id} + + ) bif JOIN ( - SELECT deliverer,customer_no AS "customerNo",customer_name AS "customerName",id as "orderId",is_urgent AS "isUrgent",order_code AS "orderNo",require_over_time AS "requireOverTime" - FROM business_order - WHERE is_del = 0 - - AND deliverer=#{request.deliverer} - - - AND customer_no=#{request.customerNo} - - - AND customer_name=#{request.customerName} - + SELECT customer_no AS "customerNo",customer_name AS "customerName",id as "orderId",is_urgent AS + "isUrgent",order_code AS "orderNo",require_over_time AS "requireOverTime" + FROM business_order + WHERE is_del = 0 + + AND deliverer=#{request.deliverer} + + + AND customer_no=#{request.customerNo} + + + AND customer_name=#{request.customerName} + ) bo ON bo.orderId = bif.order_id ORDER BY bif.deliverTime DESC @@ -83,4 +87,34 @@ FROM business_interchange + + diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java index 97c39e6..b062ecd 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java @@ -5,10 +5,14 @@ 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.BaseApprovalSubmitRequest; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.print.CertificateListRequest; import com.casic.missiles.dto.business.print.CertificateListResponse; +import com.casic.missiles.dto.business.print.CertificateRefusePrintRequest; +import com.casic.missiles.dto.flowable.ApprovalAgreeRequest; +import com.casic.missiles.dto.flowable.ApprovalRefuseRequest; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessCertificatePrintService; @@ -19,6 +23,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; /** @@ -40,16 +45,61 @@ /** * 证书打印列表，除了基本的列表的信息，需要判断证书打印审批中的状态，进而达到权限的控制 */ - @ApiOperation("设备列表-分页") + @ApiOperation("证书打印-分页") @PostMapping("/listPage") - public ReturnDTO> CertificatePrintlistPage(@RequestBody @Valid CertificateListRequest request, BindingResult bindingResult) throws Exception { + public ReturnDTO> certificatePrintListPage(@RequestBody @Valid CertificateListRequest 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(certificatePrintService.CertificatePrintlistPage(request,page))); + return ReturnUtil.success(super.packForBT(certificatePrintService.certificatePrintListPage(request, page))); } - //同意 拒绝 请求审批 + + /** + * 证书打印列表，除了基本的列表的信息，需要判断证书打印审批中的状态，进而达到权限的控制 + */ + @ApiOperation("证书打印导出") + @PostMapping("/export") + public void certificatePrintExport(@RequestBody @Valid CertificateListRequest request, HttpServletResponse response) throws Exception { + Page page = PageFactory.defaultPage(); + certificatePrintService.certificatePrintExport(request, response, page); + } + + /** + * 证书打印列表，除了基本的列表的信息，需要判断证书打印审批中的状态，进而达到权限的控制 + */ + @ApiOperation("证书审批-同意") + @PostMapping("/agree") + public void agreeAginPrint(@RequestBody @Valid ApprovalAgreeRequest request,BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + certificatePrintService.agreeAginPrint(request); + } + + /** + * 证书审批拒绝 + */ + @ApiOperation("证书审批-拒绝") + @PostMapping("/refuse") + public void refuseAgainPrint(@RequestBody @Valid CertificateRefusePrintRequest request, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + certificatePrintService.refuseAgainPrint(request); + } +// + /** + * 申请再次打印 + */ + @ApiOperation("证书审批-发起申请") + @PostMapping("/submitApproval") + public ReturnDTO submitAgainPrint(@RequestBody @Valid BaseApprovalSubmitRequest request,BindingResult bindingResult){ + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return certificatePrintService.submitAgainPrint(request); + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java index 4094bf1..f21769e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java @@ -78,7 +78,7 @@ */ @ApiOperation("设备终止") @PostMapping("/terminate") - public ReturnDTO forcedTerminate(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) { + public ReturnDTO forcedTerminate(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) { Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId()) || Objects.isNull(deviceReceiveDTO.getSampleId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); @@ -88,7 +88,7 @@ /** * 催办会产生催办消息，对相关操作人员进行消息提示 */ - @ApiOperation("催办") + @ApiOperation("催办（暂时未开发）") @PostMapping("/rushDoProcess") public ReturnDTO rushDoProcess(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) { Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId()) || Objects.isNull(deviceReceiveDTO.getSampleId()), () -> { diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java index 1fee737..78af9c4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java @@ -10,6 +10,8 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.interchange.InterchangeListRequest; import com.casic.missiles.dto.business.interchange.InterchangeListResponse; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BusinessInterchange; @@ -94,11 +96,21 @@ return ReturnUtil.success(bizExchangeService.deleteExchange(idDTO.getId())); } - //*******************************************************************************************************************// @ApiOperation("设备交接单导出") @PostMapping("/export") public void exportExchange(@RequestBody @Valid InterchangeListRequest request, HttpServletResponse response) { bizExchangeService.exportExchange(request, response); } + + @ApiOperation("样品列表") + @PostMapping("/sampleList") + public ReturnDTO> exchangeSampleList(@RequestBody @Valid InterchangeSampleListRequest 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(bizExchangeService.exchangeSampleList(page, request))); + } + } 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 077014f..2c0697d 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 @@ -44,7 +44,7 @@ @ApiOperation("客户投诉详情") @PostMapping("/detail") - public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { + public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO)throws Exception { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ApplyFromIdEnum.java index 863f37e..e5aeca4 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ApplyFromIdEnum.java @@ -18,4 +18,6 @@ String DEVICE_BORROW_APPROVAL = "clsbjysp"; // 设备借用申请 String DEVICE_FIX_APPROVAL = "sbglsbjxsq"; // 设备检修申请 String DEVICE_FIX_ACCEPTANCE = "sbglsbjxbyysd"; // 设备检修保养验收单 + + String CERTIFICATE_PRINT_APPROVAL = "sbglbzzzcxsqssd"; // 证书打印通过，暂定************ } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java index 9e3d9fd..dafb69c 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java @@ -48,12 +48,14 @@ TRACE_SUPPLIER_SAVE_FAILED(2404, "溯源供方保存至草稿箱失败"), TRACE_SUPPLIER_SUBMIT_FAILED(2405, "溯源供方提交处理失败"), TRAIN_PLAN_SUBMIT_FAILED(2406, "培训计划提交处理失败"), + FILE_SUBMIT_FAILED(2407, "文件提交处理失败"), FLOW_NO_JOIN_FLOWABLE(2408, "该流程暂未接入Flowable,请重试"), HANDLE_FAILED(500, "操作失败"), QRCODE_FAILED(2409, "二维码生成失败"), RECEIVE_SAMPLE_NOT_EXIST(2410, "待检测中不存在扫描收入的样品"), - COMPLETE_SAMPLE_NOT_EXIST(2411, "检测中不存在扫描收入的样品"); + COMPLETE_SAMPLE_NOT_EXIST(2411, "检测中不存在扫描收入的样品"), + AGAIN_PRINT_SUBMIT_FAILED(2412, "证书再次打印提交处理失败"); private Integer code; private String message; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java index e7c492b..e000734 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java @@ -1,15 +1,19 @@ package com.casic.missiles.listeners.flowable; +import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.casic.missiles.enums.ApplyFromIdEnum; +import com.casic.missiles.enums.ApprovalStatusEnum; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.EquipmentApplyProcessEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.MeterFixedAssetsMapper; +import com.casic.missiles.mapper.business.BusinessCertificateReportMapper; import com.casic.missiles.mapper.equipment.EquipmentApplyEquipmentMapper; import com.casic.missiles.mapper.equipment.EquipmentApplyMapper; import com.casic.missiles.mapper.system.SystemFlowFormMapper; +import com.casic.missiles.model.business.BusinessCertificateReport; import com.casic.missiles.model.equipment.EquipmentApply; import com.casic.missiles.model.equipment.EquipmentApplyEquipment; import com.casic.missiles.model.equipment.EquipmentFixedAssets; @@ -21,8 +25,10 @@ import org.flowable.engine.delegate.ExecutionListener; import org.flowable.engine.repository.ProcessDefinition; import org.springframework.stereotype.Component; +import org.springframework.util.ObjectUtils; import java.util.List; +import java.util.Objects; import java.util.stream.Collectors; @Slf4j @@ -32,27 +38,51 @@ public void notify(DelegateExecution execution) { RepositoryService repositoryService = SpringContextUtil.getBean(RepositoryService.class); SystemFlowFormMapper flowFormMapper = SpringContextUtil.getBean(SystemFlowFormMapper.class); - System.err.println("审批通过触发监听器:"+execution); + System.err.println("审批通过触发监听器:" + execution); ProcessDefinition processDefinition = repositoryService.getProcessDefinition(execution.getProcessDefinitionId()); QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("pro_def_id", processDefinition.getKey()); wrapper.eq("is_del", 0); SystemFlowForm systemFlowForm = flowFormMapper.selectOne(wrapper); String id = execution.getProcessInstanceBusinessKey(); - switch (systemFlowForm.getFormId()){ + switch (systemFlowForm.getFormId()) { // 标准装置申请 - case ApplyFromIdEnum.STANDARD_REVERT_APPROVAL:updateStandardState(id, EquipmentApplyProcessEnum.STANDARD_USE);break; - case ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL: updateStandardState(id, EquipmentApplyProcessEnum.STOP);break; - case ApplyFromIdEnum.STANDARD_RESUME_APPROVAL: updateStandardState(id, EquipmentApplyProcessEnum.REVOKE);break; + case ApplyFromIdEnum.STANDARD_REVERT_APPROVAL: + updateStandardState(id, EquipmentApplyProcessEnum.STANDARD_USE); + break; + case ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL: + updateStandardState(id, EquipmentApplyProcessEnum.STOP); + break; + case ApplyFromIdEnum.STANDARD_RESUME_APPROVAL: + updateStandardState(id, EquipmentApplyProcessEnum.REVOKE); + break; // 设备状态管理申请 - case ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.IDLE);break; - case ApplyFromIdEnum.DEVICE_SEALED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.SEALED);break; - case ApplyFromIdEnum.DEVICE_UNSEALED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.USE);break; - case ApplyFromIdEnum.DEVICE_SCRAPPED_ROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.SCRAP);break; - case ApplyFromIdEnum.DEVICE_HANDLE_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.MANAGEMENT);break; + case ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL: + updateEquipmentState(id, EquipmentApplyProcessEnum.IDLE); + break; + case ApplyFromIdEnum.DEVICE_SEALED_APPROVAL: + updateEquipmentState(id, EquipmentApplyProcessEnum.SEALED); + break; + case ApplyFromIdEnum.DEVICE_UNSEALED_APPROVAL: + updateEquipmentState(id, EquipmentApplyProcessEnum.USE); + break; + case ApplyFromIdEnum.DEVICE_SCRAPPED_ROVAL: + updateEquipmentState(id, EquipmentApplyProcessEnum.SCRAP); + break; + case ApplyFromIdEnum.DEVICE_HANDLE_APPROVAL: + updateEquipmentState(id, EquipmentApplyProcessEnum.MANAGEMENT); + break; // 设备借用领用申请 - case ApplyFromIdEnum.DEVICE_CONSUMING_APPROVAL: updateEquipmentApplyState(id, EquipmentApplyProcessEnum.WAIT_COLLECTING);break; - case ApplyFromIdEnum.DEVICE_BORROW_APPROVAL: updateEquipmentApplyState(id, EquipmentApplyProcessEnum.WAIT_BORROWED);break; + case ApplyFromIdEnum.DEVICE_CONSUMING_APPROVAL: + updateEquipmentApplyState(id, EquipmentApplyProcessEnum.WAIT_COLLECTING); + break; + case ApplyFromIdEnum.DEVICE_BORROW_APPROVAL: + updateEquipmentApplyState(id, EquipmentApplyProcessEnum.WAIT_BORROWED); + break; + //证书打印审批通过状态回填 + case ApplyFromIdEnum.CERTIFICATE_PRINT_APPROVAL: + updateCertificateState(Long.valueOf(id)); + break; } } @@ -60,8 +90,8 @@ EquipmentApplyMapper equipmentApplyMapper = SpringContextUtil.getBean(EquipmentApplyMapper.class); UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.eq("id",id).set("process_result", state); - if(equipmentApplyMapper.update(null, updateWrapper)<=0){ + updateWrapper.eq("id", id).set("process_result", state); + if (equipmentApplyMapper.update(null, updateWrapper) <= 0) { throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } } @@ -74,17 +104,32 @@ List equipmentApplyEquipments = equipmentMapper.selectList(wrapper); List equipmentIds = equipmentApplyEquipments.stream().map(EquipmentApplyEquipment::getEquipmentId).collect(Collectors.toList()); UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.in("id",equipmentIds).set("manager_state",state); - if(meterFixedAssetsMapper.update(null,updateWrapper)<=0){ + updateWrapper.in("id", equipmentIds).set("manager_state", state); + if (meterFixedAssetsMapper.update(null, updateWrapper) <= 0) { throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } } - private void updateStandardState(String id,String state) { + private void updateStandardState(String id, String state) { MeterFixedAssetsMapper meterFixedAssetsMapper = SpringContextUtil.getBean(MeterFixedAssetsMapper.class); UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.in("id",id).set("manager_state",state); - if(meterFixedAssetsMapper.update(null,updateWrapper)<=0){ + updateWrapper.in("id", id).set("manager_state", state); + if (meterFixedAssetsMapper.update(null, updateWrapper) <= 0) { + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + } + + private void updateCertificateState(Long id) { + Assert.isFalse(Objects.isNull(id), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + BusinessCertificateReportMapper certificateReportMapper = SpringContextUtil.getBean(BusinessCertificateReportMapper.class); + BusinessCertificateReport certificateReport = new BusinessCertificateReport(); + certificateReport.setId(id); + certificateReport.setApprovalStatus(ApprovalStatusEnum.PASSED); //审批状态为审批中 + certificateReport.setPrintStatus("1"); //打印状态可打印 + int row = certificateReportMapper.updateById(certificateReport); + if (row <= 0) { throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java index d00db2e..bcbb996 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java @@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.business.interchange.InterchangeListRequest; import com.casic.missiles.dto.business.interchange.InterchangeListResponse; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListResponse; import com.casic.missiles.model.business.BusinessInterchange; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -20,8 +22,10 @@ */ public interface BusinessInterchangeMapper extends BaseMapper { - List selectInterchangeListPage(@Param("page") Page page, @Param("request") InterchangeListRequest request); + List selectInterchangeListPage(@Param("page") Page page, @Param("request") InterchangeListRequest request); - Long selectMaxExchangeNo(); + List exchangeSampleList(@Param("page") Page page, @Param("request") InterchangeSampleListRequest request); + + Long selectMaxExchangeNo(); } diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml index 94760a8..718e628 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml @@ -33,10 +33,10 @@ diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml index fd5562c..2342e79 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml @@ -35,45 +35,49 @@ id, interchange_code, order_id, certification_company, certification_company_fex, certification_company_email, reciever, reciever_phone, certification_company_address, customer_id, require_over_time, deliver_time, mesure_category, secrecy, appearance, rely_file, deliverer_sign_file, deliverer_sign_time, reciever_sign_file, remark, is_del, create_user, create_time, update_time - + SELECT + bif.id,deliverer,customerNo,customerName,delivererTel,orderId,id,interchangeCode,remark,deliverTime,bo.orderId,isUrgent,orderNo,requireOverTime,reciever FROM ( - SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS "deliverTime" - FROM business_interchange - WHERE is_del = 0 - - AND interchange_Code=#{request.interchangeCode} - - - AND reciever=#{request.reciever} - + SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS + "deliverTime",reciever,deliverer,deliverer_tel AS "delivererTel" + FROM business_interchange + WHERE is_del = 0 + + AND interchange_Code=#{request.interchangeCode} + + + AND reciever=#{request.reciever} + - - AND #{request.startTime} DATE_FORMAT(deliver_time,'%Y-%m-%d') - - - AND #{request.endTime} = ]]> DATE_FORMAT(deliver_time,'%Y-%m-%d') - - - and id in - - #{id} - - + + AND #{request.startTime} DATE_FORMAT(deliver_time,'%Y-%m-%d') + + + AND #{request.endTime} = ]]> DATE_FORMAT(deliver_time,'%Y-%m-%d') + + + and id in + + #{id} + + ) bif JOIN ( - SELECT deliverer,customer_no AS "customerNo",customer_name AS "customerName",id as "orderId",is_urgent AS "isUrgent",order_code AS "orderNo",require_over_time AS "requireOverTime" - FROM business_order - WHERE is_del = 0 - - AND deliverer=#{request.deliverer} - - - AND customer_no=#{request.customerNo} - - - AND customer_name=#{request.customerName} - + SELECT customer_no AS "customerNo",customer_name AS "customerName",id as "orderId",is_urgent AS + "isUrgent",order_code AS "orderNo",require_over_time AS "requireOverTime" + FROM business_order + WHERE is_del = 0 + + AND deliverer=#{request.deliverer} + + + AND customer_no=#{request.customerNo} + + + AND customer_name=#{request.customerName} + ) bo ON bo.orderId = bif.order_id ORDER BY bif.deliverTime DESC @@ -83,4 +87,34 @@ FROM business_interchange + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml index c9b53d4..b4e8a69 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -158,15 +158,15 @@ - SELECT bcr.id,certificate_no AS "certificateNo",bcr.certificate_name AS "certificateName",csi.sample_no AS "sampleNo",,csi.sample_name - AS "sampleName",csi.sample_model AS "sampleModel",csi.manufacturing_no AS "manufacturingNo",bo.order_code AS "orderNo",bo.measure_type - AS "measureType",bcr.certificate_type AS "certificateType",bcr.print_status AS "printStatus",bcr.print_num AS "printNum",bcr.approval_status AS "approvalStatus", - bcr.create_time AS "createTime",measurePersonId + SELECT bcr.id,certificate_no AS "certificateNo",bcr.certificate_name AS "certificateName",csi.sample_no AS "sampleNo", + csi.sample_name AS "sampleName",csi.sample_model AS "sampleModel",csi.manufacturing_no AS "manufacturingNo",bo.order_code AS "orderNo", + bo.measure_type AS "measureType",bcr.certificate_type AS "certificateType",bcr.print_status AS "printStatus",bcr.print_num AS "printNum", + bcr.approval_status AS "approvalStatus",bcr.create_time AS "createTime",bcr.measure_person_id AS "measurePersonId" FROM ( SELECT * FROM business_certificate_report @@ -56,28 +56,34 @@ #{id} + + and bcr.id in + + #{id} + + ) bcr JOIN ( - SELECT id - FROM business_order - WHERE is_del=0 - - and ORDER_CODE like concat('%',#{request.orderNo},'%') - - - and CUTOMER_NAME like concat('%',#{request.cutomerName},'%') - + SELECT id + FROM business_order + WHERE is_del=0 + + and ORDER_CODE like concat('%',#{request.orderNo},'%') + + + and CUTOMER_NAME like concat('%',#{request.cutomerName},'%') + ) bo ON bo.id=bcr.orderId JOIN ( - SELECT id - FROM customer_sample_info - WHERE is_del=0 - - and SAMPLE_NO like concat('%',#{request.sampleNo},'%') - - - and SAMPLE_NAME like concat('%',#{request.sampleName},'%') - + SELECT id + FROM customer_sample_info + WHERE is_del=0 + + and SAMPLE_NO like concat('%',#{request.sampleNo},'%') + + + and SAMPLE_NAME like concat('%',#{request.sampleName},'%') + ) csi ON csi.id=bcr.sampleId diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml index fd5562c..2342e79 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml @@ -35,45 +35,49 @@ id, interchange_code, order_id, certification_company, certification_company_fex, certification_company_email, reciever, reciever_phone, certification_company_address, customer_id, require_over_time, deliver_time, mesure_category, secrecy, appearance, rely_file, deliverer_sign_file, deliverer_sign_time, reciever_sign_file, remark, is_del, create_user, create_time, update_time - + SELECT + bif.id,deliverer,customerNo,customerName,delivererTel,orderId,id,interchangeCode,remark,deliverTime,bo.orderId,isUrgent,orderNo,requireOverTime,reciever FROM ( - SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS "deliverTime" - FROM business_interchange - WHERE is_del = 0 - - AND interchange_Code=#{request.interchangeCode} - - - AND reciever=#{request.reciever} - + SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS + "deliverTime",reciever,deliverer,deliverer_tel AS "delivererTel" + FROM business_interchange + WHERE is_del = 0 + + AND interchange_Code=#{request.interchangeCode} + + + AND reciever=#{request.reciever} + - - AND #{request.startTime} DATE_FORMAT(deliver_time,'%Y-%m-%d') - - - AND #{request.endTime} = ]]> DATE_FORMAT(deliver_time,'%Y-%m-%d') - - - and id in - - #{id} - - + + AND #{request.startTime} DATE_FORMAT(deliver_time,'%Y-%m-%d') + + + AND #{request.endTime} = ]]> DATE_FORMAT(deliver_time,'%Y-%m-%d') + + + and id in + + #{id} + + ) bif JOIN ( - SELECT deliverer,customer_no AS "customerNo",customer_name AS "customerName",id as "orderId",is_urgent AS "isUrgent",order_code AS "orderNo",require_over_time AS "requireOverTime" - FROM business_order - WHERE is_del = 0 - - AND deliverer=#{request.deliverer} - - - AND customer_no=#{request.customerNo} - - - AND customer_name=#{request.customerName} - + SELECT customer_no AS "customerNo",customer_name AS "customerName",id as "orderId",is_urgent AS + "isUrgent",order_code AS "orderNo",require_over_time AS "requireOverTime" + FROM business_order + WHERE is_del = 0 + + AND deliverer=#{request.deliverer} + + + AND customer_no=#{request.customerNo} + + + AND customer_name=#{request.customerName} + ) bo ON bo.orderId = bif.order_id ORDER BY bif.deliverTime DESC @@ -83,4 +87,34 @@ FROM business_interchange + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml index c9b53d4..b4e8a69 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -158,15 +158,15 @@ - SELECT bcr.id,certificate_no AS "certificateNo",bcr.certificate_name AS "certificateName",csi.sample_no AS "sampleNo",,csi.sample_name - AS "sampleName",csi.sample_model AS "sampleModel",csi.manufacturing_no AS "manufacturingNo",bo.order_code AS "orderNo",bo.measure_type - AS "measureType",bcr.certificate_type AS "certificateType",bcr.print_status AS "printStatus",bcr.print_num AS "printNum",bcr.approval_status AS "approvalStatus", - bcr.create_time AS "createTime",measurePersonId + SELECT bcr.id,certificate_no AS "certificateNo",bcr.certificate_name AS "certificateName",csi.sample_no AS "sampleNo", + csi.sample_name AS "sampleName",csi.sample_model AS "sampleModel",csi.manufacturing_no AS "manufacturingNo",bo.order_code AS "orderNo", + bo.measure_type AS "measureType",bcr.certificate_type AS "certificateType",bcr.print_status AS "printStatus",bcr.print_num AS "printNum", + bcr.approval_status AS "approvalStatus",bcr.create_time AS "createTime",bcr.measure_person_id AS "measurePersonId" FROM ( SELECT * FROM business_certificate_report @@ -56,28 +56,34 @@ #{id} + + and bcr.id in + + #{id} + + ) bcr JOIN ( - SELECT id - FROM business_order - WHERE is_del=0 - - and ORDER_CODE like concat('%',#{request.orderNo},'%') - - - and CUTOMER_NAME like concat('%',#{request.cutomerName},'%') - + SELECT id + FROM business_order + WHERE is_del=0 + + and ORDER_CODE like concat('%',#{request.orderNo},'%') + + + and CUTOMER_NAME like concat('%',#{request.cutomerName},'%') + ) bo ON bo.id=bcr.orderId JOIN ( - SELECT id - FROM customer_sample_info - WHERE is_del=0 - - and SAMPLE_NO like concat('%',#{request.sampleNo},'%') - - - and SAMPLE_NAME like concat('%',#{request.sampleName},'%') - + SELECT id + FROM customer_sample_info + WHERE is_del=0 + + and SAMPLE_NO like concat('%',#{request.sampleNo},'%') + + + and SAMPLE_NAME like concat('%',#{request.sampleName},'%') + ) csi ON csi.id=bcr.sampleId diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml index fd5562c..2342e79 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml @@ -35,45 +35,49 @@ id, interchange_code, order_id, certification_company, certification_company_fex, certification_company_email, reciever, reciever_phone, certification_company_address, customer_id, require_over_time, deliver_time, mesure_category, secrecy, appearance, rely_file, deliverer_sign_file, deliverer_sign_time, reciever_sign_file, remark, is_del, create_user, create_time, update_time - + SELECT + bif.id,deliverer,customerNo,customerName,delivererTel,orderId,id,interchangeCode,remark,deliverTime,bo.orderId,isUrgent,orderNo,requireOverTime,reciever FROM ( - SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS "deliverTime" - FROM business_interchange - WHERE is_del = 0 - - AND interchange_Code=#{request.interchangeCode} - - - AND reciever=#{request.reciever} - + SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS + "deliverTime",reciever,deliverer,deliverer_tel AS "delivererTel" + FROM business_interchange + WHERE is_del = 0 + + AND interchange_Code=#{request.interchangeCode} + + + AND reciever=#{request.reciever} + - - AND #{request.startTime} DATE_FORMAT(deliver_time,'%Y-%m-%d') - - - AND #{request.endTime} = ]]> DATE_FORMAT(deliver_time,'%Y-%m-%d') - - - and id in - - #{id} - - + + AND #{request.startTime} DATE_FORMAT(deliver_time,'%Y-%m-%d') + + + AND #{request.endTime} = ]]> DATE_FORMAT(deliver_time,'%Y-%m-%d') + + + and id in + + #{id} + + ) bif JOIN ( - SELECT deliverer,customer_no AS "customerNo",customer_name AS "customerName",id as "orderId",is_urgent AS "isUrgent",order_code AS "orderNo",require_over_time AS "requireOverTime" - FROM business_order - WHERE is_del = 0 - - AND deliverer=#{request.deliverer} - - - AND customer_no=#{request.customerNo} - - - AND customer_name=#{request.customerName} - + SELECT customer_no AS "customerNo",customer_name AS "customerName",id as "orderId",is_urgent AS + "isUrgent",order_code AS "orderNo",require_over_time AS "requireOverTime" + FROM business_order + WHERE is_del = 0 + + AND deliverer=#{request.deliverer} + + + AND customer_no=#{request.customerNo} + + + AND customer_name=#{request.customerName} + ) bo ON bo.orderId = bif.order_id ORDER BY bif.deliverTime DESC @@ -83,4 +87,34 @@ FROM business_interchange + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml index c9b53d4..b4e8a69 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -158,15 +158,15 @@ - SELECT bcr.id,certificate_no AS "certificateNo",bcr.certificate_name AS "certificateName",csi.sample_no AS "sampleNo",,csi.sample_name - AS "sampleName",csi.sample_model AS "sampleModel",csi.manufacturing_no AS "manufacturingNo",bo.order_code AS "orderNo",bo.measure_type - AS "measureType",bcr.certificate_type AS "certificateType",bcr.print_status AS "printStatus",bcr.print_num AS "printNum",bcr.approval_status AS "approvalStatus", - bcr.create_time AS "createTime",measurePersonId + SELECT bcr.id,certificate_no AS "certificateNo",bcr.certificate_name AS "certificateName",csi.sample_no AS "sampleNo", + csi.sample_name AS "sampleName",csi.sample_model AS "sampleModel",csi.manufacturing_no AS "manufacturingNo",bo.order_code AS "orderNo", + bo.measure_type AS "measureType",bcr.certificate_type AS "certificateType",bcr.print_status AS "printStatus",bcr.print_num AS "printNum", + bcr.approval_status AS "approvalStatus",bcr.create_time AS "createTime",bcr.measure_person_id AS "measurePersonId" FROM ( SELECT * FROM business_certificate_report @@ -56,28 +56,34 @@ #{id} + + and bcr.id in + + #{id} + + ) bcr JOIN ( - SELECT id - FROM business_order - WHERE is_del=0 - - and ORDER_CODE like concat('%',#{request.orderNo},'%') - - - and CUTOMER_NAME like concat('%',#{request.cutomerName},'%') - + SELECT id + FROM business_order + WHERE is_del=0 + + and ORDER_CODE like concat('%',#{request.orderNo},'%') + + + and CUTOMER_NAME like concat('%',#{request.cutomerName},'%') + ) bo ON bo.id=bcr.orderId JOIN ( - SELECT id - FROM customer_sample_info - WHERE is_del=0 - - and SAMPLE_NO like concat('%',#{request.sampleNo},'%') - - - and SAMPLE_NAME like concat('%',#{request.sampleName},'%') - + SELECT id + FROM customer_sample_info + WHERE is_del=0 + + and SAMPLE_NO like concat('%',#{request.sampleNo},'%') + + + and SAMPLE_NAME like concat('%',#{request.sampleName},'%') + ) csi ON csi.id=bcr.sampleId diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml index fd5562c..2342e79 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml @@ -35,45 +35,49 @@ id, interchange_code, order_id, certification_company, certification_company_fex, certification_company_email, reciever, reciever_phone, certification_company_address, customer_id, require_over_time, deliver_time, mesure_category, secrecy, appearance, rely_file, deliverer_sign_file, deliverer_sign_time, reciever_sign_file, remark, is_del, create_user, create_time, update_time - + SELECT + bif.id,deliverer,customerNo,customerName,delivererTel,orderId,id,interchangeCode,remark,deliverTime,bo.orderId,isUrgent,orderNo,requireOverTime,reciever FROM ( - SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS "deliverTime" - FROM business_interchange - WHERE is_del = 0 - - AND interchange_Code=#{request.interchangeCode} - - - AND reciever=#{request.reciever} - + SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS + "deliverTime",reciever,deliverer,deliverer_tel AS "delivererTel" + FROM business_interchange + WHERE is_del = 0 + + AND interchange_Code=#{request.interchangeCode} + + + AND reciever=#{request.reciever} + - - AND #{request.startTime} DATE_FORMAT(deliver_time,'%Y-%m-%d') - - - AND #{request.endTime} = ]]> DATE_FORMAT(deliver_time,'%Y-%m-%d') - - - and id in - - #{id} - - + + AND #{request.startTime} DATE_FORMAT(deliver_time,'%Y-%m-%d') + + + AND #{request.endTime} = ]]> DATE_FORMAT(deliver_time,'%Y-%m-%d') + + + and id in + + #{id} + + ) bif JOIN ( - SELECT deliverer,customer_no AS "customerNo",customer_name AS "customerName",id as "orderId",is_urgent AS "isUrgent",order_code AS "orderNo",require_over_time AS "requireOverTime" - FROM business_order - WHERE is_del = 0 - - AND deliverer=#{request.deliverer} - - - AND customer_no=#{request.customerNo} - - - AND customer_name=#{request.customerName} - + SELECT customer_no AS "customerNo",customer_name AS "customerName",id as "orderId",is_urgent AS + "isUrgent",order_code AS "orderNo",require_over_time AS "requireOverTime" + FROM business_order + WHERE is_del = 0 + + AND deliverer=#{request.deliverer} + + + AND customer_no=#{request.customerNo} + + + AND customer_name=#{request.customerName} + ) bo ON bo.orderId = bif.order_id ORDER BY bif.deliverTime DESC @@ -83,4 +87,34 @@ FROM business_interchange + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml index c9b53d4..b4e8a69 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -158,15 +158,15 @@ - SELECT bcr.id,certificate_no AS "certificateNo",bcr.certificate_name AS "certificateName",csi.sample_no AS "sampleNo",,csi.sample_name - AS "sampleName",csi.sample_model AS "sampleModel",csi.manufacturing_no AS "manufacturingNo",bo.order_code AS "orderNo",bo.measure_type - AS "measureType",bcr.certificate_type AS "certificateType",bcr.print_status AS "printStatus",bcr.print_num AS "printNum",bcr.approval_status AS "approvalStatus", - bcr.create_time AS "createTime",measurePersonId + SELECT bcr.id,certificate_no AS "certificateNo",bcr.certificate_name AS "certificateName",csi.sample_no AS "sampleNo", + csi.sample_name AS "sampleName",csi.sample_model AS "sampleModel",csi.manufacturing_no AS "manufacturingNo",bo.order_code AS "orderNo", + bo.measure_type AS "measureType",bcr.certificate_type AS "certificateType",bcr.print_status AS "printStatus",bcr.print_num AS "printNum", + bcr.approval_status AS "approvalStatus",bcr.create_time AS "createTime",bcr.measure_person_id AS "measurePersonId" FROM ( SELECT * FROM business_certificate_report @@ -56,28 +56,34 @@ #{id} + + and bcr.id in + + #{id} + + ) bcr JOIN ( - SELECT id - FROM business_order - WHERE is_del=0 - - and ORDER_CODE like concat('%',#{request.orderNo},'%') - - - and CUTOMER_NAME like concat('%',#{request.cutomerName},'%') - + SELECT id + FROM business_order + WHERE is_del=0 + + and ORDER_CODE like concat('%',#{request.orderNo},'%') + + + and CUTOMER_NAME like concat('%',#{request.cutomerName},'%') + ) bo ON bo.id=bcr.orderId JOIN ( - SELECT id - FROM customer_sample_info - WHERE is_del=0 - - and SAMPLE_NO like concat('%',#{request.sampleNo},'%') - - - and SAMPLE_NAME like concat('%',#{request.sampleName},'%') - + SELECT id + FROM customer_sample_info + WHERE is_del=0 + + and SAMPLE_NO like concat('%',#{request.sampleNo},'%') + + + and SAMPLE_NAME like concat('%',#{request.sampleName},'%') + ) csi ON csi.id=bcr.sampleId diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml index fd5562c..2342e79 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml @@ -35,45 +35,49 @@ id, interchange_code, order_id, certification_company, certification_company_fex, certification_company_email, reciever, reciever_phone, certification_company_address, customer_id, require_over_time, deliver_time, mesure_category, secrecy, appearance, rely_file, deliverer_sign_file, deliverer_sign_time, reciever_sign_file, remark, is_del, create_user, create_time, update_time - + SELECT + bif.id,deliverer,customerNo,customerName,delivererTel,orderId,id,interchangeCode,remark,deliverTime,bo.orderId,isUrgent,orderNo,requireOverTime,reciever FROM ( - SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS "deliverTime" - FROM business_interchange - WHERE is_del = 0 - - AND interchange_Code=#{request.interchangeCode} - - - AND reciever=#{request.reciever} - + SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS + "deliverTime",reciever,deliverer,deliverer_tel AS "delivererTel" + FROM business_interchange + WHERE is_del = 0 + + AND interchange_Code=#{request.interchangeCode} + + + AND reciever=#{request.reciever} + - - AND #{request.startTime} DATE_FORMAT(deliver_time,'%Y-%m-%d') - - - AND #{request.endTime} = ]]> DATE_FORMAT(deliver_time,'%Y-%m-%d') - - - and id in - - #{id} - - + + AND #{request.startTime} DATE_FORMAT(deliver_time,'%Y-%m-%d') + + + AND #{request.endTime} = ]]> DATE_FORMAT(deliver_time,'%Y-%m-%d') + + + and id in + + #{id} + + ) bif JOIN ( - SELECT deliverer,customer_no AS "customerNo",customer_name AS "customerName",id as "orderId",is_urgent AS "isUrgent",order_code AS "orderNo",require_over_time AS "requireOverTime" - FROM business_order - WHERE is_del = 0 - - AND deliverer=#{request.deliverer} - - - AND customer_no=#{request.customerNo} - - - AND customer_name=#{request.customerName} - + SELECT customer_no AS "customerNo",customer_name AS "customerName",id as "orderId",is_urgent AS + "isUrgent",order_code AS "orderNo",require_over_time AS "requireOverTime" + FROM business_order + WHERE is_del = 0 + + AND deliverer=#{request.deliverer} + + + AND customer_no=#{request.customerNo} + + + AND customer_name=#{request.customerName} + ) bo ON bo.orderId = bif.order_id ORDER BY bif.deliverTime DESC @@ -83,4 +87,34 @@ FROM business_interchange + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml index c9b53d4..b4e8a69 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -158,15 +158,15 @@ - SELECT bcr.id,certificate_no AS "certificateNo",bcr.certificate_name AS "certificateName",csi.sample_no AS "sampleNo",,csi.sample_name - AS "sampleName",csi.sample_model AS "sampleModel",csi.manufacturing_no AS "manufacturingNo",bo.order_code AS "orderNo",bo.measure_type - AS "measureType",bcr.certificate_type AS "certificateType",bcr.print_status AS "printStatus",bcr.print_num AS "printNum",bcr.approval_status AS "approvalStatus", - bcr.create_time AS "createTime",measurePersonId + SELECT bcr.id,certificate_no AS "certificateNo",bcr.certificate_name AS "certificateName",csi.sample_no AS "sampleNo", + csi.sample_name AS "sampleName",csi.sample_model AS "sampleModel",csi.manufacturing_no AS "manufacturingNo",bo.order_code AS "orderNo", + bo.measure_type AS "measureType",bcr.certificate_type AS "certificateType",bcr.print_status AS "printStatus",bcr.print_num AS "printNum", + bcr.approval_status AS "approvalStatus",bcr.create_time AS "createTime",bcr.measure_person_id AS "measurePersonId" FROM ( SELECT * FROM business_certificate_report @@ -56,28 +56,34 @@ #{id} + + and bcr.id in + + #{id} + + ) bcr JOIN ( - SELECT id - FROM business_order - WHERE is_del=0 - - and ORDER_CODE like concat('%',#{request.orderNo},'%') - - - and CUTOMER_NAME like concat('%',#{request.cutomerName},'%') - + SELECT id + FROM business_order + WHERE is_del=0 + + and ORDER_CODE like concat('%',#{request.orderNo},'%') + + + and CUTOMER_NAME like concat('%',#{request.cutomerName},'%') + ) bo ON bo.id=bcr.orderId JOIN ( - SELECT id - FROM customer_sample_info - WHERE is_del=0 - - and SAMPLE_NO like concat('%',#{request.sampleNo},'%') - - - and SAMPLE_NAME like concat('%',#{request.sampleName},'%') - + SELECT id + FROM customer_sample_info + WHERE is_del=0 + + and SAMPLE_NO like concat('%',#{request.sampleNo},'%') + + + and SAMPLE_NAME like concat('%',#{request.sampleName},'%') + ) csi ON csi.id=bcr.sampleId diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml index fd5562c..2342e79 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml @@ -35,45 +35,49 @@ id, interchange_code, order_id, certification_company, certification_company_fex, certification_company_email, reciever, reciever_phone, certification_company_address, customer_id, require_over_time, deliver_time, mesure_category, secrecy, appearance, rely_file, deliverer_sign_file, deliverer_sign_time, reciever_sign_file, remark, is_del, create_user, create_time, update_time - + SELECT + bif.id,deliverer,customerNo,customerName,delivererTel,orderId,id,interchangeCode,remark,deliverTime,bo.orderId,isUrgent,orderNo,requireOverTime,reciever FROM ( - SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS "deliverTime" - FROM business_interchange - WHERE is_del = 0 - - AND interchange_Code=#{request.interchangeCode} - - - AND reciever=#{request.reciever} - + SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS + "deliverTime",reciever,deliverer,deliverer_tel AS "delivererTel" + FROM business_interchange + WHERE is_del = 0 + + AND interchange_Code=#{request.interchangeCode} + + + AND reciever=#{request.reciever} + - - AND #{request.startTime} DATE_FORMAT(deliver_time,'%Y-%m-%d') - - - AND #{request.endTime} = ]]> DATE_FORMAT(deliver_time,'%Y-%m-%d') - - - and id in - - #{id} - - + + AND #{request.startTime} DATE_FORMAT(deliver_time,'%Y-%m-%d') + + + AND #{request.endTime} = ]]> DATE_FORMAT(deliver_time,'%Y-%m-%d') + + + and id in + + #{id} + + ) bif JOIN ( - SELECT deliverer,customer_no AS "customerNo",customer_name AS "customerName",id as "orderId",is_urgent AS "isUrgent",order_code AS "orderNo",require_over_time AS "requireOverTime" - FROM business_order - WHERE is_del = 0 - - AND deliverer=#{request.deliverer} - - - AND customer_no=#{request.customerNo} - - - AND customer_name=#{request.customerName} - + SELECT customer_no AS "customerNo",customer_name AS "customerName",id as "orderId",is_urgent AS + "isUrgent",order_code AS "orderNo",require_over_time AS "requireOverTime" + FROM business_order + WHERE is_del = 0 + + AND deliverer=#{request.deliverer} + + + AND customer_no=#{request.customerNo} + + + AND customer_name=#{request.customerName} + ) bo ON bo.orderId = bif.order_id ORDER BY bif.deliverTime DESC @@ -83,4 +87,34 @@ FROM business_interchange + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml index c9b53d4..b4e8a69 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -158,15 +158,15 @@ - SELECT bcr.id,certificate_no AS "certificateNo",bcr.certificate_name AS "certificateName",csi.sample_no AS "sampleNo",,csi.sample_name - AS "sampleName",csi.sample_model AS "sampleModel",csi.manufacturing_no AS "manufacturingNo",bo.order_code AS "orderNo",bo.measure_type - AS "measureType",bcr.certificate_type AS "certificateType",bcr.print_status AS "printStatus",bcr.print_num AS "printNum",bcr.approval_status AS "approvalStatus", - bcr.create_time AS "createTime",measurePersonId + SELECT bcr.id,certificate_no AS "certificateNo",bcr.certificate_name AS "certificateName",csi.sample_no AS "sampleNo", + csi.sample_name AS "sampleName",csi.sample_model AS "sampleModel",csi.manufacturing_no AS "manufacturingNo",bo.order_code AS "orderNo", + bo.measure_type AS "measureType",bcr.certificate_type AS "certificateType",bcr.print_status AS "printStatus",bcr.print_num AS "printNum", + bcr.approval_status AS "approvalStatus",bcr.create_time AS "createTime",bcr.measure_person_id AS "measurePersonId" FROM ( SELECT * FROM business_certificate_report @@ -56,28 +56,34 @@ #{id} + + and bcr.id in + + #{id} + + ) bcr JOIN ( - SELECT id - FROM business_order - WHERE is_del=0 - - and ORDER_CODE like concat('%',#{request.orderNo},'%') - - - and CUTOMER_NAME like concat('%',#{request.cutomerName},'%') - + SELECT id + FROM business_order + WHERE is_del=0 + + and ORDER_CODE like concat('%',#{request.orderNo},'%') + + + and CUTOMER_NAME like concat('%',#{request.cutomerName},'%') + ) bo ON bo.id=bcr.orderId JOIN ( - SELECT id - FROM customer_sample_info - WHERE is_del=0 - - and SAMPLE_NO like concat('%',#{request.sampleNo},'%') - - - and SAMPLE_NAME like concat('%',#{request.sampleName},'%') - + SELECT id + FROM customer_sample_info + WHERE is_del=0 + + and SAMPLE_NO like concat('%',#{request.sampleNo},'%') + + + and SAMPLE_NAME like concat('%',#{request.sampleName},'%') + ) csi ON csi.id=bcr.sampleId diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml index fd5562c..2342e79 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml @@ -35,45 +35,49 @@ id, interchange_code, order_id, certification_company, certification_company_fex, certification_company_email, reciever, reciever_phone, certification_company_address, customer_id, require_over_time, deliver_time, mesure_category, secrecy, appearance, rely_file, deliverer_sign_file, deliverer_sign_time, reciever_sign_file, remark, is_del, create_user, create_time, update_time - + SELECT + bif.id,deliverer,customerNo,customerName,delivererTel,orderId,id,interchangeCode,remark,deliverTime,bo.orderId,isUrgent,orderNo,requireOverTime,reciever FROM ( - SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS "deliverTime" - FROM business_interchange - WHERE is_del = 0 - - AND interchange_Code=#{request.interchangeCode} - - - AND reciever=#{request.reciever} - + SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS + "deliverTime",reciever,deliverer,deliverer_tel AS "delivererTel" + FROM business_interchange + WHERE is_del = 0 + + AND interchange_Code=#{request.interchangeCode} + + + AND reciever=#{request.reciever} + - - AND #{request.startTime} DATE_FORMAT(deliver_time,'%Y-%m-%d') - - - AND #{request.endTime} = ]]> DATE_FORMAT(deliver_time,'%Y-%m-%d') - - - and id in - - #{id} - - + + AND #{request.startTime} DATE_FORMAT(deliver_time,'%Y-%m-%d') + + + AND #{request.endTime} = ]]> DATE_FORMAT(deliver_time,'%Y-%m-%d') + + + and id in + + #{id} + + ) bif JOIN ( - SELECT deliverer,customer_no AS "customerNo",customer_name AS "customerName",id as "orderId",is_urgent AS "isUrgent",order_code AS "orderNo",require_over_time AS "requireOverTime" - FROM business_order - WHERE is_del = 0 - - AND deliverer=#{request.deliverer} - - - AND customer_no=#{request.customerNo} - - - AND customer_name=#{request.customerName} - + SELECT customer_no AS "customerNo",customer_name AS "customerName",id as "orderId",is_urgent AS + "isUrgent",order_code AS "orderNo",require_over_time AS "requireOverTime" + FROM business_order + WHERE is_del = 0 + + AND deliverer=#{request.deliverer} + + + AND customer_no=#{request.customerNo} + + + AND customer_name=#{request.customerName} + ) bo ON bo.orderId = bif.order_id ORDER BY bif.deliverTime DESC @@ -83,4 +87,34 @@ FROM business_interchange + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml index c9b53d4..b4e8a69 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -158,15 +158,15 @@ - SELECT bcr.id,certificate_no AS "certificateNo",bcr.certificate_name AS "certificateName",csi.sample_no AS "sampleNo",,csi.sample_name - AS "sampleName",csi.sample_model AS "sampleModel",csi.manufacturing_no AS "manufacturingNo",bo.order_code AS "orderNo",bo.measure_type - AS "measureType",bcr.certificate_type AS "certificateType",bcr.print_status AS "printStatus",bcr.print_num AS "printNum",bcr.approval_status AS "approvalStatus", - bcr.create_time AS "createTime",measurePersonId + SELECT bcr.id,certificate_no AS "certificateNo",bcr.certificate_name AS "certificateName",csi.sample_no AS "sampleNo", + csi.sample_name AS "sampleName",csi.sample_model AS "sampleModel",csi.manufacturing_no AS "manufacturingNo",bo.order_code AS "orderNo", + bo.measure_type AS "measureType",bcr.certificate_type AS "certificateType",bcr.print_status AS "printStatus",bcr.print_num AS "printNum", + bcr.approval_status AS "approvalStatus",bcr.create_time AS "createTime",bcr.measure_person_id AS "measurePersonId" FROM ( SELECT * FROM business_certificate_report @@ -56,28 +56,34 @@ #{id} + + and bcr.id in + + #{id} + + ) bcr JOIN ( - SELECT id - FROM business_order - WHERE is_del=0 - - and ORDER_CODE like concat('%',#{request.orderNo},'%') - - - and CUTOMER_NAME like concat('%',#{request.cutomerName},'%') - + SELECT id + FROM business_order + WHERE is_del=0 + + and ORDER_CODE like concat('%',#{request.orderNo},'%') + + + and CUTOMER_NAME like concat('%',#{request.cutomerName},'%') + ) bo ON bo.id=bcr.orderId JOIN ( - SELECT id - FROM customer_sample_info - WHERE is_del=0 - - and SAMPLE_NO like concat('%',#{request.sampleNo},'%') - - - and SAMPLE_NAME like concat('%',#{request.sampleName},'%') - + SELECT id + FROM customer_sample_info + WHERE is_del=0 + + and SAMPLE_NO like concat('%',#{request.sampleNo},'%') + + + and SAMPLE_NAME like concat('%',#{request.sampleName},'%') + ) csi ON csi.id=bcr.sampleId diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml index fd5562c..2342e79 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml @@ -35,45 +35,49 @@ id, interchange_code, order_id, certification_company, certification_company_fex, certification_company_email, reciever, reciever_phone, certification_company_address, customer_id, require_over_time, deliver_time, mesure_category, secrecy, appearance, rely_file, deliverer_sign_file, deliverer_sign_time, reciever_sign_file, remark, is_del, create_user, create_time, update_time - + SELECT + bif.id,deliverer,customerNo,customerName,delivererTel,orderId,id,interchangeCode,remark,deliverTime,bo.orderId,isUrgent,orderNo,requireOverTime,reciever FROM ( - SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS "deliverTime" - FROM business_interchange - WHERE is_del = 0 - - AND interchange_Code=#{request.interchangeCode} - - - AND reciever=#{request.reciever} - + SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS + "deliverTime",reciever,deliverer,deliverer_tel AS "delivererTel" + FROM business_interchange + WHERE is_del = 0 + + AND interchange_Code=#{request.interchangeCode} + + + AND reciever=#{request.reciever} + - - AND #{request.startTime} DATE_FORMAT(deliver_time,'%Y-%m-%d') - - - AND #{request.endTime} = ]]> DATE_FORMAT(deliver_time,'%Y-%m-%d') - - - and id in - - #{id} - - + + AND #{request.startTime} DATE_FORMAT(deliver_time,'%Y-%m-%d') + + + AND #{request.endTime} = ]]> DATE_FORMAT(deliver_time,'%Y-%m-%d') + + + and id in + + #{id} + + ) bif JOIN ( - SELECT deliverer,customer_no AS "customerNo",customer_name AS "customerName",id as "orderId",is_urgent AS "isUrgent",order_code AS "orderNo",require_over_time AS "requireOverTime" - FROM business_order - WHERE is_del = 0 - - AND deliverer=#{request.deliverer} - - - AND customer_no=#{request.customerNo} - - - AND customer_name=#{request.customerName} - + SELECT customer_no AS "customerNo",customer_name AS "customerName",id as "orderId",is_urgent AS + "isUrgent",order_code AS "orderNo",require_over_time AS "requireOverTime" + FROM business_order + WHERE is_del = 0 + + AND deliverer=#{request.deliverer} + + + AND customer_no=#{request.customerNo} + + + AND customer_name=#{request.customerName} + ) bo ON bo.orderId = bif.order_id ORDER BY bif.deliverTime DESC @@ -83,4 +87,34 @@ FROM business_interchange + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml index c9b53d4..b4e8a69 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -158,15 +158,15 @@ - SELECT bcr.id,certificate_no AS "certificateNo",bcr.certificate_name AS "certificateName",csi.sample_no AS "sampleNo",,csi.sample_name - AS "sampleName",csi.sample_model AS "sampleModel",csi.manufacturing_no AS "manufacturingNo",bo.order_code AS "orderNo",bo.measure_type - AS "measureType",bcr.certificate_type AS "certificateType",bcr.print_status AS "printStatus",bcr.print_num AS "printNum",bcr.approval_status AS "approvalStatus", - bcr.create_time AS "createTime",measurePersonId + SELECT bcr.id,certificate_no AS "certificateNo",bcr.certificate_name AS "certificateName",csi.sample_no AS "sampleNo", + csi.sample_name AS "sampleName",csi.sample_model AS "sampleModel",csi.manufacturing_no AS "manufacturingNo",bo.order_code AS "orderNo", + bo.measure_type AS "measureType",bcr.certificate_type AS "certificateType",bcr.print_status AS "printStatus",bcr.print_num AS "printNum", + bcr.approval_status AS "approvalStatus",bcr.create_time AS "createTime",bcr.measure_person_id AS "measurePersonId" FROM ( SELECT * FROM business_certificate_report @@ -56,28 +56,34 @@ #{id} + + and bcr.id in + + #{id} + + ) bcr JOIN ( - SELECT id - FROM business_order - WHERE is_del=0 - - and ORDER_CODE like concat('%',#{request.orderNo},'%') - - - and CUTOMER_NAME like concat('%',#{request.cutomerName},'%') - + SELECT id + FROM business_order + WHERE is_del=0 + + and ORDER_CODE like concat('%',#{request.orderNo},'%') + + + and CUTOMER_NAME like concat('%',#{request.cutomerName},'%') + ) bo ON bo.id=bcr.orderId JOIN ( - SELECT id - FROM customer_sample_info - WHERE is_del=0 - - and SAMPLE_NO like concat('%',#{request.sampleNo},'%') - - - and SAMPLE_NAME like concat('%',#{request.sampleName},'%') - + SELECT id + FROM customer_sample_info + WHERE is_del=0 + + and SAMPLE_NO like concat('%',#{request.sampleNo},'%') + + + and SAMPLE_NAME like concat('%',#{request.sampleName},'%') + ) csi ON csi.id=bcr.sampleId diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml index fd5562c..2342e79 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml @@ -35,45 +35,49 @@ id, interchange_code, order_id, certification_company, certification_company_fex, certification_company_email, reciever, reciever_phone, certification_company_address, customer_id, require_over_time, deliver_time, mesure_category, secrecy, appearance, rely_file, deliverer_sign_file, deliverer_sign_time, reciever_sign_file, remark, is_del, create_user, create_time, update_time - + SELECT + bif.id,deliverer,customerNo,customerName,delivererTel,orderId,id,interchangeCode,remark,deliverTime,bo.orderId,isUrgent,orderNo,requireOverTime,reciever FROM ( - SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS "deliverTime" - FROM business_interchange - WHERE is_del = 0 - - AND interchange_Code=#{request.interchangeCode} - - - AND reciever=#{request.reciever} - + SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS + "deliverTime",reciever,deliverer,deliverer_tel AS "delivererTel" + FROM business_interchange + WHERE is_del = 0 + + AND interchange_Code=#{request.interchangeCode} + + + AND reciever=#{request.reciever} + - - AND #{request.startTime} DATE_FORMAT(deliver_time,'%Y-%m-%d') - - - AND #{request.endTime} = ]]> DATE_FORMAT(deliver_time,'%Y-%m-%d') - - - and id in - - #{id} - - + + AND #{request.startTime} DATE_FORMAT(deliver_time,'%Y-%m-%d') + + + AND #{request.endTime} = ]]> DATE_FORMAT(deliver_time,'%Y-%m-%d') + + + and id in + + #{id} + + ) bif JOIN ( - SELECT deliverer,customer_no AS "customerNo",customer_name AS "customerName",id as "orderId",is_urgent AS "isUrgent",order_code AS "orderNo",require_over_time AS "requireOverTime" - FROM business_order - WHERE is_del = 0 - - AND deliverer=#{request.deliverer} - - - AND customer_no=#{request.customerNo} - - - AND customer_name=#{request.customerName} - + SELECT customer_no AS "customerNo",customer_name AS "customerName",id as "orderId",is_urgent AS + "isUrgent",order_code AS "orderNo",require_over_time AS "requireOverTime" + FROM business_order + WHERE is_del = 0 + + AND deliverer=#{request.deliverer} + + + AND customer_no=#{request.customerNo} + + + AND customer_name=#{request.customerName} + ) bo ON bo.orderId = bif.order_id ORDER BY bif.deliverTime DESC @@ -83,4 +87,34 @@ FROM business_interchange + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml index c9b53d4..b4e8a69 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -158,15 +158,15 @@ - SELECT bcr.id,certificate_no AS "certificateNo",bcr.certificate_name AS "certificateName",csi.sample_no AS "sampleNo",,csi.sample_name - AS "sampleName",csi.sample_model AS "sampleModel",csi.manufacturing_no AS "manufacturingNo",bo.order_code AS "orderNo",bo.measure_type - AS "measureType",bcr.certificate_type AS "certificateType",bcr.print_status AS "printStatus",bcr.print_num AS "printNum",bcr.approval_status AS "approvalStatus", - bcr.create_time AS "createTime",measurePersonId + SELECT bcr.id,certificate_no AS "certificateNo",bcr.certificate_name AS "certificateName",csi.sample_no AS "sampleNo", + csi.sample_name AS "sampleName",csi.sample_model AS "sampleModel",csi.manufacturing_no AS "manufacturingNo",bo.order_code AS "orderNo", + bo.measure_type AS "measureType",bcr.certificate_type AS "certificateType",bcr.print_status AS "printStatus",bcr.print_num AS "printNum", + bcr.approval_status AS "approvalStatus",bcr.create_time AS "createTime",bcr.measure_person_id AS "measurePersonId" FROM ( SELECT * FROM business_certificate_report @@ -56,28 +56,34 @@ #{id} + + and bcr.id in + + #{id} + + ) bcr JOIN ( - SELECT id - FROM business_order - WHERE is_del=0 - - and ORDER_CODE like concat('%',#{request.orderNo},'%') - - - and CUTOMER_NAME like concat('%',#{request.cutomerName},'%') - + SELECT id + FROM business_order + WHERE is_del=0 + + and ORDER_CODE like concat('%',#{request.orderNo},'%') + + + and CUTOMER_NAME like concat('%',#{request.cutomerName},'%') + ) bo ON bo.id=bcr.orderId JOIN ( - SELECT id - FROM customer_sample_info - WHERE is_del=0 - - and SAMPLE_NO like concat('%',#{request.sampleNo},'%') - - - and SAMPLE_NAME like concat('%',#{request.sampleName},'%') - + SELECT id + FROM customer_sample_info + WHERE is_del=0 + + and SAMPLE_NO like concat('%',#{request.sampleNo},'%') + + + and SAMPLE_NAME like concat('%',#{request.sampleName},'%') + ) csi ON csi.id=bcr.sampleId diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml index fd5562c..2342e79 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml @@ -35,45 +35,49 @@ id, interchange_code, order_id, certification_company, certification_company_fex, certification_company_email, reciever, reciever_phone, certification_company_address, customer_id, require_over_time, deliver_time, mesure_category, secrecy, appearance, rely_file, deliverer_sign_file, deliverer_sign_time, reciever_sign_file, remark, is_del, create_user, create_time, update_time - + SELECT + bif.id,deliverer,customerNo,customerName,delivererTel,orderId,id,interchangeCode,remark,deliverTime,bo.orderId,isUrgent,orderNo,requireOverTime,reciever FROM ( - SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS "deliverTime" - FROM business_interchange - WHERE is_del = 0 - - AND interchange_Code=#{request.interchangeCode} - - - AND reciever=#{request.reciever} - + SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS + "deliverTime",reciever,deliverer,deliverer_tel AS "delivererTel" + FROM business_interchange + WHERE is_del = 0 + + AND interchange_Code=#{request.interchangeCode} + + + AND reciever=#{request.reciever} + - - AND #{request.startTime} DATE_FORMAT(deliver_time,'%Y-%m-%d') - - - AND #{request.endTime} = ]]> DATE_FORMAT(deliver_time,'%Y-%m-%d') - - - and id in - - #{id} - - + + AND #{request.startTime} DATE_FORMAT(deliver_time,'%Y-%m-%d') + + + AND #{request.endTime} = ]]> DATE_FORMAT(deliver_time,'%Y-%m-%d') + + + and id in + + #{id} + + ) bif JOIN ( - SELECT deliverer,customer_no AS "customerNo",customer_name AS "customerName",id as "orderId",is_urgent AS "isUrgent",order_code AS "orderNo",require_over_time AS "requireOverTime" - FROM business_order - WHERE is_del = 0 - - AND deliverer=#{request.deliverer} - - - AND customer_no=#{request.customerNo} - - - AND customer_name=#{request.customerName} - + SELECT customer_no AS "customerNo",customer_name AS "customerName",id as "orderId",is_urgent AS + "isUrgent",order_code AS "orderNo",require_over_time AS "requireOverTime" + FROM business_order + WHERE is_del = 0 + + AND deliverer=#{request.deliverer} + + + AND customer_no=#{request.customerNo} + + + AND customer_name=#{request.customerName} + ) bo ON bo.orderId = bif.order_id ORDER BY bif.deliverTime DESC @@ -83,4 +87,34 @@ FROM business_interchange + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml index c9b53d4..b4e8a69 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -158,15 +158,15 @@ - SELECT bcr.id,certificate_no AS "certificateNo",bcr.certificate_name AS "certificateName",csi.sample_no AS "sampleNo",,csi.sample_name - AS "sampleName",csi.sample_model AS "sampleModel",csi.manufacturing_no AS "manufacturingNo",bo.order_code AS "orderNo",bo.measure_type - AS "measureType",bcr.certificate_type AS "certificateType",bcr.print_status AS "printStatus",bcr.print_num AS "printNum",bcr.approval_status AS "approvalStatus", - bcr.create_time AS "createTime",measurePersonId + SELECT bcr.id,certificate_no AS "certificateNo",bcr.certificate_name AS "certificateName",csi.sample_no AS "sampleNo", + csi.sample_name AS "sampleName",csi.sample_model AS "sampleModel",csi.manufacturing_no AS "manufacturingNo",bo.order_code AS "orderNo", + bo.measure_type AS "measureType",bcr.certificate_type AS "certificateType",bcr.print_status AS "printStatus",bcr.print_num AS "printNum", + bcr.approval_status AS "approvalStatus",bcr.create_time AS "createTime",bcr.measure_person_id AS "measurePersonId" FROM ( SELECT * FROM business_certificate_report @@ -56,28 +56,34 @@ #{id} + + and bcr.id in + + #{id} + + ) bcr JOIN ( - SELECT id - FROM business_order - WHERE is_del=0 - - and ORDER_CODE like concat('%',#{request.orderNo},'%') - - - and CUTOMER_NAME like concat('%',#{request.cutomerName},'%') - + SELECT id + FROM business_order + WHERE is_del=0 + + and ORDER_CODE like concat('%',#{request.orderNo},'%') + + + and CUTOMER_NAME like concat('%',#{request.cutomerName},'%') + ) bo ON bo.id=bcr.orderId JOIN ( - SELECT id - FROM customer_sample_info - WHERE is_del=0 - - and SAMPLE_NO like concat('%',#{request.sampleNo},'%') - - - and SAMPLE_NAME like concat('%',#{request.sampleName},'%') - + SELECT id + FROM customer_sample_info + WHERE is_del=0 + + and SAMPLE_NO like concat('%',#{request.sampleNo},'%') + + + and SAMPLE_NAME like concat('%',#{request.sampleName},'%') + ) csi ON csi.id=bcr.sampleId diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml index fd5562c..2342e79 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml @@ -35,45 +35,49 @@ id, interchange_code, order_id, certification_company, certification_company_fex, certification_company_email, reciever, reciever_phone, certification_company_address, customer_id, require_over_time, deliver_time, mesure_category, secrecy, appearance, rely_file, deliverer_sign_file, deliverer_sign_time, reciever_sign_file, remark, is_del, create_user, create_time, update_time - + SELECT + bif.id,deliverer,customerNo,customerName,delivererTel,orderId,id,interchangeCode,remark,deliverTime,bo.orderId,isUrgent,orderNo,requireOverTime,reciever FROM ( - SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS "deliverTime" - FROM business_interchange - WHERE is_del = 0 - - AND interchange_Code=#{request.interchangeCode} - - - AND reciever=#{request.reciever} - + SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS + "deliverTime",reciever,deliverer,deliverer_tel AS "delivererTel" + FROM business_interchange + WHERE is_del = 0 + + AND interchange_Code=#{request.interchangeCode} + + + AND reciever=#{request.reciever} + - - AND #{request.startTime} DATE_FORMAT(deliver_time,'%Y-%m-%d') - - - AND #{request.endTime} = ]]> DATE_FORMAT(deliver_time,'%Y-%m-%d') - - - and id in - - #{id} - - + + AND #{request.startTime} DATE_FORMAT(deliver_time,'%Y-%m-%d') + + + AND #{request.endTime} = ]]> DATE_FORMAT(deliver_time,'%Y-%m-%d') + + + and id in + + #{id} + + ) bif JOIN ( - SELECT deliverer,customer_no AS "customerNo",customer_name AS "customerName",id as "orderId",is_urgent AS "isUrgent",order_code AS "orderNo",require_over_time AS "requireOverTime" - FROM business_order - WHERE is_del = 0 - - AND deliverer=#{request.deliverer} - - - AND customer_no=#{request.customerNo} - - - AND customer_name=#{request.customerName} - + SELECT customer_no AS "customerNo",customer_name AS "customerName",id as "orderId",is_urgent AS + "isUrgent",order_code AS "orderNo",require_over_time AS "requireOverTime" + FROM business_order + WHERE is_del = 0 + + AND deliverer=#{request.deliverer} + + + AND customer_no=#{request.customerNo} + + + AND customer_name=#{request.customerName} + ) bo ON bo.orderId = bif.order_id ORDER BY bif.deliverTime DESC @@ -83,4 +87,34 @@ FROM business_interchange + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml index c9b53d4..b4e8a69 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -158,15 +158,15 @@ - SELECT bcr.id,certificate_no AS "certificateNo",bcr.certificate_name AS "certificateName",csi.sample_no AS "sampleNo",,csi.sample_name - AS "sampleName",csi.sample_model AS "sampleModel",csi.manufacturing_no AS "manufacturingNo",bo.order_code AS "orderNo",bo.measure_type - AS "measureType",bcr.certificate_type AS "certificateType",bcr.print_status AS "printStatus",bcr.print_num AS "printNum",bcr.approval_status AS "approvalStatus", - bcr.create_time AS "createTime",measurePersonId + SELECT bcr.id,certificate_no AS "certificateNo",bcr.certificate_name AS "certificateName",csi.sample_no AS "sampleNo", + csi.sample_name AS "sampleName",csi.sample_model AS "sampleModel",csi.manufacturing_no AS "manufacturingNo",bo.order_code AS "orderNo", + bo.measure_type AS "measureType",bcr.certificate_type AS "certificateType",bcr.print_status AS "printStatus",bcr.print_num AS "printNum", + bcr.approval_status AS "approvalStatus",bcr.create_time AS "createTime",bcr.measure_person_id AS "measurePersonId" FROM ( SELECT * FROM business_certificate_report @@ -56,28 +56,34 @@ #{id} + + and bcr.id in + + #{id} + + ) bcr JOIN ( - SELECT id - FROM business_order - WHERE is_del=0 - - and ORDER_CODE like concat('%',#{request.orderNo},'%') - - - and CUTOMER_NAME like concat('%',#{request.cutomerName},'%') - + SELECT id + FROM business_order + WHERE is_del=0 + + and ORDER_CODE like concat('%',#{request.orderNo},'%') + + + and CUTOMER_NAME like concat('%',#{request.cutomerName},'%') + ) bo ON bo.id=bcr.orderId JOIN ( - SELECT id - FROM customer_sample_info - WHERE is_del=0 - - and SAMPLE_NO like concat('%',#{request.sampleNo},'%') - - - and SAMPLE_NAME like concat('%',#{request.sampleName},'%') - + SELECT id + FROM customer_sample_info + WHERE is_del=0 + + and SAMPLE_NO like concat('%',#{request.sampleNo},'%') + + + and SAMPLE_NAME like concat('%',#{request.sampleName},'%') + ) csi ON csi.id=bcr.sampleId diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml index fd5562c..2342e79 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml @@ -35,45 +35,49 @@ id, interchange_code, order_id, certification_company, certification_company_fex, certification_company_email, reciever, reciever_phone, certification_company_address, customer_id, require_over_time, deliver_time, mesure_category, secrecy, appearance, rely_file, deliverer_sign_file, deliverer_sign_time, reciever_sign_file, remark, is_del, create_user, create_time, update_time - + SELECT + bif.id,deliverer,customerNo,customerName,delivererTel,orderId,id,interchangeCode,remark,deliverTime,bo.orderId,isUrgent,orderNo,requireOverTime,reciever FROM ( - SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS "deliverTime" - FROM business_interchange - WHERE is_del = 0 - - AND interchange_Code=#{request.interchangeCode} - - - AND reciever=#{request.reciever} - + SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS + "deliverTime",reciever,deliverer,deliverer_tel AS "delivererTel" + FROM business_interchange + WHERE is_del = 0 + + AND interchange_Code=#{request.interchangeCode} + + + AND reciever=#{request.reciever} + - - AND #{request.startTime} DATE_FORMAT(deliver_time,'%Y-%m-%d') - - - AND #{request.endTime} = ]]> DATE_FORMAT(deliver_time,'%Y-%m-%d') - - - and id in - - #{id} - - + + AND #{request.startTime} DATE_FORMAT(deliver_time,'%Y-%m-%d') + + + AND #{request.endTime} = ]]> DATE_FORMAT(deliver_time,'%Y-%m-%d') + + + and id in + + #{id} + + ) bif JOIN ( - SELECT deliverer,customer_no AS "customerNo",customer_name AS "customerName",id as "orderId",is_urgent AS "isUrgent",order_code AS "orderNo",require_over_time AS "requireOverTime" - FROM business_order - WHERE is_del = 0 - - AND deliverer=#{request.deliverer} - - - AND customer_no=#{request.customerNo} - - - AND customer_name=#{request.customerName} - + SELECT customer_no AS "customerNo",customer_name AS "customerName",id as "orderId",is_urgent AS + "isUrgent",order_code AS "orderNo",require_over_time AS "requireOverTime" + FROM business_order + WHERE is_del = 0 + + AND deliverer=#{request.deliverer} + + + AND customer_no=#{request.customerNo} + + + AND customer_name=#{request.customerName} + ) bo ON bo.orderId = bif.order_id ORDER BY bif.deliverTime DESC @@ -83,4 +87,34 @@ FROM business_interchange + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml index c9b53d4..b4e8a69 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -158,15 +158,15 @@ - SELECT bcr.id,certificate_no AS "certificateNo",bcr.certificate_name AS "certificateName",csi.sample_no AS "sampleNo",,csi.sample_name - AS "sampleName",csi.sample_model AS "sampleModel",csi.manufacturing_no AS "manufacturingNo",bo.order_code AS "orderNo",bo.measure_type - AS "measureType",bcr.certificate_type AS "certificateType",bcr.print_status AS "printStatus",bcr.print_num AS "printNum",bcr.approval_status AS "approvalStatus", - bcr.create_time AS "createTime",measurePersonId + SELECT bcr.id,certificate_no AS "certificateNo",bcr.certificate_name AS "certificateName",csi.sample_no AS "sampleNo", + csi.sample_name AS "sampleName",csi.sample_model AS "sampleModel",csi.manufacturing_no AS "manufacturingNo",bo.order_code AS "orderNo", + bo.measure_type AS "measureType",bcr.certificate_type AS "certificateType",bcr.print_status AS "printStatus",bcr.print_num AS "printNum", + bcr.approval_status AS "approvalStatus",bcr.create_time AS "createTime",bcr.measure_person_id AS "measurePersonId" FROM ( SELECT * FROM business_certificate_report @@ -56,28 +56,34 @@ #{id} + + and bcr.id in + + #{id} + + ) bcr JOIN ( - SELECT id - FROM business_order - WHERE is_del=0 - - and ORDER_CODE like concat('%',#{request.orderNo},'%') - - - and CUTOMER_NAME like concat('%',#{request.cutomerName},'%') - + SELECT id + FROM business_order + WHERE is_del=0 + + and ORDER_CODE like concat('%',#{request.orderNo},'%') + + + and CUTOMER_NAME like concat('%',#{request.cutomerName},'%') + ) bo ON bo.id=bcr.orderId JOIN ( - SELECT id - FROM customer_sample_info - WHERE is_del=0 - - and SAMPLE_NO like concat('%',#{request.sampleNo},'%') - - - and SAMPLE_NAME like concat('%',#{request.sampleName},'%') - + SELECT id + FROM customer_sample_info + WHERE is_del=0 + + and SAMPLE_NO like concat('%',#{request.sampleNo},'%') + + + and SAMPLE_NAME like concat('%',#{request.sampleName},'%') + ) csi ON csi.id=bcr.sampleId diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml index fd5562c..2342e79 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml @@ -35,45 +35,49 @@ id, interchange_code, order_id, certification_company, certification_company_fex, certification_company_email, reciever, reciever_phone, certification_company_address, customer_id, require_over_time, deliver_time, mesure_category, secrecy, appearance, rely_file, deliverer_sign_file, deliverer_sign_time, reciever_sign_file, remark, is_del, create_user, create_time, update_time - + SELECT + bif.id,deliverer,customerNo,customerName,delivererTel,orderId,id,interchangeCode,remark,deliverTime,bo.orderId,isUrgent,orderNo,requireOverTime,reciever FROM ( - SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS "deliverTime" - FROM business_interchange - WHERE is_del = 0 - - AND interchange_Code=#{request.interchangeCode} - - - AND reciever=#{request.reciever} - + SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS + "deliverTime",reciever,deliverer,deliverer_tel AS "delivererTel" + FROM business_interchange + WHERE is_del = 0 + + AND interchange_Code=#{request.interchangeCode} + + + AND reciever=#{request.reciever} + - - AND #{request.startTime} DATE_FORMAT(deliver_time,'%Y-%m-%d') - - - AND #{request.endTime} = ]]> DATE_FORMAT(deliver_time,'%Y-%m-%d') - - - and id in - - #{id} - - + + AND #{request.startTime} DATE_FORMAT(deliver_time,'%Y-%m-%d') + + + AND #{request.endTime} = ]]> DATE_FORMAT(deliver_time,'%Y-%m-%d') + + + and id in + + #{id} + + ) bif JOIN ( - SELECT deliverer,customer_no AS "customerNo",customer_name AS "customerName",id as "orderId",is_urgent AS "isUrgent",order_code AS "orderNo",require_over_time AS "requireOverTime" - FROM business_order - WHERE is_del = 0 - - AND deliverer=#{request.deliverer} - - - AND customer_no=#{request.customerNo} - - - AND customer_name=#{request.customerName} - + SELECT customer_no AS "customerNo",customer_name AS "customerName",id as "orderId",is_urgent AS + "isUrgent",order_code AS "orderNo",require_over_time AS "requireOverTime" + FROM business_order + WHERE is_del = 0 + + AND deliverer=#{request.deliverer} + + + AND customer_no=#{request.customerNo} + + + AND customer_name=#{request.customerName} + ) bo ON bo.orderId = bif.order_id ORDER BY bif.deliverTime DESC @@ -83,4 +87,34 @@ FROM business_interchange + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml index c9b53d4..b4e8a69 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -158,15 +158,15 @@ - SELECT bcr.id,certificate_no AS "certificateNo",bcr.certificate_name AS "certificateName",csi.sample_no AS "sampleNo",,csi.sample_name - AS "sampleName",csi.sample_model AS "sampleModel",csi.manufacturing_no AS "manufacturingNo",bo.order_code AS "orderNo",bo.measure_type - AS "measureType",bcr.certificate_type AS "certificateType",bcr.print_status AS "printStatus",bcr.print_num AS "printNum",bcr.approval_status AS "approvalStatus", - bcr.create_time AS "createTime",measurePersonId + SELECT bcr.id,certificate_no AS "certificateNo",bcr.certificate_name AS "certificateName",csi.sample_no AS "sampleNo", + csi.sample_name AS "sampleName",csi.sample_model AS "sampleModel",csi.manufacturing_no AS "manufacturingNo",bo.order_code AS "orderNo", + bo.measure_type AS "measureType",bcr.certificate_type AS "certificateType",bcr.print_status AS "printStatus",bcr.print_num AS "printNum", + bcr.approval_status AS "approvalStatus",bcr.create_time AS "createTime",bcr.measure_person_id AS "measurePersonId" FROM ( SELECT * FROM business_certificate_report @@ -56,28 +56,34 @@ #{id} + + and bcr.id in + + #{id} + + ) bcr JOIN ( - SELECT id - FROM business_order - WHERE is_del=0 - - and ORDER_CODE like concat('%',#{request.orderNo},'%') - - - and CUTOMER_NAME like concat('%',#{request.cutomerName},'%') - + SELECT id + FROM business_order + WHERE is_del=0 + + and ORDER_CODE like concat('%',#{request.orderNo},'%') + + + and CUTOMER_NAME like concat('%',#{request.cutomerName},'%') + ) bo ON bo.id=bcr.orderId JOIN ( - SELECT id - FROM customer_sample_info - WHERE is_del=0 - - and SAMPLE_NO like concat('%',#{request.sampleNo},'%') - - - and SAMPLE_NAME like concat('%',#{request.sampleName},'%') - + SELECT id + FROM customer_sample_info + WHERE is_del=0 + + and SAMPLE_NO like concat('%',#{request.sampleNo},'%') + + + and SAMPLE_NAME like concat('%',#{request.sampleName},'%') + ) csi ON csi.id=bcr.sampleId diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml index fd5562c..2342e79 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml @@ -35,45 +35,49 @@ id, interchange_code, order_id, certification_company, certification_company_fex, certification_company_email, reciever, reciever_phone, certification_company_address, customer_id, require_over_time, deliver_time, mesure_category, secrecy, appearance, rely_file, deliverer_sign_file, deliverer_sign_time, reciever_sign_file, remark, is_del, create_user, create_time, update_time - + SELECT + bif.id,deliverer,customerNo,customerName,delivererTel,orderId,id,interchangeCode,remark,deliverTime,bo.orderId,isUrgent,orderNo,requireOverTime,reciever FROM ( - SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS "deliverTime" - FROM business_interchange - WHERE is_del = 0 - - AND interchange_Code=#{request.interchangeCode} - - - AND reciever=#{request.reciever} - + SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS + "deliverTime",reciever,deliverer,deliverer_tel AS "delivererTel" + FROM business_interchange + WHERE is_del = 0 + + AND interchange_Code=#{request.interchangeCode} + + + AND reciever=#{request.reciever} + - - AND #{request.startTime} DATE_FORMAT(deliver_time,'%Y-%m-%d') - - - AND #{request.endTime} = ]]> DATE_FORMAT(deliver_time,'%Y-%m-%d') - - - and id in - - #{id} - - + + AND #{request.startTime} DATE_FORMAT(deliver_time,'%Y-%m-%d') + + + AND #{request.endTime} = ]]> DATE_FORMAT(deliver_time,'%Y-%m-%d') + + + and id in + + #{id} + + ) bif JOIN ( - SELECT deliverer,customer_no AS "customerNo",customer_name AS "customerName",id as "orderId",is_urgent AS "isUrgent",order_code AS "orderNo",require_over_time AS "requireOverTime" - FROM business_order - WHERE is_del = 0 - - AND deliverer=#{request.deliverer} - - - AND customer_no=#{request.customerNo} - - - AND customer_name=#{request.customerName} - + SELECT customer_no AS "customerNo",customer_name AS "customerName",id as "orderId",is_urgent AS + "isUrgent",order_code AS "orderNo",require_over_time AS "requireOverTime" + FROM business_order + WHERE is_del = 0 + + AND deliverer=#{request.deliverer} + + + AND customer_no=#{request.customerNo} + + + AND customer_name=#{request.customerName} + ) bo ON bo.orderId = bif.order_id ORDER BY bif.deliverTime DESC @@ -83,4 +87,34 @@ FROM business_interchange + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml index c9b53d4..b4e8a69 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -158,15 +158,15 @@ - SELECT bcr.id,certificate_no AS "certificateNo",bcr.certificate_name AS "certificateName",csi.sample_no AS "sampleNo",,csi.sample_name - AS "sampleName",csi.sample_model AS "sampleModel",csi.manufacturing_no AS "manufacturingNo",bo.order_code AS "orderNo",bo.measure_type - AS "measureType",bcr.certificate_type AS "certificateType",bcr.print_status AS "printStatus",bcr.print_num AS "printNum",bcr.approval_status AS "approvalStatus", - bcr.create_time AS "createTime",measurePersonId + SELECT bcr.id,certificate_no AS "certificateNo",bcr.certificate_name AS "certificateName",csi.sample_no AS "sampleNo", + csi.sample_name AS "sampleName",csi.sample_model AS "sampleModel",csi.manufacturing_no AS "manufacturingNo",bo.order_code AS "orderNo", + bo.measure_type AS "measureType",bcr.certificate_type AS "certificateType",bcr.print_status AS "printStatus",bcr.print_num AS "printNum", + bcr.approval_status AS "approvalStatus",bcr.create_time AS "createTime",bcr.measure_person_id AS "measurePersonId" FROM ( SELECT * FROM business_certificate_report @@ -56,28 +56,34 @@ #{id} + + and bcr.id in + + #{id} + + ) bcr JOIN ( - SELECT id - FROM business_order - WHERE is_del=0 - - and ORDER_CODE like concat('%',#{request.orderNo},'%') - - - and CUTOMER_NAME like concat('%',#{request.cutomerName},'%') - + SELECT id + FROM business_order + WHERE is_del=0 + + and ORDER_CODE like concat('%',#{request.orderNo},'%') + + + and CUTOMER_NAME like concat('%',#{request.cutomerName},'%') + ) bo ON bo.id=bcr.orderId JOIN ( - SELECT id - FROM customer_sample_info - WHERE is_del=0 - - and SAMPLE_NO like concat('%',#{request.sampleNo},'%') - - - and SAMPLE_NAME like concat('%',#{request.sampleName},'%') - + SELECT id + FROM customer_sample_info + WHERE is_del=0 + + and SAMPLE_NO like concat('%',#{request.sampleNo},'%') + + + and SAMPLE_NAME like concat('%',#{request.sampleName},'%') + ) csi ON csi.id=bcr.sampleId diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml index fd5562c..2342e79 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml @@ -35,45 +35,49 @@ id, interchange_code, order_id, certification_company, certification_company_fex, certification_company_email, reciever, reciever_phone, certification_company_address, customer_id, require_over_time, deliver_time, mesure_category, secrecy, appearance, rely_file, deliverer_sign_file, deliverer_sign_time, reciever_sign_file, remark, is_del, create_user, create_time, update_time - + SELECT + bif.id,deliverer,customerNo,customerName,delivererTel,orderId,id,interchangeCode,remark,deliverTime,bo.orderId,isUrgent,orderNo,requireOverTime,reciever FROM ( - SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS "deliverTime" - FROM business_interchange - WHERE is_del = 0 - - AND interchange_Code=#{request.interchangeCode} - - - AND reciever=#{request.reciever} - + SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS + "deliverTime",reciever,deliverer,deliverer_tel AS "delivererTel" + FROM business_interchange + WHERE is_del = 0 + + AND interchange_Code=#{request.interchangeCode} + + + AND reciever=#{request.reciever} + - - AND #{request.startTime} DATE_FORMAT(deliver_time,'%Y-%m-%d') - - - AND #{request.endTime} = ]]> DATE_FORMAT(deliver_time,'%Y-%m-%d') - - - and id in - - #{id} - - + + AND #{request.startTime} DATE_FORMAT(deliver_time,'%Y-%m-%d') + + + AND #{request.endTime} = ]]> DATE_FORMAT(deliver_time,'%Y-%m-%d') + + + and id in + + #{id} + + ) bif JOIN ( - SELECT deliverer,customer_no AS "customerNo",customer_name AS "customerName",id as "orderId",is_urgent AS "isUrgent",order_code AS "orderNo",require_over_time AS "requireOverTime" - FROM business_order - WHERE is_del = 0 - - AND deliverer=#{request.deliverer} - - - AND customer_no=#{request.customerNo} - - - AND customer_name=#{request.customerName} - + SELECT customer_no AS "customerNo",customer_name AS "customerName",id as "orderId",is_urgent AS + "isUrgent",order_code AS "orderNo",require_over_time AS "requireOverTime" + FROM business_order + WHERE is_del = 0 + + AND deliverer=#{request.deliverer} + + + AND customer_no=#{request.customerNo} + + + AND customer_name=#{request.customerName} + ) bo ON bo.orderId = bif.order_id ORDER BY bif.deliverTime DESC @@ -83,4 +87,34 @@ FROM business_interchange + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml index c9b53d4..b4e8a69 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -158,15 +158,15 @@ - SELECT bcr.id,certificate_no AS "certificateNo",bcr.certificate_name AS "certificateName",csi.sample_no AS "sampleNo",,csi.sample_name - AS "sampleName",csi.sample_model AS "sampleModel",csi.manufacturing_no AS "manufacturingNo",bo.order_code AS "orderNo",bo.measure_type - AS "measureType",bcr.certificate_type AS "certificateType",bcr.print_status AS "printStatus",bcr.print_num AS "printNum",bcr.approval_status AS "approvalStatus", - bcr.create_time AS "createTime",measurePersonId + SELECT bcr.id,certificate_no AS "certificateNo",bcr.certificate_name AS "certificateName",csi.sample_no AS "sampleNo", + csi.sample_name AS "sampleName",csi.sample_model AS "sampleModel",csi.manufacturing_no AS "manufacturingNo",bo.order_code AS "orderNo", + bo.measure_type AS "measureType",bcr.certificate_type AS "certificateType",bcr.print_status AS "printStatus",bcr.print_num AS "printNum", + bcr.approval_status AS "approvalStatus",bcr.create_time AS "createTime",bcr.measure_person_id AS "measurePersonId" FROM ( SELECT * FROM business_certificate_report @@ -56,28 +56,34 @@ #{id} + + and bcr.id in + + #{id} + + ) bcr JOIN ( - SELECT id - FROM business_order - WHERE is_del=0 - - and ORDER_CODE like concat('%',#{request.orderNo},'%') - - - and CUTOMER_NAME like concat('%',#{request.cutomerName},'%') - + SELECT id + FROM business_order + WHERE is_del=0 + + and ORDER_CODE like concat('%',#{request.orderNo},'%') + + + and CUTOMER_NAME like concat('%',#{request.cutomerName},'%') + ) bo ON bo.id=bcr.orderId JOIN ( - SELECT id - FROM customer_sample_info - WHERE is_del=0 - - and SAMPLE_NO like concat('%',#{request.sampleNo},'%') - - - and SAMPLE_NAME like concat('%',#{request.sampleName},'%') - + SELECT id + FROM customer_sample_info + WHERE is_del=0 + + and SAMPLE_NO like concat('%',#{request.sampleNo},'%') + + + and SAMPLE_NAME like concat('%',#{request.sampleName},'%') + ) csi ON csi.id=bcr.sampleId diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml index fd5562c..2342e79 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml @@ -35,45 +35,49 @@ id, interchange_code, order_id, certification_company, certification_company_fex, certification_company_email, reciever, reciever_phone, certification_company_address, customer_id, require_over_time, deliver_time, mesure_category, secrecy, appearance, rely_file, deliverer_sign_file, deliverer_sign_time, reciever_sign_file, remark, is_del, create_user, create_time, update_time - + SELECT + bif.id,deliverer,customerNo,customerName,delivererTel,orderId,id,interchangeCode,remark,deliverTime,bo.orderId,isUrgent,orderNo,requireOverTime,reciever FROM ( - SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS "deliverTime" - FROM business_interchange - WHERE is_del = 0 - - AND interchange_Code=#{request.interchangeCode} - - - AND reciever=#{request.reciever} - + SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS + "deliverTime",reciever,deliverer,deliverer_tel AS "delivererTel" + FROM business_interchange + WHERE is_del = 0 + + AND interchange_Code=#{request.interchangeCode} + + + AND reciever=#{request.reciever} + - - AND #{request.startTime} DATE_FORMAT(deliver_time,'%Y-%m-%d') - - - AND #{request.endTime} = ]]> DATE_FORMAT(deliver_time,'%Y-%m-%d') - - - and id in - - #{id} - - + + AND #{request.startTime} DATE_FORMAT(deliver_time,'%Y-%m-%d') + + + AND #{request.endTime} = ]]> DATE_FORMAT(deliver_time,'%Y-%m-%d') + + + and id in + + #{id} + + ) bif JOIN ( - SELECT deliverer,customer_no AS "customerNo",customer_name AS "customerName",id as "orderId",is_urgent AS "isUrgent",order_code AS "orderNo",require_over_time AS "requireOverTime" - FROM business_order - WHERE is_del = 0 - - AND deliverer=#{request.deliverer} - - - AND customer_no=#{request.customerNo} - - - AND customer_name=#{request.customerName} - + SELECT customer_no AS "customerNo",customer_name AS "customerName",id as "orderId",is_urgent AS + "isUrgent",order_code AS "orderNo",require_over_time AS "requireOverTime" + FROM business_order + WHERE is_del = 0 + + AND deliverer=#{request.deliverer} + + + AND customer_no=#{request.customerNo} + + + AND customer_name=#{request.customerName} + ) bo ON bo.orderId = bif.order_id ORDER BY bif.deliverTime DESC @@ -83,4 +87,34 @@ FROM business_interchange + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml index c9b53d4..b4e8a69 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -158,15 +158,15 @@ - SELECT bcr.id,certificate_no AS "certificateNo",bcr.certificate_name AS "certificateName",csi.sample_no AS "sampleNo",,csi.sample_name - AS "sampleName",csi.sample_model AS "sampleModel",csi.manufacturing_no AS "manufacturingNo",bo.order_code AS "orderNo",bo.measure_type - AS "measureType",bcr.certificate_type AS "certificateType",bcr.print_status AS "printStatus",bcr.print_num AS "printNum",bcr.approval_status AS "approvalStatus", - bcr.create_time AS "createTime",measurePersonId + SELECT bcr.id,certificate_no AS "certificateNo",bcr.certificate_name AS "certificateName",csi.sample_no AS "sampleNo", + csi.sample_name AS "sampleName",csi.sample_model AS "sampleModel",csi.manufacturing_no AS "manufacturingNo",bo.order_code AS "orderNo", + bo.measure_type AS "measureType",bcr.certificate_type AS "certificateType",bcr.print_status AS "printStatus",bcr.print_num AS "printNum", + bcr.approval_status AS "approvalStatus",bcr.create_time AS "createTime",bcr.measure_person_id AS "measurePersonId" FROM ( SELECT * FROM business_certificate_report @@ -56,28 +56,34 @@ #{id} + + and bcr.id in + + #{id} + + ) bcr JOIN ( - SELECT id - FROM business_order - WHERE is_del=0 - - and ORDER_CODE like concat('%',#{request.orderNo},'%') - - - and CUTOMER_NAME like concat('%',#{request.cutomerName},'%') - + SELECT id + FROM business_order + WHERE is_del=0 + + and ORDER_CODE like concat('%',#{request.orderNo},'%') + + + and CUTOMER_NAME like concat('%',#{request.cutomerName},'%') + ) bo ON bo.id=bcr.orderId JOIN ( - SELECT id - FROM customer_sample_info - WHERE is_del=0 - - and SAMPLE_NO like concat('%',#{request.sampleNo},'%') - - - and SAMPLE_NAME like concat('%',#{request.sampleName},'%') - + SELECT id + FROM customer_sample_info + WHERE is_del=0 + + and SAMPLE_NO like concat('%',#{request.sampleNo},'%') + + + and SAMPLE_NAME like concat('%',#{request.sampleName},'%') + ) csi ON csi.id=bcr.sampleId diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml index fd5562c..2342e79 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml @@ -35,45 +35,49 @@ id, interchange_code, order_id, certification_company, certification_company_fex, certification_company_email, reciever, reciever_phone, certification_company_address, customer_id, require_over_time, deliver_time, mesure_category, secrecy, appearance, rely_file, deliverer_sign_file, deliverer_sign_time, reciever_sign_file, remark, is_del, create_user, create_time, update_time - + SELECT + bif.id,deliverer,customerNo,customerName,delivererTel,orderId,id,interchangeCode,remark,deliverTime,bo.orderId,isUrgent,orderNo,requireOverTime,reciever FROM ( - SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS "deliverTime" - FROM business_interchange - WHERE is_del = 0 - - AND interchange_Code=#{request.interchangeCode} - - - AND reciever=#{request.reciever} - + SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS + "deliverTime",reciever,deliverer,deliverer_tel AS "delivererTel" + FROM business_interchange + WHERE is_del = 0 + + AND interchange_Code=#{request.interchangeCode} + + + AND reciever=#{request.reciever} + - - AND #{request.startTime} DATE_FORMAT(deliver_time,'%Y-%m-%d') - - - AND #{request.endTime} = ]]> DATE_FORMAT(deliver_time,'%Y-%m-%d') - - - and id in - - #{id} - - + + AND #{request.startTime} DATE_FORMAT(deliver_time,'%Y-%m-%d') + + + AND #{request.endTime} = ]]> DATE_FORMAT(deliver_time,'%Y-%m-%d') + + + and id in + + #{id} + + ) bif JOIN ( - SELECT deliverer,customer_no AS "customerNo",customer_name AS "customerName",id as "orderId",is_urgent AS "isUrgent",order_code AS "orderNo",require_over_time AS "requireOverTime" - FROM business_order - WHERE is_del = 0 - - AND deliverer=#{request.deliverer} - - - AND customer_no=#{request.customerNo} - - - AND customer_name=#{request.customerName} - + SELECT customer_no AS "customerNo",customer_name AS "customerName",id as "orderId",is_urgent AS + "isUrgent",order_code AS "orderNo",require_over_time AS "requireOverTime" + FROM business_order + WHERE is_del = 0 + + AND deliverer=#{request.deliverer} + + + AND customer_no=#{request.customerNo} + + + AND customer_name=#{request.customerName} + ) bo ON bo.orderId = bif.order_id ORDER BY bif.deliverTime DESC @@ -83,4 +87,34 @@ FROM business_interchange + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml index c9b53d4..b4e8a69 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -158,15 +158,15 @@ - SELECT bcr.id,certificate_no AS "certificateNo",bcr.certificate_name AS "certificateName",csi.sample_no AS "sampleNo",,csi.sample_name - AS "sampleName",csi.sample_model AS "sampleModel",csi.manufacturing_no AS "manufacturingNo",bo.order_code AS "orderNo",bo.measure_type - AS "measureType",bcr.certificate_type AS "certificateType",bcr.print_status AS "printStatus",bcr.print_num AS "printNum",bcr.approval_status AS "approvalStatus", - bcr.create_time AS "createTime",measurePersonId + SELECT bcr.id,certificate_no AS "certificateNo",bcr.certificate_name AS "certificateName",csi.sample_no AS "sampleNo", + csi.sample_name AS "sampleName",csi.sample_model AS "sampleModel",csi.manufacturing_no AS "manufacturingNo",bo.order_code AS "orderNo", + bo.measure_type AS "measureType",bcr.certificate_type AS "certificateType",bcr.print_status AS "printStatus",bcr.print_num AS "printNum", + bcr.approval_status AS "approvalStatus",bcr.create_time AS "createTime",bcr.measure_person_id AS "measurePersonId" FROM ( SELECT * FROM business_certificate_report @@ -56,28 +56,34 @@ #{id} + + and bcr.id in + + #{id} + + ) bcr JOIN ( - SELECT id - FROM business_order - WHERE is_del=0 - - and ORDER_CODE like concat('%',#{request.orderNo},'%') - - - and CUTOMER_NAME like concat('%',#{request.cutomerName},'%') - + SELECT id + FROM business_order + WHERE is_del=0 + + and ORDER_CODE like concat('%',#{request.orderNo},'%') + + + and CUTOMER_NAME like concat('%',#{request.cutomerName},'%') + ) bo ON bo.id=bcr.orderId JOIN ( - SELECT id - FROM customer_sample_info - WHERE is_del=0 - - and SAMPLE_NO like concat('%',#{request.sampleNo},'%') - - - and SAMPLE_NAME like concat('%',#{request.sampleName},'%') - + SELECT id + FROM customer_sample_info + WHERE is_del=0 + + and SAMPLE_NO like concat('%',#{request.sampleNo},'%') + + + and SAMPLE_NAME like concat('%',#{request.sampleName},'%') + ) csi ON csi.id=bcr.sampleId diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml index fd5562c..2342e79 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml @@ -35,45 +35,49 @@ id, interchange_code, order_id, certification_company, certification_company_fex, certification_company_email, reciever, reciever_phone, certification_company_address, customer_id, require_over_time, deliver_time, mesure_category, secrecy, appearance, rely_file, deliverer_sign_file, deliverer_sign_time, reciever_sign_file, remark, is_del, create_user, create_time, update_time - + SELECT + bif.id,deliverer,customerNo,customerName,delivererTel,orderId,id,interchangeCode,remark,deliverTime,bo.orderId,isUrgent,orderNo,requireOverTime,reciever FROM ( - SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS "deliverTime" - FROM business_interchange - WHERE is_del = 0 - - AND interchange_Code=#{request.interchangeCode} - - - AND reciever=#{request.reciever} - + SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS + "deliverTime",reciever,deliverer,deliverer_tel AS "delivererTel" + FROM business_interchange + WHERE is_del = 0 + + AND interchange_Code=#{request.interchangeCode} + + + AND reciever=#{request.reciever} + - - AND #{request.startTime} DATE_FORMAT(deliver_time,'%Y-%m-%d') - - - AND #{request.endTime} = ]]> DATE_FORMAT(deliver_time,'%Y-%m-%d') - - - and id in - - #{id} - - + + AND #{request.startTime} DATE_FORMAT(deliver_time,'%Y-%m-%d') + + + AND #{request.endTime} = ]]> DATE_FORMAT(deliver_time,'%Y-%m-%d') + + + and id in + + #{id} + + ) bif JOIN ( - SELECT deliverer,customer_no AS "customerNo",customer_name AS "customerName",id as "orderId",is_urgent AS "isUrgent",order_code AS "orderNo",require_over_time AS "requireOverTime" - FROM business_order - WHERE is_del = 0 - - AND deliverer=#{request.deliverer} - - - AND customer_no=#{request.customerNo} - - - AND customer_name=#{request.customerName} - + SELECT customer_no AS "customerNo",customer_name AS "customerName",id as "orderId",is_urgent AS + "isUrgent",order_code AS "orderNo",require_over_time AS "requireOverTime" + FROM business_order + WHERE is_del = 0 + + AND deliverer=#{request.deliverer} + + + AND customer_no=#{request.customerNo} + + + AND customer_name=#{request.customerName} + ) bo ON bo.orderId = bif.order_id ORDER BY bif.deliverTime DESC @@ -83,4 +87,34 @@ FROM business_interchange + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml index c9b53d4..b4e8a69 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -158,15 +158,15 @@ - SELECT bcr.id,certificate_no AS "certificateNo",bcr.certificate_name AS "certificateName",csi.sample_no AS "sampleNo",,csi.sample_name - AS "sampleName",csi.sample_model AS "sampleModel",csi.manufacturing_no AS "manufacturingNo",bo.order_code AS "orderNo",bo.measure_type - AS "measureType",bcr.certificate_type AS "certificateType",bcr.print_status AS "printStatus",bcr.print_num AS "printNum",bcr.approval_status AS "approvalStatus", - bcr.create_time AS "createTime",measurePersonId + SELECT bcr.id,certificate_no AS "certificateNo",bcr.certificate_name AS "certificateName",csi.sample_no AS "sampleNo", + csi.sample_name AS "sampleName",csi.sample_model AS "sampleModel",csi.manufacturing_no AS "manufacturingNo",bo.order_code AS "orderNo", + bo.measure_type AS "measureType",bcr.certificate_type AS "certificateType",bcr.print_status AS "printStatus",bcr.print_num AS "printNum", + bcr.approval_status AS "approvalStatus",bcr.create_time AS "createTime",bcr.measure_person_id AS "measurePersonId" FROM ( SELECT * FROM business_certificate_report @@ -56,28 +56,34 @@ #{id} + + and bcr.id in + + #{id} + + ) bcr JOIN ( - SELECT id - FROM business_order - WHERE is_del=0 - - and ORDER_CODE like concat('%',#{request.orderNo},'%') - - - and CUTOMER_NAME like concat('%',#{request.cutomerName},'%') - + SELECT id + FROM business_order + WHERE is_del=0 + + and ORDER_CODE like concat('%',#{request.orderNo},'%') + + + and CUTOMER_NAME like concat('%',#{request.cutomerName},'%') + ) bo ON bo.id=bcr.orderId JOIN ( - SELECT id - FROM customer_sample_info - WHERE is_del=0 - - and SAMPLE_NO like concat('%',#{request.sampleNo},'%') - - - and SAMPLE_NAME like concat('%',#{request.sampleName},'%') - + SELECT id + FROM customer_sample_info + WHERE is_del=0 + + and SAMPLE_NO like concat('%',#{request.sampleNo},'%') + + + and SAMPLE_NAME like concat('%',#{request.sampleName},'%') + ) csi ON csi.id=bcr.sampleId diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml index fd5562c..2342e79 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml @@ -35,45 +35,49 @@ id, interchange_code, order_id, certification_company, certification_company_fex, certification_company_email, reciever, reciever_phone, certification_company_address, customer_id, require_over_time, deliver_time, mesure_category, secrecy, appearance, rely_file, deliverer_sign_file, deliverer_sign_time, reciever_sign_file, remark, is_del, create_user, create_time, update_time - + SELECT + bif.id,deliverer,customerNo,customerName,delivererTel,orderId,id,interchangeCode,remark,deliverTime,bo.orderId,isUrgent,orderNo,requireOverTime,reciever FROM ( - SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS "deliverTime" - FROM business_interchange - WHERE is_del = 0 - - AND interchange_Code=#{request.interchangeCode} - - - AND reciever=#{request.reciever} - + SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS + "deliverTime",reciever,deliverer,deliverer_tel AS "delivererTel" + FROM business_interchange + WHERE is_del = 0 + + AND interchange_Code=#{request.interchangeCode} + + + AND reciever=#{request.reciever} + - - AND #{request.startTime} DATE_FORMAT(deliver_time,'%Y-%m-%d') - - - AND #{request.endTime} = ]]> DATE_FORMAT(deliver_time,'%Y-%m-%d') - - - and id in - - #{id} - - + + AND #{request.startTime} DATE_FORMAT(deliver_time,'%Y-%m-%d') + + + AND #{request.endTime} = ]]> DATE_FORMAT(deliver_time,'%Y-%m-%d') + + + and id in + + #{id} + + ) bif JOIN ( - SELECT deliverer,customer_no AS "customerNo",customer_name AS "customerName",id as "orderId",is_urgent AS "isUrgent",order_code AS "orderNo",require_over_time AS "requireOverTime" - FROM business_order - WHERE is_del = 0 - - AND deliverer=#{request.deliverer} - - - AND customer_no=#{request.customerNo} - - - AND customer_name=#{request.customerName} - + SELECT customer_no AS "customerNo",customer_name AS "customerName",id as "orderId",is_urgent AS + "isUrgent",order_code AS "orderNo",require_over_time AS "requireOverTime" + FROM business_order + WHERE is_del = 0 + + AND deliverer=#{request.deliverer} + + + AND customer_no=#{request.customerNo} + + + AND customer_name=#{request.customerName} + ) bo ON bo.orderId = bif.order_id ORDER BY bif.deliverTime DESC @@ -83,4 +87,34 @@ FROM business_interchange + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml index c9b53d4..b4e8a69 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -158,15 +158,15 @@ - SELECT bcr.id,certificate_no AS "certificateNo",bcr.certificate_name AS "certificateName",csi.sample_no AS "sampleNo",,csi.sample_name - AS "sampleName",csi.sample_model AS "sampleModel",csi.manufacturing_no AS "manufacturingNo",bo.order_code AS "orderNo",bo.measure_type - AS "measureType",bcr.certificate_type AS "certificateType",bcr.print_status AS "printStatus",bcr.print_num AS "printNum",bcr.approval_status AS "approvalStatus", - bcr.create_time AS "createTime",measurePersonId + SELECT bcr.id,certificate_no AS "certificateNo",bcr.certificate_name AS "certificateName",csi.sample_no AS "sampleNo", + csi.sample_name AS "sampleName",csi.sample_model AS "sampleModel",csi.manufacturing_no AS "manufacturingNo",bo.order_code AS "orderNo", + bo.measure_type AS "measureType",bcr.certificate_type AS "certificateType",bcr.print_status AS "printStatus",bcr.print_num AS "printNum", + bcr.approval_status AS "approvalStatus",bcr.create_time AS "createTime",bcr.measure_person_id AS "measurePersonId" FROM ( SELECT * FROM business_certificate_report @@ -56,28 +56,34 @@ #{id} + + and bcr.id in + + #{id} + + ) bcr JOIN ( - SELECT id - FROM business_order - WHERE is_del=0 - - and ORDER_CODE like concat('%',#{request.orderNo},'%') - - - and CUTOMER_NAME like concat('%',#{request.cutomerName},'%') - + SELECT id + FROM business_order + WHERE is_del=0 + + and ORDER_CODE like concat('%',#{request.orderNo},'%') + + + and CUTOMER_NAME like concat('%',#{request.cutomerName},'%') + ) bo ON bo.id=bcr.orderId JOIN ( - SELECT id - FROM customer_sample_info - WHERE is_del=0 - - and SAMPLE_NO like concat('%',#{request.sampleNo},'%') - - - and SAMPLE_NAME like concat('%',#{request.sampleName},'%') - + SELECT id + FROM customer_sample_info + WHERE is_del=0 + + and SAMPLE_NO like concat('%',#{request.sampleNo},'%') + + + and SAMPLE_NAME like concat('%',#{request.sampleName},'%') + ) csi ON csi.id=bcr.sampleId diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml index fd5562c..2342e79 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml @@ -35,45 +35,49 @@ id, interchange_code, order_id, certification_company, certification_company_fex, certification_company_email, reciever, reciever_phone, certification_company_address, customer_id, require_over_time, deliver_time, mesure_category, secrecy, appearance, rely_file, deliverer_sign_file, deliverer_sign_time, reciever_sign_file, remark, is_del, create_user, create_time, update_time - + SELECT + bif.id,deliverer,customerNo,customerName,delivererTel,orderId,id,interchangeCode,remark,deliverTime,bo.orderId,isUrgent,orderNo,requireOverTime,reciever FROM ( - SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS "deliverTime" - FROM business_interchange - WHERE is_del = 0 - - AND interchange_Code=#{request.interchangeCode} - - - AND reciever=#{request.reciever} - + SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS + "deliverTime",reciever,deliverer,deliverer_tel AS "delivererTel" + FROM business_interchange + WHERE is_del = 0 + + AND interchange_Code=#{request.interchangeCode} + + + AND reciever=#{request.reciever} + - - AND #{request.startTime} DATE_FORMAT(deliver_time,'%Y-%m-%d') - - - AND #{request.endTime} = ]]> DATE_FORMAT(deliver_time,'%Y-%m-%d') - - - and id in - - #{id} - - + + AND #{request.startTime} DATE_FORMAT(deliver_time,'%Y-%m-%d') + + + AND #{request.endTime} = ]]> DATE_FORMAT(deliver_time,'%Y-%m-%d') + + + and id in + + #{id} + + ) bif JOIN ( - SELECT deliverer,customer_no AS "customerNo",customer_name AS "customerName",id as "orderId",is_urgent AS "isUrgent",order_code AS "orderNo",require_over_time AS "requireOverTime" - FROM business_order - WHERE is_del = 0 - - AND deliverer=#{request.deliverer} - - - AND customer_no=#{request.customerNo} - - - AND customer_name=#{request.customerName} - + SELECT customer_no AS "customerNo",customer_name AS "customerName",id as "orderId",is_urgent AS + "isUrgent",order_code AS "orderNo",require_over_time AS "requireOverTime" + FROM business_order + WHERE is_del = 0 + + AND deliverer=#{request.deliverer} + + + AND customer_no=#{request.customerNo} + + + AND customer_name=#{request.customerName} + ) bo ON bo.orderId = bif.order_id ORDER BY bif.deliverTime DESC @@ -83,4 +87,34 @@ FROM business_interchange + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml index c9b53d4..b4e8a69 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -158,15 +158,15 @@