From 04202b8c1c47fea00ecf9dea9aae97c35406bd66 Mon Sep 17 00:00:00 2001 From: Frane Date: Thu, 19 Aug 2021 18:33:20 +0800 Subject: [PATCH] =?UTF-8?q?20210819=E5=8D=95=E4=BD=8D=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E8=80=83=E5=8B=A4=E6=9C=AA=E7=9F=A5=E4=BA=BA=E5=91=98=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=96=B9=E6=B3=95=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...DB_V2021-08-19-001(数据修正脚本).sql | 56 +++++++++++++++ .../版本日志/SGGLDB_V2021-08-18-001.sql | 6 ++ .../版本日志/SGGLDB_V2021-08-19-001.sql | 39 +++++++++++ .../Door/InOutManHoursItem.aspx.cs | 17 +++-- SGGL/FineUIPro.Web/ErrLog.txt | 65 +----------------- .../File/Excel/Temp/202108181024434903.xls | Bin 0 -> 84480 bytes .../File/Excel/Temp/202108181123056668.xls | Bin 0 -> 47104 bytes .../HSSE/SitePerson/PersonInfo.aspx.cs | 4 +- .../HSSE/SitePerson/PersonInfoEdit.aspx.cs | 8 ++- .../DoorProject/uploadController.cs | 4 +- 10 files changed, 119 insertions(+), 80 deletions(-) create mode 100644 DataBase/初始化及数据迁移/SGGLDB_V2021-08-19-001(数据修正脚本).sql create mode 100644 DataBase/版本日志/SGGLDB_V2021-08-18-001.sql create mode 100644 DataBase/版本日志/SGGLDB_V2021-08-19-001.sql create mode 100644 SGGL/FineUIPro.Web/File/Excel/Temp/202108181024434903.xls create mode 100644 SGGL/FineUIPro.Web/File/Excel/Temp/202108181123056668.xls diff --git a/DataBase/初始化及数据迁移/SGGLDB_V2021-08-19-001(数据修正脚本).sql b/DataBase/初始化及数据迁移/SGGLDB_V2021-08-19-001(数据修正脚本).sql new file mode 100644 index 00000000..156cc3b5 --- /dev/null +++ b/DataBase/初始化及数据迁移/SGGLDB_V2021-08-19-001(数据修正脚本).sql @@ -0,0 +1,56 @@ +select * from SitePerson_Person where ProjectId='7d4cce15-bc9b-4ed4-8b59-2edc8488528b' +and UnitId='1c1cc3ba-8654-4bac-b7e7-b45f4eec0dc9' + +select * from base_project where projectname like '%ɽ%' +select * from Base_Unit where UnitName like '%ʮ%' + +delete from QualityAudit_PersonQuality where PersonId in +(select PersonId from SitePerson_Person +where ProjectId='7d4cce15-bc9b-4ed4-8b59-2edc8488528b' and UnitId='1c1cc3ba-8654-4bac-b7e7-b45f4eec0dc9' +and IdentityCard not in (select IdentityCard from Project_ProjectUser as p + left join Sys_User as u on p.UserId=u.UserId + where p.ProjectId='7d4cce15-bc9b-4ed4-8b59-2edc8488528b' + and p.UnitId='1c1cc3ba-8654-4bac-b7e7-b45f4eec0dc9')) +go +delete from EduTrain_TrainRecordDetail where PersonId in +(select PersonId from SitePerson_Person +where ProjectId='7d4cce15-bc9b-4ed4-8b59-2edc8488528b' and UnitId='1c1cc3ba-8654-4bac-b7e7-b45f4eec0dc9' +and IdentityCard not in (select IdentityCard from Project_ProjectUser as p + left join Sys_User as u on p.UserId=u.UserId + where p.ProjectId='7d4cce15-bc9b-4ed4-8b59-2edc8488528b' + and p.UnitId='1c1cc3ba-8654-4bac-b7e7-b45f4eec0dc9')) +go +delete from EduTrain_TrainRecord +where (select COUNT(*) from EduTrain_TrainRecordDetail where TrainingId =EduTrain_TrainRecord.TrainingId) =0 +and ProjectId='7d4cce15-bc9b-4ed4-8b59-2edc8488528b' and UnitIds like '%1c1cc3ba-8654-4bac-b7e7-b45f4eec0dc9%' +go + +delete from SitePerson_Checking where PersonId in +(select PersonId from SitePerson_Person +where ProjectId='7d4cce15-bc9b-4ed4-8b59-2edc8488528b' and UnitId='1c1cc3ba-8654-4bac-b7e7-b45f4eec0dc9' +and IdentityCard not in (select IdentityCard from Project_ProjectUser as p + left join Sys_User as u on p.UserId=u.UserId + where p.ProjectId='7d4cce15-bc9b-4ed4-8b59-2edc8488528b' + and p.UnitId='1c1cc3ba-8654-4bac-b7e7-b45f4eec0dc9')) +go +delete from SitePerson_PersonInOut where PersonId in +(select PersonId from SitePerson_Person +where ProjectId='7d4cce15-bc9b-4ed4-8b59-2edc8488528b' and UnitId='1c1cc3ba-8654-4bac-b7e7-b45f4eec0dc9' +and IdentityCard not in (select IdentityCard from Project_ProjectUser as p + left join Sys_User as u on p.UserId=u.UserId + where p.ProjectId='7d4cce15-bc9b-4ed4-8b59-2edc8488528b' + and p.UnitId='1c1cc3ba-8654-4bac-b7e7-b45f4eec0dc9')) +go +delete from SitePerson_Person +where ProjectId='7d4cce15-bc9b-4ed4-8b59-2edc8488528b' and UnitId='1c1cc3ba-8654-4bac-b7e7-b45f4eec0dc9' +and IdentityCard not in (select IdentityCard from Project_ProjectUser as p + left join Sys_User as u on p.UserId=u.UserId + where p.ProjectId='7d4cce15-bc9b-4ed4-8b59-2edc8488528b' + and p.UnitId='1c1cc3ba-8654-4bac-b7e7-b45f4eec0dc9') + +delete from SitePerson_Person_Bak +where ProjectId='7d4cce15-bc9b-4ed4-8b59-2edc8488528b' and UnitId='1c1cc3ba-8654-4bac-b7e7-b45f4eec0dc9' +and IdentityCard not in (select IdentityCard from Project_ProjectUser as p + left join Sys_User as u on p.UserId=u.UserId + where p.ProjectId='7d4cce15-bc9b-4ed4-8b59-2edc8488528b' + and p.UnitId='1c1cc3ba-8654-4bac-b7e7-b45f4eec0dc9') \ No newline at end of file diff --git a/DataBase/版本日志/SGGLDB_V2021-08-18-001.sql b/DataBase/版本日志/SGGLDB_V2021-08-18-001.sql new file mode 100644 index 00000000..ed7ca117 --- /dev/null +++ b/DataBase/版本日志/SGGLDB_V2021-08-18-001.sql @@ -0,0 +1,6 @@ +ALTER TABLE SitePerson_Checking ALTER COLUMN IdentityCard NVARCHAR(50) +GO +ALTER TABLE SitePerson_Checking ALTER COLUMN Address NVARCHAR(200) +GO +ALTER TABLE SitePerson_Checking ALTER COLUMN WorkAreaName NVARCHAR(200) +GO \ No newline at end of file diff --git a/DataBase/版本日志/SGGLDB_V2021-08-19-001.sql b/DataBase/版本日志/SGGLDB_V2021-08-19-001.sql new file mode 100644 index 00000000..fafcf0fb --- /dev/null +++ b/DataBase/版本日志/SGGLDB_V2021-08-19-001.sql @@ -0,0 +1,39 @@ + +ALTER PROC [dbo].[spInOutManHoursReport] + @projectId NVARCHAR(50), + @unitId NVARCHAR(max)= NULL, + @postId NVARCHAR(max)= NULL, + @startTime DATETIME = NULL, + @endTime DATETIME = NULL +AS +/*****************λ****************/ +SELECT CAST(NEWID() AS NVARCHAR(100)) AS ID + ,T.ProjectId + ,p.UnitId + ,ISNULL((case when P.UnitId=''then null + else (case when u.ShortUnitName IS NOT NULL THEN u.ShortUnitName ELSE u.UnitName END) end),'δ֪') AS UnitName + ,ISNULL((case when P.UnitId=''then null + else u.UnitName end),'δ֪') AS AllUnitName + ,p.WorkPostId as PostId + ,ISNULL((case when W.WorkPostName=''then null else W.WorkPostName end),'δ֪') AS PostName + ,SUM(ISNULL(ManHours,0)) AS ManHoursSum + ,COUNT(T.NewID) AS ManCountSum + ,(SELECT COUNT(PersonId) FROM SitePerson_Person + WHERE ProjectId = T.ProjectId AND P.UnitId=UnitId AND P.WorkPostId=WorkPostId AND IsUsed=1 AND OutTime IS NOT NULL + group by ProjectId,UnitId,WorkPostId) AS PersonCountSum +FROM dbo.t_d_EmployInOutRecord AS T +LEFT JOIN dbo.SitePerson_Person AS P ON T.ProjectId=P.ProjectId AND T.IDCardNo=P.IdentityCard +LEFT JOIN dbo.Base_Unit AS U ON P.UnitId=U.UnitId +--LEFT JOIN dbo.ProjectData_TeamGroup AS Team ON P.TeamGroupId=Team.TeamGroupId +LEFT JOIN dbo.Base_WorkPost AS W ON P.WorkPostId=W.WorkPostId +WHERE T.ProjectId = @ProjectId +AND (RecordDate >= @startTime OR @startTime IS NULL) +AND (RecordDate <= @endTime OR @endTime IS NULL) +AND (@unitId like '%'+P.UnitId+'%' OR @unitId IS NULL) +AND (@postId like '%'+P.WorkPostId+'%' OR @postId IS NULL) +GROUP BY T.ProjectId,P.UnitId,U.UnitName,u.ShortUnitName,P.WorkPostId,W.WorkPostName + + +GO + + diff --git a/SGGL/FineUIPro.Web/Door/InOutManHoursItem.aspx.cs b/SGGL/FineUIPro.Web/Door/InOutManHoursItem.aspx.cs index d7904a98..f82a9b28 100644 --- a/SGGL/FineUIPro.Web/Door/InOutManHoursItem.aspx.cs +++ b/SGGL/FineUIPro.Web/Door/InOutManHoursItem.aspx.cs @@ -115,11 +115,12 @@ namespace FineUIPro.Web.Door /// private void GetPersonStatistic() { - string strSql = @"SELECT NewID,ProjectId,InstallationName,UnitId,UnitName,EmployNO,EmployName,RecordDate - ,IDCardNo,Nation,PostName,WorkIn1,OffDuty1,WorkIn2,OffDuty2,WorkIn3,OffDuty3,ManHours - ,DepartmentID,DepartName,NationName,PostId,ManOverHours - FROM dbo.t_d_EmployInOutRecord - WHERE ProjectId = @ProjectId "; + string strSql = @"SELECT NewID,T.ProjectId,T.InstallationName,T.UnitId,T.UnitName,T.EmployNO,T.EmployName,T.RecordDate + ,T.IDCardNo,T.Nation,T.PostName,T.WorkIn1,T.OffDuty1,T.WorkIn2,T.OffDuty2,T.WorkIn3,T.OffDuty3,T.ManHours + ,T.DepartmentID,T.DepartName,T.NationName,T.PostId,T.ManOverHours + FROM dbo.t_d_EmployInOutRecord T + LEFT JOIN dbo.SitePerson_Person AS P ON T.ProjectId=P.ProjectId AND T.IDCardNo=P.IdentityCard + WHERE T.ProjectId = @ProjectId "; List listStr = new List { new SqlParameter("@ProjectId", this.ProjectId), @@ -127,8 +128,7 @@ namespace FineUIPro.Web.Door if (this.UnitName == "未知") { - strSql += " AND (UnitName IS NULL OR UnitName='')"; - listStr.Add(new SqlParameter("@UnitName", this.UnitName)); + strSql += " AND P.UnitId IS NULL"; } else { @@ -137,8 +137,7 @@ namespace FineUIPro.Web.Door } if (this.PostName == "未知") { - strSql += " AND (PostName IS NULL OR PostName='')"; - listStr.Add(new SqlParameter("@PostName", this.UnitName)); + strSql += " AND P.WorkPostId IS NULL "; } else { diff --git a/SGGL/FineUIPro.Web/ErrLog.txt b/SGGL/FineUIPro.Web/ErrLog.txt index ffe7dfcb..5f282702 100644 --- a/SGGL/FineUIPro.Web/ErrLog.txt +++ b/SGGL/FineUIPro.Web/ErrLog.txt @@ -1,64 +1 @@ - -错误信息开始=====> -错误类型:HttpException -错误信息:文件“/ZHGL/RealName/LeavePost.aspx”不存在。 -错误堆栈: - 在 System.Web.UI.Util.CheckVirtualFileExists(VirtualPath virtualPath) - 在 System.Web.Compilation.BuildManager.GetVPathBuildResultInternal(VirtualPath virtualPath, Boolean noBuild, Boolean allowCrossApp, Boolean allowBuildInPrecompile, Boolean throwIfNotFound, Boolean ensureIsUpToDate) - 在 System.Web.Compilation.BuildManager.GetVPathBuildResultWithNoAssert(HttpContext context, VirtualPath virtualPath, Boolean noBuild, Boolean allowCrossApp, Boolean allowBuildInPrecompile, Boolean throwIfNotFound, Boolean ensureIsUpToDate) - 在 System.Web.Compilation.BuildManager.GetVirtualPathObjectFactory(VirtualPath virtualPath, HttpContext context, Boolean allowCrossApp, Boolean throwIfNotFound) - 在 System.Web.Compilation.BuildManager.CreateInstanceFromVirtualPath(VirtualPath virtualPath, Type requiredBaseType, HttpContext context, Boolean allowCrossApp) - 在 System.Web.UI.PageHandlerFactory.GetHandlerHelper(HttpContext context, String requestType, VirtualPath virtualPath, String physicalPath) - 在 System.Web.UI.PageHandlerFactory.GetHandler(HttpContext context, String requestType, String virtualPath, String path) - 在 System.Web.HttpApplication.MaterializeHandlerExecutionStep.System.Web.HttpApplication.IExecutionStep.Execute() - 在 System.Web.HttpApplication.ExecuteStepImpl(IExecutionStep step) - 在 System.Web.HttpApplication.ExecuteStep(IExecutionStep step, Boolean& completedSynchronously) -出错时间:08/16/2021 14:45:33 -出错文件:http://localhost:8118/ZHGL/RealName/LeavePost.aspx -IP地址:::1 - -出错时间:08/16/2021 14:45:33 - - -错误信息开始=====> -错误类型:NullReferenceException -错误信息:未将对象引用设置到对象的实例。 -错误堆栈: - 在 System.Collections.Generic.Dictionary`2.Insert(TKey key, TValue value, Boolean add) - 在 FineUIPro.ResourceHelper.GetResourceContentAsBinary(String resName, String resVersion) - 在 FineUIPro.ResourceHandler.ProcessRequest(HttpContext context) - 在 System.Web.HttpApplication.CallHandlerExecutionStep.System.Web.HttpApplication.IExecutionStep.Execute() - 在 System.Web.HttpApplication.ExecuteStepImpl(IExecutionStep step) - 在 System.Web.HttpApplication.ExecuteStep(IExecutionStep step, Boolean& completedSynchronously) -出错时间:08/16/2021 16:29:05 -出错文件:http://localhost:8118/res.axd?font=lib.iconfont.iconfont.woff&t=636947851460000000 -IP地址:::1 - -出错时间:08/16/2021 16:29:05 - - -错误信息开始=====> -错误类型:HttpParseException -错误信息:类型“FineUIPro.CheckBox”不具有名为“OnSelectedIndexChanged”的公共属性。 -错误堆栈: - 在 System.Web.UI.TemplateParser.ProcessException(Exception ex) - 在 System.Web.UI.TemplateParser.ParseStringInternal(String text, Encoding fileEncoding) - 在 System.Web.UI.TemplateParser.ParseString(String text, VirtualPath virtualPath, Encoding fileEncoding) -----错误类型:HttpException -----错误信息: -----类型“FineUIPro.CheckBox”不具有名为“OnSelectedIndexChanged”的公共属性。 -----错误堆栈: - 在 System.Web.UI.ControlBuilder.AddProperty(String filter, String name, String value, Boolean mainDirectiveMode) - 在 System.Web.UI.ControlBuilder.PreprocessAttribute(String filter, String attribname, String attribvalue, Boolean mainDirectiveMode, Int32 line, Int32 column) - 在 System.Web.UI.ControlBuilder.PreprocessAttributes(ParsedAttributeCollection attribs) - 在 System.Web.UI.ControlBuilder.Init(TemplateParser parser, ControlBuilder parentBuilder, Type type, String tagName, String id, IDictionary attribs) - 在 System.Web.UI.ControlBuilder.CreateBuilderFromType(TemplateParser parser, ControlBuilder parentBuilder, Type type, String tagName, String id, IDictionary attribs, Int32 line, String sourceFileName) - 在 System.Web.UI.ControlBuilder.CreateChildBuilder(String filter, String tagName, IDictionary attribs, TemplateParser parser, ControlBuilder parentBuilder, String id, Int32 line, VirtualPath virtualPath, Type& childType, Boolean defaultProperty) - 在 System.Web.UI.TemplateParser.ProcessBeginTag(Match match, String inputText) - 在 System.Web.UI.TemplateParser.ParseStringInternal(String text, Encoding fileEncoding) -出错时间:08/17/2021 10:54:26 -出错文件:http://localhost:8118/HSSE/SitePerson/PersonList.aspx -IP地址:::1 - -出错时间:08/17/2021 10:54:26 - + \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/File/Excel/Temp/202108181024434903.xls b/SGGL/FineUIPro.Web/File/Excel/Temp/202108181024434903.xls new file mode 100644 index 0000000000000000000000000000000000000000..bcbe5c0be0ad02c0194fe103c8063f33033fa93a GIT binary patch literal 84480 zcmeIb2Xs_b8~1w>0tD&3L#Wb8FACC;8c3m;kkC@3L#Qepq<5qXDq=5Ku~#ez78JyS zih^B1eN_ZS?*ISHp6u+|=ZyHS_kL^L`!TGYbLKhw{C0WDE@zl|=k1EeZ+)oN=T5-u zDyNw9_k~hUi6Zh)obU3#ui)VNg$sP^Ki-P-+mIl>^!oou50narB1;r^(i7h-x!(zO zN|bb*&vD!n_9Ff|&KF3T&O}&4$P>$3jN3LY;{VL6v(#aD2)*RxqMU^|gF`z?zLoN~q5Lg}zah?Ex#uI1L^)NQ zW4I&SS%VTC=f=>`ke=5+KiiVe`S0bAf_q_(;(Kul%Z+gIQIq(>`h-h;BAhV-8zk@d_R0TjuW;Iwd}9Va^i^cE3P ze0Ic@>aD7e7Bp<#P~LRRj;I&b#%Yd!xV7kgEh38E)FQ&Tql44Rxxy?AmC$%~t04oR zLkC@Gywei4s|)q#Ei6|H0`9B@Td9hm)Y#X^=2vDmQ|Fn@>xI=vf7dE{RXWSa5`iAC zU6_UC6k*^kF--u82*_iSRK{}79@vUAZrr%c)-&-s4iDn%w+pzv@by9jQly&`}AAZFF))Icbta`>r(<@QtBVjt`dmVZt`+| z&W4H=H*$NYa)Ldk!71C{cxN?@4$S2r+z{;L}pK>yVZjI96a2D;wAx`DCvU){i<8}x=w z0sg>fT+G|N!^BZ?a%pmymt*D~5iu(~5W>)X5fGZ8H-vHiA|NzPZwQ0@ML=k--Vlxm z7XhIOdqX&UTm*z>?G51=@sE&$eS&MJ`o%$lYlnl#Mbsp?cCco=7)WsKU;=P4kl@u>F?D$YzBHR;ms1`YJ^;;LBCByLa!lD%GJw2dh#=W&TQ0=0kJ4)K~eU zGFumIk=>^Ye?yH***8QQH=s1rv}}XM)}9KZuDbB|@rAh|h0V50#eU|$Gntrwx*>47 z6>C&;`=Ee!75d%x+ly2)P{nb8XuD(28@=g=xY=D%b^80HsO;iZ99XINfJ#ksuhfNu zTMAqDzjubf?oKG|Zck_6h2Rl7@!}xChxw$7g9IPuu?1dau7EeTZ?ieUhxscn4ibEr zZ+CGJbC?e_nf6jw&jr2TjxSs|Xqn8z4?k>$s-iN#9aDx<#ipKb`W;!e2XA1Cl3#~JwaU>!I`==@Km2Hw!+-`>#mpKh2HFn)H!4JCpP{cICn zh5Gl$EXw@jr(f4aWqw^#h9s|9;ei$C4*CDl3Iz7?)u=!aV_P3u)2VmTf1P~ay_`z!<;1v@)6}&bj=8Fw5;?g){`jMNIhEbZ ziFGNbg=;y!p<4Q_WKQmdUkA!g9h6_IdW`Dfe=!yO-l;Z;f2bDQa&A z`}}d>e)n=}xR>K*Z0XYTy|r{Lr>MOh>~rC(E$-#iaxcft z-rBmBQ`FuL_IdQxuieY3?Ou+Xy~VheQ`FuL_IdUAqweL@VL9;^Wp5EE$1SI}x9FH{ zFMZ`+PF?qM-0ZEfYdJ;jEjs4cJqz8-spnpfo4qx2EvKlxMaS&lzu&!_`tIep*;^~u za*Enpbj*bhbKT2{a4*Nr-XdMgDQa)gF{|$O@Sg_m<+#~ftZO+%?JYXy?srzXwI|GJ zIJfwPb>VdoHW3fiE2Mbw3&ot-(@LZs9z)Uk&{9q#49p=V^EYo^7v9p$T&(x5b)ew@ zrG+?9T4L6|rG-VC6QGiK^o*is4Y7-^g`#H-DOxmlwERVL+e;N)3Xj=gG*^$ka+oz( z7ORQ!d4;P@>CB?#mnfp}5Uk&{`b(f|!2fAzADr=4v&!ByvRr zcY*864HaLi|?JkF1~mEy7=C)E^S$t6HDJ%d-<@%Ij!>6g>!N(JtcoaLgP@LzV5dm ze`A&Q%c6hb_PNV@rTZuW4iH)z4&c99l!1EsEvP&q0_yVjhTS9m{n8~lte?mepgMIOeL)TaFmU~|Q@XGxv zZO*=TeslJ{^P98p-Ky}x&Z;6MtU);y@h=@i)d**-ljEe}bKEoKtS{b;!e_guI^(c) z&>v^hoC&z9a}@pLcf2!9KE1vO&eQ-SDR)oO@^f;gL~RYP;cP8Zrf+cb?X2#?C;oR8 zxyJiepnC`6--{vPNRIP-TB!4vQ#Ime?4q8>rVpkE{CL9vL?`JI_=o?cF1*VtTtEJ^;d^xoA zb*--Nlr}EqT-I~TOXc<7I5y>vG_0g&&p(>|S}JasHLV~EhvI1uBtyJ%dztjxX5;-{n^}dxfRFCN&k#R`8esZ@yVQRDag@dBaecSZ0 z+46pNvK-;83Wp>gxGpzCPBQylk&Tm)3(pTc zHdjunB~K)7l2`J0@x6jai8-`N5PH<3^6b$p>2(=TsOWCy8Tkn=L2j$M$54 zKG=FRTY9O(+$Oo(2SBoQ=Y;uEU_r{#f)?W->74(@0=etQHFIvdF$mRpCF_%Z^EZo$9$I^3(jea2eZh@cOR3?#S#NE=KT}TPR!XUReYM`3RXR_q zzc(vu$|pl5$M=JUvNtO?IcKIw>i2t?8sD2$zu$T4Z*SJtY(jEg))diFa^CMb(`iG=d0z~CkCvC5w;_4=5IHIDGlS&3v|KU4 zjYxMQ$Ls?1pHE9>_Szi$x9$T4yBz~sE6+0wVkdB?LqT8@f- zx>~GtUjB;oOsZ~P{^>mF>v{R*GmqwoBrR9e@IDmt>1N#Xe%2mdsF4~qx!n{wxqQf$ zow!gVbr*F}BlTp;30AvC>IYjTP}NA4hVjsLyj*y_V8VR4LprcV>b4Y#1T|7muapj} zk$QH}p|z5=ZThjfl2rmijnst$nlfnANUfGUhf%Ob>UE5IHBz^1`45e}MrvvHVvW=T zX?^L)HByhQ-m*nb-dwvl2RTNhNv%et<*b8vMB34837_+}*Dk>O(<{s5N>NqQ=Zv^- z5+qgA&kx+U5jR#%uip=cL36~L2F(#095iQJN*DIspgEiJq@9E29GN7|8M}4lf<-HF z$H!x;vJH#!#nG}e_GTZV9cO3Um{o?Zm!0wJ?1yQb*%<|l48Ps9H@g;nu3T>0^ap5B z^D;!s8I#WsY_bp+22UuL`v`k`@Pvw)(q-ea&!mY-jLUv7=Nkr^aoNp>lu4J9*2&il z!pQ^EUY(uOAGq}7nK$D7S2JfPOTg`sc_MkgMEFdpd49@|1KYFQX37j5VoqQv1U!KvL9kVVD@kuInXJZ{(HIY=(sxIX9XUqS zw7lSz>@JinFUZf8N-ZyFk}I)ldBM^f#15Ai)JpZWv0(Z*QPlE+`A zyx`DUF|p+ZC8YTU%~Qn|mlsqVE0(gnpmg3D+T!v82?WavvZmDcWxXP~KJ~G@Aa{&( z+46#%nG&y;7pU;DykO(zX}-)$3nUDob_Ek|lDm5Q+O)jjc(zok-?oT;(zt%x8n2X- z=Hn}7O5`G~E%+VN zu8@l9GHh&|TZb05ajw`C53A-N+s3(v)=I~3oLea+mkQlDw{@~OR>Kt!_ZK5*xFRW8 z@-$pAChhz{> z;zov$HJG5t;T)T=Ci~D@QRbTLa=9|9ugSh{b91_5ljPaca%Ljy_RT`b&x`0M7xMEq zA&4MHe%{{fbOz@9yz>KPG|b1aA-H@D6XGcOd8cVBJe;P}=jV;$gZhbW5 zw%MYI-_r(X$dFe#cjTD!15spBrsPP~c}otYiRsN-@_L#S`SrY|1>#qq&52ui zGwb)+oO4-H_Ap=8i0r7zC)phl*=2GMaE=fGZLArO+C^kn7$FCVvk}=nQ+}jDMP#2J zc!50?kzE~~i~te=MQuwF=ZeU_F-rnSM0UtEl4o&_7)V6+uwdJfsJ2`nPc^s=fb>*j<4|Do3 zb)~v+e&B)Y5g4jA)|6{PcwbWGa`RE^~(b^w!C_V?d3{d!JK>D2!;*Yf*W% z(@S3`lHc;hR-*C_TsLxoNX`xt#YMq9#pItvrNsun8oF=ezKxZfFs_nfqa&lDW1^B0 zVj>eFW8$Nu1_!Q%RK}>7$fW4#sHDV%$f(HZsQ8!|kBqU=$cl_f(UH-S@yM9qnK3$n zMaRdY=%lE~C~sn99Em6ywT+63N%SN}#wA9f=y=pMDl#%A$~$9XWF&|vH8LhTDmp1x zM$|DehP@P<7!~iC5sg973Grw%*ujW#s8~``Ok`YiY;;f}>IEX39TgYlsTtHiGBFW# zjEhW&ij9p;^6H+r=xAR*Mny$O$48@{UX6)D-Qqz^Ldgk{aY1w)36nv_#K?r`$i&Dv z&+ds~HzOme8Wooq=UsGkWKv=*x`!DfqY~mg>&WtaDvUI9fAbmMJi z$`ueuVY@LHmpmJTNWoD7&4`MPi;f9qW{f=vacB&j+jICpAEIW`J#Y%B-CNfjGLSJg zG6pstljPYw@Dy|ltOxy>7!&Os9~sR!49CMI*iqhNp)Z=nL+6o6kqL3$y7q;XghZHG zTx48qkbd-eAwvqHbdWmwTAdh=#=s)uJnIOXp_wH{0|)o=?C`>{$GHWk72dH2gFd~G zu_qqB>*d!l)+jZ6B%lhBQC{8S&xpoAg)~kNGoy1+*XVXQ1*R%qk)n_YvxT{N45m&qr)2JB4 zAlQ!=k>fSG2cCddqcc4-`s)ZIl1g}WcpRp-$jgZ);zWG3Cy^HJvmQoV44+=Dre!hg zB_tt+$0r1x?fF{G2E%lNnOQvM;3OhG#sKNnJ(wWKoPv|=_?Xz3Anxk(YlJckn&@?J zqRg5TVP>-Y2%3>I0P)6{=zlIc5_So%_UuQ0?1_h7q7cD7TkX%t@EDDO!E@v)%t%!t zqv!n5pD{5BkpknK=OnH$BSr;|GM;{oF#-C83OP$5(MyH?j0k-&U1apKaDPS_5o0f+ zj$D3RTw_=?8sq5-h!p-A09FG~jF&4EuCFmOL*KwWyv@uvbw!Mbj!lRS5~K>30GQAq zqvxQh>d0uqWw_^92tQCOB-lh;OjMAthmed&fx#MaDh@X3)fjXR)Q#y38iRF%_pF&y z1&ppx3~GUp;x%6TI~>z%>{DP`=-H3{g%5odeiP?qJ(wLNa2SrqNi-&#-ZN6p4!H1% zgW)DJID54kjxUp8E-E;6^@_NKGXPi_?+7-;`KE;+MkdC^#(TC}t%l<{7{MUD2X-zc zIDEhnU`H{YGb#Vv452Xz!v~_NXRCP`x@O6Y=3X7nNI|1045Z$M>m#BunCit~BEX{C zIS~=Xi+lpWzk$V-9H-crA4Xz)i1V~bzdK-aZ@7+vx->Hxp-md<8YUR z_~U83=o${32z^))$0R0r)zMGH6cWCT_~Sk8^2MKcZjxX{^UoO(?J>1Lj|NjCwF4q% zK~bLbT)$ypsgj6QQji52Hw-|;HVGmm$_^4E^&O`M76e zqQ$onaO2VNB+o4|e}`jNGZrH(D(gY?XH4R}f&-_Qt_w55cB7%fAR~i+b`LX4K&1Sq z#=v?Ic+nWIq6_0VqIoppxVJs}T><-82nR`?V-0#6(?RqKWPVrrPkHMVz$$8nn!b;O!R8WqGI zeNh*!MlBP940CGqLPNO9_73>y5)8uZM_6twMjX#p`?iteWuXgK^X?uM0I0%v^tZS5 zz!0$*N70;(2N{$Q!?-1er3yCBaf@fsuv<0;?uuPN_M~TH)Od)3qxo#X+i*E|6e7Y| zT!Oa>X|7Zud=TsWAiDNXX}Gw-!t@`fG}xv@KgPw!diSGxw!op7QxIfSrKmcoyv=B0j>pV-R$`GlEIK zM$w$-dbiqVkC<0rgFiCPb3dgpQZSa|VTtE@fy0%!E9YnEaZeTEI#-U2Jy_hw#s@Pq zpI-xut#0(FXRDR2IRk(V2g@iSMTR&O?46O$h4{#I1)nW=Ml)_fP=%N)VB;Jag9Itx zrUttQ4(r)!|A2&v9O4MufjW!a*3h_O`HUaW@=e z;*8@p$HJ)S_$1F(Gd}vBsPI`g20E`+WAeeZ0z-0FGsn9q2x3;Bqj zu7F{fQ@Eh}Qa)F}3MncETRC3y9$GCs90L-A1xokq9@rrw4l=?XQNDLZW#I_+vfT63 z3|kGKVYxDS^{QhG1{(S`o^|obD;D>`>PQu0^^b8DlONBF>ggE=O{~T}tp@?oHzVaU z8a^HJb_L%fEWogfgbH|Bk6+iYA~*tfeLU;vn{vr6J14~6jq!~N_}B#|QhXBONyGq% z0Dw)lMC{ezIZcp^GB?8_Gb#~dgSXFc(t!?#7odAE9(od^V*z7)lv#?WnTb8ZXE@sf z&wHyI{V2mQcSvMf=+$a08RhdczE2n6(QAo`XV<}Jv$slN~D1Ga=#~7_wbpN z?2|@eGVHwv$%&C~_`rG{HTKdBx(80^i@2;quo&(e6*wb}!J5l+bmhRt4(GxnJ}xQP zB3I_P7-z7X!jGMJ=-RJBJZ9tEBFINhWI2PPxwNOQy)~moR|Zl%!S-&9zaQb%n0iEe zk6dc1kiaz;B6E-xl5g`|cH&UUAQrA71ssr8;k{)CtudN0Ulf(;Ww@N9bI|0oSHx&+ zV0m;nR1u4+i3(APARCp+XD}eaDX^6Cc30nQ57Q_Phu*vFnAvj)#jQ_HhT}a~!yK<= zg@lj?!;SM?KW1t`(eC{QFL zg@nB%L^JO?>d6O|3K*Ay)R7Ax*`47hK!RunkHe4=mVv1zhB8|5L2)q$1@V|@frnk9?l4kZAI^XR7GQ|z$f?cU9Wyr z8Trv2S)O^;ruDhr1f!f3(tUWogM*aJW~g?j~yX6&ALOyU?SJwpnY2;wu` zVUI^h^K1+vj|3^)fsqC-?$tfqsDvwER{;?apKbJR3@n!R$fEhl4{r(5d3KLKBc7>X>_Bk#XpDdLfwd6__8?oxR3W?&Hj9ZcoY2z?{R>Fs zjD(7UShylW<(L6@Z^ai5A9xzTtvJu=4Ag-FeI3p&4>E~UMZ*)YpBeP2xU7buaSR}s zC3))_b>nQ0%Vrq3x2_Rx*pHmk))6vFQ?Y%g*=TCD1vr9&EdK70q245@8aNv5DA>_sYmf zfq8fwTFg0f@EDHBh)Eop#L>x~y1>;yjlq|D+eBw#dW6sC#o#fvSBsRH%hPUrT06+(2leMO13XUQ{58na90VZL5#a*< zfT9yUikAI&m=Lv%&J60@zP&|G_xQZjlgRiC=SEz?(;+;d3St@PJyAF}RHA}>e#bv5 z$ykf2g?D589gZakmQ!9G?w=9Edhy{QOmw{(<6lqFabT9gcKCg+h`567f}l?qkr687 zhBGHrp55a&b6Kmv(1NtuM@-=MFig$U9`QsG(_0kHXJ^oj_kT!IV+gniLs3C?HI#+( zbE4d1i}vbp?tdb$@1rEJAkQJT@c9tOB(&LcxyiAZ77kOyJs0x~i_eL;PvTWa1QOrM zf~#z7vwIfJ@?>KQf1(hpyk|)q=fFZg!XgmIy+Rt-2r_7s7;HL)I?5Ieo{A+Pw0O@z z3gVgnjE47xkm=MBAq@Re8f{#ET3VHP-y2m%Vq6+BpIPXY-_#nX^ zp9VtI5Ay5Gn(@M}o7wDm~;~ekmIImW5oMzn} zr(8AMe>Lu}jy~++I6G>fExpj*nrKUJ)V((PsE^}JtK&Ey^o1_!I!;7C=%T*kjP36@ zXrl9IisQ_KUjIsUoc+*W*K~Zt8T7GYfa457zaJjxIJcsI>kM|BZ_$sVhB!_X`sKcB z9A_rl|7(Whyoh$T!}np9LOT}XD>PHkj)U2bvjy#_G9152j&@{@aGd67$L%8>XA;`+ z!zjmj677i1#n-K)9XI4TPEWLBU%un4MLWujcAO8@Fr z9jzuf&e?jX!$jC5+VSEf*d*Ffs=#p`Mmtib;9DGFZ(F9K|Iv=mr$Mi1NAnrbE7~z> zCUlQ>j0~@a1b}*>D)I_-HioY+y|Ks@iu?C27RKKKrnrIg?Wg6R$9F?Ibx2rJ^otoW$RwsAMP05lnq^J>*-H+*;b&A&eN+%wG*7SHXubZhGF>%W?q*XQB(tJX}ezvlLL&n1Q) zh?~}Q?)kap-kh3ptj70C*Cw9W-{t6+#U9^NcX0btU!L9E_=`1@%ONdU(|h@mU9xU%XId*l!)asr=r-IT`rY2z-ZPv4H;C z{r;U_zkq&XT!G0r*^_g|7PM`{zYABtJ^JOyGK)_ydUnB~St;+nT%*afw!7DKX}fEd z^Lev5`3-A-T>JZv`@L4;vZuor-hTSb-R=K=VENh4H+&sYZRhXeVaPiz1D zoca3~-F|12@QfJ~Z`^hL$B$({)Bn(}c5g=2-reKz$eSvaU-DtUXHp;NJnGQ?3h(yn z_Hpcp#&hmmJ1P5U{mnaS9*^(y-fz`Xk0uOzVD(-5FFf*cNUYzq_t1r8SjZfIn z=h~AaZoRARiL__e+?8|B;d<{p_Qcuu&!Z`JL&wbASZx6sxC{w4>rBbd8JE+x$lt!h z#}CiTnM?~QbFlAaFGp19`1!0`r?2@iVdT@zx{Y}FzynYJ?sVB+tJ7<@yu0(`qhFp_ zknq-LRgP@yU3N&T?Ip`D%XzcSlD$9O(CW_GcYV~O&MU3Pe*Rk3ufCm8WB;QoD}UDW z^@5aHjgG8YbpKAzop{KLMTf4Kc* zv$tQ5Sr)ge)4J&=GI}OITjjEAzuo;#M)}>b?{w_a_Wa0dl|K4)^*8Ht+ie`1^yiDI z@2-n$RqxHy?a%-E>9)_-znU=qs-AaEU-4u_s~`V(Y|MbqUcUB)&g;6@z3^iGPy45S zR=Lvd2Di0(rS6vX)hvc>VO~1|h$9e`ELaPfz^x&WT%k-C82_ zjm2-oJ>Dude*61XIv?z|Y4YhBhgOyU&%z%@E!^4Tvt2!UJaOpfd(XZ7;18ePb<52! zEqSBt<2QcN@j}&Ui#jEK@@~N|`I*VrJecs^o6o-ce2M-~uKIrOxi@D&^6Q-;&BBN6 zPOAQ1-pJ>l{cKE?!NoSrnfk}6$FBQ0uJnXIKFd1s%+db!OF!7@$qVOd&5r!0bCuT5 zl=$+GS8F|&HDTP;@2h1kn0!M)+0X7d_1kx?kt?dnw^Pav9T&Uz>E%Z@t|_&vWb%xs zQ|dqZ_+?-Bu9Dtm$k5TtO7;Hoj%#|qGxF7vPXCU}8ux6U^!86-#rwZ9wCn!Ol~1qf z8dW9h#?+?6o_K0N-SoYmKY#AA4ztgnIg>qO&iQjMfBf}lC(|DM zV$sq$|M}0R39~Pp7D+l^N^Y`zsY}?c}YtES?J3F+WKI5|!`D0(Yy77xIJ-wjc zGk><4SNw`UPDDMw`ITnf_dVP(>W^tpoI3D9=%-s6efQFjBd=UoKIyI%rDu%!{ev&A zSaG&brPmJbJ+UveUR3upHK&(2{`l4dOMc4V*!|T0vj_Kma`iVK#7(chd*J*(A1QP4 zrYAC|jU0REnX6M;q%2Hp)qd*gzERWeJ5{m4z|7S>Uf43M^0)09etK2Ix7Mt9{eu>_ z?>-dLGoo!l^-et=tGaF1;!m&I^}v8LKRvW^;cKBOCC^s8V_=O5w{GdW^uU+lO%9j& zqrtj|mY@%bk?)OPvF_lay6a-&AKJOB`G#h{oQnE(e*LIFOQjrLQ*y)jK4-ejzkkZk)?wv4 zX7=rMAT(uq?y*ub>B z_cGgstvm4Z=v{RdKXT*2LvOzSOPPUB9Ua?f*1)U^{U5L1V0fS0^&d=Ili#|;fHlAF zuQUIvh+79uYtrhYa@CIB^k=tw-XH8d7Tt2sq+fya_&ed{@y*#2i;n=7`Elx$G>=L(#+9QXWo5tqxY(n+I4Jfr7NPJTD-Kzq9^W3 zj=Qd2t?F-1y?#sT@*S5g+EKpOn4Y_)o*&w(&9*UnGLDqky0urQw9~hrNZ4Due{{$j zSNt9J*7={}_TMsX;YU9;to7o7M>_uU*SzOfJUlA%^?H>i)tlJ*iYIF|?mFUB%DO2x zJoZ;~+1MksZhP{`;~gt}nlX9Ynw!q7tkd|Dprr-s+rF=ONvC(cydFnHI1w2(4O=N|3wSi7wa=AGHHdrj-_C+v=@`tX?N z`X7$lu)5LKSMK_z*&Um|p4j@!CUs{Gc=d%RTD)H-B(8I6>`RkwuXSI|^n15$9NOsX zJr8}qW8Ccx^Ok(|aNafd-1gKR8L!+|v)Z^}O*U>C^Gk_)yDjPT-obJ^d!M=I1HOJ+orxuJ3p3YEa|w#`QxES2;1Y=D@8(SA6vB$cJ8tx$EXTd)Bz;v&<)k zF3tF`(f0RVJihyi4jFFyNmSnUoae*WggjN>(L>U?LV*)xxa z$9L`W?B&gKx@Owi*jM(@nw^hh*r<(>@$!J-!#Ci|fKp@xR1<){m%S8OW#O6m z)59lBc<-qSYny(uL9OQ=7Gk+B~`3<-OK# ze`i_x*|`rS?pi(YWW!x|bb9^icY2(eI_s97w}ssBO5Y zUfcTBhW?$>so=v!#hcys>cQiUw%yYw?2U}4p4#^r8s=+yNN8*PY@gSR5ZQ{nT;_-U zdz*m3DU!Y$E9;^YrobBmryTmmnwX1OV|bD74a~G{m z5R>TNyEvvHToo2~hNATqu-tH*ZTJf0ZAGT#xZtdSY()_n^D%QN$ej`uob<#uOYX-P zA(z0!zjSCvT=Bhbz|A3R9jD37j??;X$BBE)aoWG=INjcKoW37A&VVl+XXww4lXKp2 z#+3?jrdGw59Y=)Vcee07VpukZ;tQY4%XvloMGdhq`0MVU-|ai1e}`<5^H&TUr=|Rz zFOs>kc<`0q1m6_Dq5N%%+`01ls>9_)&YKldzUk1s$a!C9 zEBdUvGXU$ro=$`_*y-k^I{k2raJu5_s7K=Ksk`8ds>kDtsVCzYfv>0TBENJMjlcd^ zNLaBF$DC*It@d;A<5s1dt)*kbN1?^#ox!1O`QT7|IhxZ6zgYCYdxa*ujFY?)8@|== zwj#Oo$JYa$0)s7o?13xN zH~&}w26X*;ods_6y)V=)Pvp(5*s3dqF%x&;Uns_r!J&BOjMsY|{KpVydw5eM%?vzi z7vq-<03+O)B^%g|Gps(xVn^PSe@hwt9zUPr9IvV07sHpj9xtWehjD~Z*PT%8U*g5t zf$T|R!yEGmIj<|Sxgl4HjBko#{FaL$S6zAP@W2mJEB?maKk&?7Ylo@f%E#<3~N@ zU5L{WHtv5HirE;g%y+FAa?%cc@9@h+D8cuRcXY#Y#s4k@?`TcTNssLA%tsdAyJAjf znKu=KKX3+hwew|}Wp#Qz^kqk0Cts5ohPuf-)OU@f1&S1knsqHCg<2%mTay^Hy77sO z)S{TwX`v#~Yc;8uMWRn>623ke?`ZF=Q<#tzDN>k0qW7DvV}EH9e@v#EY*~|pUwK9A zZd9b=2C2A3Vqa@g2_ez9NGc(u#fntIAeFF4)RQLh2gSN!CE_EM6w(q!Drt~PS|r8_ zO$rwh{g`zM7t&Hi3O7jM7KwV&q*6kn_mfmgNXrzdltC(Gk*Ft4qBVBI9Lz_ewRLxv zE7D~KiJCQa$7rTWrG>;u!#b4~(h5Z?ZIDV^BIK2kX$tyZLR2C1AyqMkGfKhuMEjG(L& zN5<~X8bvB^kjh&m>PeF-2#Il*qzXb>t4I|LQU!}dJ!w)!Au(E$#5HzzXPqKdG)NUK z67{4>m4w6?Pf{fztyiQ<1_|GY6kt!(lO|Ob5=RD-Dhp|YB2_j>l`RtWq)AnT#PNir zDnhzRk*XM^Di(=)(xj?F;wVH?RUvIuq^bs~szsunG^v`9ICha#O-P#*shUBmW|62T zO{y*=j(8+h7t&@$s&0^~TO{g9lWGWw<0MHngtSGGY8a#%7KwV&q?$tF=t@#eA#GKp zng*$+MWUWGsg{r;6seYwwkc9AgH+2RQBRswTSyHQskV@|D^hKPRNEp^PnuLmNDURK zj*xCvq&fzvjzyxLG^wtT8Yxm;A?;A4x(2DPMWUWGsh*G;D^fin?Np?C2C1G!qMkIV zzL1(IQhg!aqDb`(QhkGT6f=frFeHo(?T$UM|NbA>01+rXa8B32MMfP2=3{RL%GfV~ zGPW>K*3?CIxr?lsi>$eetc8oLrHibUi>$Satc{DTt&1$uMHb~E<4$B?A8^qZDC3ei zP{#Fdpe)`+mf#{wbde>w$gXgaUFjlg=OSzGBD=~(#<_mcb}(W^K&Cw+LOg=D;k(As z@mA##5r#)Z7#_jgv|3GSAS7Cp?;1(BDN+N2)W9Oq)-|c2kZ6Y_H54!1rAQ48QbUVG z57DGXLZbDO#GjDv?%b|OjSNyFi$uTDq{c#`&6CtvNV^rOu|aBVk?4(@)I>=16q1?< z=?+C|VvzVF)8?#{deWq(LZW|>)Ko}!DpFH}#2=S7Nz{`jT`nYgB}tbH=`KaO+#vBs zrA-p`q)Gh2=x*2s@{yVe>25`8W{{d$BQgb2Qqe#sSQge$$J!w)4 zAu(>Sb$puA-MLqhS{S4j7KwV&q?STrv>}O4WV$=|DN;*=)Y2kRPny(9NQ_Y=wGz_( ziqy&=wX#UmlP0wm5+fT){2l4;&I5|n+90*INYs-iwGk5IAxUk7^q?ZOF-UDJ67{4> zZH2@rN>W=P?NOw*2C1z@qMkG%wBt;78Aw`NbNc^>D(=w?iO^Ol{BQ{A#4kX10=}|?BF-S2MiF(qc zSRrvtA&I{N-Q9Uikzx%}tVN=pG$~F<9EnKc??88V9#^C|gA`|xs3%Q|7ZS%WlK6|x z-JQLP6mO8?EfV#lNeM#Ys7F$Qke*Pa1cSuiZ8oiddeWpsA#toEDN#sIDpI0B;x9Iv zB87O1F1j^XLKv{Pe+0`zx9xk$;F0x)OvfeJTJ}$Dp zF0y17Sw9z9e-~Mbi!9YemgXW$caaTnkqvZ_4RVnUc99KnkzL~=%W#opy2ysQ$g*5y z*#R;}td5XrkKl8FZtwzMH0vlH@uKpGj)q5cG(3VNTCFB^5)v)Sca6UFk|Oc>f*u_^ zStQ!JCUq7P?U1C-Qm2;{sk1@iGX^sT(L*$;i;!r&By|xI|09a;UC}yqu}JhQP3kHn z+C1;=Dx_BwsjE>Zw$rQ=y-}0835lLUQa2&Jsz}`oQa6i4J!w*RA<@4`>Mo?$6sfyG z>TZ#!Cr!FqNc2jQt`^ekigdL>y4oU9Pny(2Nc3frdI)L1BK0sxJuDLSq)9!6#0WrA zPa(abNIeZwPm4r7X;LpCF>a95OGpP4sh2_OWs#^SP3kQqMjMiP3+bRD^)^VoEfV#l zNqvOG7)4SaA-$D25L_KLzKOr%SlGIN~?PeGQgv5wV zQi_n?RiqSylwy&nCrwHf65~8csX}^Bkx~s(szsunG$~C;934nX6VhQtN;61l7KwV& zq;w&1Od%;#1ffk8+(xgE`;;2W`AR&FANP`U0Ad5sjY0_XJajYb1u#i4fq`?MhutlPtG--&C zIKq-NL`WYg(h!3*#3E5onskkjhAGlDLi$*dt}#g0SS0F6lQM)fT#+(_bWD*l3{r+g zqMkG*+R-uB!1eqyK`KTvJFzULHb{=1BRjWz&ZMG7a4UBn2)^~C}Y0_%Gkm{ zS+0vL&qbE+BD>Z_Hrhot#zi*PMK;bwHr_=x!9_OFMK;MrHrYj1;3AviBAepl$fB(IY-r9x=@Dh+&3D zFgLAMlZFe47UjD}(ie&}+#n6NNVIiL8X+XwAxR^|OHU}$2!k}jBGE%MX{3;7y(Enk z(n&=cX^=)*B>I&m@$-k>9NIid_|zm?_oX6@GDxE=61`EAa)d-rAt^^lUnx?KLCUd6 z)RQLV3W@$jQm&A`R-{~mlxvZwCr!!|61|e7JRyCfNO=Y+&mvJznv^dj`Z7uRLi$#b z@(ohHMWUWG=~^K%0+4jAkiJu-YYo!17KwV&q|riR+#qSRkiJ)>(FSR>MWUWGX^fB< zZAcm;q#qP%j6oV>k*Ft48Y?8mD3Zns=|@ExYmmlTBPeF(3W>3oq=`cM zS&=3hq=^=ZdeWpxLSn=wX_AnBQKU%*X_7^vo-}E)kQnDlnk=OMDAHtuG}$6iPnuL9 zB#sUw6$t59MJg~z1r~{V(xfRu;+R6x6e0blNK*{b6pKVXY0^|7aU>#Xs*rwHq^SmJ zszsunG-;ZUIDU~dO-N@HX_`TrW|62TO`0wwj(Q|b7t$Y!G~FOgw@B2JCe08M$4ZiB z2H(k67{4>HwbCIBHbXQ^NMtXLAt>rQBRsQOGpb8X_k=wR-{=5 zX_iHzo-}E;kQOS^Y$07xq}c{(wnd_zG--~I7AevkA>of`a*jcoW03xr>wvi^J#dab z&qYQZ1mY_W@MiHmHhi)@*TY`KeUg^O&Zi)@vPY_*GQjf-rp zi)@{XY`u$YgNy7Y7uiM^*(Mj+W*6BO7ui-9*)|v1b{E;rF0vgivYi1kMy$DzX^)sI z9zomiUE};VM0vzq!z1Pz9>LtST1}cKBwCd38cFyMpz2-Gz4v(*iMFmu^Myn^Bx$~Q zX)#5bZ`5hNMWTmj(gGpTdP!O!q%cKVV2~DAB>I&mEff-Mo}`6BDy~Qi4bno3L~qoj zMM9#dkhDlhB@}6qL0V*ys3%RjQAqSJl5P}INkzKRAl+z@s3%QYEF^j*NsEQVFYfZa zE2_K27KwV&q$NV4FZ13dLMo+5ON=@#u}IXDCM^{bBLGQDg>;!BEj36>EfV#lNy~)9 zxIxk~A(d97Wd>=PMWUWGX}ORXZAe-!q%w-M+#oHtNYs-itq>Ap6iF+DR92Bz7^D>z ziF(qcl|o`PeGU3yD#bq}4*I zph&9?(rSxDJ!#S!Au;xnv_?o36={t@T4Rx@Crw%_Bt~qK)(WYTBCRz@Yb_G>q)F?9 z#5hmVIw4h7q;&>qokgOaG-h|+F+12 zSS0F6lWr0cMhoqy2&8jWRa*RP1-0Vj$b5g6jF6X+GvnAS|sX8lQs#7qaI0{ zgj7S3HW{Q%7KwV&q|HL&SV_`mA@NHueD8`zy3H1edeWpVLgEO^d$$OwmLhF2>a@io zQBRt*RYL_KNJb|KxSNZW-} zSCO_Gr0o`odeWqug|thNZWdBKMY`D_-E5JlCr#QRq}vr~hmh(k(hh^P!y-{nnzU0$ zyA^4tkRlXmr$O3jkp7qJfLl;{;2fQr3zXgFB4cj`=3~DE%Gkm{*&QyjJ6&XVxybHz zk=^4WyVpf_pNs5%7uf?YvIkvcdt77>xyT-Nkv-xfd(=htn2YRj7ujAH*%L0ZCtYMu zxyYV&kv-!gd)7tvoQv%F02$-KEs$xCxJ5jIw&AYLITVNVIiLx=l#5Ly~S2FKwhqw;80{ED}9LlXeM-)=SbZAvIQ{T?T2F zMWSD6((OW`&69MykeVpc?FQ*~i$rhKq}@WIr;xN;NKF-Kw?W!%k*Ft4xU5Vy zqMkJAZXq!OkaV|@S}4-p2I+2#L_KNJJwjsKAn6__X&wHilqC5)LN15Gf4MYB2;Ly{g4Qd>oOz#u(fk*Ft4dQeD=q9i>iq)0`2&>%f%k*Ft4+9M>!UXu0*DN2#{ z7^FQGiF(qchlIq4P0~X`idLkD4AMguiF(qchlRvAPtwCeiczG84bsCFiF(qcM})-D zfuu)-6st&&7^Fum67{4>j|z!n3Q3O&DNd0dHAs(IBPY8))B}q>R zDM^u@Fi1~WBmuN2-=448fWjFlt;W^c*F~aM=&?7R+C;75-rMijikNVIv9_6ez*BJDFs`z#W@ zQIlQ~5FN*uM4TCBE4>qUbjfplP2vK5+eXf`-Rj?k@g#;{T7LO(xf+p z#JEAy8$#->NN*UVH!KqMq)7*a#Arj(0U`BKqyq-&fJLI7H0hv_7^6r!D5SoMbkHCj zv`EyGCcP;nMmCb(6jHJxy=jo%v`EyGCcPyj#zT_c5>h`!ddncaWs#^SO?q2MjG`pH zEhPRRjPG61b>-U@iF(qccZ9^)%X{AuQi>wIW7O##i$pzX(jg%+Vv}@8NU4f+$RHiE zNYs-iy(=Wfd6M20Qko*YYmnZxNYs-iy(c7&4kW!Nq;y4k&mg^Lk*Ft4IxHlPDI^^h z(f~y|Y>*CHBiF(qc_l3mqi=_93G)R%&H%RYWB6nm)D$+57bj%`APnz_JkWMJlCql|nq)!aeCl-l%(xgv?bW)K%6;ie$eQJ>~TcMfM*T*{?3L-&|zByU5PC$o_DV zopq6&bCLb&BKyllcHTwyw~OpTfQ%9AIAq!*j*CaoHhkAOdmpYm;<(`v#|@8QZd$D- zeJ&(glyYqOEJv7eb;PlJtdm=}1NT!XSNNk?0|sbV5k9UXo4-X_O+J zFi0mX68%b(P6~-OPtr*tr_4AKu4iF(qcABDuoM$(T$8m~w{8l)dB67{4> zr-a0KNYW`GO;Ds$2I-VVqMkJAw2&A@Njfd0iHdaEAf2{I)RQLtBqYXOl714>Bt`nk zApK;Ks3%SOSxAi7B>gO;$%^!|LHgMuQBRumi;x)SN%}=d1&Z{GLHflaQBRumA0csc zAn89snxaVmF-ZThNYs-i{VF7mDJ1ae;A}cEE4skNoR$`5tgL0Lb^_o&Kjh%7KwV&q;o>TA0eF+()EgT&LEw$NYs-i z{VAjnMfy`nHz?Ad2I)_WL_KNJUqT91q`!nTOOgIENPk%*>PeH%3#phQofpzVqwgY>sWqMkJAf{=4HJ}U#~Zese?cndoxhRehHMZg@LjXF0zs?vTzq!DHqvgF0#@tvNA5RvM#c6F0%42vI;J; ziY~HBF0#rlvMMgJsxGo>F0$$_vKlV3nl7?hF0$G#vN|rZx-PPMF0%RoGI|W{PkRJ^ zq661}`R;x)NLZU^Hgr6V*X}%(b7^D!3L|fOSP$AI{ zNeUIx0!0cnNTC*q9->LbghcBlshE%!DpE0nRLmmLuQVx4NVIv9!i2O)k-`j8m_?#D zYEp3_(Njn&E~Fb3sklKZZjq=bO)4QI`WHzhgtS@6SSCUjxNJ|u{ zq(Lfak*Ft43KtT6nWS(bEmfp&gA{I&s3%P-B_u`wl1d3_nIe@kNTnPeGI3yIN&q|!oKp-80-QfZ4sJ!w)IAu&dgR7OZE6{(CtDr1qT zCrv6VBt|xp$_i4gf#3retkk%Gq>iF(qcDnjCzLQ)kW-K0oW3{n+~ zL_KLzRUvUCBB`p7HY!q8gH+WbQBRswO-LNSNUA2JO^Q^_AXT$S)RQJv7ZOK3lBx@7 zvm#YDNYyP8^`uEPgv7Cuq#8onqDVCiQVoklJ!w)+A#sEysiu&&DpE~@RMR3+PnuLq zND+!uOGw)ksg^;iWs#^SO{y)V28vW$NZS>uwn3_Gk*Ft4sw1R^id08PH!D&dgH*>N zQBRswS4fQ%sjiTAC{kU6RM#R=PnuLuNR1V#o{)AbQayuI&mvJznp9s%O%$oVkZw_= z`Ua`KLHb{=1E}x7IeG&Z8FdhtkG&ZvW4{E-*up?rQy1CgF0y7WvgR(b7A~@uF0xiG zvequLHZHQZF0x1$S(J+`+C>)QB8zpA#kt7hU1SL^vP2hIl8fvL7ul6AvUV=A_Aauk zTx1;rWQD6`WHz}g>FM=%?wgAi$pzXQgb0O0+7^PNcSjGbA!~} zB2iD8)Ivy%8zi+5(!Gk*!XUMt%SrFMN%sv z-LFWk3{oqLL_KLzYaubRku|ndQLQ<@d z9#f=PgA{9#s3%Q|6B0)vlH!E)xFW?Fq&SO2J!w+BkT`yk6fdN`iWF~<;w=*Oq)7=v z;;2Vbf{>n2qy&SMV3DXNO-d9J$4ZhCh4iE%B^snei$pzXQj(B3!jhCEq^A@q$si?J zB`Ey^x+$r1l1>y+xv)H0dfKbycLRg!H^3U1gB2vPjgECUp=} zH%00oq!$#agF)(Gkp7qJ0O~t%j^4>dMjZs^V{Zn^*e`)HwlGlE-9>h_i>!x>tfz~t zmy4{oi>!}}tgnkK*+tgRMb_U%mf|8yb&;jH$kJV816*VSU1Wn?WP@E~LtJFnxX3bG zWSK6qp)Rs47g=_Ij1i0Wr#+&hcm!?3ca5|67nMhJG(4iC;StPDtJS1VLZU_au95VT zB6TuIoh%YTHqdA)3@hNVHy(x(I2XB6TrHT`Us)N|U+@ zi8fDCS0TNkNL>w5SBpe%)TC}gqNkA5O-QdQQa6Lt%_31xn$%rL^e>XS3+XjQ>TZy_ zTO{g9ldcvLy^^G>h4i{2U2TxAwn)^ICiM^!eVL>lLfWrLJq%J0i$pzXQcoc<0+7^G zNN*@oPlMFcB2iD8)JsT=8zl7-(g8*4WsrJVB>>Zz@tBgVe_&QBRuGS4fO(B=r^2TZ+`zAoaCK)RQJ93yJZNq+}tztw_lR zDcK@XPny(ENQ|N+^%K%Niqy{_^|MISlP2{S5@Rn({e^T$k@_2?{uYUP(xen2F=CUH zBBXZ}Da9bASS0F6lTwAmI8Rclkls_IRD+aik*Ft4N)r-C2a?i+bXbwn3{sj!qMkG< zT}T{LNJ+^LxuFIA`LZ2LoE{Zq)Ayq8l^~CLi$XRvJ6s| zMWUWGDO*T6ij*y+WO**K zd>7fZF0#=svN0~Qu`aT4F0%11vI#D-i7v89F0#okvH};`6c^c47uhry*>o4#3>Vo< z7uj_#vg-q6j4-qpZNbCDf~ia2HO{s_R~9_Xu;5{a1v59TOp}HSi5B3yM$#9GG~6H! zw@9>2O&TF2+6_q~#H&sy(g=ez!XnY4HEE=fXl*2o6w*mW8flP5S|s{`CXEsjZIq-@ zLi$pXMj5107Kz@YNjXBIWs{U6q^}ey#~|fcBYSE2Qrf=~{zy ztwo}qG-9it^H%Q|x67{4> z6NJR5N74i#{iH|}4AKOPL_KNJL?JO&k~C3BKP%EigEY}1QBRsQNl1*aBux_1FN!qD zAWgDJ)RQJn782t!Nt1>2A4QsMkS1Fs>PeFdgv4l0Qh|_uRipxgRA7;)Crz3nB#r?j zO%c*>iZsO_O|eMSlO|0S5=Rb_rV8nIMVe}mrdlNGNt31t=>|obCZscpG|eDQvq;pF zCQTR8EJd0wq(2mCxnsxWq)FEcX`UioFQmT|>3V~7y+Jzav~zmkBffP) z|GVF{y(+Yl^LPn-WZvn>KX~QV%4mEgh*6(kP@dNH-vrMOuPX8EFF&OS-F=U-_T$rB1DQV(3}flEDbsRu6gz@;9z)B~4#;8G7<>VaTA5N!P)dgRR`+uPKx zuznNP|EQV(3}flEDbsRu6gz@;9z)B~4#;8G7<>VZo=@PACLalK)MNO zBhn_M%}Bhy6~}Ez+mUWY+JUqa=@ukjKd%zcFTMWH_CP8uX#y-K0+v4>$H`(bP|QWX zs^O~${WT87JrUvj>)R*9fv#k|sAs=$5K5m6>mDKXpq2l-S0#MWqrZF}FZS+xBSIu= zad_@jc-1&~BHP{*y^t$)qGSsEZ-V%n7q=P8C#e|H#g@O8unPRcc-s{vjFdX$hz9;$ PeG>nR_HSXqs{H>4Up0=Y literal 0 HcmV?d00001 diff --git a/SGGL/FineUIPro.Web/File/Excel/Temp/202108181123056668.xls b/SGGL/FineUIPro.Web/File/Excel/Temp/202108181123056668.xls new file mode 100644 index 0000000000000000000000000000000000000000..754696439916e7faa508f721571227b471ecb8df GIT binary patch literal 47104 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 literal 0 HcmV?d00001 diff --git a/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonInfo.aspx.cs b/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonInfo.aspx.cs index edc2985a..46b82702 100644 --- a/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonInfo.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonInfo.aspx.cs @@ -63,8 +63,8 @@ namespace FineUIPro.Web.HSSE.SitePerson this.drpUnit.SelectedValue = this.CurrUser.UnitId; this.drpUnit.Enabled = false; } - this.txtStartDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now.AddMonths(-1)); - this.txtEndDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now.AddDays(1)); + this.txtStartDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now.AddDays(-1)); + this.txtEndDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now.AddMinutes(1)); // 绑定表格 BindGrid(); } diff --git a/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonInfoEdit.aspx.cs b/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonInfoEdit.aspx.cs index 46ac817f..0613b768 100644 --- a/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonInfoEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonInfoEdit.aspx.cs @@ -246,9 +246,11 @@ namespace FineUIPro.Web.HSSE.SitePerson string[] personIds = this.drpPersonId.Value.Split(','); foreach (var item in personIds) { - Model.SitePerson_Checking personInfo = new Model.SitePerson_Checking(); - personInfo.ProjectId = this.ProjectId; - personInfo.PersonId = item.Trim(); + Model.SitePerson_Checking personInfo = new Model.SitePerson_Checking + { + ProjectId = this.ProjectId, + PersonId = item.Trim() + }; var person = BLL.PersonService.GetPersonById(personInfo.PersonId); if (person != null) { diff --git a/SGGL/WebAPI/Controllers/DoorProject/uploadController.cs b/SGGL/WebAPI/Controllers/DoorProject/uploadController.cs index 2888a1cc..41ac3423 100644 --- a/SGGL/WebAPI/Controllers/DoorProject/uploadController.cs +++ b/SGGL/WebAPI/Controllers/DoorProject/uploadController.cs @@ -259,8 +259,8 @@ namespace WebAPI.Controllers { if (!string.IsNullOrEmpty(person.OutTime)) { - getPerson.OutTime = Funs.GetNewDateTime(person.OutTime); - PersonService.AddPerson(getPerson); + var outTime = Funs.GetNewDateTimeOrNow(person.OutTime); + PersonService.PersonOut(getPerson.PersonId, outTime); responeData.message = "更新出场时间"; } else