微调

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<SourceIssue.ChannelListDTO> 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)

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;

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() + ") ");
             }
         }
     }