From 0f82049a5663003ce9c381808502be892b4bf0b2 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Wed, 9 Nov 2022 16:26:02 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A3=90=E7=9F=B3=E5=AF=BC=E5=85=A5=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E6=96=B0=E5=A2=9E=E5=88=97=E8=A1=A8=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E5=9D=87=E5=A2=9E=E5=8A=A07=E5=A4=A9=E9=80=94=E5=BE=84?= =?UTF-8?q?=E5=9C=B0=EF=BC=8C=E5=AF=BC=E5=85=A5=E5=AF=B9=E4=B8=8B=E6=8B=89?= =?UTF-8?q?=E6=A1=86=E5=AD=97=E6=AE=B5=E5=80=BC=E6=A0=A1=E9=AA=8C=E6=AD=A3?= =?UTF-8?q?=E7=A1=AE=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/IcTripReportRecordDTO.java | 5 ++ .../epmet/dto/form/IcTripReportFormDTO.java | 4 + .../entity/IcTripReportRecordEntity.java | 4 + .../excel/IcPsTripReportRecordExcel.java | 7 +- .../IcPsTripReportRecordExportExcel.java | 8 +- .../IcPsTripReportExcelImportListener.java | 79 +++++++++++++----- .../IcTripReportExcelImportListener.java | 38 ++++++--- .../V0.0.86__alter_ic_trip_report.sql | 3 + .../excel/ps_trip_report_import_template.xlsx | Bin 10373 -> 10294 bytes 9 files changed, 109 insertions(+), 39 deletions(-) create mode 100644 epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.86__alter_ic_trip_report.sql diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java index 7796f0f5d8..60491f0b17 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java @@ -289,6 +289,11 @@ public class IcTripReportRecordDTO implements Serializable { */ @ExcelIgnore private String registeredResidence; + /** + * 7天内到达或途径【磐石】 + */ + @ExcelIgnore + private String passBy; /** * 来曹事由【磐石】 */ diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcTripReportFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcTripReportFormDTO.java index 1f2cf09949..65f289cd46 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcTripReportFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcTripReportFormDTO.java @@ -209,6 +209,10 @@ public class IcTripReportFormDTO implements Serializable { */ @NotBlank(message = "户籍地不能为空", groups = {PsAdd.class}) private String registeredResidence; + /** + * 7天内到达或途径【磐石】 + */ + private String passBy; /** * 来曹事由【磐石】 */ diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcTripReportRecordEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcTripReportRecordEntity.java index 497e0707c6..3ab91a19b5 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcTripReportRecordEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcTripReportRecordEntity.java @@ -139,6 +139,10 @@ public class IcTripReportRecordEntity extends BaseEpmetEntity { * 户籍地 【磐石】 */ private String registeredResidence; + /** + * 7天内到达或途径【磐石】 + */ + private String passBy; /** * 来曹事由【磐石】 */ diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExcel.java index 743aa60438..1c442cac62 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExcel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExcel.java @@ -39,6 +39,9 @@ public class IcPsTripReportRecordExcel { @NotBlank(message = "来自地区详细地址不能为空") private String sourceDetailAddress; + @ExcelProperty("7天内到达或途径") + private String passBy; + @ExcelProperty("来曹事由（100字以内）") @NotBlank(message = "来曹事由不能为空") @Length(max = 500,message = "来曹事由不能超过100字") @@ -84,10 +87,10 @@ public class IcPsTripReportRecordExcel { @ExcelProperty("是否达到曹县") private String isArrive; - @ExcelProperty("上报时间\n" + + /*@ExcelProperty("上报时间\n" + "（2022-01-01）") @JsonFormat(pattern = "yyyy-MM-dd") - private Date reportingTime; + private Date reportingTime;*/ @ExcelProperty("管控措施\n" + "（500字以内）") diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExportExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExportExcel.java index fd9c52e04a..f036e4a185 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExportExcel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExportExcel.java @@ -55,11 +55,17 @@ public class IcPsTripReportRecordExportExcel implements Serializable { @ColumnWidth(30) @ExcelProperty(value = "来自地区详细地址",order = 6) private String sourceDetailAddress; + /** + * 7天内到达或途径【磐石】 + */ + @ColumnWidth(25) + @ExcelProperty(value = "7天内到达或途径") + private String passBy; /** * 来曹事由（100字以内）【磐石】 */ @ColumnWidth(25) - @ExcelProperty(value = "来曹事由（100字以内）",order = 7) + @ExcelProperty(value = "来曹事由（100字以内）") private String describeContent; /** * 48小时核酸检测 0:阴性 1:阳性 -中国字 diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcPsTripReportExcelImportListener.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcPsTripReportExcelImportListener.java index 8fc2a65e39..06cea360b2 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcPsTripReportExcelImportListener.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcPsTripReportExcelImportListener.java @@ -6,17 +6,18 @@ import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.exception.ExceptionUtils; import com.epmet.commons.tools.exception.ValidateException; import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.utils.DateUtils; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.constant.IcResiUserConstant; import com.epmet.entity.IcTripReportRecordEntity; import com.epmet.excel.IcPsTripReportRecordExcel; -import com.epmet.excel.data.IcTripReportExcelData; import com.epmet.excel.error.IcPsTripReportRecordErrorExcel; import com.epmet.service.impl.IcTripReportRecordServiceImpl; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import java.util.ArrayList; +import java.util.Date; import java.util.List; import java.util.Map; import java.util.concurrent.atomic.AtomicBoolean; @@ -78,18 +79,45 @@ public class IcPsTripReportExcelImportListener implements ReadListenerxss=+T7YtLaVb?$)^;9U79mp}a zHJwM%KMfwZN*;QmA0@X9Qk9>~>^LsC08=BJv>1`jr5!Qz+!kcEBB*9Ft^JvJ$98V+ zOP1^ajPg&G7O>Y&#YZwyCG!!#+lp5jH1uvux<2-!VVSJf}(0qYb?u zPvPm7(<0{ib;LA3@&58oOUd+pV*I$JF0};K zxGnzhO9TndV%-}J84mCRXeoO4_o#)5I%dWO*C;UCOM6xpA7rt&R*tU23>mq1G<@+~ zn)-!{ny^VftvXYkyr6T#11nn*mv^3Ron2no`hrEb-xnY+jt%+1oQZ6=Wpj;Bzh<->tRg=K(L&db2;{tmZK zNq;?;*OdJ>-pPsTU7gE_uj7xhhN{_fgo5IbLXOMtDOg}euz%t{rIdkL<>s+6X)Tm% z!jni#I&MQAI7eYOjzhvo$>BGjC60*StO7LV8OQhe=ak=NrFCf5)VfHv~Mu~Fk&?%pXWpZoKPCW%qP|gL{dlh?e z3qOs(^?+GZkRMK!HO7#I2cx@qArGWAb?;|b$qn7@G3%_00Q(Cs(tt0NPm}{~yRAMc z8(NNyq%IY!<=QLDzrK1k-+CYCT(>x|UtfYpopV|@)WAC3y~U%I)#A^T!QB9#)fpN3 zDM>0l0}P;j!Xx4O=SKj1?xtO%1y=Dk6PID*UYBNA^{+1EJy*7fh8gkcKD$ADp5T5XZt=!Gr1N-h8*z1pT_ zHO@`VOmdsg##CTHQhg0wI|_0jS+>XZee}T@!mL{sCwJt&V(Q*|q_jOMYDr3YAV{Go zRLX}A?VZ3Wv9;u0evryf|EiA&ROjQO1H|fc(r=K@S-72(jFg((OI|h)I#&0pfuVB- z*c?l&q@;btrO$GaRc_GexD*7m$LX7yQbp4z${4U$MAGr-x?iN2)NJjj;UN7Y)oDVO z6;)LvyKXmS8Xf#2^IOF?rEuutc)IMq*flCiN|B8XL0tX{+bs!4HwL~tMuX)~fop!z ztKDW}UJ&_P&&ed>b(a~4j438y^Vgzd8m7IPuRj*w=-;gdeE`dYVNB614dT}*1fo5p8C8E(O!{UN5|0~W;8 z5WP8jGH&zgP3p`;lBxc($ea42Am9x&S>(WgVE?IhZq%2lBRA}?zn{L7(>gj>;~>{NSs{~&peZEJU96I)T^!1EYwvdl7Va}kqN+0&Yq<`L+p??@9aZP23BW>dxSke1 z_hkQgdU|))!G<-Hc;k6`4dEm!wQUKkTy!rWLoS?aR1V%@?rzhNC7SsQO+D^0wK+!~ z>{jP#efL0)!D^Rlkd$;DB^BfAj-Rb?q4DIJcs<&jHwFA6+~_P~$Sy_6AS>v$HM~Z8 z2FK2-JijhRCSZJsI}|O;By^xUdIl+SN>vv(oiuU~h&)w~g$J-rT0p>_YOma7H7%%u z=nfElG%=!2bmg85*<)zNAFX)5QOt8x%C^gE(Gh2igYug(+wc_kXq1C^aAs9d0RL&{ z@@3vWItM-AQ)e>K;W{AnCFfirZ?&hSJx^rkd!vhErEn42Bt5V)W+Ar06x+m}cIsdI zm5?<(qwl?W4+wDx{;F3Z_eGexCVYDHd&?~_#fZqT-R#Z=6J_c2^ph;6!SKZ>KymJe zr-bsn5@o6Hmd%3Flr$4kDpU7JrWYgfyiJ9M?(-(AcsRI;TxHQ;gvnM;mgOk8Me9q7 zUQ8qSiXoccb{DoLH7sYYU@VHpWXGxo3Z7sp?aH_Cz>@zlTwX0*wTEEo>nX^Zt!Jb> z6DJ@jz_|L(F)U58vZsb$=PzYJM8%AMf?c@199X3^>Pq$KC_-E~1ycX|vvh)JUMt+Y zyehapa+BzCc&%tB=;gtiQ4d=*p_pCCu1WZo7l+Iv8V;6IRvHEoac>g6v$Rn17nNei z^(tK>z(+~P4Z?Y!j!`9u@_VR`Rd_Mx)kf`d9O%c$;j!~d84e3@SOjtOm#R?98^PaP zIu-lXmV2663_RD2l|l<9Vm(VDHB~&TYgfI(zE47+{Yr-L?KaC>9i|TJ0(~p$@JlDZ z!=oOaM6)w_obX8V_Y!EeWYOcC$nGPerq~C-wRcq8y*i?w&45(tx@D=MOkbf9Tt8B} znR_G*!ae}%m!6~m7aBxMrbK+VX04`1Fp0d*T6zxEQ?GSmE*@Xjj43H#L>85+;7F~p z#sRC!podZR>TEZ6?%6Ncez;#{R=tmkdO-Ivw?oUGQ`ks`n?{`M))yi!i2=n#EA*q)2m|7!~$W+Yah^|3X=wKq;6o_kEjvC!YYqEJxO zohTKfb{9(c+7o3VOoEhA8;xbCgx&F^T^aTkC+Q(8)#6D#;g(R`VxTAH(LginDIV{C zdKKZ9xDZd@cdzUw_-~D=xClSuBA))hgs$zS{3)DIa(J$@z&Yw8(YDSw9ozaDAci{x9CW_ThWYY~8UVX=@P3pj&?i>Fq@|Opm~b7b&}h^$aif{kKzy zI7P$jyCno7_g82As8*mG;<9EYLC9vHmmt_u_sq?NXhaKnACkUqj%q9NG|=V>rTDga zk|@WkU_wPFw#OeO7plf-^k^w81#%ftj{g#)J0)u)DezbI8s_KAz{(3%YH8-Y!SuVt zj|%U-*j?dM`ZjkYs2jbx7c5F>1iqLROJRm9%q$K*-0V)ut%?N7}9SZz3^^m~3c z%<}Yfz3uRET<|+BpW$SkC&yce&N4q(pKW@W;N`YXGVGvMBh_*yQPkGnU=?yJ>wuVe zt{Oi*!!AAj>$6vLqtrEu+xBAotnP#rG%}>A9P(1llSBPM>zHj7K&`P8y0@V$TBR?an^)fTo5is z8Grs~1=dBvO}-JjCg-B(T&blKV^@wT(V?0scc;ZmOS`S)u8y}RoZYI$`}=?I)=aQy zZ{RuGj0HK-p;voHKgK3~fAr_6{!ZJ;`+O8U=l~c6Z{Q_hdg7vcrNNy_9f!j3Uq>76 zMv2Zs6u{}w!FH;H;qC=HyB)B1v|klq8e%QgW{kj z-(>2ulgiYh!I}xKS?x|0h{`M4ryMH3Hol%@3<3ao^TE%}+=t_dw8CH42K*Yd?SG;U z9%i+>s9i}O(|%^gJU%FYkIz@%jDC4;Z%c@>J7eSc?$f&0ZvEWW7!ww~?YLb_abU-L z7G)Po`wujd?ZiBIqgMyJDFg=edL?18yJT0IL*d!=(_=A>y>vlqYSo2k7EGP^T(Q85 zpz~Awj)fAeO`rHAPkAHRyV=rwk8EJrW&})YJq8vFVqs$v(IXJrt z-5!Ue?8hF=ccqrIOBzPeDC^n|XLIc2JQN;C-&MQA{`1*Mzkv@d;1cj?Bsl$!_5lk$ z8?7c8Bn_Yr?yA1=;#(Xn3<1x_e+Ngol&M7qF%KHQ0%~br)dKLNG+h(jV2|JW+KVE# zdj<0NQ;WpzMxP@1j%*w7>dQ>h_(fU4)Z$xt94}Lj|FzL+d>J}cXz1T}Z?II!uk58^KA(q3xIRX`J_*1$y=ygh6jHDn>W*UFVEEV$olhaFU zU_yo*}$^YNeIv}XP{@-l=2hab< z6jIrQ6iMFGr&)`%;&#sf}`x=#K^%6`&y>DR3ZKK0Vi$LFpFpIdt3Tj$nWJL2b=ZElSHx1E) z1Ovw9r*qx?VU1V^FNkL!5>Q!Zq?jbbKV1{TRIpT7;D3|(K_`Fq)B~Qv@ofCS? zeN3Q94(;~G_(pbz@2pmwj-_IYw{Pyijb zk@So&_ZHV#cU=)f<Hqr2;_w_Yq=J-%W}w$nm&GQ~IZ7h((Wm4@&;P7%E?h<9D`jt#~#`VuA56hr=S zp+Ghto?2RHN7^m;1Hx#^9@%&Gsg(YsjP4@QA?mrTX0WX^D;< z*>z#R4T7C)@(!!w3PYjY9kNb^on*EJOeWE^!M3E1zE^MyfO}(r+QRK@=p^4}#+QxN zE2gTPm~y2@!`JmzNfO_|IA~1M~60}B?_t|3t;bIohbam_zV=fu+Z_8q@Ly4f3?PIs#kqkeLmCi@1u z)zRt6U6VA~0qkgNDYJ&Tk;ky$hgdWCmVmA5cm1 z(Q>?{ln%G&vU{I=pxGDShxeaMbo;HQ3^@70mc(c*#A04rDTdE1NBMuQ=)FTMia)Jc@&9m<7l{amk{a(S$&4I z3Qt5etMeO=tEILw6*|+J)5utL%3~go8n=cCGfuX#MZ@)VR3$l}=VabF7}lo8=IOR1 z#r4Gzdj|U7HEaDqxy@m+(e9x|B5%uFuP%arQm;Bn4V1-}JTU75AWet#>F?rE2P0po ze+D0}60Dr%_sh9#)!qjvYV>Q+XWRRVDHoBBZ-@sWJD=@-;ny>Jo!m83_=>5bJFRc) z`9rF%hvY6RAGxik5_k8%eH+TpLO%V>;e&d;X)hgCBzY$m7>~HUEc*Th{RLNgbBn43 zkw=9i*$>*wf2{88{X#OLai4TyPBD8qgakjn1im0! zWJ{{Gmvr}$8f*&X1M)3otB&tj?Kx?{O&QY&!@JpZo=D^*7;bKN-ddyFBErQ~ zP;^z^9)aLLjhwVrFR*Xhxye7RjZ8u9rQEtMw7}Rk1Pk_y2xIFuBRwUxt84FCJ|zfb zfc=dS0D^-T_1S@}fp8gL-4f`{@gVF+p~5L3U{>THN3rWCTok|kEABv1s@bjzMm<0Q z=S(z*qEYP3{1h4J=`~{Z!`}$?9pd~+$(-;MYISqm^3mB9z`OeSs=B*W_<%Drz_XLT z(%UJIt~1rSW?6iA(fRt(ruWE?`<>O!pA>0;Z$0ay`Dx9)d3^3WgheEsB^mu|=j_hX zxw%{7?eoYeLh(S%+azG&)7~Dhx@rk-F`TY@i*MgiT)1SsDvE$6;^Mc>`pMfDeWxAz z-`@_xS)k9iDnJC(~n5kh|`{Sw+xf7PJkH+HS)8ImF&Z^#Mnh zQGX+F#t^5Bqe8>$J)Md?^*(Jsc!^!b$&#m;MDMP4?NWNNP@{a2JL% zb{Lbmc_7&IS8kL@>T}5--!=Xw0#p3%J5iSd#%|9+)cY644o1epC1XB)Okj*qa1|S~ z5#)Vl=G)QC%FU`|@D4HQ!F_h|r-A;Qxw#yDtpe&;{n4r^etZo2r5xHnbYq&4o}|$D zwarcZT7K!)H45bRGhwdn>hGHsOz9%?GV6}xR(B*oXl+*LDcGkrgvZkn&{Z@eS4f0N znxhIt{S@mhp8BR#)6C02YC^%LycAr6AYpmtAwHd1E56L?XR0vrJit#9e5dwUfT*pI z7Z+yz3*~_}Rvd$zPRqDQ*6C0Ad9q39AbdW$6hPfACj50&X+3kt1|9h>Sbr1T1NWgX272-m$n1d|C1-k6DB2ryf}S_h z9Lk}7dXI5tEcYDsy(?2}t~nQ)j>B*{4^;0ReE#< z{+b9WZ64HCo(o0|ztKpMkCgxCPx8;;AHRIX4&C_^MVAnEh)B# zOlAKGBAu=ia#TF*H0=11T?b>6jEz`&vI|0hX2=Ig*)OcC@=x@$(g>Up_(y5-sRLvK z-{?EA2}tBq<+2+WQ2wE99_8O0HzRBBgO-O%umNx0vqRb5Jg4jbG#jB?A{uDbUl=sM z&CoZD*yJ$}P*s^!)BX^m`X^z_#JtNZzMZLSlH6bU*ZJq062HikDju;>I(`W3&z>24 zZ8WGfg*m&Fp`DLlTC7ADWLiBW3RPAIO{Sf=-|#(kp}r|>yI@xhGYAm7b#t;TF|K*> z6%P?$msR-bzWrcClIHW`?P4f-=S5~J&-7xgQ@h9ZBL2H)Jwc)M4c>KGqIt|kdjWzI zD^CxWA1!{hm8-NN9{ivy+^T|rM_M;YH|944$cG$nyu+m3OS+!fj01|(@KD^KthcY9 z!DQLB-X*!+8|6N&-Xgv<8O4UMda*7vo&}gxi0#&$=4@yy^Z&xAXB)2&)A3|NOphz~ zD{Y|Ax;30uBG^mPppD7Bd15fFK}R~G13mFdciO!tm0=Z@bdm80r0rr8G(9zsdgKZW_6@pt;bD$Zyvb! zl38FX7>TrfUim#R=tl8h{?MQ0N+>H$%`2qr)mLMB2|67ggIDKnui`CuDX2cG#6(0y zk$&#kGr&oje+myumw68|d#~~i$IV@h{~jGKwCX+r!Z1fSJ%62KeR#$rY(dYPvvqEy zRigPzO}6WNceOTr+}q+mA~=8XgH6=PlKJgw5Iqpd63Nbs(ZYP28(IF4MY^K+ zb}>C2tyId#gBqS649PXVeUAFZy1Z8~p(R-fYfrqNg9!-TwYRxgTkly#G2v$fN$+5$vb$~|{3|PM9XGuCTzhZ!$NwrPa zR~>8^J=}sb2PmvCDKDlZ!nHepN25DuZWI-SgegliFoV=Mf9C+!(+>n#r=~Gz+du#(slZ}F-Ywa z+36FhfYQ%5=btqBjyLz?=HLU%JzcCO{(D^q-&Fqa=tAGDJaUgqiDTgTnpHA4|6A{s zzK>yxq{U6MZPvm`BA3Z7I{om!l1_H7Fn*u4YVU0y4xc^hu mKT6^Lk5@DO4*=%HW{PTnrlug3_kNh7?$w>tO