From 483f916b0306ab26597cf36898646847d9541a54 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 3 Nov 2022 14:43:55 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A3=90=E7=9F=B3=E5=88=A0=E9=99=A4=E5=B9=B4?= =?UTF-8?q?=E9=BE=84=E5=AD=97=E6=AE=B5=E5=BC=95=E8=B5=B7=E7=9A=84=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= 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 | 4 ---- .../IcPsTripReportRecordExportExcel.java | 16 ++++------------ .../V0.0.81__alter_ic_trip_report.sql | 3 +++ .../excel/ps_trip_report_import_template.xlsx | Bin 11236 -> 11192 bytes 7 files changed, 7 insertions(+), 29 deletions(-) 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 f40344f6cb..79824e838a 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 @@ -279,11 +279,6 @@ public class IcTripReportRecordDTO implements Serializable { */ @ExcelIgnore private String registeredResidence; - /** - * 年龄【磐石】 - */ - @ExcelIgnore - private int age; /** * 来曹事由【磐石】 */ 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 b088332acf..1f2cf09949 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,10 +209,6 @@ public class IcTripReportFormDTO implements Serializable { */ @NotBlank(message = "户籍地不能为空", groups = {PsAdd.class}) private String registeredResidence; - /** - * 年龄【磐石】 - */ - private int age; /** * 来曹事由【磐石】 */ 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 c261c5acd9..497e0707c6 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,10 +139,6 @@ public class IcTripReportRecordEntity extends BaseEpmetEntity { * 户籍地 【磐石】 */ private String registeredResidence; - /** - * 年龄【磐石】 - */ - private int age; /** * 来曹事由【磐石】 */ 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 04a8a16900..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 @@ -19,10 +19,6 @@ public class IcPsTripReportRecordExcel { @NotBlank(message = "姓名不能为空") private String name; - @ExcelProperty("年龄") - //@NotNull(message = "年龄不能为空") - private Integer age; - @ExcelProperty("证件号") @NotBlank(message = "证件号不能为空") private String idCard; 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 150dfd684d..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 @@ -6,10 +6,8 @@ import com.alibaba.excel.annotation.write.style.HeadStyle; import com.alibaba.excel.enums.poi.FillPatternTypeEnum; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; -import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; -import java.util.Date; /** @@ -25,31 +23,25 @@ public class IcPsTripReportRecordExportExcel implements Serializable { * 姓名 */ @ColumnWidth(12) - @ExcelProperty(value = "姓名", order = 1) + @ExcelProperty(value = "姓名") private String name; - /** - * 年龄【磐石】 - */ - @ColumnWidth(10) - @ExcelProperty(value = "年龄",order = 2) - private int age; /** * 证件号 */ @ColumnWidth(20) - @ExcelProperty(value = "证件号",order = 3) + @ExcelProperty(value = "证件号") private String idCard; /** * 户籍地 【磐石】 */ @ColumnWidth(28) - @ExcelProperty(value = "户籍地（省市县区）",order = 4) + @ExcelProperty(value = "户籍地（省市县区）") private String registeredResidence; /** * 手机号 */ @ColumnWidth(15) - @ExcelProperty(value = "手机号",order = 5) + @ExcelProperty(value = "手机号") private String mobile; /** * 来自地区（格式：省-市-区-街道-社区） diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.81__alter_ic_trip_report.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.81__alter_ic_trip_report.sql index 8d7d62ce97..847f53f326 100644 --- a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.81__alter_ic_trip_report.sql +++ b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.81__alter_ic_trip_report.sql @@ -17,3 +17,6 @@ ADD COLUMN `control_measures` varchar(512) CHARACTER SET utf8mb4 COLLATE utf8mb ADD COLUMN `trip_data_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '行程记录类型，字典表(trip_data_type)【磐石】' AFTER `control_measures`; +ALTER TABLE `ic_trip_report_record` +DROP COLUMN `age`; + diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/ps_trip_report_import_template.xlsx b/epmet-user/epmet-user-server/src/main/resources/excel/ps_trip_report_import_template.xlsx index 5566dc466db856edb40bf99499b2940f50295831..186dee0bf753fba81f65cebf36e84a3ef9374e85 100644 GIT binary patch delta 5091 zcmY*dWmptUxCL2|mTp)&rMp?W8|m))q#G6%SOg?w1(ueSMmiJ_Sh^*pkyuhfLi*~> z@6NAzX3m`Vop%2}ceX_tlxc0X5;3#PW6La# zBFwho$l*Tb$Q0rpj#qLwJhjM{@Ezkt4uVD!2MsD8aU?k6dS&LRCUn!@X6`KNMf~H3 zjlwpL44>0pJFj8hm!ajYudQZyMi|s(Y=>K^NP=Em#*vHN5 z(U4a}X`%|##nOvO%f$mqChnptLuwbwuMuDdYw(fcWf;ZmWa?h8_F;XaqjPEv#c-=K zKemzmFA~bm4tDW9Ikua{?<#aja#VdydL!^nX|uW&S+u7_TML?l<2U_WLke0X)f}!h z@O(F$QJT@-U}bk>hN8DF!2{@*%)>&%QEr@^9HZM3A`r}JiQy*%o}QaiEh}5;IWJkh=ZP0rQr_(H57r#yGVRZY3xOx5bj(hdo~ z<9PT~^I9~XrUm(-K`nxIi_&>eC&hu+=6Y(eGurG7G+~ZIqh}hCiW9Ic7Xp5rBoLTL z*T5y@pW|Wt6#BK9NR8$lfGn~hMxLdOAm{Mq@}6T@gvfADMw5B{o<0zyHIws zD)$(J;^loL#_`+Z{+Hxu(YEVzQlr^BF*gqm?C%m?4uaR)u4w#7+4H^^XH&JZQQTXF zKB4@*&RDL|L;I-!6ckq&0UjAxC*_9-Nw@LR3Bk<-bBwHla*R=yX-RsEQE8TXXEp*= zBc4{=3H$RwO)K3UL&#w;?}LbC1+aKhTV9?a=WFlFaxV%Gd)cS8Uw5JrbX``;g=dZ{wm(0(?8>HR9_@k+4q%IKsi6l(Ax5#z62D5^eY$Jkn){}?0e7XS6|OE8!o^VT zqtH+TZ#odU2>U-dsf>DtMJYjsND;;uR*m?alA9EC-lgLlR zcs*_KG;pMJn@}h$!8v!6AlpgZ(U&C%!|NGOny)9K!fi8lJ1aOl;XYBfPN_(I7I$77 zonc#`JTE8VfF!MQ_4eFGWQrZG|E)jVVJb3+yWP#d#&XG!P=qqZs^iqt^1)QBq_QBaG%Sa*cF+G8fg9eKQrmZmrK zp2uJf^ld47y&;BgOiU1qZRvWloa-uVn9-Aqb4ypo$-xfxm7miWXHp%Qd^V`#P$3RD z=AWye#j`e*Nte)XHvcF_PfZzn0Ae$aw0vHY*7BomKw_NZ*4ig5bok(CYJrxAIjddT z;zL^~ddR6&X4y-lJy5)M^+8tm+Le)tUO*eG82=--j(JMgVdQ`VsJ6Z)qWevmqUObp z(x!n38e#!_A?sLH>E|{Yo-b)o>QRE2LBC~>{4&!g@8)gCRnc_b@j(}za-u|hTbcjb z<_$~U;^{rXWVV77yOx-QgU!x2`e^b_p`nM-=&;b>)aB6jH<`_{qyiekKe`yp4E_9>exxF~sk_F$JNsR16pk65j zYnJ6hpRG`Z9vrLm1}-; z1*$90O7+5Q6@R}uckOrK+~HaZkd8Ik(fqnw?x1vyewBN9wI)!N@DiXCME_bUX!dJ# zWQfBZOPamJjX5*DPi73ChQpZC1~8GIJY9m2BP=f()q^h~7faBz`yJH-&fhnx@hc%6 z2KHT8se>RE3W@|5Y>%8CZ25Y5h%}sc>gj6(=-r2E=CpHi_fXr>43_0I&*4`Elvxe2 zx<#DR-rqi!$OS}kQyul$<+OnG=slN?i?|b7miu{H9t64A9?3(Y+o?ZR>Y34Ap4;gU zI?GIS20{aQ+Hcp2^Q)x%pvAQd)&`drAfw!fWy#~K$@y8>)_F<>*vN5v`N3fM@^&Ko zc9F8;qy~H~S(UkV+OxOf9fmG_q2hkfe)6I^EMitBFyx9IiI*$$ICBP-ULKs>G>s6V zkhpT4Do5@n$=mX;H+~KmKI);Gn2B51_gkLGSm@dl50^c1*lTM^xk;J$9R04ND`ctv z2~O|0=Qlr#x9Y|XF2A{)v)O*N&`zVZ!qpYtz2Bz29H?!JVsw**yv+7oj$Pb|jW6&o zL*Ri}AG?s!HhD(V)scECAT|%f&&Pp436??h(3zNr2&yr(R=A=}e*d;~fu1s#DuW}c7VGBN?>>A3`fv_%JaEvfY z&ws!SGirbPnffLrYslsmKk*D6yiHlNIMv(=!eAF7WF^EaVhPw^Hs@B@+zdDWdcE)ps@O#RbL*80TJYT`-PYD}^|tD+BR7uC}MS zMbKJ+WZtBK3LepKyLx_a*y$2{xBsyjVk`WVnna){!lcf>2r?}u0<~Z^Xr&5(0xc`q)Gartn^vRvOq$G@qqJ^grGea7a z1D4>|(-cRPV6)6LEC=zX{?l76i(v%AufMSMp4p)3)f}*U58lK)CD|wsWf?zm4fq-rKa6E1{$3Xl3iQT4X<>M#MJR?JRpBH~NZrgDX=q}Fm#f>@$=6*t6#xI{CR7Gj90&oaaVy25PGNu>fE5T;eHMHBGr zGjP6y_QCtY!xU37K-mCs)*&z!$c)gAPx9kE?#ar;WKK0YQ4C_b6w_2KS2fiW@*b-} zAr%``3HZ)3LYOE56)2hle&!0Z}l9x_;MFyj~fKu9YbHp0)=_3a=uTcc|q6g-I8qe7- zx7==i(yn$CyHnqG0>M7pcS*h9G80cst7&xW8BcV6+DMJ!AJt=!BEVneQim`-V#hw z3^Qo2mmOSz;vA_6Z}*8F?4>OM#i$W-;x^&N3gh7*;o?oU#Q9S#Qby)57Z{@&QEhX|nun$M z4)w;>BjUj#_O1ytxSlg4K-d3Hie;u3H5lKsLI`1!TUn#nq()eY*M!@=X(Ai<$&e0` zeLl`LKGhP>#~~jZl~Ks|o^qEULtWkrkjLr~hxsQX3KvT3DmYmJu(7!`jlf}Oro`xt z5Qlu}AFz<2htr|@4*g92EVM<#;m@|fI8C^YbDB6i1>Z;X)iBpwS2y_kI_zD9|EGR< zmmj}(=wo4GKNH>SJsX=!e#65d@BfF3$8h{F7jWQ0*MrDXKjz>Ww}K`6wK2`W&}U}{ZY{Nbw^0}k2F`H& z*Tkm!F(ZGtOt}qQ;n-GGV`P8UjO9$sYUUNDs~M^jR^m6|&K+mX%M^WU(j6+`=1Wib zz!=tehwGVw`JT~`-ldf|D53S9d-?cBLV~%4qC>mqt+k&2#Bp+%QN88D=M}%>$LI~x zv%Qti)mPx>p#c)|EDQDArQL%PW0VB^`kj1KsLLiS;Ulb=6Ip5SyV^XKC=~gzjHhDyp!t5X9}=`*pzPa=&z<^CXNFJXPVgXkn_b8);*pIjn)PytpkjTSb?yME zNu=!JUB&OJh0E8de^nKLRrwy-=))j{3U2aOP*~o4{@I6KOz#WM@OLtgZ>fr(A3|pW zs%WvTSdr2?`M#?4i&YZ0&kh}mHQuuVls*JAm8@m#Id;CS)7zGsfy^aAiDphXn;Z8=x4{Y+AxwQ2WgX?M~^)&SV`KWO|PcPDu?-Lp;+0q zc5+XPCrso-7y?dMf0Z)%P+mW~S}XRUk|5UyXH2xEGB}ED@E?C+-w4u{FYoAo;?LFS z>T4i9GkH%>Tl{{WSiq@Dl( delta 5192 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