From 6608505543aeb371b63f07920487ff2687e88338 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 30 Sep 2022 10:51:36 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=81=94=E7=B3=BB=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/IcNatCompareRecordDTO.java | 2 +- .../data/IcNatCompareRecordExcelData.java | 6 +++--- .../excel/ic_nat_compare_record_template.xlsx | Bin 8778 -> 8790 bytes 3 files changed, 4 insertions(+), 4 deletions(-) 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 2d80e320670947890c70f7334ca3db7e10d26d99..f2e5997d379f1b896b45e9b9c8ba05663de35221 100644 GIT binary patch delta 1170 zcmV;D1a14uMAk&GlK}-NP{WT+lb8W2f3cI&7OW(d0ChzrB#J=nEPL8U#7<-z(y-zJ zEV%}^LR>X5Sdyh=yo~xPmyOVQ-bA% zf&|rI&@4SZig`(Sq2XE=C1{(0@f=AR%F6_8tSu?VhHpSJ6F7%*;;PV+Sy$>ce=Zq+ zWNW|?ArmaYGQljv4bU%pBHAGZ?~&z`&Rc-s7;=!HtifRr;vcUCEzO?|tuk=R%+{sb zX%~0M7Q7RC_ts>+v8t+|8nrQ8{t(|Uu5Q{@{Y*8t;(*dvaLP3>Tj;cYkue_B&Fyk# z?82RSm4P^~)31-$&$ss&|5hBRLCxLKKzJ?*?Q-vxyV1qva*oo7M3GO<{Aju)Q#zhd zLLQpI2mMX5?m_Ox|AROpOA^s>NXf~7xCf+d?!(`Zegm`o0QYskv`N)IpB-}vR&C5|C$#^5*LFx#rJBkEVEdkP&pr1- zdHtvr*@Jb`^c5|#oD%4TX=J~x=&zr57fVW<=Y7MK>7k-e;OKSz{#`j5``|hNPmrN^ z745tqR*X5(f#xnV1N3;(8mqa-rGMQrH(20J1Zl-)dH#`UE_<37R`x9%rfsEwTO)QF zdY?!vDDF|e>*U}jw#Vj8e2wKJ);j4qk$9UHtLUTd{@zBwmiMA=oIqZ zjGsYnJCDld*_;xy^Gf#c6@T`i5MR+*C`=fIN$^gz4D(Kj=8vhElwdZ0kpUBkXx$-y zbms`49pLyJ6THCBL$TZG@9jbcVFiv+hZfdA>z|{MDa2rHZ*wp%tA3cMlh5&wKeG- z_!ho#yOq5o3R=vYXNwP%*wnGK@MehGH^$?vrZVt<0Vp}oFt|0wPYY~i7tikECNA0W zhgAOqkRG!%2aFI2>@+6L%K!iX?vu$E&=tp!Yn<|Y^X_NUc0S$HkC4*`y4Mb~s2HyW z0-+p}u^bhXZXPNE2^y1{9x?$flg%EJ1t?I%k4=+hA5;PX1CzTSKLJ^j`yVg?Rg)|r zHUfMblZ+c2lYk%)9PBhE&C37)0PX+)02BZK000000096X0002E7n9Bx7L#=$5R+F8 z5DNeR00031AOHXWPm}E+IsqJ$C?PfhLz7=2KmoOrpdmZ~dXwEDAsq9`n<790007kl k000;O0000000031AOHXWrUa9{1R9exA`k{S9smFU09-^6s{jB1 delta 1129 zcmV-v1eW{OM9M_4lK};$K*%3Rlb8W2e{qu17OW(d0ChzrB#J=nEPL8U#ExYf(y-zJ zEV%}^LRq@=Ge~Pk4 zx&|DF;RFk?lv7J_1N2o-L^~vBJyJdCq6Kh;ibCktl9Q)y!A5WLzl#C~2 zJbq{fAM`iLx(Bfv|9|3?oJH|*v`o?2WGy;3aA z?f%eRA#sPvZKaa_Ii@=p0{@Sv@B6IpTqfF+i&24!83VsQIB)cZe|t_>%h-WO%T~)u zViiN{iG{kPcg12|P&|(jza;c-v?iW!zk>qdp~6w2B#gk;n0*L*z@t2H$AG}dg_lQI zgHk1Z2vhVYYTyzD*jZt`9@OsR&^%gFLCp`!uZ{XGE8moKp3TSC4IM(hnf^1#UE|T& zG@DXl4qnL?zQ7R_f8t9z3A(~46u~>uGR!+Anm?svlE7s8LIDLtEZs>zR_6?#oZ$HE z6THAg{{y%_0q}VOOlH|^biE2^$#pDQXyIyUO;2#V(LR27cu$h4Z1Eu0VHWD(Iv&2x zVsVY#5dn3VU}zePgL((10^2}i0hNB82|v2 zJ|Gs8z8)F@A(Po2lLe+g$R9|PaUWCy`~s85A3q0F1ONbdY%i0(Asmw_APxaZlQDgmjJtRXxBb(85KAq75i?wCK54 Date: Fri, 30 Sep 2022 10:58:22 +0800 Subject: [PATCH 2/3] =?UTF-8?q?YtHsResUtils=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/commons/tools/utils/YtHsResUtils.java | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) 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..6adc8ac307 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; } } From c48ffbe4c325b979356726e4e923b6b40249d72c Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 30 Sep 2022 10:59:12 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E9=85=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/commons/tools/utils/YtHsResUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 6adc8ac307..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 @@ -43,7 +43,7 @@ public class YtHsResUtils { } } catch (Exception e) { e.printStackTrace(); - log.warn(String.format("烟台核算检测结果查询异常cardNo:%s,异常信息:%s", cardNo, e.getMessage())); + log.warn(String.format("烟台核酸检测结果查询异常cardNo:%s,异常信息:%s", cardNo, e.getMessage())); } YtHsjcResDTO resultResult = new YtHsjcResDTO(); resultResult.setData(new ArrayList<>());