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 01754a0..84d8a69 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 @@ -88,6 +88,15 @@ } /** + * 证书状态从打印状态变更为不可打印状态 + */ + @ApiOperation("变更为不可打印") + @PostMapping("/noPrintable") + public ReturnDTO certificatePrintExport(@RequestBody @Valid IdDTO idDTO){ + return certificatePrintService.certificatePrintStatus(idDTO.getId(),"2"); + } + + /** * 证书打印列表,除了基本的列表的信息,需要判断证书打印审批中的状态,进而达到权限的控制 */ @ApiOperation("证书审批-同意") 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 01754a0..84d8a69 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 @@ -88,6 +88,15 @@ } /** + * 证书状态从打印状态变更为不可打印状态 + */ + @ApiOperation("变更为不可打印") + @PostMapping("/noPrintable") + public ReturnDTO certificatePrintExport(@RequestBody @Valid IdDTO idDTO){ + return certificatePrintService.certificatePrintStatus(idDTO.getId(),"2"); + } + + /** * 证书打印列表,除了基本的列表的信息,需要判断证书打印审批中的状态,进而达到权限的控制 */ @ApiOperation("证书审批-同意") diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificatePrintMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificatePrintMapper.java index 866408d..7a87471 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificatePrintMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificatePrintMapper.java @@ -23,4 +23,6 @@ Page selectBatchForApprovalList(@Param("page")Page page, @Param("request") CertificateListRequest request, @Param("businessKey") List businessKey); CertificatePrintDetail selectPrintDetailById(@Param("id") Long id); + + } 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 01754a0..84d8a69 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 @@ -88,6 +88,15 @@ } /** + * 证书状态从打印状态变更为不可打印状态 + */ + @ApiOperation("变更为不可打印") + @PostMapping("/noPrintable") + public ReturnDTO certificatePrintExport(@RequestBody @Valid IdDTO idDTO){ + return certificatePrintService.certificatePrintStatus(idDTO.getId(),"2"); + } + + /** * 证书打印列表,除了基本的列表的信息,需要判断证书打印审批中的状态,进而达到权限的控制 */ @ApiOperation("证书审批-同意") diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificatePrintMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificatePrintMapper.java index 866408d..7a87471 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificatePrintMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificatePrintMapper.java @@ -23,4 +23,6 @@ Page selectBatchForApprovalList(@Param("page")Page page, @Param("request") CertificateListRequest request, @Param("businessKey") List businessKey); CertificatePrintDetail selectPrintDetailById(@Param("id") Long id); + + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java index 2a56cce..436ff93 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java @@ -93,6 +93,19 @@ } @Override + public ReturnDTO certificatePrintStatus(Long id, String printStatus) { + BusinessCertificatePrint businessCertificatePrint = BusinessCertificatePrint.builder() + .id(id) + .printStatus(printStatus) + .build(); + int updatePrintStatus = this.baseMapper.updateById(businessCertificatePrint); + if (updatePrintStatus > 0) { + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + + @Override public ReturnDTO agreeAgainPrint(ApprovalAgreeRequest request) { return approvalOperateService.agree(request); } @@ -131,7 +144,7 @@ @Override public ReturnDTO submitAgainPrint(BaseApprovalSubmitRequest request) { //已取消后的提交需先删除原有实例 - if (StringUtils.isNotEmpty(request.getProcessId())){ + if (StringUtils.isNotEmpty(request.getProcessId())) { runtimeService.updateBusinessStatus(request.getProcessId(), ApprovalStatusEnum.DELETED); runtimeService.deleteProcessInstance(request.getProcessId(), "删除"); } @@ -163,7 +176,7 @@ if (ApprovalStatusEnum.TO_BE_APPROVED.equals(request.getApprovalStatus()) && CollectionUtils.isEmpty(request.getIds())) { approvalList = handlerBeApproved(approvalList, page, request); } else { - if("0".equals(request.getApprovalStatus())){ + if ("0".equals(request.getApprovalStatus())) { request.setApprovalStatus(""); } approvalList = this.baseMapper.selectBatchForApprovalList(page, request, 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 01754a0..84d8a69 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 @@ -88,6 +88,15 @@ } /** + * 证书状态从打印状态变更为不可打印状态 + */ + @ApiOperation("变更为不可打印") + @PostMapping("/noPrintable") + public ReturnDTO certificatePrintExport(@RequestBody @Valid IdDTO idDTO){ + return certificatePrintService.certificatePrintStatus(idDTO.getId(),"2"); + } + + /** * 证书打印列表,除了基本的列表的信息,需要判断证书打印审批中的状态,进而达到权限的控制 */ @ApiOperation("证书审批-同意") diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificatePrintMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificatePrintMapper.java index 866408d..7a87471 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificatePrintMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificatePrintMapper.java @@ -23,4 +23,6 @@ Page selectBatchForApprovalList(@Param("page")Page page, @Param("request") CertificateListRequest request, @Param("businessKey") List businessKey); CertificatePrintDetail selectPrintDetailById(@Param("id") Long id); + + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java index 2a56cce..436ff93 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java @@ -93,6 +93,19 @@ } @Override + public ReturnDTO certificatePrintStatus(Long id, String printStatus) { + BusinessCertificatePrint businessCertificatePrint = BusinessCertificatePrint.builder() + .id(id) + .printStatus(printStatus) + .build(); + int updatePrintStatus = this.baseMapper.updateById(businessCertificatePrint); + if (updatePrintStatus > 0) { + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + + @Override public ReturnDTO agreeAgainPrint(ApprovalAgreeRequest request) { return approvalOperateService.agree(request); } @@ -131,7 +144,7 @@ @Override public ReturnDTO submitAgainPrint(BaseApprovalSubmitRequest request) { //已取消后的提交需先删除原有实例 - if (StringUtils.isNotEmpty(request.getProcessId())){ + if (StringUtils.isNotEmpty(request.getProcessId())) { runtimeService.updateBusinessStatus(request.getProcessId(), ApprovalStatusEnum.DELETED); runtimeService.deleteProcessInstance(request.getProcessId(), "删除"); } @@ -163,7 +176,7 @@ if (ApprovalStatusEnum.TO_BE_APPROVED.equals(request.getApprovalStatus()) && CollectionUtils.isEmpty(request.getIds())) { approvalList = handlerBeApproved(approvalList, page, request); } else { - if("0".equals(request.getApprovalStatus())){ + if ("0".equals(request.getApprovalStatus())) { request.setApprovalStatus(""); } approvalList = this.baseMapper.selectBatchForApprovalList(page, request, null); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessCertificatePrintService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessCertificatePrintService.java index 319ef3a..99e7b96 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessCertificatePrintService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessCertificatePrintService.java @@ -19,6 +19,7 @@ CertificatePrintDetail certificatePrintDetail(Long id); void certificatePrintExport(CertificateListRequest request, HttpServletResponse response, Page page) throws Exception; + ReturnDTO certificatePrintStatus(Long id,String printStatus); ReturnDTO agreeAgainPrint(ApprovalAgreeRequest request);