diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index e028713..8e46101 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -25,6 +25,11 @@ 2.0.0 + com.casic + casic-metering-service + 2.0.0 + + com.github.oshi oshi-core 5.7.0 diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index e028713..8e46101 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -25,6 +25,11 @@ 2.0.0 + com.casic + casic-metering-service + 2.0.0 + + com.github.oshi oshi-core 5.7.0 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index bbef828..5d16918 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -19,4 +19,5 @@ String DEVICE_FIX_APPROVAL = "sbglsbjxsq"; // 设备检修申请 String DEVICE_FIX_ACCEPTANCE = "sbglsbjxbyysd"; // 设备检修保养验收单 String CERTIFICATE_PRINT_APPROVAL = "ywglzsdy"; // 证书打印通过 + String CERTIFICATE_REPORT_APPROVAL = "ywglzsbg"; // 证书报告通过 } diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index e028713..8e46101 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -25,6 +25,11 @@ 2.0.0 + com.casic + casic-metering-service + 2.0.0 + + com.github.oshi oshi-core 5.7.0 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index bbef828..5d16918 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -19,4 +19,5 @@ String DEVICE_FIX_APPROVAL = "sbglsbjxsq"; // 设备检修申请 String DEVICE_FIX_ACCEPTANCE = "sbglsbjxbyysd"; // 设备检修保养验收单 String CERTIFICATE_PRINT_APPROVAL = "ywglzsdy"; // 证书打印通过 + String CERTIFICATE_REPORT_APPROVAL = "ywglzsbg"; // 证书报告通过 } 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 27bdd92..c2597b0 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 @@ -97,6 +97,11 @@ case ApplyFromIdEnum.CERTIFICATE_PRINT_APPROVAL: updateCertificateState(Long.valueOf(id)); break; + //证书报告审批通过状态回填 + case ApplyFromIdEnum.CERTIFICATE_REPORT_APPROVAL: + updateCertificateState(Long.valueOf(id)); + break; + } //设置通过状态为已通过 diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index e028713..8e46101 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -25,6 +25,11 @@ 2.0.0 + com.casic + casic-metering-service + 2.0.0 + + com.github.oshi oshi-core 5.7.0 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index bbef828..5d16918 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -19,4 +19,5 @@ String DEVICE_FIX_APPROVAL = "sbglsbjxsq"; // 设备检修申请 String DEVICE_FIX_ACCEPTANCE = "sbglsbjxbyysd"; // 设备检修保养验收单 String CERTIFICATE_PRINT_APPROVAL = "ywglzsdy"; // 证书打印通过 + String CERTIFICATE_REPORT_APPROVAL = "ywglzsbg"; // 证书报告通过 } 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 27bdd92..c2597b0 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 @@ -97,6 +97,11 @@ case ApplyFromIdEnum.CERTIFICATE_PRINT_APPROVAL: updateCertificateState(Long.valueOf(id)); break; + //证书报告审批通过状态回填 + case ApplyFromIdEnum.CERTIFICATE_REPORT_APPROVAL: + updateCertificateState(Long.valueOf(id)); + break; + } //设置通过状态为已通过 diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java index be19dde..efe802b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java @@ -23,12 +23,16 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BusinessCertificateReportMapper; import com.casic.missiles.model.business.BusinessCertificateReport; +import com.casic.missiles.model.customer.CustomerSampleInfo; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.service.IBaseApprovalService; +import com.casic.missiles.service.Impl.customer.CustomerSampleServiceImpl; import com.casic.missiles.service.business.IBusinessCertificateReportService; import com.casic.missiles.service.business.IBusinessOriginalRecordService; +import com.casic.missiles.service.customer.CustomerSampleService; import com.casic.missiles.service.flowable.ApprovalOperateService; import com.casic.missiles.utils.NumberGeneratorUtil; +import com.casic.missiles.utils.SpringContextUtil; import org.flowable.engine.RuntimeService; import org.flowable.engine.TaskService; import org.flowable.engine.runtime.ProcessInstance; @@ -68,6 +72,8 @@ private RuntimeService runtimeService; @Resource private IBaseExportService iBaseExportService; + @Resource + private CustomerSampleServiceImpl sampleService; /** * 保存证书报告信息 @@ -168,6 +174,7 @@ return ReturnUtil.success(); } + /** * 审批状态列表查询 * @@ -221,13 +228,38 @@ throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED); }); request.setCreateUserId(user.getId()); - List reportResponseList= handleApprovalStatus(null, request); + List reportResponseList = handleApprovalStatus(null, request); iBaseExportService.exportExcel(response, CertificateReportResponse.class, reportResponseList, ExportEnum.CERTIFICATE_REPORT.getSheetName()); } catch (Exception e) { log.error("证书报告导出出现异常，异常信息为{}", e); } } + /** + * 审批通过后 更新样品有效期 + * @param id + * @return + */ + @Override + public boolean updateCertificateReportState(Long id) { + + BusinessCertificateReport certificateReport = new BusinessCertificateReport(); + certificateReport.setId(id); + certificateReport.setApprovalStatus(ApprovalStatusEnum.PASSED); //审批状态为通过 + int row = this.baseMapper.updateById(certificateReport); + //更新样品有效期 + BusinessCertificateReport certificateReport1 = this.baseMapper.selectById(id); + if (certificateReport1.getSampleId() != null) { + CustomerSampleInfo sampleInfo = sampleService.getById(certificateReport1.getSampleId()); + if (sampleInfo != null) { + sampleInfo.setValidDeadline(certificateReport1.getExpirationDate()); + boolean rs = sampleService.updateById(sampleInfo); + if (row > 0 & rs) return true; + } + } + return row > 0 ? true : false; + } + private List handleApprovalStatus(Page page, CertificateReportApprovalRequest request) { List approvalList = new ArrayList<>(); List businessKeys = new ArrayList<>(); diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index e028713..8e46101 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -25,6 +25,11 @@ 2.0.0 + com.casic + casic-metering-service + 2.0.0 + + com.github.oshi oshi-core 5.7.0 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index bbef828..5d16918 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -19,4 +19,5 @@ String DEVICE_FIX_APPROVAL = "sbglsbjxsq"; // 设备检修申请 String DEVICE_FIX_ACCEPTANCE = "sbglsbjxbyysd"; // 设备检修保养验收单 String CERTIFICATE_PRINT_APPROVAL = "ywglzsdy"; // 证书打印通过 + String CERTIFICATE_REPORT_APPROVAL = "ywglzsbg"; // 证书报告通过 } 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 27bdd92..c2597b0 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 @@ -97,6 +97,11 @@ case ApplyFromIdEnum.CERTIFICATE_PRINT_APPROVAL: updateCertificateState(Long.valueOf(id)); break; + //证书报告审批通过状态回填 + case ApplyFromIdEnum.CERTIFICATE_REPORT_APPROVAL: + updateCertificateState(Long.valueOf(id)); + break; + } //设置通过状态为已通过 diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java index be19dde..efe802b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java @@ -23,12 +23,16 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BusinessCertificateReportMapper; import com.casic.missiles.model.business.BusinessCertificateReport; +import com.casic.missiles.model.customer.CustomerSampleInfo; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.service.IBaseApprovalService; +import com.casic.missiles.service.Impl.customer.CustomerSampleServiceImpl; import com.casic.missiles.service.business.IBusinessCertificateReportService; import com.casic.missiles.service.business.IBusinessOriginalRecordService; +import com.casic.missiles.service.customer.CustomerSampleService; import com.casic.missiles.service.flowable.ApprovalOperateService; import com.casic.missiles.utils.NumberGeneratorUtil; +import com.casic.missiles.utils.SpringContextUtil; import org.flowable.engine.RuntimeService; import org.flowable.engine.TaskService; import org.flowable.engine.runtime.ProcessInstance; @@ -68,6 +72,8 @@ private RuntimeService runtimeService; @Resource private IBaseExportService iBaseExportService; + @Resource + private CustomerSampleServiceImpl sampleService; /** * 保存证书报告信息 @@ -168,6 +174,7 @@ return ReturnUtil.success(); } + /** * 审批状态列表查询 * @@ -221,13 +228,38 @@ throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED); }); request.setCreateUserId(user.getId()); - List reportResponseList= handleApprovalStatus(null, request); + List reportResponseList = handleApprovalStatus(null, request); iBaseExportService.exportExcel(response, CertificateReportResponse.class, reportResponseList, ExportEnum.CERTIFICATE_REPORT.getSheetName()); } catch (Exception e) { log.error("证书报告导出出现异常，异常信息为{}", e); } } + /** + * 审批通过后 更新样品有效期 + * @param id + * @return + */ + @Override + public boolean updateCertificateReportState(Long id) { + + BusinessCertificateReport certificateReport = new BusinessCertificateReport(); + certificateReport.setId(id); + certificateReport.setApprovalStatus(ApprovalStatusEnum.PASSED); //审批状态为通过 + int row = this.baseMapper.updateById(certificateReport); + //更新样品有效期 + BusinessCertificateReport certificateReport1 = this.baseMapper.selectById(id); + if (certificateReport1.getSampleId() != null) { + CustomerSampleInfo sampleInfo = sampleService.getById(certificateReport1.getSampleId()); + if (sampleInfo != null) { + sampleInfo.setValidDeadline(certificateReport1.getExpirationDate()); + boolean rs = sampleService.updateById(sampleInfo); + if (row > 0 & rs) return true; + } + } + return row > 0 ? true : false; + } + private List handleApprovalStatus(Page page, CertificateReportApprovalRequest request) { List approvalList = new ArrayList<>(); List businessKeys = new ArrayList<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessCertificateReportService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessCertificateReportService.java index 38542be..e8a61c7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessCertificateReportService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessCertificateReportService.java @@ -40,4 +40,6 @@ void originExport(CertificateReportApprovalRequest request, HttpServletResponse response); + boolean updateCertificateReportState(Long id); + }