From c2c5c9668e7f610050e941a69f380142bf46f3d4 Mon Sep 17 00:00:00 2001 From: caozehui <2427765068@qq.com> Date: Mon, 23 Jun 2025 09:26:02 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gather/detection/service/impl/DetectionServiceImpl.java | 2 +- .../java/com/njcn/gather/device/pojo/vo/ProvinceDevExcel.java | 2 +- .../main/java/com/njcn/gather/script/util/ScriptDtlsDesc.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/detection/src/main/java/com/njcn/gather/detection/service/impl/DetectionServiceImpl.java b/detection/src/main/java/com/njcn/gather/detection/service/impl/DetectionServiceImpl.java index 2e415b5e..d688fe6c 100644 --- a/detection/src/main/java/com/njcn/gather/detection/service/impl/DetectionServiceImpl.java +++ b/detection/src/main/java/com/njcn/gather/detection/service/impl/DetectionServiceImpl.java @@ -763,7 +763,7 @@ public class DetectionServiceImpl { result.setResultFlag(setResultFlag(Arrays.asList(a, b, c))); } else { List channelTypeAList = sourceIssue.getChannelList().stream() - .filter(x -> x.getChannelType().contains("U")) + .filter(x -> x.getChannelType().contains("Ua")) .sorted(Comparator.comparing( x -> Optional.ofNullable(x.getDipData()) .map(SourceIssue.ChannelListDTO.DipDataDTO::getFTransValue) diff --git a/detection/src/main/java/com/njcn/gather/device/pojo/vo/ProvinceDevExcel.java b/detection/src/main/java/com/njcn/gather/device/pojo/vo/ProvinceDevExcel.java index 268b9cfa..d3d31ad4 100644 --- a/detection/src/main/java/com/njcn/gather/device/pojo/vo/ProvinceDevExcel.java +++ b/detection/src/main/java/com/njcn/gather/device/pojo/vo/ProvinceDevExcel.java @@ -80,7 +80,7 @@ public class ProvinceDevExcel implements Serializable { private String sampleId; @Excel(name = "送样日期（yyyy-MM-dd）", width = 25, format = "yyyy-MM-dd", orderNum = "18") - private String arrivedDate; + private LocalDate arrivedDate; @Excel(name="委托方", width = 40, orderNum = "19") private String delegate; diff --git a/detection/src/main/java/com/njcn/gather/script/util/ScriptDtlsDesc.java b/detection/src/main/java/com/njcn/gather/script/util/ScriptDtlsDesc.java index 06884ddd..dd71dd8b 100644 --- a/detection/src/main/java/com/njcn/gather/script/util/ScriptDtlsDesc.java +++ b/detection/src/main/java/com/njcn/gather/script/util/ScriptDtlsDesc.java @@ -91,7 +91,7 @@ public class ScriptDtlsDesc { buffer.append(name + " "); for (PqScriptDtls dtls : list) { buffer.append(dtls.getPhase() + "相(暂态深度=" + dtls.getTransValue() + ResultUnitEnum.VOLTAGE_DUR_UNIT.getUnit() - + ",暂态持续时间=" + (ObjectUtil.isNull(dtls.getRetainTime()) ? dtls.getRetainTime() : dtls.getRetainTime().intValue()) + ResultUnitEnum.VOLTAGE_MAG_UNIT.getUnit() + ") "); + + ",暂态持续时间=" + (ObjectUtil.isNull(dtls.getRetainTime()) ? "/" : dtls.getRetainTime().toString()) + ResultUnitEnum.VOLTAGE_MAG_UNIT.getUnit() + ") "); } } }