diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java index e023b35..82e26ca 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.eqpt; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; @@ -105,14 +106,14 @@ //生成证书报告的,需要改变为动态选择性 originFutureTask = CompletableFuture.supplyAsync( () -> printFileRegister.registerPrintFile(ORIGINAL_RECORD_APPROVAL, "数据打印", null, map2, true, null, customOriginUrls), threadPool); - if (parallelCreateFile(originFutureTask, certificateFutureTask, id, map,deviceMeasureApproval)) { + if (parallelCreateFile(originFutureTask, certificateFutureTask, id, map, deviceMeasureApproval)) { return; } } - singleCreateFile(originFutureTask, certificateFutureTask, id, map,deviceMeasureApproval); + singleCreateFile(originFutureTask, certificateFutureTask, id, map, deviceMeasureApproval); } - private void singleCreateFile(CompletableFuture originFutureTask, CompletableFuture certificateFutureTask, Long id, Map map,BizBusinessDeviceMeasureApproval oldMeasureApproval) { + private void singleCreateFile(CompletableFuture originFutureTask, CompletableFuture certificateFutureTask, Long id, Map map, BizBusinessDeviceMeasureApproval oldMeasureApproval) { if (certificateFutureTask != null) { certificateFutureTask.thenRun( () -> { @@ -156,7 +157,7 @@ } } - private Boolean parallelCreateFile(CompletableFuture originFutureTask, CompletableFuture certificateFutureTask, Long id, Map map,BizBusinessDeviceMeasureApproval oldMeasureApproval) { + private Boolean parallelCreateFile(CompletableFuture originFutureTask, CompletableFuture certificateFutureTask, Long id, Map map, BizBusinessDeviceMeasureApproval oldMeasureApproval) { if (certificateFutureTask != null && originFutureTask != null) { CompletableFuture tempCertificateFutureTask = certificateFutureTask; CompletableFuture tempOriginFutureTask = originFutureTask; @@ -305,11 +306,13 @@ private void saveCertificatePrintInfo(BizBusinessDeviceMeasureApproval measureApproval) { BizBusinessCertificatePrintMapper certificatePrintMapper = SpringContextUtil.getBean(BizBusinessCertificatePrintMapper.class); BizBusinessCertificatePrint certificatePrint = getCertificatePrintByReport(measureApproval); + int row = certificatePrintMapper.insert(certificatePrint); IEqptEquipmentInfoService eqptEquipmentInfoService = SpringContextUtil.getBean(IEqptEquipmentInfoService.class); eqptEquipmentInfoService.updateCertificateInfo(measureApproval.getSampleId(), "中国西昌卫星发射中心计量测试站", measureApproval.getTraceDate(), - measureApproval.getMeasureValidDate(), measureApproval.getMeterIdentify()); + StringUtils.isEmpty(measureApproval.getMeasureValidDate()) ? "" : + DateUtil.format(DateUtil.parseDate(measureApproval.getMeasureValidDate()), "yyyy-MM-dd"), measureApproval.getMeterIdentify()); if (row <= 0) { throw new BusinessException(BusinessExceptionEnum.APPROVAL_PROCESSOR_HANDLE_FAILED); }