From 18e4245eff89c41dc4e08595ab7522c5b59242c6 Mon Sep 17 00:00:00 2001 From: wxr Date: Mon, 17 Nov 2025 20:38:23 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8D=A7=E5=85=89=E6=95=B0=E6=8D=AE=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vo/XRFDeviceSampleProjectReqVO.java | 6 +++--- .../service/XRFDataServiceImpl.java | 16 ++++++++-------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/thirdpartyapi/controller/vo/XRFDeviceSampleProjectReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/thirdpartyapi/controller/vo/XRFDeviceSampleProjectReqVO.java index 1c55cd3..387b6b0 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/thirdpartyapi/controller/vo/XRFDeviceSampleProjectReqVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/thirdpartyapi/controller/vo/XRFDeviceSampleProjectReqVO.java @@ -14,19 +14,19 @@ public class XRFDeviceSampleProjectReqVO implements Serializable { * 检测项目名称 */ @Schema(description = "检测项目名称") - private String xRFProjectName; + private String xrfProjectName; /** * 检测项目单位 */ @Schema(description = "检测项目单位") - private String xRFProjectUnit; + private String xrfProjectUnit; /** * 检测项目值 */ @Schema(description = "检测项目值") - private String xRFProjectValue; + private String xrfProjectValue; /** * 小数位数 diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/thirdpartyapi/service/XRFDataServiceImpl.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/thirdpartyapi/service/XRFDataServiceImpl.java index 63dcf1c..0d14cf2 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/thirdpartyapi/service/XRFDataServiceImpl.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/thirdpartyapi/service/XRFDataServiceImpl.java @@ -138,20 +138,20 @@ public class XRFDataServiceImpl implements XRFDataService { for (XRFDeviceSampleProjectReqVO ygDeviceSampleElement : sampleElements) { //如果设备上来的元素值为空，则跳过继续 - if (ygDeviceSampleElement.getXRFProjectValue() == null) { + if (ygDeviceSampleElement.getXrfProjectValue() == null) { continue; } //查询是否有特殊转换率 // QmsConYgConverRate conYgConverRate = conYgConverRateService.getOne(Wrappers.query().lambda().eq(QmsConYgConverRate::getDeviceNo, ygDeviceSample.getDeviceNo()) // .eq(QmsConYgConverRate::getLineName, ygDeviceSample.getLineName()).eq(QmsConYgConverRate::getElementName, ygDeviceSampleElement.getElementName())); - ConfigXRFConversionRateDO conYgConverRate = configXRFConversionRateMapper.selectBy(ygDeviceSample.getDeviceNo(), ygDeviceSample.getLineName(), ygDeviceSampleElement.getXRFProjectName()); + ConfigXRFConversionRateDO conYgConverRate = configXRFConversionRateMapper.selectBy(ygDeviceSample.getDeviceNo(), ygDeviceSample.getLineName(), ygDeviceSampleElement.getXrfProjectName()); ConfigXRFProjectDO conYgElement = null; if(conYgConverRate != null && conYgConverRate.getConversionRate() != null) { - conYgElement = conYgElementList.stream().filter(f -> f.getXRFProjectName().equals(ygDeviceSampleElement.getXRFProjectName()) && f.getConversionRate().equals(conYgConverRate.getConversionRate())).findFirst().orElse(null); + conYgElement = conYgElementList.stream().filter(f -> f.getXRFProjectName().equals(ygDeviceSampleElement.getXrfProjectName()) && f.getConversionRate().equals(conYgConverRate.getConversionRate())).findFirst().orElse(null); } else { - conYgElement = conYgElementList.stream().filter(f -> f.getXRFProjectName().equals(ygDeviceSampleElement.getXRFProjectName()) && (StringUtils.isBlank(f.getXRFProjectUnit()) || StringUtils.isBlank(ygDeviceSampleElement.getXRFProjectUnit()) || f.getXRFProjectUnit().equals(ygDeviceSampleElement.getXRFProjectUnit()))).findFirst().orElse(null); + conYgElement = conYgElementList.stream().filter(f -> f.getXRFProjectName().equals(ygDeviceSampleElement.getXrfProjectName()) && (StringUtils.isBlank(f.getXRFProjectUnit()) || StringUtils.isBlank(ygDeviceSampleElement.getXrfProjectUnit()) || f.getXRFProjectUnit().equals(ygDeviceSampleElement.getXrfProjectUnit()))).findFirst().orElse(null); } if(conYgElement != null) { //数据转换 @@ -159,10 +159,10 @@ public class XRFDataServiceImpl implements XRFDataService { Integer conYgElementDataType = 0; if(conYgConverRate != null && conYgConverRate.getConversionRate() != null) { BigDecimal convertRate = new BigDecimal(conYgConverRate.getConversionRate().toString()); - elementValue = new BigDecimal(ygDeviceSampleElement.getXRFProjectValue()).multiply(convertRate); + elementValue = new BigDecimal(ygDeviceSampleElement.getXrfProjectValue()).multiply(convertRate); } else { BigDecimal convertRate = new BigDecimal(conYgElement.getConversionRate().toString()); - elementValue = new BigDecimal(ygDeviceSampleElement.getXRFProjectValue()).multiply(convertRate); + elementValue = new BigDecimal(ygDeviceSampleElement.getXrfProjectValue()).multiply(convertRate); } if(elementValue.compareTo(BigDecimal.ZERO) < 0) { elementValue = BigDecimal.ZERO; @@ -185,10 +185,10 @@ public class XRFDataServiceImpl implements XRFDataService { ReportFieldValueData reportFieldValueData = new ReportFieldValueData(); reportFieldValueData.setFieldName(conYgElement.getSaveColumn()); - reportFieldValueData.setFieldValue(ygDeviceSampleElement.getXRFProjectName()); + reportFieldValueData.setFieldValue(ygDeviceSampleElement.getXrfProjectName()); reportFieldValueData.setDecimalPosition(ygDeviceSampleElement.getValueDecimals()); reportFieldValueData.setMathSymbol("="); - reportFieldValueData.setUnit(ygDeviceSampleElement.getXRFProjectUnit()); + reportFieldValueData.setUnit(ygDeviceSampleElement.getXrfProjectUnit()); assayDataJson.put(conYgElement.getSaveColumn(), reportFieldValueData); // if(conYgElementDataType != null && conYgElementDataType.intValue() > -1) {