From 97a57f60bc1a51e7ed1e3cc2dce8acab56a7593a Mon Sep 17 00:00:00 2001
From: zhaocheng <578322713@qq.com>
Date: Wed, 14 Jun 2023 17:34:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=A8=A1=E6=9D=BF=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controller/Repeat.php        |   3 +--
 extend/service/CarInfoHandle.php |   6 ++++++
 public/static/tpl.xlsx           | Bin 8776 -> 8891 bytes
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/controller/Repeat.php b/app/controller/Repeat.php
index bb90578..a884cb3 100644
--- a/app/controller/Repeat.php
+++ b/app/controller/Repeat.php
@@ -158,8 +158,7 @@ class Repeat extends BaseController
         Db::startTrans();
         try {
             Db::query("insert into car_info_t( `id`, `register_date`, `car_man`, `car_number`, `car_phone`, `car_frame_no`, `car_no`, `engine_no`, `factory_model`, `purchase_price`, `company`, `insurer1_date`, `insurer2_date`, `id_man`, `id_number`, `id_phone`, `insured_man`, `insured_number`, `insured_phone`, `link_man_1`, `link_phone_1`, `link_man_2`, `link_phone_2`, `link_man_3`, `link_phone_3`, `is_delete`, `source`, `is_export_bhx`, `is_export_bmc`, `is_export_failed`, `is_export_none_bmc`, `is_update_bhx`, `create_timestamp`, `update_timestamp`, `is_export_failed_bmc`, `tag`) 
-select `id`, `register_date`, `car_man`, `car_number`, `car_phone`, `car_frame_no`, `car_no`, `engine_no`, `factory_model`, `purchase_price`, `company`, `insurer1_date`, `insurer2_date`, `id_man`, `id_number`, `id_phone`, `insured_man`, `insured_number`, `insured_phone`, `link_man_1`, `link_phone_1`, `link_man_2`, `link_phone_2`, `link_man_3`, `link_phone_3`, `is_delete`, `source`, `is_export_bhx`, `is_export_bmc`, `is_export_failed`, `is_export_none_bmc`, `is_update_bhx`, `create_timestamp`, `update_timestamp`, `is_export_failed_bmc`, `tag` from repeat_data_t where repeat_id=:id;",
-                ['id' => $id]);
+select `id`, `register_date`, `car_man`, `car_number`, `car_phone`, `car_frame_no`, `car_no`, `engine_no`, `factory_model`, `purchase_price`, `company`, `insurer1_date`, `insurer2_date`, `id_man`, `id_number`, `id_phone`, `insured_man`, `insured_number`, `insured_phone`, `link_man_1`, `link_phone_1`, `link_man_2`, `link_phone_2`, `link_man_3`, `link_phone_3`, `is_delete`, `source`, `is_export_bhx`, `is_export_bmc`, `is_export_failed`, `is_export_none_bmc`, `is_update_bhx`, `create_timestamp`, `update_timestamp`, `is_export_failed_bmc`, `tag` from repeat_data_t where repeat_id=:id;", ['id' => $id]);
             Db::table('repeat_data_t')->where('repeat_id', $id)->delete();
             Db::commit();
         } catch (\Exception $e) {
diff --git a/extend/service/CarInfoHandle.php b/extend/service/CarInfoHandle.php
index 2c71d92..5aa1345 100644
--- a/extend/service/CarInfoHandle.php
+++ b/extend/service/CarInfoHandle.php
@@ -567,6 +567,12 @@ class CarInfoHandle
                     'factory_model' => trim(trim($worksheet->getCellByColumnAndRow(9, $row)->getValue(), '"')),
                     'purchase_price' => trim(trim($worksheet->getCellByColumnAndRow(10, $row)->getValue(), '"')),
                     'tag' => trim(trim($worksheet->getCellByColumnAndRow(11, $row)->getValue(), '"')),
+                    'insurer2_date' => trim(trim($worksheet->getCellByColumnAndRow(12, $row)->getValue(), '"')),
+                    'insurer1_date' => trim(trim($worksheet->getCellByColumnAndRow(13, $row)->getValue(), '"')),
+                    'link_man_1' => trim(trim($worksheet->getCellByColumnAndRow(14, $row)->getValue(), '"')),
+                    'link_phone_1' => trim(trim($worksheet->getCellByColumnAndRow(15, $row)->getValue(), '"')),
+                    'link_man_2' => trim(trim($worksheet->getCellByColumnAndRow(16, $row)->getValue(), '"')),
+                    'link_phone_2' => trim(trim($worksheet->getCellByColumnAndRow(17, $row)->getValue(), '"')),
                     'source' => $id,
                     'create_timestamp' => $now,
                     'update_timestamp' => $now
diff --git a/public/static/tpl.xlsx b/public/static/tpl.xlsx
index 0e1cce97dd3dfa79f5b13aedc539bd40f0ce555d..18d5fe2aafb14d4e6f6b09dc6e9690e21f1e0d70 100644
GIT binary patch
delta 2310
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

delta 2171
zcmZ8ic{J2(AD^*Zl66K6GcjZzF}kj3G@-27LX%xL1|gF%wxS_qU&hbPG9pYV#@I3~
z@(xB}%E|ItVzNbzT{mUB@lNkO=Y8+J&pF@ckLP^P_j}Ig`7Es#J!c#8z~o19_gRKu
z5Xejb1d;)PK>h?jCnDimgq|OPh}Vs|8k#~Guw|p6x7UQHD(3!WKj`qzd?Jy<K#1a?
zYvx3z9MwQ|fPrmuA01A=RXDT%WgerkO{_2B3DRply^$r-(8NP^^sh`)$6@WVs-9Se
z8o@(Cc(J1b9~(;%XOqu{%yckC==B{IiL@h-2d0=c3HDg}5zW>7{(fcdV_djWPE@AE
zVM3g^k=mRBYTb+Y_A?kpO;59=K_P=LCIUd#i4|bsaf}@#gVm}?Cz5?&`OOb%;t8F0
zRjbCH8Gc4Bn~bsy?@={x!yqAYhVRH`F8g74om8uA0*6h$sj&LTNjlLb>BYipM;UY0
z2kmYa+bhE?S4^Cnl+~HE{4m<Kta+j}IE7O{yJGh-{Q1M6R}5#%o{${Jy3aR_!NWo8
zdf_rI&I9sP;mc8$CSXp-?x*TPU#D||LQp=SqM%fVSyNo^x|TX0W=THGkiWnTND0Eo
z-d|(`Yb}lqyTLH@21ayxqnrUnH45c76|d!eB5Dke!A_PdvG#8){2s|`tLlH?a{P=c
zXilv6!ccGg?Xo8!r!C7GTS6CoY$z1~I;ePRk_NA{thlO?^+|frpLc2HY5UlE5-b?<
zw1q^)EmSbW{(XZ!&irso3oBvnVFxA$6gj@C=}=-_<8^u>R(vVhvw@iAi89M-YIXTK
zFe=FmIll3#GQUw&r5tCo070gdC--twVF`yGduh}z9*O;6Y)8>p>bStti_VFBoOv@&
zANOe<aY+tm;4kyc&*C>|yCxJw%L+8jhmr$b;v%=I?PFSEW3H3bsOb}z7vVbr8XHo^
z2V}mAiE*t2&DolJeIn(Kk+J@J;5-GuUC2yQ+;Ft_EFU^qVGsxg0y0$;$k_#+1S%TZ
zJ*BaNal5HksN1G0P^0TU5=C{bYc;`ql%|gty>kfKT!=oX{L7*uN3iMb+r4s>|3ydJ
z{8KO#2^cc4)l9s-<ZLiey7xyT_8G0~<Vb<tq6l&4;2j^iwJH2v!(67wH6b|#>d^SJ
zD4Fg%qxXukN#YXuw(yq-a#)`svkr{=R#=eb2+Wz_><mawZbeUmcr~&JT*(^LAWT{x
zS<K$Lddve;bLuz3AWC8hJ*r=Z>>4)BxxTP`A<p(%RUN~tt0g0~-zU&G_Y+_uM^@V?
zzpNFY7`-BP;7JkJ(t4(Bm(-om-o_(&AC9ccj)_Q9(R8{lljKQWr4I$aL{wRfL{Cq4
zS>O)PD+#Cco#r=AddJyljqgHOLL@^sNVlOBG7+O0?y9+6+j4!{t~04Tseajgt&~+T
z6oEK;8VRpcYMVc#r#cxye!uI-O+Te$#wo3Iyu805b8z)T)xOFN_uNMMF6H?NT5`q;
z%`<r0vw-ocsGq#jvE?0o0?BMSv!qk9O?!GrGm%i4TpnpcAA{)j$45(BSG}GtcIn*h
z%--=)S0wF7$D3uo;pI#>Z0mS@Je@*HEa7oH>j$#T+_-C*s+pTUGws;hI(M7!Jr32O
za!pb$-?aRjwLDXoLpj*g<v325d6Yi>iE?XcQ)^ydwe_15-`xr~?xXc_5z9MHlXtGp
zz<>4}a8s%1JZD1+w@jBG$Ap%K?Mj9|W}B@Q{<0Se!sMNec{(_r4G*1dA88xd+}JvS
z;xkOK8UK@&G&!bQlnm!9w1ZzibQ=?@7ZLO;5%2FpB3=m#jQHV&S1EnAY*VP^=B+jK
zn@NX7^RxLR<t?Edkg`10^f=^a$N>Igi}oQi=>59)ZW;X}Df`M;`vCRanY4TT{;@3f
zGo`{1W=^FvVm4X0z^&mO8rj};-^X<P5O;$7-hCoDAv`t4!CH(ttsl^UuV)lxh2Qh;
z)Zs-a5|q2Vl&mB}`e6|JZ&zfEy>e~fjYb_g-Emp5(8@^mm?;G!E$USw%eX<6rl}fP
zfBxosiK^3JA6C1N!ebSuO{nkK+;j;)?)s$oMQmQuE*|$0m_1cX%XFZ$jnJJh>bcBc
zewe5bt?i7ZRGqYmemEK1XE?xuR=XH)(SP-jt!kc^jQvhC+ct68e$k^{c;~&9J`07t
zPUK!_t|!A64v$U!-S8f4K8ONz<q_obuN~NE=@&;oON~rE8rm>>wCHM{z!Uyz`ubfL
z^;L~;lehDpV)uD1D~F}x_ec8Z7nhoGbK>!NBWPIe0c21xie`)+Yh!VbB_#J`PjeLf
z*R#PR!z+C?&3ju{Rw$}q2<)-`bG7>wVduY~n<VWQ4Msu~Asas_lv?SUXTr!WmH6{-
z9(^2azt^y_KhR)*G$gL+t4&pUQkvCEza}M*1p(JuOKq-Hx@h!j_R`!gJwa1(wmDBm
zILYP~la10BoON9Nta@P)YnLG#^c7BAg7Ah`)uLuNn|Y)`(TR9#8BY<sad9;u!9{V-
zz~yyTGb;<L$f~~|$#-RR`Ktp1YK6sPs*n$JL0Us>LYGm!Z&Wa2u}&ktH)&{rUOJ!t
zy59A4o<eh)f~k-IfB-m(rv-N90db|{U?l*n1c?1FqJeQGL-;?Fgilov7=+~Cp8yon
z6pRHzk!Y|La2IJP5C#Xn!x1Q_b6^4Je@Xpk82yv#{~zH6Ae7C(Mu3m<Nw6?btZWF@
z0s58I5kG!YjW3LM{F3_7&Od)HeFOt!RWM**z(GYB{&$=HYg;Cep@I@YDgJo-4<1U^
AUjP6A