diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/ResistanceThermometerHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/ResistanceThermometerHandler.java index 048a955..65486a6 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/ResistanceThermometerHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/ResistanceThermometerHandler.java @@ -41,8 +41,6 @@ @Slf4j public class ResistanceThermometerHandler extends StandardEquipmentSupport implements PrintFileModuleNameEnum, StandardEquipmentPrint { - private final BizBusinessDeviceMeasureInfoMapper bizBusinessDeviceMeasureInfoMapper; - private final PrintFileRegister printFileRegister; private final BizBusinessDeviceMeasureEquipmentMapper bizBusinessDeviceMeasureEquipmentMapper; @@ -54,7 +52,6 @@ for (BizEquipmentInfo checkEquipment : request.getCheckEquipmentList()) { checkEquipment.setEquipmentType("核查标准"); } - try { if (ObjectUtil.isEmpty(request)) { return null; @@ -70,16 +67,6 @@ return null; } -// Comparator comparator = (s1, s2) -> { -// int v1 = Integer.parseInt(s1); -// int v2 = Integer.parseInt(s2); -// -// // 先按绝对值降序,如果绝对值相等,则按原值升序(使得负数在正数后) -// return Math.abs(v2) != Math.abs(v1) -// ? Integer.compare(Math.abs(v2), Math.abs(v1)) -// : Integer.compare(v1, v2); -// }; - //最低和最高温度点重复性 TreeMap> repTreeMap = thermometerList.stream() .filter(t -> TEMPERATURE.equals(t.getParams()) && REPEATABILITY.equals(t.getCheckType())) @@ -167,10 +154,8 @@ List list = Collections.emptyList(); request.setMeasureDataResistanceThermometerList(list); } - BizBusinessDeviceMeasureInfo measureInfo = bizBusinessDeviceMeasureInfoMapper.selectDetailById(request.getDataId()); DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - map.put("dataNo", measureInfo.getDataNo()); List equipmentList = bizBusinessDeviceMeasureEquipmentMapper.selectEquipmentListByDataId(request.getDataId()); if (CollectionUtils.isEmpty(equipmentList)) { @@ -385,10 +370,15 @@ log.debug("该报告没有证书报告"); return null; } - BizBusinessDeviceMeasureInfo measureInfo = bizBusinessDeviceMeasureInfoMapper.selectDetailById(request.getDataId()); DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - map.put("dataNo", measureInfo.getDataNo()); + + List equipmentList = bizBusinessDeviceMeasureEquipmentMapper.selectEquipmentListByDataId(request.getDataId()); + if (CollectionUtils.isEmpty(equipmentList)) { + equipmentList = new ArrayList<>(); + equipmentList.add(new MeasureEquipmentInfoDTO()); + } + map.put("equipmentList", equipmentList); prepareCustomCoverParams(map, request.getMeasureDataResistanceThermometerList());