ClientApps/CN_Gather
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

微调

Browse Source
This commit is contained in:
caozehui
2025-06-23 09:26:02 +08:00
parent a0b0023def
commit c2c5c9668e
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
detection/src/main/java/com/njcn/gather/detection/service/impl/DetectionServiceImpl.java
View File

@@ -763,7 +763,7 @@ public class DetectionServiceImpl {
result.setResultFlag(setResultFlag(Arrays.asList(a, b, c))); result.setResultFlag(setResultFlag(Arrays.asList(a, b, c)));
} else { } else {
List<SourceIssue.ChannelListDTO> channelTypeAList = sourceIssue.getChannelList().stream() List<SourceIssue.ChannelListDTO> channelTypeAList = sourceIssue.getChannelList().stream()
.filter(x -> x.getChannelType().contains("U")) .filter(x -> x.getChannelType().contains("Ua"))
.sorted(Comparator.comparing( .sorted(Comparator.comparing(
x -> Optional.ofNullable(x.getDipData()) x -> Optional.ofNullable(x.getDipData())
.map(SourceIssue.ChannelListDTO.DipDataDTO::getFTransValue) .map(SourceIssue.ChannelListDTO.DipDataDTO::getFTransValue)

2
detection/src/main/java/com/njcn/gather/device/pojo/vo/ProvinceDevExcel.java
View File

@@ -80,7 +80,7 @@ public class ProvinceDevExcel implements Serializable {
private String sampleId; private String sampleId;
@Excel(name = "送样日期（yyyy-MM-dd）", width = 25, format = "yyyy-MM-dd", orderNum = "18") @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") @Excel(name="委托方", width = 40, orderNum = "19")
private String delegate; private String delegate;

2
detection/src/main/java/com/njcn/gather/script/util/ScriptDtlsDesc.java
View File

@@ -91,7 +91,7 @@ public class ScriptDtlsDesc {
buffer.append(name + " "); buffer.append(name + " ");
for (PqScriptDtls dtls : list) { for (PqScriptDtls dtls : list) {
buffer.append(dtls.getPhase() + "相(暂态深度=" + dtls.getTransValue() + ResultUnitEnum.VOLTAGE_DUR_UNIT.getUnit() 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() + ") ");
} }
} }
} }