From 8a11f0d8439c9d2f9e8b4b4d3b3d444d5ae47a9b Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Fri, 4 Nov 2022 16:13:31 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=BE=E5=BC=80=E6=B5=8B=E5=B0=8F=E5=AF=A8?= =?UTF-8?q?=E5=AD=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../IcTripReportRecordController.java | 5 +++-- .../excel/IcPsTripReportRecordExcel.java | 2 +- .../IcPsTripReportRecordExportExcel.java | 4 ++-- .../impl/IcTripReportRecordServiceImpl.java | 6 ++---- .../excel/ps_trip_report_import_template.xlsx | Bin 10357 -> 10352 bytes 5 files changed, 8 insertions(+), 9 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java index b6b2ad9856..354c3be87c 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java @@ -9,6 +9,7 @@ import com.epmet.commons.tools.aop.NoRepeatSubmit; import com.epmet.commons.tools.constant.AppClientConstant; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.constant.ServiceConstant; +import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.dto.form.PageFormDTO; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.EpmetException; @@ -118,7 +119,7 @@ public class IcTripReportRecordController implements ResultDataResolver { ValidatorUtils.validateEntity(formDTO,IcTripReportFormDTO.IcResiInternalGroup.class); } //磐石客户 - if("45687aa479955f9d06204d415238f7cc".equals(formDTO.getCustomerId())){ + if(StrConstant.PS_CUSTOMER_ID.equals(formDTO.getCustomerId())){ ValidatorUtils.validateEntity(formDTO,IcTripReportFormDTO.PsAdd.class); }else { ValidatorUtils.validateEntity(formDTO,IcTripReportFormDTO.XzzAdd.class); @@ -182,7 +183,7 @@ public class IcTripReportRecordController implements ResultDataResolver { } } //磐石客户 - if("45687aa479955f9d06204d415238f7cc".equals(formDTO.getCustomerId())){ + if(StrConstant.PS_CUSTOMER_ID.equals(formDTO.getCustomerId())){ ValidatorUtils.validateEntity(formDTO,IcTripReportFormDTO.PsAdd.class); }else { ValidatorUtils.validateEntity(formDTO,IcTripReportFormDTO.XzzAdd.class); 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 c0841b4a29..4410c61293 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 @@ -38,7 +38,7 @@ public class IcPsTripReportRecordExcel { @NotBlank(message = "来自地区详细地址不能为空") private String sourceDetailAddress; - @ExcelProperty("在曹事由（100字以内）") + @ExcelProperty("来曹事由（100字以内）") @NotBlank(message = "来曹事由不能为空") @Length(max = 500,message = "来曹事由不能超过100字") private String describeContent; 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 bfdd634a1f..73af0b78d0 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 @@ -56,10 +56,10 @@ public class IcPsTripReportRecordExportExcel implements Serializable { @ExcelProperty(value = "来自地区详细地址",order = 7) private String sourceDetailAddress; /** - * 在曹事由（100字以内）【磐石】 + * 来曹事由（100字以内）【磐石】 */ @ColumnWidth(25) - @ExcelProperty(value = "在曹事由（100字以内）",order = 8) + @ExcelProperty(value = "来曹事由（100字以内）",order = 8) private String describeContent; /** * 48小时核酸检测 0:阴性 1:阳性 -中国字 diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java index 4debd80010..00d805abad 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java @@ -207,8 +207,7 @@ public class IcTripReportRecordServiceImpl extends BaseServiceImpl!zh*l-nU_5N#Lb7 zJ{M^x327|^^O+YG1%5csNqRUJX&Bb-zW}oc4Jir*iU4Y`l#@0WHh+`UB$?8GYt|<1 zk~X~d5+||d_=4>=Ew5Ij4GF{q5*md~2x(9l6CebPY181#kaqnRJm>Q{@txNt(oo;z z&QE^#{C^(bn+XTi7-V^1k89 zmx`~ymLFi}y4y7jPk#aqwp)<9p4Zn>DYw}*db*p$eZz)-+Suvo9y~gol-qXtHctE5{dEGFuqQh zmEl+#q`E#6B2{mC=B}}5Sb$ztz<=-idcYQxNQGLA@0ms`zPmOZsb#eF9m`w9)_Z2l z>lWmBnbB%^uxgl{u2+y1H3=FwcU%wm7!46AO>6;6_?3DliK{I2^gY1K(ja8#di%sk z-!&mp4Un(~NPi`r%w@q5Av};5=*7fQL9@YeSlMxuob)i@d@W%O4kLw=O--Y+G66h0 zf@hLQnN%7iwl57X>xpN5s4_A4cD=~+HPP-FgCvSD6IPc9m88GmA_LN-i+sa(L42f>ChK*`L+ z@kfw#)Q4l~r%uCwi zH%bIBCu}vOU(#0Qcg-c;(~Efr4r2q3g0l0%CEWl5kc3zQXsa#^6P3Y4-yxgt>31j@QVsR)#+K-mx| zn*!ykK&c6ox!RuSTEXhdP&>hvI)xv3A=CoV9;$P$H%-(n1ei{DZVgp1!YgOFB@a?0HN9K4_T#9m>jF?F~o zUygxrQC^LKa8WMDK)5Jhp%8Mf3!|)XQC<_-s9ccOV<4j#`){*K41^0pl|jgznFMZw z5k|_XTvRq=AY4?gG6-W^;|X=1utf=Hx_@PxKLjINn0GX->EuN306oL$_!E{ZHSvxO z-bV0752>TU&mT`x;U6#*^}8_0dS(-btTwhiGQN@KyWfXd$i|D<4yIu`M%gWsjF!4Z zE5?Jln9Xw~B$ZTYTa`8xt)WOIMS~U!zHZlcEF)lO?7__Il35hSx4kwI26puw6Ms9V zw@BUlYX=ZU_ySi0gnYnUi&>M0I0prd(fG zFICrO;NZoJ`4r;}R~%m{|27q45h#sg$js1+qCrP~xn}uzw$U0~O`t z!(S7_&yM71hvnR~Yp7ZyPP>zP2Y=cel>(l+CCJ-vI2Wb4;o zoE$w(41c>h{N+*PVR-QU@X22%cRxS=^ApJHPfzdNcz$$1A!i%IRU&!iL&;Zkr(;6@ zu#7g`7Sc)bt;wNZQR#z+`+i%vhCTS2>TkR7x!Qo6Q<{9jY-8-P2O;uZBK!be{0{&C z|NjF3P)h>@6aWSQ2mk;8Appk_Z{bO^10E*tv$~lqLj4pm`&t-WKSkTE*8W za-M0y>PAC>4&czTyu8S{p}ev1WE%t4OK?#jX-By!(9U~9F?M_hin$~tbSQ2btC$Z* zf4jwo@ej5IoDs6X3Op0cGu#1VGZN7eDfoyqpSJD+f@7#bf%XokNs5269;|YIHuRNA zQb~U>VWy+*lr8vB9MgLz$6(vGNjvK`f`5wN){oEqsIk=Dt~j7F7o2hn%r~~Id5$N? zZgn+tejT>Fks$64<*iUsOXqEu&++d-LcsO*0~16PeCS|*s=UtbAF359Gm>R-N@B98 z$c$dyP(t3j_s{w}zu`h1E&e5@F_~B7nx+|@Pl+c$*?XV=iSiq>Y#>1f1Zy=#8I!Rl zx&?{=YOs`(a3?_<#}RMgNdW)=U;+RD5dZ)H0000000000008Zi%qKnpZIcTqJpnV5 NNhl@;nI!-K008mN0YCr% delta 2182 zcmV;12zmGLQ1wu-0SW}_{NVbt1q#jrHA97?{-BF%=_Ux59V6V3A4ahh@V*TbO9C&w z@wrGlNl0rUn9sbhDDcC1PSV4LP&$cm;fPQOq&K@hP2DK;5lE;iSN8Fk%syv zcYgA_=l}Eg9xqGLdM7JOuBY2g-NLq!lMf76 zzLbCcwZ%SmuDcz>@P8!WV7ocF<9R(Tk#HLwqpQ1d+%s(Wr-hxa?!lwePPjeC(3}3D zu9Z-d$#kNto3>0jXwEb|aI0lDjAh)|?Haa6nK*`}d!WDDF?+6@Uu>H2A2CRBj8;xA zAg!*-iTt83xo#SLcVaJj`n4^?G8&%I1P92{2N-v^8oC9>W`9!?k5yucMTx}tYZzZA z%*t>q2~u6336ZKdJaf+|8Wy0JRPf*Xz8VLBQ=edzH50!Y`teT zy-rSEkQuFp`>Tf8?sz#_QRAR-W7qX?m(dWB(!dt5gkPy^lDNuJSKkM`EcF9+u6IC; z^tB3*pstUEb$^6ZlJRT?91*}r@8az7AnT|PC(=)yg#pVyG?9SwGx(5YAeug-Vb` zX*D}e1TZIPHKbqCR_1rjW!=;Biw^Ef@U8&qZcis~9;6WsNI#s1mG6eo1_``C@PGvb z0Lg1&FMpq0OzaT}BgoPSLOUWkR1_%70%b*@lmyCUfwC%4$^zwzKv@$g>jI@BP^toD zL!fL5l&b=zCQ!Bn%CZ6a5=4A&f0ixcC*>nF$CNzvT!B7rzw-A*~u^mDEBC-p_numl$e7 z78m8q5fCoQs}T?`%H;?M7v(DyLhf}zloc+@Ya$z!3-WpdWE^AvZB~hZa6zat2)Q$p zz-=(XSUHu8%4P(Fi^^37VQgzWVT&hhQ-8vlZrR}v!N?Zm9ZhRGIng^n*KpeYgyl*N zylaEE5xmg@>Ui+;$CE_x2Mk5M4h*uM*?=Ldg>8?FZ>0Gi^k5dUaS_|2X_$^tcGD!I zrEbxR@n9}y^IQQ*1y$Nnr42=^D^fwxpoN03TeV%w7%?>VVdizoEDGb>ev1eLyMKC) zi5=5Bpjx+J=G(ROe4)BLSKQdCZkJ1Q7m#)V#R}-++l=yNZKd=^H07 zTTAPO>e?I}ym)aj!8pSe$5+a~O+{D)O5+GJGqj>;(2-wm8FZJiW%FbvW(rK2Mh&Sb zylIgX(KLX)LeuK1w4`e55JOdiG=F`$jnF8^HY%AH*hs>s#FkXv#z=~2BfwsvjTKdc zUhs0$plgjygZU;pd>0gAT17A|k|LT0u-Qy&!kxdaTPCbfMM1fzLA~%_ql&Xk*OMjP zvT%RN((UX1h0*Qce%bErdKD-}y$zKPaU{eQ$H7jBNWaz8RBa0-=d-CyT7Rk`*pIz| z^76^iud%^r$8u0%2r4VA&Ht($bn+lLpw95&(eVE5;a3l0|33bi?VjBp?M}Y@mhR3? zT}Z&n$eCfi?|*Z0?@4U%@sH1+9mh@&ACl$yM?Vc8{2d$IeDv?rJLjfyS=GvsDj)rE za^r{C@aT6~&P}_zs@0>kJAb`*IJk8)MwajH#0HN)Bu|6e|G;u?x^5zEGfLOt-CHDE zzy9L%_-SnL+s(l*k3tWF!|w-A{yM$;`N^N3Kwf`3ym#aI@gaqrZ46h5uxPhkiw+4<7FMZQ&aB;A^VC?ZD@118z=9@(Htru_VVH$ajh019<*F z00030{{sL}O9KQH00saE0000X05RGgYD=;nCjozJ!ypuf?+5!2!TUs$c3me)%0B4T z3WH^A>`wHwl|>`!miFJzq-~b6!N8m2d3}65m@js!j=sP;+2{hL2|*EP-Uz8T1$wEL z@f=0YGc8!%XeiJg99oo@7dbbSHx{03W59X|E(#>=C^rS#dT%Jkj&DIRmxP24&2?iH z^PzvV8*CW=U>m?0Av3JNGr>H=9WXWn5gn0&4@mQA>mDFDh8h%T?{J!=_$TYZD);As zzB5WH>GvkQ>8Lwq3w~%0>7A29ux;Crr$+RNZbUF`fL_7h?-uwJdl-~feXCOfa1nT_Y z`jf0Cx&=g-F2$FVYbQYkG1?w#OOvrD6#?**$0t4ka+3xqJp?!-005IwBNLNaC=dpo IB>(^b04j+Ly8r+H