diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java index 4206d75..15557c3 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java @@ -10,7 +10,6 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.quality.BizQualityInternalAuditPlanVO; -import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.model.quality.BizQualityInternalAuditPlan; import com.casic.missiles.service.quality.IBizQualityInternalAuditPlanService; import io.swagger.annotations.Api; @@ -114,10 +113,7 @@ //to-do 所有文件压缩包导出 List plans = null; if (CollectionUtils.isEmpty(bizQualityInternalAuditPlanVO.getIds())) { - bizQualityInternalAuditPlanVO.setApprovalStatus(ApprovalStatusEnum.PASSED); - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(BizQualityInternalAuditPlan::getApprovalStatus, ApprovalStatusEnum.PASSED); - plans = bizQualityInternalAuditPlanService.list(queryWrapper); + plans = bizQualityInternalAuditPlanService.list(null); } else { bizQualityInternalAuditPlanService.listByIds(bizQualityInternalAuditPlanVO.getIds()); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java index 4206d75..15557c3 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java @@ -10,7 +10,6 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.quality.BizQualityInternalAuditPlanVO; -import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.model.quality.BizQualityInternalAuditPlan; import com.casic.missiles.service.quality.IBizQualityInternalAuditPlanService; import io.swagger.annotations.Api; @@ -114,10 +113,7 @@ //to-do 所有文件压缩包导出 List plans = null; if (CollectionUtils.isEmpty(bizQualityInternalAuditPlanVO.getIds())) { - bizQualityInternalAuditPlanVO.setApprovalStatus(ApprovalStatusEnum.PASSED); - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(BizQualityInternalAuditPlan::getApprovalStatus, ApprovalStatusEnum.PASSED); - plans = bizQualityInternalAuditPlanService.list(queryWrapper); + plans = bizQualityInternalAuditPlanService.list(null); } else { bizQualityInternalAuditPlanService.listByIds(bizQualityInternalAuditPlanVO.getIds()); } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureApproval.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureApproval.java index 8f1dd85..472e737 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureApproval.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureApproval.java @@ -151,7 +151,7 @@ @ApiModelProperty(value = "零点漂移(0.02活塞打印需要)", dataType = "String") @TableField(exist = false) - private String zeroDrift; + private String zeroDriftResult; @ApiModelProperty(value = "指针平稳性(0.02活塞打印需要)", dataType = "String") @TableField(exist = false) diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java index 4206d75..15557c3 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java @@ -10,7 +10,6 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.quality.BizQualityInternalAuditPlanVO; -import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.model.quality.BizQualityInternalAuditPlan; import com.casic.missiles.service.quality.IBizQualityInternalAuditPlanService; import io.swagger.annotations.Api; @@ -114,10 +113,7 @@ //to-do 所有文件压缩包导出 List plans = null; if (CollectionUtils.isEmpty(bizQualityInternalAuditPlanVO.getIds())) { - bizQualityInternalAuditPlanVO.setApprovalStatus(ApprovalStatusEnum.PASSED); - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(BizQualityInternalAuditPlan::getApprovalStatus, ApprovalStatusEnum.PASSED); - plans = bizQualityInternalAuditPlanService.list(queryWrapper); + plans = bizQualityInternalAuditPlanService.list(null); } else { bizQualityInternalAuditPlanService.listByIds(bizQualityInternalAuditPlanVO.getIds()); } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureApproval.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureApproval.java index 8f1dd85..472e737 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureApproval.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureApproval.java @@ -151,7 +151,7 @@ @ApiModelProperty(value = "零点漂移(0.02活塞打印需要)", dataType = "String") @TableField(exist = false) - private String zeroDrift; + private String zeroDriftResult; @ApiModelProperty(value = "指针平稳性(0.02活塞打印需要)", dataType = "String") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/DcPowerStrategyType.java b/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/DcPowerStrategyType.java index 8601e8d..2133dbd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/DcPowerStrategyType.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/DcPowerStrategyType.java @@ -104,7 +104,7 @@ BigDecimal technicalIndex = new BigDecimal(dcPower.getTechnicalIndex()); BigDecimal rippleVoltage = new BigDecimal(dcPower.getRippleVoltage()); int compare = rippleVoltage.compareTo(technicalIndex); - dcPower.setTechnicalIndex(dcPower.getTechnicalIndexSymbol() + dcPower.getTechnicalIndex() + "%"); + dcPower.setTechnicalIndex(dcPower.getTechnicalIndexSymbol() + dcPower.getTechnicalIndex()); dcPower.setRippleVoltage(dcPower.getRippleVoltage() + "mV"); if (compare > 0) { dcPower.setRippleVoltage(dcPower.getRippleVoltage() + "*"); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java index 4206d75..15557c3 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java @@ -10,7 +10,6 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.quality.BizQualityInternalAuditPlanVO; -import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.model.quality.BizQualityInternalAuditPlan; import com.casic.missiles.service.quality.IBizQualityInternalAuditPlanService; import io.swagger.annotations.Api; @@ -114,10 +113,7 @@ //to-do 所有文件压缩包导出 List plans = null; if (CollectionUtils.isEmpty(bizQualityInternalAuditPlanVO.getIds())) { - bizQualityInternalAuditPlanVO.setApprovalStatus(ApprovalStatusEnum.PASSED); - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(BizQualityInternalAuditPlan::getApprovalStatus, ApprovalStatusEnum.PASSED); - plans = bizQualityInternalAuditPlanService.list(queryWrapper); + plans = bizQualityInternalAuditPlanService.list(null); } else { bizQualityInternalAuditPlanService.listByIds(bizQualityInternalAuditPlanVO.getIds()); } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureApproval.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureApproval.java index 8f1dd85..472e737 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureApproval.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureApproval.java @@ -151,7 +151,7 @@ @ApiModelProperty(value = "零点漂移(0.02活塞打印需要)", dataType = "String") @TableField(exist = false) - private String zeroDrift; + private String zeroDriftResult; @ApiModelProperty(value = "指针平稳性(0.02活塞打印需要)", dataType = "String") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/DcPowerStrategyType.java b/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/DcPowerStrategyType.java index 8601e8d..2133dbd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/DcPowerStrategyType.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/DcPowerStrategyType.java @@ -104,7 +104,7 @@ BigDecimal technicalIndex = new BigDecimal(dcPower.getTechnicalIndex()); BigDecimal rippleVoltage = new BigDecimal(dcPower.getRippleVoltage()); int compare = rippleVoltage.compareTo(technicalIndex); - dcPower.setTechnicalIndex(dcPower.getTechnicalIndexSymbol() + dcPower.getTechnicalIndex() + "%"); + dcPower.setTechnicalIndex(dcPower.getTechnicalIndexSymbol() + dcPower.getTechnicalIndex()); dcPower.setRippleVoltage(dcPower.getRippleVoltage() + "mV"); if (compare > 0) { dcPower.setRippleVoltage(dcPower.getRippleVoltage() + "*"); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/PressureGaugeHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/PressureGaugeHandler.java index 84d1582..f9231c4 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/PressureGaugeHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/PressureGaugeHandler.java @@ -4,7 +4,6 @@ import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.casic.missiles.core.application.service.AbstractDictService; -import com.casic.missiles.dto.business.deviceMeasure.MeasureEquipmentInfoDTO; import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.certificate.ToBeRemoveDataItem; import com.casic.missiles.enums.BusinessExceptionEnum; @@ -102,6 +101,7 @@ } return urlList; } catch (Exception ex) { + log.error("生成核查记录发生异常========>", ex); throw new BusinessException(BusinessExceptionEnum.MEASURE_APPROVAL_UPDATE_FAILED); } } @@ -158,14 +158,14 @@ readyForCoverParams(map, measureItemInfo.getLabCode()); //参数 customParam(map, measureItemInfo); - if (!map.containsKey("equipmentList") || CollectionUtils.isEmpty((List) map.get("equipmentList"))) { - List equipmentList = bizBusinessDeviceMeasureEquipmentMapper.selectEquipmentListByDataId(measureItemInfo.getDataId()); - if (CollectionUtils.isEmpty(equipmentList)) { - equipmentList = new ArrayList<>(); - equipmentList.add(new MeasureEquipmentInfoDTO()); - } - map.put("equipmentList", equipmentList); - } +// if (!map.containsKey("equipmentList") || CollectionUtils.isEmpty((List) map.get("equipmentList"))) { +// List equipmentList = bizBusinessDeviceMeasureEquipmentMapper.selectEquipmentListByDataId(measureItemInfo.getDataId()); +// if (CollectionUtils.isEmpty(equipmentList)) { +// equipmentList = new ArrayList<>(); +// equipmentList.add(new MeasureEquipmentInfoDTO()); +// } +// map.put("equipmentList", equipmentList); +// } map.put("measureMedium", measureItemInfo.getMeasureMedium()); map.put("insulationResistance", measureItemInfo.getInsulationResistance()); if (StringUtils.isNotEmpty((String) map.get("technologyFile"))) { @@ -200,6 +200,7 @@ } return urlList; } catch (Exception ex) { + log.error("生成原始记录发生异常========>", ex); throw new BusinessException(BusinessExceptionEnum.MEASURE_APPROVAL_UPDATE_FAILED); } } @@ -241,14 +242,14 @@ //准备封面参数 String customUrl = readyForCoverParams(map, measureItemInfo.getLabCode()); customParam(map, measureItemInfo); - if (!map.containsKey("equipmentList") || CollectionUtils.isEmpty((List) map.get("equipmentList"))) { - List equipmentList = bizBusinessDeviceMeasureEquipmentMapper.selectEquipmentListByDataId(measureItemInfo.getDataId()); - if (CollectionUtils.isEmpty(equipmentList)) { - equipmentList = new ArrayList<>(); - equipmentList.add(new MeasureEquipmentInfoDTO()); - } - map.put("equipmentList", equipmentList); - } +// if (!map.containsKey("equipmentList") || CollectionUtils.isEmpty((List) map.get("equipmentList"))) { +// List equipmentList = bizBusinessDeviceMeasureEquipmentMapper.selectEquipmentListByDataId(measureItemInfo.getDataId()); +// if (CollectionUtils.isEmpty(equipmentList)) { +// equipmentList = new ArrayList<>(); +// equipmentList.add(new MeasureEquipmentInfoDTO()); +// } +// map.put("equipmentList", equipmentList); +// } map.put("resultList", resultList); map.put("setPointGaugeList", setPointGaugeList); map.put("setPointList", setPointList); @@ -279,6 +280,7 @@ } return urlList; } catch (Exception ex) { + log.error("生成证书报告发生异常========>", ex); throw new BusinessException(BusinessExceptionEnum.MEASURE_APPROVAL_UPDATE_FAILED); } } @@ -304,9 +306,18 @@ if (ObjectUtils.isNotEmpty(measureItemInfo.getDataProcessing())) { map.put("equation", "截距a=" + measureItemInfo.getDataProcessing().getInterceptA() + "，斜率b=" + measureItemInfo.getDataProcessing().getSlopeB()); } - if (ObjectUtils.isNotEmpty(pistonGauge)) { - map.put("rangeUnit", pistonGauge.getRangeUnit());//单位 - if (pistonGauge.getZeroDrift()) {//零点漂移 +// if (ObjectUtils.isNotEmpty(pistonGauge)) { +// map.put("rangeUnit", pistonGauge.getRangeUnit());//单位 +// if (pistonGauge.getZeroDrift() != null){ +// if (pistonGauge.getZeroDrift()) {//零点漂移 +// map.put("upToStandard", "\uF052"); +// } else { +// map.put("belowStandard", "\uF052"); +// } +// } +// } + if (StringUtils.isNotBlank(measureItemInfo.getZeroDriftResult())) { + if ("合格".equals(measureItemInfo.getZeroDriftResult())) { map.put("upToStandard", "\uF052"); } else { map.put("belowStandard", "\uF052"); @@ -515,7 +526,7 @@ } else { map.put("secondSeq", indexList.get(titleIndex++)); } - if (StringUtils.isEmpty(measureItemInfo.getZeroDrift())) { + if (StringUtils.isEmpty(measureItemInfo.getZeroDriftResult())) { addDataRemoveItem(dataItems, 4, "零点漂移"); } else { map.put("thirdSeq", indexList.get(titleIndex++)); @@ -598,7 +609,7 @@ } else { map.put("thirdSeq", titleIndex++ + "."); } - if (StringUtils.isEmpty(measureItemInfo.getZeroDrift())) { + if (StringUtils.isEmpty(measureItemInfo.getZeroDriftResult())) { addDataRemoveItem(dataItems, 5, "零点漂移"); } else { map.put("fourthSeq", titleIndex++ + "."); @@ -611,7 +622,7 @@ } else { map.put("secondSeq", titleIndex++ + "."); } - if (StringUtils.isEmpty(measureItemInfo.getZeroDrift())) { + if (StringUtils.isEmpty(measureItemInfo.getZeroDriftResult())) { addDataRemoveItem(dataItems, 5, "零点漂移"); } else { map.put("thirdSeq", titleIndex++ + "."); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java index 4206d75..15557c3 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java @@ -10,7 +10,6 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.quality.BizQualityInternalAuditPlanVO; -import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.model.quality.BizQualityInternalAuditPlan; import com.casic.missiles.service.quality.IBizQualityInternalAuditPlanService; import io.swagger.annotations.Api; @@ -114,10 +113,7 @@ //to-do 所有文件压缩包导出 List plans = null; if (CollectionUtils.isEmpty(bizQualityInternalAuditPlanVO.getIds())) { - bizQualityInternalAuditPlanVO.setApprovalStatus(ApprovalStatusEnum.PASSED); - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(BizQualityInternalAuditPlan::getApprovalStatus, ApprovalStatusEnum.PASSED); - plans = bizQualityInternalAuditPlanService.list(queryWrapper); + plans = bizQualityInternalAuditPlanService.list(null); } else { bizQualityInternalAuditPlanService.listByIds(bizQualityInternalAuditPlanVO.getIds()); } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureApproval.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureApproval.java index 8f1dd85..472e737 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureApproval.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureApproval.java @@ -151,7 +151,7 @@ @ApiModelProperty(value = "零点漂移(0.02活塞打印需要)", dataType = "String") @TableField(exist = false) - private String zeroDrift; + private String zeroDriftResult; @ApiModelProperty(value = "指针平稳性(0.02活塞打印需要)", dataType = "String") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/DcPowerStrategyType.java b/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/DcPowerStrategyType.java index 8601e8d..2133dbd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/DcPowerStrategyType.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/DcPowerStrategyType.java @@ -104,7 +104,7 @@ BigDecimal technicalIndex = new BigDecimal(dcPower.getTechnicalIndex()); BigDecimal rippleVoltage = new BigDecimal(dcPower.getRippleVoltage()); int compare = rippleVoltage.compareTo(technicalIndex); - dcPower.setTechnicalIndex(dcPower.getTechnicalIndexSymbol() + dcPower.getTechnicalIndex() + "%"); + dcPower.setTechnicalIndex(dcPower.getTechnicalIndexSymbol() + dcPower.getTechnicalIndex()); dcPower.setRippleVoltage(dcPower.getRippleVoltage() + "mV"); if (compare > 0) { dcPower.setRippleVoltage(dcPower.getRippleVoltage() + "*"); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/PressureGaugeHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/PressureGaugeHandler.java index 84d1582..f9231c4 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/PressureGaugeHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/PressureGaugeHandler.java @@ -4,7 +4,6 @@ import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.casic.missiles.core.application.service.AbstractDictService; -import com.casic.missiles.dto.business.deviceMeasure.MeasureEquipmentInfoDTO; import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.certificate.ToBeRemoveDataItem; import com.casic.missiles.enums.BusinessExceptionEnum; @@ -102,6 +101,7 @@ } return urlList; } catch (Exception ex) { + log.error("生成核查记录发生异常========>", ex); throw new BusinessException(BusinessExceptionEnum.MEASURE_APPROVAL_UPDATE_FAILED); } } @@ -158,14 +158,14 @@ readyForCoverParams(map, measureItemInfo.getLabCode()); //参数 customParam(map, measureItemInfo); - if (!map.containsKey("equipmentList") || CollectionUtils.isEmpty((List) map.get("equipmentList"))) { - List equipmentList = bizBusinessDeviceMeasureEquipmentMapper.selectEquipmentListByDataId(measureItemInfo.getDataId()); - if (CollectionUtils.isEmpty(equipmentList)) { - equipmentList = new ArrayList<>(); - equipmentList.add(new MeasureEquipmentInfoDTO()); - } - map.put("equipmentList", equipmentList); - } +// if (!map.containsKey("equipmentList") || CollectionUtils.isEmpty((List) map.get("equipmentList"))) { +// List equipmentList = bizBusinessDeviceMeasureEquipmentMapper.selectEquipmentListByDataId(measureItemInfo.getDataId()); +// if (CollectionUtils.isEmpty(equipmentList)) { +// equipmentList = new ArrayList<>(); +// equipmentList.add(new MeasureEquipmentInfoDTO()); +// } +// map.put("equipmentList", equipmentList); +// } map.put("measureMedium", measureItemInfo.getMeasureMedium()); map.put("insulationResistance", measureItemInfo.getInsulationResistance()); if (StringUtils.isNotEmpty((String) map.get("technologyFile"))) { @@ -200,6 +200,7 @@ } return urlList; } catch (Exception ex) { + log.error("生成原始记录发生异常========>", ex); throw new BusinessException(BusinessExceptionEnum.MEASURE_APPROVAL_UPDATE_FAILED); } } @@ -241,14 +242,14 @@ //准备封面参数 String customUrl = readyForCoverParams(map, measureItemInfo.getLabCode()); customParam(map, measureItemInfo); - if (!map.containsKey("equipmentList") || CollectionUtils.isEmpty((List) map.get("equipmentList"))) { - List equipmentList = bizBusinessDeviceMeasureEquipmentMapper.selectEquipmentListByDataId(measureItemInfo.getDataId()); - if (CollectionUtils.isEmpty(equipmentList)) { - equipmentList = new ArrayList<>(); - equipmentList.add(new MeasureEquipmentInfoDTO()); - } - map.put("equipmentList", equipmentList); - } +// if (!map.containsKey("equipmentList") || CollectionUtils.isEmpty((List) map.get("equipmentList"))) { +// List equipmentList = bizBusinessDeviceMeasureEquipmentMapper.selectEquipmentListByDataId(measureItemInfo.getDataId()); +// if (CollectionUtils.isEmpty(equipmentList)) { +// equipmentList = new ArrayList<>(); +// equipmentList.add(new MeasureEquipmentInfoDTO()); +// } +// map.put("equipmentList", equipmentList); +// } map.put("resultList", resultList); map.put("setPointGaugeList", setPointGaugeList); map.put("setPointList", setPointList); @@ -279,6 +280,7 @@ } return urlList; } catch (Exception ex) { + log.error("生成证书报告发生异常========>", ex); throw new BusinessException(BusinessExceptionEnum.MEASURE_APPROVAL_UPDATE_FAILED); } } @@ -304,9 +306,18 @@ if (ObjectUtils.isNotEmpty(measureItemInfo.getDataProcessing())) { map.put("equation", "截距a=" + measureItemInfo.getDataProcessing().getInterceptA() + "，斜率b=" + measureItemInfo.getDataProcessing().getSlopeB()); } - if (ObjectUtils.isNotEmpty(pistonGauge)) { - map.put("rangeUnit", pistonGauge.getRangeUnit());//单位 - if (pistonGauge.getZeroDrift()) {//零点漂移 +// if (ObjectUtils.isNotEmpty(pistonGauge)) { +// map.put("rangeUnit", pistonGauge.getRangeUnit());//单位 +// if (pistonGauge.getZeroDrift() != null){ +// if (pistonGauge.getZeroDrift()) {//零点漂移 +// map.put("upToStandard", "\uF052"); +// } else { +// map.put("belowStandard", "\uF052"); +// } +// } +// } + if (StringUtils.isNotBlank(measureItemInfo.getZeroDriftResult())) { + if ("合格".equals(measureItemInfo.getZeroDriftResult())) { map.put("upToStandard", "\uF052"); } else { map.put("belowStandard", "\uF052"); @@ -515,7 +526,7 @@ } else { map.put("secondSeq", indexList.get(titleIndex++)); } - if (StringUtils.isEmpty(measureItemInfo.getZeroDrift())) { + if (StringUtils.isEmpty(measureItemInfo.getZeroDriftResult())) { addDataRemoveItem(dataItems, 4, "零点漂移"); } else { map.put("thirdSeq", indexList.get(titleIndex++)); @@ -598,7 +609,7 @@ } else { map.put("thirdSeq", titleIndex++ + "."); } - if (StringUtils.isEmpty(measureItemInfo.getZeroDrift())) { + if (StringUtils.isEmpty(measureItemInfo.getZeroDriftResult())) { addDataRemoveItem(dataItems, 5, "零点漂移"); } else { map.put("fourthSeq", titleIndex++ + "."); @@ -611,7 +622,7 @@ } else { map.put("secondSeq", titleIndex++ + "."); } - if (StringUtils.isEmpty(measureItemInfo.getZeroDrift())) { + if (StringUtils.isEmpty(measureItemInfo.getZeroDriftResult())) { addDataRemoveItem(dataItems, 5, "零点漂移"); } else { map.put("thirdSeq", titleIndex++ + "."); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java index b5ced4c..04ced78 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java @@ -30,6 +30,7 @@ import com.casic.missiles.enums.quality.file.QualityCorrectiveFileTypeEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.mapper.quality.BizQualityCorrectiveRecordMapper; +import com.casic.missiles.mapper.quality.BizQualityCorrectiveRectifFileMapper; import com.casic.missiles.model.quality.*; import com.casic.missiles.model.quality.base.DefaultManageReviewRelFile; import com.casic.missiles.model.system.SystemSign; @@ -87,10 +88,11 @@ private final IBizQualityTargetEvaluationContentService contentService; private final ISystemSignService signService; private final PrintFileRegister printFileRegister; + private final BizQualityCorrectiveRectifFileMapper correctiveRectifFileMapper; @Value("${casic.file.dir}") private String localFileDir; - public BizQualityCorrectiveRecordServiceImpl(AbstractPermissionContext permissionContext, AbstractDictService dictService, IBizQualityCorrectiveFileRelService fileRelService, IBizLabRelDeptService relDeptService, IBizQualityCorrectiveRectifFileService rectifFileService, @Lazy IBizQualityInternalAuditManagementService internalAuditManagementService, @Lazy IBizQualityManagementReviewService managementReviewService, IBizQualityNonConformanceRepService nonConformanceRepService, IBizQualityReviewFormService reviewFormService, IBizQualityNonReviewFormService nonReviewFormService, IBizQualityReviewFormItemService itemService, IBizQualityTargetEvaluationRepService evaluationRepService, IBizQualityTargetEvaluationContentService contentService, ISystemSignService signService, PrintFileRegister printFileRegister) { + public BizQualityCorrectiveRecordServiceImpl(AbstractPermissionContext permissionContext, AbstractDictService dictService, IBizQualityCorrectiveFileRelService fileRelService, IBizLabRelDeptService relDeptService, IBizQualityCorrectiveRectifFileService rectifFileService, @Lazy IBizQualityInternalAuditManagementService internalAuditManagementService, @Lazy IBizQualityManagementReviewService managementReviewService, IBizQualityNonConformanceRepService nonConformanceRepService, IBizQualityReviewFormService reviewFormService, IBizQualityNonReviewFormService nonReviewFormService, IBizQualityReviewFormItemService itemService, IBizQualityTargetEvaluationRepService evaluationRepService, IBizQualityTargetEvaluationContentService contentService, ISystemSignService signService, PrintFileRegister printFileRegister, BizQualityCorrectiveRectifFileMapper correctiveRectifFileMapper) { this.permissionContext = permissionContext; this.dictService = dictService; this.fileRelService = fileRelService; @@ -106,6 +108,7 @@ this.contentService = contentService; this.signService = signService; this.printFileRegister = printFileRegister; + this.correctiveRectifFileMapper = correctiveRectifFileMapper; } @Transactional @@ -359,39 +362,43 @@ map.put("subDate", subDate); List attachmentList = new ArrayList<>(); List relList = record.getFileRelList(); - for (BizQualityCorrectiveFileRel fileRel : relList) { - switch (fileRel.getFileType()) { - case 1: - //不符合要求情况分析报告 - nonConformanceRepTask(fileRel, currentFileName, threadPool, futures); - break; - case 2: - //内审检查表 - reviewFormTask(fileRel, currentFileName, threadPool, futures); - break; - case 3: - //内审不符合项 - noReviewFormTask(fileRel, currentFileName, threadPool, futures); - break; - case 5: - //管理评审报告 - reviewRep(fileRel, currentFileName, threadPool, futures); - break; - case 6: - //用户上传 - String s = fileRel.getFilePath().substring(fileRel.getFilePath().lastIndexOf(File.separator) + 1); - attachmentList.add(s); - break; - default: - break; + if (!CollectionUtils.isEmpty(relList)) { + for (BizQualityCorrectiveFileRel fileRel : relList) { + switch (fileRel.getFileType()) { + case 1: + //不符合要求情况分析报告 + nonConformanceRepTask(fileRel, currentFileName, threadPool, futures); + break; + case 2: + //内审检查表 + reviewFormTask(fileRel, currentFileName, threadPool, futures); + break; + case 3: + //内审不符合项 + noReviewFormTask(fileRel, currentFileName, threadPool, futures); + break; + case 5: + //管理评审报告 + reviewRep(fileRel, currentFileName, threadPool, futures); + break; + case 6: + //用户上传 + String s = fileRel.getFilePath().substring(fileRel.getFilePath().lastIndexOf(File.separator) + 1); + attachmentList.add(s); + break; + default: + break; + } } } CompletableFuture exportFileTask = CompletableFuture.supplyAsync( () -> { - List actionFileList = record.getCorrectiveActionFiles(); - for (BizQualityCorrectiveRectifFile rectifFile : actionFileList) { - String fileName = rectifFile.getFilePath().substring(rectifFile.getFilePath().lastIndexOf("/") + 1); - attachmentList.add(fileName); + List actionFileList = correctiveRectifFileMapper.selectList(new QueryWrapper().eq("module_id", record.getId())); + if (!org.springframework.util.CollectionUtils.isEmpty(actionFileList)) { + for (BizQualityCorrectiveRectifFile rectifFile : actionFileList) { + String fileName = rectifFile.getFilePath().substring(rectifFile.getFilePath().lastIndexOf("/") + 1); + attachmentList.add(fileName); + } } printFileRegister.registerPrintFile(QUALITY_CORRECTIVE_RECORD, EXPORT_TEMPLATE, null, RegisterCustomParameters.builder() diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java index 4206d75..15557c3 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java @@ -10,7 +10,6 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.quality.BizQualityInternalAuditPlanVO; -import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.model.quality.BizQualityInternalAuditPlan; import com.casic.missiles.service.quality.IBizQualityInternalAuditPlanService; import io.swagger.annotations.Api; @@ -114,10 +113,7 @@ //to-do 所有文件压缩包导出 List plans = null; if (CollectionUtils.isEmpty(bizQualityInternalAuditPlanVO.getIds())) { - bizQualityInternalAuditPlanVO.setApprovalStatus(ApprovalStatusEnum.PASSED); - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(BizQualityInternalAuditPlan::getApprovalStatus, ApprovalStatusEnum.PASSED); - plans = bizQualityInternalAuditPlanService.list(queryWrapper); + plans = bizQualityInternalAuditPlanService.list(null); } else { bizQualityInternalAuditPlanService.listByIds(bizQualityInternalAuditPlanVO.getIds()); } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureApproval.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureApproval.java index 8f1dd85..472e737 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureApproval.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureApproval.java @@ -151,7 +151,7 @@ @ApiModelProperty(value = "零点漂移(0.02活塞打印需要)", dataType = "String") @TableField(exist = false) - private String zeroDrift; + private String zeroDriftResult; @ApiModelProperty(value = "指针平稳性(0.02活塞打印需要)", dataType = "String") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/DcPowerStrategyType.java b/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/DcPowerStrategyType.java index 8601e8d..2133dbd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/DcPowerStrategyType.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/DcPowerStrategyType.java @@ -104,7 +104,7 @@ BigDecimal technicalIndex = new BigDecimal(dcPower.getTechnicalIndex()); BigDecimal rippleVoltage = new BigDecimal(dcPower.getRippleVoltage()); int compare = rippleVoltage.compareTo(technicalIndex); - dcPower.setTechnicalIndex(dcPower.getTechnicalIndexSymbol() + dcPower.getTechnicalIndex() + "%"); + dcPower.setTechnicalIndex(dcPower.getTechnicalIndexSymbol() + dcPower.getTechnicalIndex()); dcPower.setRippleVoltage(dcPower.getRippleVoltage() + "mV"); if (compare > 0) { dcPower.setRippleVoltage(dcPower.getRippleVoltage() + "*"); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/PressureGaugeHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/PressureGaugeHandler.java index 84d1582..f9231c4 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/PressureGaugeHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/PressureGaugeHandler.java @@ -4,7 +4,6 @@ import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.casic.missiles.core.application.service.AbstractDictService; -import com.casic.missiles.dto.business.deviceMeasure.MeasureEquipmentInfoDTO; import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.certificate.ToBeRemoveDataItem; import com.casic.missiles.enums.BusinessExceptionEnum; @@ -102,6 +101,7 @@ } return urlList; } catch (Exception ex) { + log.error("生成核查记录发生异常========>", ex); throw new BusinessException(BusinessExceptionEnum.MEASURE_APPROVAL_UPDATE_FAILED); } } @@ -158,14 +158,14 @@ readyForCoverParams(map, measureItemInfo.getLabCode()); //参数 customParam(map, measureItemInfo); - if (!map.containsKey("equipmentList") || CollectionUtils.isEmpty((List) map.get("equipmentList"))) { - List equipmentList = bizBusinessDeviceMeasureEquipmentMapper.selectEquipmentListByDataId(measureItemInfo.getDataId()); - if (CollectionUtils.isEmpty(equipmentList)) { - equipmentList = new ArrayList<>(); - equipmentList.add(new MeasureEquipmentInfoDTO()); - } - map.put("equipmentList", equipmentList); - } +// if (!map.containsKey("equipmentList") || CollectionUtils.isEmpty((List) map.get("equipmentList"))) { +// List equipmentList = bizBusinessDeviceMeasureEquipmentMapper.selectEquipmentListByDataId(measureItemInfo.getDataId()); +// if (CollectionUtils.isEmpty(equipmentList)) { +// equipmentList = new ArrayList<>(); +// equipmentList.add(new MeasureEquipmentInfoDTO()); +// } +// map.put("equipmentList", equipmentList); +// } map.put("measureMedium", measureItemInfo.getMeasureMedium()); map.put("insulationResistance", measureItemInfo.getInsulationResistance()); if (StringUtils.isNotEmpty((String) map.get("technologyFile"))) { @@ -200,6 +200,7 @@ } return urlList; } catch (Exception ex) { + log.error("生成原始记录发生异常========>", ex); throw new BusinessException(BusinessExceptionEnum.MEASURE_APPROVAL_UPDATE_FAILED); } } @@ -241,14 +242,14 @@ //准备封面参数 String customUrl = readyForCoverParams(map, measureItemInfo.getLabCode()); customParam(map, measureItemInfo); - if (!map.containsKey("equipmentList") || CollectionUtils.isEmpty((List) map.get("equipmentList"))) { - List equipmentList = bizBusinessDeviceMeasureEquipmentMapper.selectEquipmentListByDataId(measureItemInfo.getDataId()); - if (CollectionUtils.isEmpty(equipmentList)) { - equipmentList = new ArrayList<>(); - equipmentList.add(new MeasureEquipmentInfoDTO()); - } - map.put("equipmentList", equipmentList); - } +// if (!map.containsKey("equipmentList") || CollectionUtils.isEmpty((List) map.get("equipmentList"))) { +// List equipmentList = bizBusinessDeviceMeasureEquipmentMapper.selectEquipmentListByDataId(measureItemInfo.getDataId()); +// if (CollectionUtils.isEmpty(equipmentList)) { +// equipmentList = new ArrayList<>(); +// equipmentList.add(new MeasureEquipmentInfoDTO()); +// } +// map.put("equipmentList", equipmentList); +// } map.put("resultList", resultList); map.put("setPointGaugeList", setPointGaugeList); map.put("setPointList", setPointList); @@ -279,6 +280,7 @@ } return urlList; } catch (Exception ex) { + log.error("生成证书报告发生异常========>", ex); throw new BusinessException(BusinessExceptionEnum.MEASURE_APPROVAL_UPDATE_FAILED); } } @@ -304,9 +306,18 @@ if (ObjectUtils.isNotEmpty(measureItemInfo.getDataProcessing())) { map.put("equation", "截距a=" + measureItemInfo.getDataProcessing().getInterceptA() + "，斜率b=" + measureItemInfo.getDataProcessing().getSlopeB()); } - if (ObjectUtils.isNotEmpty(pistonGauge)) { - map.put("rangeUnit", pistonGauge.getRangeUnit());//单位 - if (pistonGauge.getZeroDrift()) {//零点漂移 +// if (ObjectUtils.isNotEmpty(pistonGauge)) { +// map.put("rangeUnit", pistonGauge.getRangeUnit());//单位 +// if (pistonGauge.getZeroDrift() != null){ +// if (pistonGauge.getZeroDrift()) {//零点漂移 +// map.put("upToStandard", "\uF052"); +// } else { +// map.put("belowStandard", "\uF052"); +// } +// } +// } + if (StringUtils.isNotBlank(measureItemInfo.getZeroDriftResult())) { + if ("合格".equals(measureItemInfo.getZeroDriftResult())) { map.put("upToStandard", "\uF052"); } else { map.put("belowStandard", "\uF052"); @@ -515,7 +526,7 @@ } else { map.put("secondSeq", indexList.get(titleIndex++)); } - if (StringUtils.isEmpty(measureItemInfo.getZeroDrift())) { + if (StringUtils.isEmpty(measureItemInfo.getZeroDriftResult())) { addDataRemoveItem(dataItems, 4, "零点漂移"); } else { map.put("thirdSeq", indexList.get(titleIndex++)); @@ -598,7 +609,7 @@ } else { map.put("thirdSeq", titleIndex++ + "."); } - if (StringUtils.isEmpty(measureItemInfo.getZeroDrift())) { + if (StringUtils.isEmpty(measureItemInfo.getZeroDriftResult())) { addDataRemoveItem(dataItems, 5, "零点漂移"); } else { map.put("fourthSeq", titleIndex++ + "."); @@ -611,7 +622,7 @@ } else { map.put("secondSeq", titleIndex++ + "."); } - if (StringUtils.isEmpty(measureItemInfo.getZeroDrift())) { + if (StringUtils.isEmpty(measureItemInfo.getZeroDriftResult())) { addDataRemoveItem(dataItems, 5, "零点漂移"); } else { map.put("thirdSeq", titleIndex++ + "."); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java index b5ced4c..04ced78 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java @@ -30,6 +30,7 @@ import com.casic.missiles.enums.quality.file.QualityCorrectiveFileTypeEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.mapper.quality.BizQualityCorrectiveRecordMapper; +import com.casic.missiles.mapper.quality.BizQualityCorrectiveRectifFileMapper; import com.casic.missiles.model.quality.*; import com.casic.missiles.model.quality.base.DefaultManageReviewRelFile; import com.casic.missiles.model.system.SystemSign; @@ -87,10 +88,11 @@ private final IBizQualityTargetEvaluationContentService contentService; private final ISystemSignService signService; private final PrintFileRegister printFileRegister; + private final BizQualityCorrectiveRectifFileMapper correctiveRectifFileMapper; @Value("${casic.file.dir}") private String localFileDir; - public BizQualityCorrectiveRecordServiceImpl(AbstractPermissionContext permissionContext, AbstractDictService dictService, IBizQualityCorrectiveFileRelService fileRelService, IBizLabRelDeptService relDeptService, IBizQualityCorrectiveRectifFileService rectifFileService, @Lazy IBizQualityInternalAuditManagementService internalAuditManagementService, @Lazy IBizQualityManagementReviewService managementReviewService, IBizQualityNonConformanceRepService nonConformanceRepService, IBizQualityReviewFormService reviewFormService, IBizQualityNonReviewFormService nonReviewFormService, IBizQualityReviewFormItemService itemService, IBizQualityTargetEvaluationRepService evaluationRepService, IBizQualityTargetEvaluationContentService contentService, ISystemSignService signService, PrintFileRegister printFileRegister) { + public BizQualityCorrectiveRecordServiceImpl(AbstractPermissionContext permissionContext, AbstractDictService dictService, IBizQualityCorrectiveFileRelService fileRelService, IBizLabRelDeptService relDeptService, IBizQualityCorrectiveRectifFileService rectifFileService, @Lazy IBizQualityInternalAuditManagementService internalAuditManagementService, @Lazy IBizQualityManagementReviewService managementReviewService, IBizQualityNonConformanceRepService nonConformanceRepService, IBizQualityReviewFormService reviewFormService, IBizQualityNonReviewFormService nonReviewFormService, IBizQualityReviewFormItemService itemService, IBizQualityTargetEvaluationRepService evaluationRepService, IBizQualityTargetEvaluationContentService contentService, ISystemSignService signService, PrintFileRegister printFileRegister, BizQualityCorrectiveRectifFileMapper correctiveRectifFileMapper) { this.permissionContext = permissionContext; this.dictService = dictService; this.fileRelService = fileRelService; @@ -106,6 +108,7 @@ this.contentService = contentService; this.signService = signService; this.printFileRegister = printFileRegister; + this.correctiveRectifFileMapper = correctiveRectifFileMapper; } @Transactional @@ -359,39 +362,43 @@ map.put("subDate", subDate); List attachmentList = new ArrayList<>(); List relList = record.getFileRelList(); - for (BizQualityCorrectiveFileRel fileRel : relList) { - switch (fileRel.getFileType()) { - case 1: - //不符合要求情况分析报告 - nonConformanceRepTask(fileRel, currentFileName, threadPool, futures); - break; - case 2: - //内审检查表 - reviewFormTask(fileRel, currentFileName, threadPool, futures); - break; - case 3: - //内审不符合项 - noReviewFormTask(fileRel, currentFileName, threadPool, futures); - break; - case 5: - //管理评审报告 - reviewRep(fileRel, currentFileName, threadPool, futures); - break; - case 6: - //用户上传 - String s = fileRel.getFilePath().substring(fileRel.getFilePath().lastIndexOf(File.separator) + 1); - attachmentList.add(s); - break; - default: - break; + if (!CollectionUtils.isEmpty(relList)) { + for (BizQualityCorrectiveFileRel fileRel : relList) { + switch (fileRel.getFileType()) { + case 1: + //不符合要求情况分析报告 + nonConformanceRepTask(fileRel, currentFileName, threadPool, futures); + break; + case 2: + //内审检查表 + reviewFormTask(fileRel, currentFileName, threadPool, futures); + break; + case 3: + //内审不符合项 + noReviewFormTask(fileRel, currentFileName, threadPool, futures); + break; + case 5: + //管理评审报告 + reviewRep(fileRel, currentFileName, threadPool, futures); + break; + case 6: + //用户上传 + String s = fileRel.getFilePath().substring(fileRel.getFilePath().lastIndexOf(File.separator) + 1); + attachmentList.add(s); + break; + default: + break; + } } } CompletableFuture exportFileTask = CompletableFuture.supplyAsync( () -> { - List actionFileList = record.getCorrectiveActionFiles(); - for (BizQualityCorrectiveRectifFile rectifFile : actionFileList) { - String fileName = rectifFile.getFilePath().substring(rectifFile.getFilePath().lastIndexOf("/") + 1); - attachmentList.add(fileName); + List actionFileList = correctiveRectifFileMapper.selectList(new QueryWrapper().eq("module_id", record.getId())); + if (!org.springframework.util.CollectionUtils.isEmpty(actionFileList)) { + for (BizQualityCorrectiveRectifFile rectifFile : actionFileList) { + String fileName = rectifFile.getFilePath().substring(rectifFile.getFilePath().lastIndexOf("/") + 1); + attachmentList.add(fileName); + } } printFileRegister.registerPrintFile(QUALITY_CORRECTIVE_RECORD, EXPORT_TEMPLATE, null, RegisterCustomParameters.builder() diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java index 252e968..38f2bd3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java @@ -32,6 +32,7 @@ import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.TemplateUtils; import com.casic.missiles.utils.ZipUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.shiro.util.CollectionUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -308,9 +309,10 @@ wrapInfo(management); String currentFileName = rootFileName + File.separator + management.getYearNo() + "年第" + management.getYearNum() + "次内部审核工作"; List auditFileList = management.getInternalAuditFiles(); - if (!CollectionUtils.isEmpty(auditFileList)){ + if (!CollectionUtils.isEmpty(auditFileList)) { List fileNameList = auditFileList.stream() - .map(file -> file.getFilePath().substring(file.getFilePath().lastIndexOf(File.separator) + 1)) + .filter(file -> StringUtils.isNotBlank(file.getFilePath())) + .map(file -> file.getFilePath().substring(file.getFilePath().lastIndexOf("/") + 1)) .collect(Collectors.toList()); CompletableFuture task = CompletableFuture.supplyAsync( () -> { diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java index 4206d75..15557c3 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java @@ -10,7 +10,6 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.quality.BizQualityInternalAuditPlanVO; -import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.model.quality.BizQualityInternalAuditPlan; import com.casic.missiles.service.quality.IBizQualityInternalAuditPlanService; import io.swagger.annotations.Api; @@ -114,10 +113,7 @@ //to-do 所有文件压缩包导出 List plans = null; if (CollectionUtils.isEmpty(bizQualityInternalAuditPlanVO.getIds())) { - bizQualityInternalAuditPlanVO.setApprovalStatus(ApprovalStatusEnum.PASSED); - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(BizQualityInternalAuditPlan::getApprovalStatus, ApprovalStatusEnum.PASSED); - plans = bizQualityInternalAuditPlanService.list(queryWrapper); + plans = bizQualityInternalAuditPlanService.list(null); } else { bizQualityInternalAuditPlanService.listByIds(bizQualityInternalAuditPlanVO.getIds()); } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureApproval.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureApproval.java index 8f1dd85..472e737 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureApproval.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureApproval.java @@ -151,7 +151,7 @@ @ApiModelProperty(value = "零点漂移(0.02活塞打印需要)", dataType = "String") @TableField(exist = false) - private String zeroDrift; + private String zeroDriftResult; @ApiModelProperty(value = "指针平稳性(0.02活塞打印需要)", dataType = "String") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/DcPowerStrategyType.java b/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/DcPowerStrategyType.java index 8601e8d..2133dbd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/DcPowerStrategyType.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/DcPowerStrategyType.java @@ -104,7 +104,7 @@ BigDecimal technicalIndex = new BigDecimal(dcPower.getTechnicalIndex()); BigDecimal rippleVoltage = new BigDecimal(dcPower.getRippleVoltage()); int compare = rippleVoltage.compareTo(technicalIndex); - dcPower.setTechnicalIndex(dcPower.getTechnicalIndexSymbol() + dcPower.getTechnicalIndex() + "%"); + dcPower.setTechnicalIndex(dcPower.getTechnicalIndexSymbol() + dcPower.getTechnicalIndex()); dcPower.setRippleVoltage(dcPower.getRippleVoltage() + "mV"); if (compare > 0) { dcPower.setRippleVoltage(dcPower.getRippleVoltage() + "*"); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/PressureGaugeHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/PressureGaugeHandler.java index 84d1582..f9231c4 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/PressureGaugeHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/PressureGaugeHandler.java @@ -4,7 +4,6 @@ import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.casic.missiles.core.application.service.AbstractDictService; -import com.casic.missiles.dto.business.deviceMeasure.MeasureEquipmentInfoDTO; import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.certificate.ToBeRemoveDataItem; import com.casic.missiles.enums.BusinessExceptionEnum; @@ -102,6 +101,7 @@ } return urlList; } catch (Exception ex) { + log.error("生成核查记录发生异常========>", ex); throw new BusinessException(BusinessExceptionEnum.MEASURE_APPROVAL_UPDATE_FAILED); } } @@ -158,14 +158,14 @@ readyForCoverParams(map, measureItemInfo.getLabCode()); //参数 customParam(map, measureItemInfo); - if (!map.containsKey("equipmentList") || CollectionUtils.isEmpty((List) map.get("equipmentList"))) { - List equipmentList = bizBusinessDeviceMeasureEquipmentMapper.selectEquipmentListByDataId(measureItemInfo.getDataId()); - if (CollectionUtils.isEmpty(equipmentList)) { - equipmentList = new ArrayList<>(); - equipmentList.add(new MeasureEquipmentInfoDTO()); - } - map.put("equipmentList", equipmentList); - } +// if (!map.containsKey("equipmentList") || CollectionUtils.isEmpty((List) map.get("equipmentList"))) { +// List equipmentList = bizBusinessDeviceMeasureEquipmentMapper.selectEquipmentListByDataId(measureItemInfo.getDataId()); +// if (CollectionUtils.isEmpty(equipmentList)) { +// equipmentList = new ArrayList<>(); +// equipmentList.add(new MeasureEquipmentInfoDTO()); +// } +// map.put("equipmentList", equipmentList); +// } map.put("measureMedium", measureItemInfo.getMeasureMedium()); map.put("insulationResistance", measureItemInfo.getInsulationResistance()); if (StringUtils.isNotEmpty((String) map.get("technologyFile"))) { @@ -200,6 +200,7 @@ } return urlList; } catch (Exception ex) { + log.error("生成原始记录发生异常========>", ex); throw new BusinessException(BusinessExceptionEnum.MEASURE_APPROVAL_UPDATE_FAILED); } } @@ -241,14 +242,14 @@ //准备封面参数 String customUrl = readyForCoverParams(map, measureItemInfo.getLabCode()); customParam(map, measureItemInfo); - if (!map.containsKey("equipmentList") || CollectionUtils.isEmpty((List) map.get("equipmentList"))) { - List equipmentList = bizBusinessDeviceMeasureEquipmentMapper.selectEquipmentListByDataId(measureItemInfo.getDataId()); - if (CollectionUtils.isEmpty(equipmentList)) { - equipmentList = new ArrayList<>(); - equipmentList.add(new MeasureEquipmentInfoDTO()); - } - map.put("equipmentList", equipmentList); - } +// if (!map.containsKey("equipmentList") || CollectionUtils.isEmpty((List) map.get("equipmentList"))) { +// List equipmentList = bizBusinessDeviceMeasureEquipmentMapper.selectEquipmentListByDataId(measureItemInfo.getDataId()); +// if (CollectionUtils.isEmpty(equipmentList)) { +// equipmentList = new ArrayList<>(); +// equipmentList.add(new MeasureEquipmentInfoDTO()); +// } +// map.put("equipmentList", equipmentList); +// } map.put("resultList", resultList); map.put("setPointGaugeList", setPointGaugeList); map.put("setPointList", setPointList); @@ -279,6 +280,7 @@ } return urlList; } catch (Exception ex) { + log.error("生成证书报告发生异常========>", ex); throw new BusinessException(BusinessExceptionEnum.MEASURE_APPROVAL_UPDATE_FAILED); } } @@ -304,9 +306,18 @@ if (ObjectUtils.isNotEmpty(measureItemInfo.getDataProcessing())) { map.put("equation", "截距a=" + measureItemInfo.getDataProcessing().getInterceptA() + "，斜率b=" + measureItemInfo.getDataProcessing().getSlopeB()); } - if (ObjectUtils.isNotEmpty(pistonGauge)) { - map.put("rangeUnit", pistonGauge.getRangeUnit());//单位 - if (pistonGauge.getZeroDrift()) {//零点漂移 +// if (ObjectUtils.isNotEmpty(pistonGauge)) { +// map.put("rangeUnit", pistonGauge.getRangeUnit());//单位 +// if (pistonGauge.getZeroDrift() != null){ +// if (pistonGauge.getZeroDrift()) {//零点漂移 +// map.put("upToStandard", "\uF052"); +// } else { +// map.put("belowStandard", "\uF052"); +// } +// } +// } + if (StringUtils.isNotBlank(measureItemInfo.getZeroDriftResult())) { + if ("合格".equals(measureItemInfo.getZeroDriftResult())) { map.put("upToStandard", "\uF052"); } else { map.put("belowStandard", "\uF052"); @@ -515,7 +526,7 @@ } else { map.put("secondSeq", indexList.get(titleIndex++)); } - if (StringUtils.isEmpty(measureItemInfo.getZeroDrift())) { + if (StringUtils.isEmpty(measureItemInfo.getZeroDriftResult())) { addDataRemoveItem(dataItems, 4, "零点漂移"); } else { map.put("thirdSeq", indexList.get(titleIndex++)); @@ -598,7 +609,7 @@ } else { map.put("thirdSeq", titleIndex++ + "."); } - if (StringUtils.isEmpty(measureItemInfo.getZeroDrift())) { + if (StringUtils.isEmpty(measureItemInfo.getZeroDriftResult())) { addDataRemoveItem(dataItems, 5, "零点漂移"); } else { map.put("fourthSeq", titleIndex++ + "."); @@ -611,7 +622,7 @@ } else { map.put("secondSeq", titleIndex++ + "."); } - if (StringUtils.isEmpty(measureItemInfo.getZeroDrift())) { + if (StringUtils.isEmpty(measureItemInfo.getZeroDriftResult())) { addDataRemoveItem(dataItems, 5, "零点漂移"); } else { map.put("thirdSeq", titleIndex++ + "."); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java index b5ced4c..04ced78 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java @@ -30,6 +30,7 @@ import com.casic.missiles.enums.quality.file.QualityCorrectiveFileTypeEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.mapper.quality.BizQualityCorrectiveRecordMapper; +import com.casic.missiles.mapper.quality.BizQualityCorrectiveRectifFileMapper; import com.casic.missiles.model.quality.*; import com.casic.missiles.model.quality.base.DefaultManageReviewRelFile; import com.casic.missiles.model.system.SystemSign; @@ -87,10 +88,11 @@ private final IBizQualityTargetEvaluationContentService contentService; private final ISystemSignService signService; private final PrintFileRegister printFileRegister; + private final BizQualityCorrectiveRectifFileMapper correctiveRectifFileMapper; @Value("${casic.file.dir}") private String localFileDir; - public BizQualityCorrectiveRecordServiceImpl(AbstractPermissionContext permissionContext, AbstractDictService dictService, IBizQualityCorrectiveFileRelService fileRelService, IBizLabRelDeptService relDeptService, IBizQualityCorrectiveRectifFileService rectifFileService, @Lazy IBizQualityInternalAuditManagementService internalAuditManagementService, @Lazy IBizQualityManagementReviewService managementReviewService, IBizQualityNonConformanceRepService nonConformanceRepService, IBizQualityReviewFormService reviewFormService, IBizQualityNonReviewFormService nonReviewFormService, IBizQualityReviewFormItemService itemService, IBizQualityTargetEvaluationRepService evaluationRepService, IBizQualityTargetEvaluationContentService contentService, ISystemSignService signService, PrintFileRegister printFileRegister) { + public BizQualityCorrectiveRecordServiceImpl(AbstractPermissionContext permissionContext, AbstractDictService dictService, IBizQualityCorrectiveFileRelService fileRelService, IBizLabRelDeptService relDeptService, IBizQualityCorrectiveRectifFileService rectifFileService, @Lazy IBizQualityInternalAuditManagementService internalAuditManagementService, @Lazy IBizQualityManagementReviewService managementReviewService, IBizQualityNonConformanceRepService nonConformanceRepService, IBizQualityReviewFormService reviewFormService, IBizQualityNonReviewFormService nonReviewFormService, IBizQualityReviewFormItemService itemService, IBizQualityTargetEvaluationRepService evaluationRepService, IBizQualityTargetEvaluationContentService contentService, ISystemSignService signService, PrintFileRegister printFileRegister, BizQualityCorrectiveRectifFileMapper correctiveRectifFileMapper) { this.permissionContext = permissionContext; this.dictService = dictService; this.fileRelService = fileRelService; @@ -106,6 +108,7 @@ this.contentService = contentService; this.signService = signService; this.printFileRegister = printFileRegister; + this.correctiveRectifFileMapper = correctiveRectifFileMapper; } @Transactional @@ -359,39 +362,43 @@ map.put("subDate", subDate); List attachmentList = new ArrayList<>(); List relList = record.getFileRelList(); - for (BizQualityCorrectiveFileRel fileRel : relList) { - switch (fileRel.getFileType()) { - case 1: - //不符合要求情况分析报告 - nonConformanceRepTask(fileRel, currentFileName, threadPool, futures); - break; - case 2: - //内审检查表 - reviewFormTask(fileRel, currentFileName, threadPool, futures); - break; - case 3: - //内审不符合项 - noReviewFormTask(fileRel, currentFileName, threadPool, futures); - break; - case 5: - //管理评审报告 - reviewRep(fileRel, currentFileName, threadPool, futures); - break; - case 6: - //用户上传 - String s = fileRel.getFilePath().substring(fileRel.getFilePath().lastIndexOf(File.separator) + 1); - attachmentList.add(s); - break; - default: - break; + if (!CollectionUtils.isEmpty(relList)) { + for (BizQualityCorrectiveFileRel fileRel : relList) { + switch (fileRel.getFileType()) { + case 1: + //不符合要求情况分析报告 + nonConformanceRepTask(fileRel, currentFileName, threadPool, futures); + break; + case 2: + //内审检查表 + reviewFormTask(fileRel, currentFileName, threadPool, futures); + break; + case 3: + //内审不符合项 + noReviewFormTask(fileRel, currentFileName, threadPool, futures); + break; + case 5: + //管理评审报告 + reviewRep(fileRel, currentFileName, threadPool, futures); + break; + case 6: + //用户上传 + String s = fileRel.getFilePath().substring(fileRel.getFilePath().lastIndexOf(File.separator) + 1); + attachmentList.add(s); + break; + default: + break; + } } } CompletableFuture exportFileTask = CompletableFuture.supplyAsync( () -> { - List actionFileList = record.getCorrectiveActionFiles(); - for (BizQualityCorrectiveRectifFile rectifFile : actionFileList) { - String fileName = rectifFile.getFilePath().substring(rectifFile.getFilePath().lastIndexOf("/") + 1); - attachmentList.add(fileName); + List actionFileList = correctiveRectifFileMapper.selectList(new QueryWrapper().eq("module_id", record.getId())); + if (!org.springframework.util.CollectionUtils.isEmpty(actionFileList)) { + for (BizQualityCorrectiveRectifFile rectifFile : actionFileList) { + String fileName = rectifFile.getFilePath().substring(rectifFile.getFilePath().lastIndexOf("/") + 1); + attachmentList.add(fileName); + } } printFileRegister.registerPrintFile(QUALITY_CORRECTIVE_RECORD, EXPORT_TEMPLATE, null, RegisterCustomParameters.builder() diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java index 252e968..38f2bd3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java @@ -32,6 +32,7 @@ import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.TemplateUtils; import com.casic.missiles.utils.ZipUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.shiro.util.CollectionUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -308,9 +309,10 @@ wrapInfo(management); String currentFileName = rootFileName + File.separator + management.getYearNo() + "年第" + management.getYearNum() + "次内部审核工作"; List auditFileList = management.getInternalAuditFiles(); - if (!CollectionUtils.isEmpty(auditFileList)){ + if (!CollectionUtils.isEmpty(auditFileList)) { List fileNameList = auditFileList.stream() - .map(file -> file.getFilePath().substring(file.getFilePath().lastIndexOf(File.separator) + 1)) + .filter(file -> StringUtils.isNotBlank(file.getFilePath())) + .map(file -> file.getFilePath().substring(file.getFilePath().lastIndexOf("/") + 1)) .collect(Collectors.toList()); CompletableFuture task = CompletableFuture.supplyAsync( () -> { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java index 4a7ed67..bfa1c01 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java @@ -26,6 +26,7 @@ import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.TemplateUtils; import com.casic.missiles.utils.ZipUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -61,7 +62,7 @@ @Value("${casic.file.dir}") private String localFileDir; - public BizQualityManagementReviewServiceImpl(AbstractPermissionContext permissionContext, AbstractDictService dictService, IBizQualityManagementReviewFileService reviewFileService,TemplateUtils templateUtils) { + public BizQualityManagementReviewServiceImpl(AbstractPermissionContext permissionContext, AbstractDictService dictService, IBizQualityManagementReviewFileService reviewFileService, TemplateUtils templateUtils) { this.permissionContext = permissionContext; this.dictService = dictService; this.reviewFileService = reviewFileService; @@ -191,15 +192,18 @@ if (ObjectUtil.isNotEmpty(managementReview)) { String currentFileName = rootFileName + File.separator + managementReview.getYearNo() + "年第" + managementReview.getYearNum() + "次管理评审工作"; List fileList = managementReview.getReviewFileList(); - List pathList = fileList.stream() - .map(file -> file.getFilePath().substring(file.getFilePath().lastIndexOf("/"))).collect(Collectors.toList()); - CompletableFuture completableFuture = CompletableFuture.supplyAsync( - () -> { - String filePath = templateUtils.downloadFile(pathList, currentFileName); - filePathList.add(filePath); - return null; - }, threadPool); - futures.add(completableFuture); + if (CollectionUtil.isNotEmpty(fileList)) { + List pathList = fileList.stream() + .filter(file -> StringUtils.isNotBlank(file.getFilePath())) + .map(file -> file.getFilePath().substring(file.getFilePath().lastIndexOf("/") + 1)).collect(Collectors.toList()); + CompletableFuture completableFuture = CompletableFuture.supplyAsync( + () -> { + String filePath = templateUtils.downloadFile(pathList, currentFileName); + filePathList.add(filePath); + return null; + }, threadPool); + futures.add(completableFuture); + } } } CompletableFuture[] futuresArr = futures.toArray(new CompletableFuture[0]); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java index 4206d75..15557c3 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditPlanController.java @@ -10,7 +10,6 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.quality.BizQualityInternalAuditPlanVO; -import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.model.quality.BizQualityInternalAuditPlan; import com.casic.missiles.service.quality.IBizQualityInternalAuditPlanService; import io.swagger.annotations.Api; @@ -114,10 +113,7 @@ //to-do 所有文件压缩包导出 List plans = null; if (CollectionUtils.isEmpty(bizQualityInternalAuditPlanVO.getIds())) { - bizQualityInternalAuditPlanVO.setApprovalStatus(ApprovalStatusEnum.PASSED); - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(BizQualityInternalAuditPlan::getApprovalStatus, ApprovalStatusEnum.PASSED); - plans = bizQualityInternalAuditPlanService.list(queryWrapper); + plans = bizQualityInternalAuditPlanService.list(null); } else { bizQualityInternalAuditPlanService.listByIds(bizQualityInternalAuditPlanVO.getIds()); } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureApproval.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureApproval.java index 8f1dd85..472e737 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureApproval.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureApproval.java @@ -151,7 +151,7 @@ @ApiModelProperty(value = "零点漂移(0.02活塞打印需要)", dataType = "String") @TableField(exist = false) - private String zeroDrift; + private String zeroDriftResult; @ApiModelProperty(value = "指针平稳性(0.02活塞打印需要)", dataType = "String") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/DcPowerStrategyType.java b/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/DcPowerStrategyType.java index 8601e8d..2133dbd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/DcPowerStrategyType.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/DcPowerStrategyType.java @@ -104,7 +104,7 @@ BigDecimal technicalIndex = new BigDecimal(dcPower.getTechnicalIndex()); BigDecimal rippleVoltage = new BigDecimal(dcPower.getRippleVoltage()); int compare = rippleVoltage.compareTo(technicalIndex); - dcPower.setTechnicalIndex(dcPower.getTechnicalIndexSymbol() + dcPower.getTechnicalIndex() + "%"); + dcPower.setTechnicalIndex(dcPower.getTechnicalIndexSymbol() + dcPower.getTechnicalIndex()); dcPower.setRippleVoltage(dcPower.getRippleVoltage() + "mV"); if (compare > 0) { dcPower.setRippleVoltage(dcPower.getRippleVoltage() + "*"); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/PressureGaugeHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/PressureGaugeHandler.java index 84d1582..f9231c4 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/PressureGaugeHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/PressureGaugeHandler.java @@ -4,7 +4,6 @@ import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.casic.missiles.core.application.service.AbstractDictService; -import com.casic.missiles.dto.business.deviceMeasure.MeasureEquipmentInfoDTO; import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.certificate.ToBeRemoveDataItem; import com.casic.missiles.enums.BusinessExceptionEnum; @@ -102,6 +101,7 @@ } return urlList; } catch (Exception ex) { + log.error("生成核查记录发生异常========>", ex); throw new BusinessException(BusinessExceptionEnum.MEASURE_APPROVAL_UPDATE_FAILED); } } @@ -158,14 +158,14 @@ readyForCoverParams(map, measureItemInfo.getLabCode()); //参数 customParam(map, measureItemInfo); - if (!map.containsKey("equipmentList") || CollectionUtils.isEmpty((List) map.get("equipmentList"))) { - List equipmentList = bizBusinessDeviceMeasureEquipmentMapper.selectEquipmentListByDataId(measureItemInfo.getDataId()); - if (CollectionUtils.isEmpty(equipmentList)) { - equipmentList = new ArrayList<>(); - equipmentList.add(new MeasureEquipmentInfoDTO()); - } - map.put("equipmentList", equipmentList); - } +// if (!map.containsKey("equipmentList") || CollectionUtils.isEmpty((List) map.get("equipmentList"))) { +// List equipmentList = bizBusinessDeviceMeasureEquipmentMapper.selectEquipmentListByDataId(measureItemInfo.getDataId()); +// if (CollectionUtils.isEmpty(equipmentList)) { +// equipmentList = new ArrayList<>(); +// equipmentList.add(new MeasureEquipmentInfoDTO()); +// } +// map.put("equipmentList", equipmentList); +// } map.put("measureMedium", measureItemInfo.getMeasureMedium()); map.put("insulationResistance", measureItemInfo.getInsulationResistance()); if (StringUtils.isNotEmpty((String) map.get("technologyFile"))) { @@ -200,6 +200,7 @@ } return urlList; } catch (Exception ex) { + log.error("生成原始记录发生异常========>", ex); throw new BusinessException(BusinessExceptionEnum.MEASURE_APPROVAL_UPDATE_FAILED); } } @@ -241,14 +242,14 @@ //准备封面参数 String customUrl = readyForCoverParams(map, measureItemInfo.getLabCode()); customParam(map, measureItemInfo); - if (!map.containsKey("equipmentList") || CollectionUtils.isEmpty((List) map.get("equipmentList"))) { - List equipmentList = bizBusinessDeviceMeasureEquipmentMapper.selectEquipmentListByDataId(measureItemInfo.getDataId()); - if (CollectionUtils.isEmpty(equipmentList)) { - equipmentList = new ArrayList<>(); - equipmentList.add(new MeasureEquipmentInfoDTO()); - } - map.put("equipmentList", equipmentList); - } +// if (!map.containsKey("equipmentList") || CollectionUtils.isEmpty((List) map.get("equipmentList"))) { +// List equipmentList = bizBusinessDeviceMeasureEquipmentMapper.selectEquipmentListByDataId(measureItemInfo.getDataId()); +// if (CollectionUtils.isEmpty(equipmentList)) { +// equipmentList = new ArrayList<>(); +// equipmentList.add(new MeasureEquipmentInfoDTO()); +// } +// map.put("equipmentList", equipmentList); +// } map.put("resultList", resultList); map.put("setPointGaugeList", setPointGaugeList); map.put("setPointList", setPointList); @@ -279,6 +280,7 @@ } return urlList; } catch (Exception ex) { + log.error("生成证书报告发生异常========>", ex); throw new BusinessException(BusinessExceptionEnum.MEASURE_APPROVAL_UPDATE_FAILED); } } @@ -304,9 +306,18 @@ if (ObjectUtils.isNotEmpty(measureItemInfo.getDataProcessing())) { map.put("equation", "截距a=" + measureItemInfo.getDataProcessing().getInterceptA() + "，斜率b=" + measureItemInfo.getDataProcessing().getSlopeB()); } - if (ObjectUtils.isNotEmpty(pistonGauge)) { - map.put("rangeUnit", pistonGauge.getRangeUnit());//单位 - if (pistonGauge.getZeroDrift()) {//零点漂移 +// if (ObjectUtils.isNotEmpty(pistonGauge)) { +// map.put("rangeUnit", pistonGauge.getRangeUnit());//单位 +// if (pistonGauge.getZeroDrift() != null){ +// if (pistonGauge.getZeroDrift()) {//零点漂移 +// map.put("upToStandard", "\uF052"); +// } else { +// map.put("belowStandard", "\uF052"); +// } +// } +// } + if (StringUtils.isNotBlank(measureItemInfo.getZeroDriftResult())) { + if ("合格".equals(measureItemInfo.getZeroDriftResult())) { map.put("upToStandard", "\uF052"); } else { map.put("belowStandard", "\uF052"); @@ -515,7 +526,7 @@ } else { map.put("secondSeq", indexList.get(titleIndex++)); } - if (StringUtils.isEmpty(measureItemInfo.getZeroDrift())) { + if (StringUtils.isEmpty(measureItemInfo.getZeroDriftResult())) { addDataRemoveItem(dataItems, 4, "零点漂移"); } else { map.put("thirdSeq", indexList.get(titleIndex++)); @@ -598,7 +609,7 @@ } else { map.put("thirdSeq", titleIndex++ + "."); } - if (StringUtils.isEmpty(measureItemInfo.getZeroDrift())) { + if (StringUtils.isEmpty(measureItemInfo.getZeroDriftResult())) { addDataRemoveItem(dataItems, 5, "零点漂移"); } else { map.put("fourthSeq", titleIndex++ + "."); @@ -611,7 +622,7 @@ } else { map.put("secondSeq", titleIndex++ + "."); } - if (StringUtils.isEmpty(measureItemInfo.getZeroDrift())) { + if (StringUtils.isEmpty(measureItemInfo.getZeroDriftResult())) { addDataRemoveItem(dataItems, 5, "零点漂移"); } else { map.put("thirdSeq", titleIndex++ + "."); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java index b5ced4c..04ced78 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java @@ -30,6 +30,7 @@ import com.casic.missiles.enums.quality.file.QualityCorrectiveFileTypeEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.mapper.quality.BizQualityCorrectiveRecordMapper; +import com.casic.missiles.mapper.quality.BizQualityCorrectiveRectifFileMapper; import com.casic.missiles.model.quality.*; import com.casic.missiles.model.quality.base.DefaultManageReviewRelFile; import com.casic.missiles.model.system.SystemSign; @@ -87,10 +88,11 @@ private final IBizQualityTargetEvaluationContentService contentService; private final ISystemSignService signService; private final PrintFileRegister printFileRegister; + private final BizQualityCorrectiveRectifFileMapper correctiveRectifFileMapper; @Value("${casic.file.dir}") private String localFileDir; - public BizQualityCorrectiveRecordServiceImpl(AbstractPermissionContext permissionContext, AbstractDictService dictService, IBizQualityCorrectiveFileRelService fileRelService, IBizLabRelDeptService relDeptService, IBizQualityCorrectiveRectifFileService rectifFileService, @Lazy IBizQualityInternalAuditManagementService internalAuditManagementService, @Lazy IBizQualityManagementReviewService managementReviewService, IBizQualityNonConformanceRepService nonConformanceRepService, IBizQualityReviewFormService reviewFormService, IBizQualityNonReviewFormService nonReviewFormService, IBizQualityReviewFormItemService itemService, IBizQualityTargetEvaluationRepService evaluationRepService, IBizQualityTargetEvaluationContentService contentService, ISystemSignService signService, PrintFileRegister printFileRegister) { + public BizQualityCorrectiveRecordServiceImpl(AbstractPermissionContext permissionContext, AbstractDictService dictService, IBizQualityCorrectiveFileRelService fileRelService, IBizLabRelDeptService relDeptService, IBizQualityCorrectiveRectifFileService rectifFileService, @Lazy IBizQualityInternalAuditManagementService internalAuditManagementService, @Lazy IBizQualityManagementReviewService managementReviewService, IBizQualityNonConformanceRepService nonConformanceRepService, IBizQualityReviewFormService reviewFormService, IBizQualityNonReviewFormService nonReviewFormService, IBizQualityReviewFormItemService itemService, IBizQualityTargetEvaluationRepService evaluationRepService, IBizQualityTargetEvaluationContentService contentService, ISystemSignService signService, PrintFileRegister printFileRegister, BizQualityCorrectiveRectifFileMapper correctiveRectifFileMapper) { this.permissionContext = permissionContext; this.dictService = dictService; this.fileRelService = fileRelService; @@ -106,6 +108,7 @@ this.contentService = contentService; this.signService = signService; this.printFileRegister = printFileRegister; + this.correctiveRectifFileMapper = correctiveRectifFileMapper; } @Transactional @@ -359,39 +362,43 @@ map.put("subDate", subDate); List attachmentList = new ArrayList<>(); List relList = record.getFileRelList(); - for (BizQualityCorrectiveFileRel fileRel : relList) { - switch (fileRel.getFileType()) { - case 1: - //不符合要求情况分析报告 - nonConformanceRepTask(fileRel, currentFileName, threadPool, futures); - break; - case 2: - //内审检查表 - reviewFormTask(fileRel, currentFileName, threadPool, futures); - break; - case 3: - //内审不符合项 - noReviewFormTask(fileRel, currentFileName, threadPool, futures); - break; - case 5: - //管理评审报告 - reviewRep(fileRel, currentFileName, threadPool, futures); - break; - case 6: - //用户上传 - String s = fileRel.getFilePath().substring(fileRel.getFilePath().lastIndexOf(File.separator) + 1); - attachmentList.add(s); - break; - default: - break; + if (!CollectionUtils.isEmpty(relList)) { + for (BizQualityCorrectiveFileRel fileRel : relList) { + switch (fileRel.getFileType()) { + case 1: + //不符合要求情况分析报告 + nonConformanceRepTask(fileRel, currentFileName, threadPool, futures); + break; + case 2: + //内审检查表 + reviewFormTask(fileRel, currentFileName, threadPool, futures); + break; + case 3: + //内审不符合项 + noReviewFormTask(fileRel, currentFileName, threadPool, futures); + break; + case 5: + //管理评审报告 + reviewRep(fileRel, currentFileName, threadPool, futures); + break; + case 6: + //用户上传 + String s = fileRel.getFilePath().substring(fileRel.getFilePath().lastIndexOf(File.separator) + 1); + attachmentList.add(s); + break; + default: + break; + } } } CompletableFuture exportFileTask = CompletableFuture.supplyAsync( () -> { - List actionFileList = record.getCorrectiveActionFiles(); - for (BizQualityCorrectiveRectifFile rectifFile : actionFileList) { - String fileName = rectifFile.getFilePath().substring(rectifFile.getFilePath().lastIndexOf("/") + 1); - attachmentList.add(fileName); + List actionFileList = correctiveRectifFileMapper.selectList(new QueryWrapper().eq("module_id", record.getId())); + if (!org.springframework.util.CollectionUtils.isEmpty(actionFileList)) { + for (BizQualityCorrectiveRectifFile rectifFile : actionFileList) { + String fileName = rectifFile.getFilePath().substring(rectifFile.getFilePath().lastIndexOf("/") + 1); + attachmentList.add(fileName); + } } printFileRegister.registerPrintFile(QUALITY_CORRECTIVE_RECORD, EXPORT_TEMPLATE, null, RegisterCustomParameters.builder() diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java index 252e968..38f2bd3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java @@ -32,6 +32,7 @@ import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.TemplateUtils; import com.casic.missiles.utils.ZipUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.shiro.util.CollectionUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -308,9 +309,10 @@ wrapInfo(management); String currentFileName = rootFileName + File.separator + management.getYearNo() + "年第" + management.getYearNum() + "次内部审核工作"; List auditFileList = management.getInternalAuditFiles(); - if (!CollectionUtils.isEmpty(auditFileList)){ + if (!CollectionUtils.isEmpty(auditFileList)) { List fileNameList = auditFileList.stream() - .map(file -> file.getFilePath().substring(file.getFilePath().lastIndexOf(File.separator) + 1)) + .filter(file -> StringUtils.isNotBlank(file.getFilePath())) + .map(file -> file.getFilePath().substring(file.getFilePath().lastIndexOf("/") + 1)) .collect(Collectors.toList()); CompletableFuture task = CompletableFuture.supplyAsync( () -> { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java index 4a7ed67..bfa1c01 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java @@ -26,6 +26,7 @@ import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.TemplateUtils; import com.casic.missiles.utils.ZipUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -61,7 +62,7 @@ @Value("${casic.file.dir}") private String localFileDir; - public BizQualityManagementReviewServiceImpl(AbstractPermissionContext permissionContext, AbstractDictService dictService, IBizQualityManagementReviewFileService reviewFileService,TemplateUtils templateUtils) { + public BizQualityManagementReviewServiceImpl(AbstractPermissionContext permissionContext, AbstractDictService dictService, IBizQualityManagementReviewFileService reviewFileService, TemplateUtils templateUtils) { this.permissionContext = permissionContext; this.dictService = dictService; this.reviewFileService = reviewFileService; @@ -191,15 +192,18 @@ if (ObjectUtil.isNotEmpty(managementReview)) { String currentFileName = rootFileName + File.separator + managementReview.getYearNo() + "年第" + managementReview.getYearNum() + "次管理评审工作"; List fileList = managementReview.getReviewFileList(); - List pathList = fileList.stream() - .map(file -> file.getFilePath().substring(file.getFilePath().lastIndexOf("/"))).collect(Collectors.toList()); - CompletableFuture completableFuture = CompletableFuture.supplyAsync( - () -> { - String filePath = templateUtils.downloadFile(pathList, currentFileName); - filePathList.add(filePath); - return null; - }, threadPool); - futures.add(completableFuture); + if (CollectionUtil.isNotEmpty(fileList)) { + List pathList = fileList.stream() + .filter(file -> StringUtils.isNotBlank(file.getFilePath())) + .map(file -> file.getFilePath().substring(file.getFilePath().lastIndexOf("/") + 1)).collect(Collectors.toList()); + CompletableFuture completableFuture = CompletableFuture.supplyAsync( + () -> { + String filePath = templateUtils.downloadFile(pathList, currentFileName); + filePathList.add(filePath); + return null; + }, threadPool); + futures.add(completableFuture); + } } } CompletableFuture[] futuresArr = futures.toArray(new CompletableFuture[0]); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java index c8b9468..5afb412 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java @@ -25,6 +25,7 @@ import com.casic.missiles.enums.quality.*; import com.casic.missiles.enums.quality.file.QualityCorrectiveFileTypeEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; +import com.casic.missiles.mapper.quality.BizQualityPreventFileRelMapper; import com.casic.missiles.mapper.quality.BizQualityPreventRecordMapper; import com.casic.missiles.model.quality.*; import com.casic.missiles.model.quality.base.DefaultManageReviewRelFile; @@ -92,10 +93,11 @@ private final IBizQualityTargetEvaluationContentService contentService; private final ISystemSignService signService; private final PrintFileRegister printFileRegister; + private final BizQualityPreventFileRelMapper bizQualityPreventFileRelMapper; @Value("${casic.file.dir}") private String localFileDir; - public BizQualityPreventRecordServiceImpl(AbstractPermissionContext permissionContext, AbstractDictService dictService, IBizQualityPreventFileRelService fileRelService, IBizLabRelDeptService relDeptService, @Lazy IBizQualityInternalAuditRepService internalAuditRepService, @Lazy IBizQualityInternalAuditManagementService internalAuditManagementService, @Lazy IBizQualityManagementReviewService managementReviewService, IBizQualityCorrectiveRectifFileService rectifFileService, PrintFileRegister printFileRegister, @Lazy IBizQualityNonConformanceRepService nonConformanceRepService, IBizQualityReviewFormService reviewFormService, IBizQualityNonReviewFormService nonReviewFormService, IBizQualityReviewFormItemService itemService, IBizQualityTargetEvaluationRepService evaluationRepService, IBizQualityTargetEvaluationContentService contentService, ISystemSignService signService) { + public BizQualityPreventRecordServiceImpl(AbstractPermissionContext permissionContext, AbstractDictService dictService, IBizQualityPreventFileRelService fileRelService, IBizLabRelDeptService relDeptService, @Lazy IBizQualityInternalAuditRepService internalAuditRepService, @Lazy IBizQualityInternalAuditManagementService internalAuditManagementService, @Lazy IBizQualityManagementReviewService managementReviewService, IBizQualityCorrectiveRectifFileService rectifFileService, PrintFileRegister printFileRegister, @Lazy IBizQualityNonConformanceRepService nonConformanceRepService, IBizQualityReviewFormService reviewFormService, IBizQualityNonReviewFormService nonReviewFormService, IBizQualityReviewFormItemService itemService, IBizQualityTargetEvaluationRepService evaluationRepService, IBizQualityTargetEvaluationContentService contentService, ISystemSignService signService, BizQualityPreventFileRelMapper bizQualityPreventFileRelMapper) { this.permissionContext = permissionContext; this.dictService = dictService; this.fileRelService = fileRelService; @@ -112,6 +114,7 @@ this.evaluationRepService = evaluationRepService; this.contentService = contentService; this.signService = signService; + this.bizQualityPreventFileRelMapper = bizQualityPreventFileRelMapper; } @Override @@ -349,27 +352,29 @@ if (ObjectUtil.isNotEmpty(record)) { String currentFileName = rootFileName + File.separator + record.getFileCode() + record.getFileName(); Map map = BeanUtil.beanToMap(record); - List fileRelList = record.getFileRelList(); - for (BizQualityPreventFileRel fileRel : fileRelList) { - switch (fileRel.getFileType()) { - case 1: - //不符合要求情况分析报告 - nonConformanceRepTask(fileRel, currentFileName, threadPool, futures); - break; - case 2: - //内审检查表 - reviewFormTask(fileRel, currentFileName, threadPool, futures); - break; - case 3: - //内审不符合项 - noReviewFormTask(fileRel, currentFileName, threadPool, futures); - break; - case 5: - //管理评审报告 - reviewRep(fileRel, currentFileName, threadPool, futures); - break; - default: - break; + List fileRelList = bizQualityPreventFileRelMapper.selectList(new QueryWrapper().eq("prevent_id", record.getId())); + if (CollectionUtils.isNotEmpty(fileRelList)){ + for (BizQualityPreventFileRel fileRel : fileRelList) { + switch (fileRel.getFileType()) { + case 1: + //不符合要求情况分析报告 + nonConformanceRepTask(fileRel, currentFileName, threadPool, futures); + break; + case 2: + //内审检查表 + reviewFormTask(fileRel, currentFileName, threadPool, futures); + break; + case 3: + //内审不符合项 + noReviewFormTask(fileRel, currentFileName, threadPool, futures); + break; + case 5: + //管理评审报告 + reviewRep(fileRel, currentFileName, threadPool, futures); + break; + default: + break; + } } } CompletableFuture exportFileTask = CompletableFuture.supplyAsync(