Merge remote-tracking branch 'remotes/origin/dev_data_update_config' into 烟台-政务master

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;
     }
 }
 

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;
 
     /**

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;