diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/YtHsResUtils.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/YtHsResUtils.java index ed1920f5a8..0ea496de19 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/YtHsResUtils.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/YtHsResUtils.java @@ -2,8 +2,6 @@ package com.epmet.commons.tools.utils; import com.alibaba.fastjson.JSON; import com.epmet.commons.tools.dto.result.YtHsjcResDTO; -import com.epmet.commons.tools.exception.EpmetErrorCode; -import com.epmet.commons.tools.exception.EpmetException; import lombok.extern.slf4j.Slf4j; import java.util.ArrayList; @@ -43,14 +41,13 @@ public class YtHsResUtils { if (result.success()) { return JSON.parseObject(result.getData(), YtHsjcResDTO.class); } - YtHsjcResDTO resultResult = new YtHsjcResDTO(); - resultResult.setData(new ArrayList<>()); - - return resultResult; } catch (Exception e) { - log.error(String.format("烟台核算检测结果查询异常cardNo:%s,异常信息:%s", cardNo, e.getMessage())); - throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode(), "获取核算检测结果api异常"+e.getMessage()); + e.printStackTrace(); + log.warn(String.format("烟台核酸检测结果查询异常cardNo:%s,异常信息:%s", cardNo, e.getMessage())); } + YtHsjcResDTO resultResult = new YtHsjcResDTO(); + resultResult.setData(new ArrayList<>()); + return resultResult; } } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcNatCompareRecordDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcNatCompareRecordDTO.java index 3b7af8fea0..9bde2314d1 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcNatCompareRecordDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcNatCompareRecordDTO.java @@ -60,7 +60,7 @@ public class IcNatCompareRecordDTO implements Serializable { * 真实手机号 */ @ColumnWidth(20) - @ExcelProperty("手机号") + @ExcelProperty("联系方式") private String realMobile; /** diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/IcNatCompareRecordExcelData.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/IcNatCompareRecordExcelData.java index 26b8ecf8f0..0a1e02cbf7 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/IcNatCompareRecordExcelData.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/IcNatCompareRecordExcelData.java @@ -21,8 +21,8 @@ public class IcNatCompareRecordExcelData { @ExcelProperty("身份证号") private String idCard; - @NotBlank(message = "手机号为必填项") - @ExcelProperty("手机号") + @NotBlank(message = "联系方式为必填项") + @ExcelProperty("联系方式") private String mobile; @Data @@ -36,7 +36,7 @@ public class IcNatCompareRecordExcelData { @ExcelProperty("身份证号") private String idCard; - @ExcelProperty("手机号") + @ExcelProperty("联系方式") @ColumnWidth(20) private String mobile; diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/ic_nat_compare_record_template.xlsx b/epmet-user/epmet-user-server/src/main/resources/excel/ic_nat_compare_record_template.xlsx index 2d80e32067..f2e5997d37 100644 Binary files a/epmet-user/epmet-user-server/src/main/resources/excel/ic_nat_compare_record_template.xlsx and b/epmet-user/epmet-user-server/src/main/resources/excel/ic_nat_compare_record_template.xlsx differ