diff --git a/DataBase/版本日志/SGGLDB_V2021-08-18-001.sql b/DataBase/版本日志/SGGLDB_V2021-08-18-001.sql deleted file mode 100644 index ed7ca117..00000000 --- a/DataBase/版本日志/SGGLDB_V2021-08-18-001.sql +++ /dev/null @@ -1,6 +0,0 @@ -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-30-001.sql b/DataBase/版本日志/SGGLDB_V2021-08-30-001.sql new file mode 100644 index 00000000..de52fb34 --- /dev/null +++ b/DataBase/版本日志/SGGLDB_V2021-08-30-001.sql @@ -0,0 +1,13 @@ +INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) +VALUES('214A1AE1-816E-4DDA-8E6E-04EB35F02A12','ֳԱ','ZHGL/RealName/OnPost.aspx',50,'D78C6E54-4240-4E82-B9B5-8ED76CF62981','Menu_ZHGL',1,1,1) +GO + +ALTER TABLE SitePerson_Person ADD IsCardNoOK BIT NULL +GO +ALTER TABLE SitePerson_Person_BAK ADD IsCardNoOK BIT NULL +GO + +ALTER TABLE [dbo].[RealName_Project] ADD JTproCode nvarchar(50) null +go +update RealName_Project set JTproCode=proCode +go diff --git a/DataBase/版本日志/已更新脚本/SGGLDB_V2021-08-18-001.sql b/DataBase/版本日志/已更新脚本/SGGLDB_V2021-08-18-001.sql index 3baf5730..ed7ca117 100644 --- a/DataBase/版本日志/已更新脚本/SGGLDB_V2021-08-18-001.sql +++ b/DataBase/版本日志/已更新脚本/SGGLDB_V2021-08-18-001.sql @@ -1,2 +1,6 @@ -alter table dbo.Comprehensive_DesignDrawings drop constraint FK_Comprehensive_DesignDrawings_Base_CNProfessional +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 similarity index 100% rename from DataBase/版本日志/SGGLDB_V2021-08-19-001.sql rename to DataBase/版本日志/已更新脚本/SGGLDB_V2021-08-19-001.sql diff --git a/DataBase/版本日志/SGGLDB_V2021-08-29-001.sql b/DataBase/版本日志/已更新脚本/SGGLDB_V2021-08-29-001.sql similarity index 100% rename from DataBase/版本日志/SGGLDB_V2021-08-29-001.sql rename to DataBase/版本日志/已更新脚本/SGGLDB_V2021-08-29-001.sql diff --git a/DataBase/菜单初始化脚本/0-8综合管理（Menu_ZHGL）.sql b/DataBase/菜单初始化脚本/0-8综合管理（Menu_ZHGL）.sql index d316b5d3..1bbb39e3 100644 --- a/DataBase/菜单初始化脚本/0-8综合管理（Menu_ZHGL）.sql +++ b/DataBase/菜单初始化脚本/0-8综合管理（Menu_ZHGL）.sql @@ -1,7 +1,7 @@ -delete from Sys_ButtonToMenu where MenuId in (select MenuId from Sys_Menu where MenuType='Menu_ZHGL') -go -delete from Sys_Menu where MenuType='Menu_ZHGL' -go +--delete from Sys_ButtonToMenu where MenuId in (select MenuId from Sys_Menu where MenuType='Menu_ZHGL') +--go +--delete from Sys_Menu where MenuType='Menu_ZHGL' +--go INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) VALUES('2572CDC8-BA26-4C74-B6F7-CB3D63E91E72','安全体系','',10,'0','Menu_ZHGL',1,0,1) GO @@ -396,7 +396,9 @@ GO INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) VALUES('4882C5F0-9D49-4B2E-BA30-E806D3CDF6FA','离岗人员修正','ZHGL/RealName/LeavePost.aspx',40,'D78C6E54-4240-4E82-B9B5-8ED76CF62981','Menu_ZHGL',1,1,1) GO - + INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) + VALUES('214A1AE1-816E-4DDA-8E6E-04EB35F02A12','在岗人员','ZHGL/RealName/OnPost.aspx',50,'D78C6E54-4240-4E82-B9B5-8ED76CF62981','Menu_ZHGL',1,1,1) + GO ----本部综合管理 --INSERT INTO Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) --VALUES('A57CBE1D-B9F4-4FB6-A428-10197734AAB6','数据统计','',30,'0','Menu_ZHGL',1,0,1) @@ -406,4 +408,4 @@ GO --VALUES('2D79CBCF-20A6-4146-B832-58368315FC96','隐患整改统计','ZHGL/DataStatistics/RectifyNoticesStatistics.aspx',20,'A57CBE1D-B9F4-4FB6-A428-10197734AAB6','Menu_ZHGL',1,1,1) --INSERT INTO Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) --VALUES('69EEFFAB-166E-4419-A334-E53EDFE7D9D7','安全会议统计','ZHGL/DataStatistics/MeetStatistics.aspx',30,'A57CBE1D-B9F4-4FB6-A428-10197734AAB6','Menu_ZHGL',1,1,1) ---GO \ No newline at end of file +--GO diff --git a/SGGL/BLL/API/APIPersonService.cs b/SGGL/BLL/API/APIPersonService.cs index 3ab4c83e..7135a90c 100644 --- a/SGGL/BLL/API/APIPersonService.cs +++ b/SGGL/BLL/API/APIPersonService.cs @@ -822,6 +822,7 @@ namespace BLL { newPerson.Isprint = "0"; newPerson.PersonId = SQLHelper.GetNewID(); + newPerson.IsCardNoOK = IDCardValid.CheckIDCard(person.IdentityCard); db.SitePerson_Person.InsertOnSubmit(newPerson); db.SubmitChanges(); CodeRecordsService.InsertCodeRecordsByMenuIdProjectIdUnitId(Const.PersonListMenuId, person.ProjectId, person.UnitId, person.PersonId, newPerson.InTime); @@ -901,6 +902,7 @@ namespace BLL getPerson.RealNameUpdateTime = null; getPerson.IsForeign = person.IsForeign; getPerson.IsOutside = person.IsOutside; + getPerson.IsCardNoOK = IDCardValid.CheckIDCard(getPerson.IdentityCard); db.SubmitChanges(); } if (!string.IsNullOrEmpty(newPerson.PersonId)) diff --git a/SGGL/BLL/BLL.csproj b/SGGL/BLL/BLL.csproj index 115270e6..31ae2e90 100644 --- a/SGGL/BLL/BLL.csproj +++ b/SGGL/BLL/BLL.csproj @@ -710,6 +710,8 @@ + + diff --git a/SGGL/BLL/Common/CommonService.cs b/SGGL/BLL/Common/CommonService.cs index 77288fe0..c413c6dc 100644 --- a/SGGL/BLL/Common/CommonService.cs +++ b/SGGL/BLL/Common/CommonService.cs @@ -590,5 +590,20 @@ namespace BLL } } #endregion + + + /// + /// 获取年龄 + /// + /// + /// + /// + public static int CalculateAgeCorrect(DateTime birthDate) + { + DateTime now = DateTime.Now; + int age = now.Year - birthDate.Year; + if (now.Month < birthDate.Month || (now.Month == birthDate.Month && now.Day < birthDate.Day)) age--; + return age; + } } } diff --git a/SGGL/BLL/Common/IDCardValid.cs b/SGGL/BLL/Common/IDCardValid.cs index 4cab797c..65b4f42b 100644 --- a/SGGL/BLL/Common/IDCardValid.cs +++ b/SGGL/BLL/Common/IDCardValid.cs @@ -16,6 +16,10 @@ namespace BLL /// 验证成功为True，否则为False public static bool CheckIDCard(string Id) { + if (string.IsNullOrEmpty(Id)) + { + return false; + } if (Id.Length == 18) { bool check = CheckIDCard18(Id); diff --git a/SGGL/BLL/HSSE/SitePerson/PersonService.cs b/SGGL/BLL/HSSE/SitePerson/PersonService.cs index 280b5171..6c74510f 100644 --- a/SGGL/BLL/HSSE/SitePerson/PersonService.cs +++ b/SGGL/BLL/HSSE/SitePerson/PersonService.cs @@ -410,6 +410,7 @@ namespace BLL Nation = person.Nation, CountryCode = person.CountryCode, ProvinceCode = person.ProvinceCode, + IsCardNoOK=IDCardValid.CheckIDCard(person.IdentityCard), }; if (person.InTime.HasValue) @@ -500,6 +501,7 @@ namespace BLL newPerson.Nation = person.Nation; newPerson.CountryCode = person.CountryCode; newPerson.ProvinceCode = person.ProvinceCode; + newPerson.IsCardNoOK = IDCardValid.CheckIDCard(person.IdentityCard); db.SubmitChanges(); } } diff --git a/SGGL/BLL/ZHGL/RealName/OnPostService.cs b/SGGL/BLL/ZHGL/RealName/OnPostService.cs new file mode 100644 index 00000000..17eb8b5c --- /dev/null +++ b/SGGL/BLL/ZHGL/RealName/OnPostService.cs @@ -0,0 +1,113 @@ +using FineUIPro; +using System; +using System.Collections; +using System.Linq; + +namespace BLL +{ + public static class OnPostService + { + public static Model.SGGLDB db = Funs.DB; + + #region 获取列表 + /// + /// 记录数 + /// + public static int count + { + get; + set; + } + + /// + /// 定义变量 + /// + private static IQueryable getDataLists = from x in db.SitePerson_Person + where x.IsUsed == true + select x; + + /// + /// + /// + /// + /// + /// + /// + /// + public static IEnumerable getListData(string projectId, string personName, string identityCard, string rblStates, string rbInfo, string rbIDCardNo, string rbRealName, + Grid Grid1) + { + IQueryable getDataList = getDataLists; + if (projectId != Const._Null && !string.IsNullOrEmpty(projectId)) + { + getDataList = getDataList.Where(x => x.ProjectId == projectId); + } + if (!string.IsNullOrEmpty(personName)) + { + getDataList = getDataList.Where(x => x.PersonName.Contains(personName)); + } + if (!string.IsNullOrEmpty(identityCard)) + { + getDataList = getDataList.Where(x => x.IdentityCard.Contains(identityCard)); + } + if (rblStates == "1") + { + getDataList = getDataList.Where(x => !x.OutTime.HasValue); + } + if (rblStates == "0") + { + getDataList = getDataList.Where(x => x.OutTime.HasValue); + } + if (rbInfo == "1") + { + getDataList = getDataList.Where(x => x.HeadImage != null && x.IsCardNoOK ==true); + } + if (rbInfo == "0") + { + getDataList = getDataList.Where(x => x.HeadImage == null || x.IsCardNoOK ==false); + } + if (rbInfo == "1") + { + getDataList = getDataList.Where(x => x.IsCardNoOK == true); + } + if (rbInfo == "0") + { + getDataList = getDataList.Where(x =>x.IsCardNoOK == false); + } + if (rbRealName == "1") + { + getDataList = getDataList.Where(x => x.RealNameAddTime.HasValue); + } + if (rbRealName == "0") + { + getDataList = getDataList.Where(x => !x.RealNameAddTime.HasValue); + } + count = getDataList.Count(); + if (count == 0) + { + return null; + } + getDataList = SortConditionHelper.SortingAndPaging(getDataList, Grid1.SortField, Grid1.SortDirection, Grid1.PageIndex, Grid1.PageSize); + return from x in getDataList + select new + { + x.PersonId, + x.IdentityCard, + x.PersonName, + x.ProjectId, + //db.Base_Project.First(y => x.ProjectId == y.ProjectId).ShortName, + SexName = x.Sex == "1" ? "男" : "女", + x.InTime, + x.OutTime, + x.Birthday, + x.CountryCode, + x.ProvinceCode, + db.ProjectData_TeamGroup.First(z => x.TeamGroupId == z.TeamGroupId).TeamGroupName, + db.Base_WorkPost.First(z => x.WorkPostId == z.WorkPostId).WorkPostName, + IsPostName = x.OutTime.HasValue ? "是" : "否", + }; + } + #endregion + + } +} diff --git a/SGGL/BLL/ZHGL/RealName/RealName_ProjectService.cs b/SGGL/BLL/ZHGL/RealName/RealName_ProjectService.cs new file mode 100644 index 00000000..6e5e3505 --- /dev/null +++ b/SGGL/BLL/ZHGL/RealName/RealName_ProjectService.cs @@ -0,0 +1,42 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace BLL +{ + public static class RealName_ProjectService + { + public static Model.SGGLDB db = Funs.DB; + + /// + /// + /// + /// + public static List GetRealName_ProjectList() + { + return (from x in Funs.DB.RealName_Project orderby x.ProCode select x).ToList(); + } + + /// + /// + /// + /// + /// + public static string GeJTproCodeByproCode(string proCode) + { + string code = string.Empty; + var project = Funs.DB.RealName_Project.FirstOrDefault(e => e.ProCode == proCode); + if (project != null) + { + code = project.JTproCode; + if (string.IsNullOrEmpty(code)) + { + code = project.ProCode; + } + } + return code; + } + } +} diff --git a/SGGL/BLL/ZHGL/RealName/SynchroSetService.cs b/SGGL/BLL/ZHGL/RealName/SynchroSetService.cs index f20c7262..356ec3cb 100644 --- a/SGGL/BLL/ZHGL/RealName/SynchroSetService.cs +++ b/SGGL/BLL/ZHGL/RealName/SynchroSetService.cs @@ -502,7 +502,7 @@ namespace BLL JArray arr = JArray.Parse(obj["data"].ToString()); foreach (var item in arr) { - proCode = item["proCode"].ToString(); + string JTproCode = item["proCode"].ToString(); string proName = item["proName"].ToString(); string proShortName = item["proShortName"].ToString(); if (!string.IsNullOrEmpty(proCode)) @@ -512,6 +512,7 @@ namespace BLL { getProject.ProName = proName; getProject.ProShortName = proShortName; + getProject.JTproCode = JTproCode; Funs.DB.SubmitChanges(); } else @@ -520,6 +521,7 @@ namespace BLL { ID = SQLHelper.GetNewID(), ProCode = proCode, + JTproCode=JTproCode, ProName = proName, ProShortName = proShortName }; @@ -719,7 +721,7 @@ namespace BLL select new { unitId=x.UnitId, - proCode = y.JTProjectCode, + proCode = z.JTproCode, collCropCode = u.CollCropCode, collCropType = db.Sys_Const.First(t => t.GroupId == ConstValue.Group_ProjectUnitType && t.ConstValue == x.UnitType).Remark, entryTime = string.Format("{0:yyyy-MM-dd}", x.InTime), @@ -840,7 +842,7 @@ namespace BLL && u.CollCropCode != null && u.CollCropCode != "" select new { - proCode = y.JTProjectCode, + proCode = z.JTproCode, collCropCode = u.CollCropCode, teamType = x.TeamTypeId, teamName = x.TeamGroupName, @@ -913,13 +915,14 @@ namespace BLL string contenttype = "application/json;charset=unicode"; var getData = (from x in Funs.DB.SitePerson_Person join y in Funs.DB.Base_Project on x.ProjectId equals y.ProjectId + join z in Funs.DB.RealName_Project on y.JTProjectCode equals z.ProCode join u in Funs.DB.Base_Unit on x.UnitId equals u.UnitId join v in Funs.DB.ProjectData_TeamGroup on x.TeamGroupId equals v.TeamGroupId join w in Funs.DB.Base_WorkPost on x.WorkPostId equals w.WorkPostId where ((x.IdentityCard != null && x.IdentityCard != "" && identityCard == null) || (identityCard != null && x.IdentityCard == identityCard)) - && y.JTProjectCode == proCode + && y.JTProjectCode == proCode && z.JTproCode != null && v.TeamId.HasValue && x.HeadImage != null && x.HeadImage.Length > 0 - && ((type == Const.BtnModify && !x.RealNameUpdateTime.HasValue) || (type != Const.BtnModify && !x.RealNameAddTime.HasValue && x.IsUsed && !x.OutTime.HasValue)) + && ((type == Const.BtnModify && !x.RealNameUpdateTime.HasValue && x.RealNameAddTime.HasValue) || (type != Const.BtnModify && !x.RealNameAddTime.HasValue && x.IsUsed && !x.OutTime.HasValue)) && (x.IdentityCard.Length == 15 || x.IdentityCard.Length == 18) select new { @@ -942,7 +945,7 @@ namespace BLL //positiveIdcardImage = db.AttachFile.First(t => (x.PersonId + "#1") == t.ToKeyId).ImageByte, //negativeIdcardImage = db.AttachFile.First(t => (x.PersonId + "#5") == t.ToKeyId).ImageByte, headImage = x.HeadImage, - proCode = y.JTProjectCode, + proCode = z.JTproCode, teamId = v.TeamId, mobile = x.Telephone, teamLeaderFlag = (v.GroupLeaderId == x.PersonId ? "Y" : "N"), @@ -1036,12 +1039,14 @@ namespace BLL string contenttype = "application/json;charset=unicode"; var getData = (from x in Funs.DB.SitePerson_Person join y in Funs.DB.Base_Project on x.ProjectId equals y.ProjectId + join z in Funs.DB.RealName_Project on y.JTProjectCode equals z.ProCode join u in Funs.DB.Base_Unit on x.UnitId equals u.UnitId join v in Funs.DB.ProjectData_TeamGroup on x.TeamGroupId equals v.TeamGroupId join w in Funs.DB.Base_WorkPost on x.WorkPostId equals w.WorkPostId where x.IdentityCard == identityCard && y.JTProjectCode == proCode && v.TeamId.HasValue && x.HeadImage != null && x.HeadImage.Length > 0 - && (x.IdentityCard.Length == 15 || x.IdentityCard.Length == 18) + && (x.IdentityCard.Length == 15 || x.IdentityCard.Length == 18) + && z.JTproCode != null select new { name = x.PersonName, @@ -1061,7 +1066,7 @@ namespace BLL countryCode = x.CountryCode, provinceCode = x.ProvinceCode, headImage = x.HeadImage, - proCode = y.JTProjectCode, + proCode = z.JTproCode, teamId = v.TeamId, mobile = x.Telephone, teamLeaderFlag = (v.GroupLeaderId == x.PersonId ? "Y" : "N"), @@ -1160,15 +1165,17 @@ namespace BLL join p in Funs.DB.SitePerson_Person on x.PersonId equals p.PersonId join v in Funs.DB.ProjectData_TeamGroup on p.TeamGroupId equals v.TeamGroupId join r in Funs.DB.RealName_CollTeam on v.TeamId equals r.TeamId + join z in Funs.DB.RealName_Project on x.ProCode equals z.ProCode where x.IdcardNumber != null && x.IdcardType != null && x.ChangeTime.HasValue && (proCode == null || x.ProCode == proCode) && p.HeadImage != null && p.HeadImage.Length > 0 && v.TeamId.HasValue && p.HeadImage != null && r.TeamId.HasValue - && (p.IdentityCard.Length == 15 || p.IdentityCard.Length == 18) + && (p.IdentityCard.Length == 15 || p.IdentityCard.Length == 18) && p.RealNameAddTime.HasValue + && z.JTproCode != null orderby x.ChangeTime descending select new { p.PersonId, - proCode = x.ProCode, + proCode = z.JTproCode, name = x.Name, idcardType = x.IdcardType, idcardNumber = x.IdcardNumber, @@ -1247,7 +1254,7 @@ namespace BLL { var getProject = new { - proCode + proCode = RealName_ProjectService.GeJTproCodeByproCode(proCode), }; var returndata = BLL.APIGetHttpService.OutsideHttp(Funs.RealNameApiUrl + "/foreignApi/baseData/getCollTeam", "POST", null, newToken, JsonConvert.SerializeObject(getProject)); if (!string.IsNullOrEmpty(returndata)) @@ -1304,13 +1311,14 @@ namespace BLL { var getCollTeam = (from x in Funs.DB.ProjectData_TeamGroup join y in Funs.DB.Base_Project on x.ProjectId equals y.ProjectId + join z in Funs.DB.RealName_Project on y.JTProjectCode equals z.ProCode join u in Funs.DB.Base_Unit on x.UnitId equals u.UnitId join s in Funs.DB.SitePerson_Person on x.GroupLeaderId equals s.PersonId into jonPerson from s in jonPerson.DefaultIfEmpty() - where teamGroupIds.Contains(x.TeamGroupId) + where teamGroupIds.Contains(x.TeamGroupId) && z.JTproCode != null select new { - proCode = y.JTProjectCode, + proCode = z.JTproCode, collCropCode = u.CollCropCode, teamType = x.TeamTypeId, teamName = x.TeamGroupName, @@ -1344,9 +1352,10 @@ namespace BLL { var getData = (from x in db.SitePerson_Person join y in db.Base_Project on x.ProjectId equals y.ProjectId + join z in Funs.DB.RealName_Project on y.JTProjectCode equals z.ProCode join v in db.ProjectData_TeamGroup on x.TeamGroupId equals v.TeamGroupId join w in db.Base_WorkPost on x.WorkPostId equals w.WorkPostId - where personList.Contains(x.PersonId) + where personList.Contains(x.PersonId) && z.JTproCode != null select new { name = x.PersonName, @@ -1368,7 +1377,7 @@ namespace BLL //positiveIdcardImage = db.AttachFile.First(t => (x.PersonId + "#1") == t.ToKeyId).ImageByte, //negativeIdcardImage = db.AttachFile.First(t => (x.PersonId + "#5") == t.ToKeyId).ImageByte, headImage = x.HeadImage, - proCode = y.JTProjectCode, + proCode = z.JTproCode, teamId = v.TeamId, mobile = x.Telephone, teamLeaderFlag = (v.GroupLeaderId == x.PersonId ? "Y" : "N"), diff --git a/SGGL/FineUIPro.Web/File/Excel/Temp/201901260220172933.xls b/SGGL/FineUIPro.Web/File/Excel/Temp/201901260220172933.xls deleted file mode 100644 index ae9a539e..00000000 Binary files a/SGGL/FineUIPro.Web/File/Excel/Temp/201901260220172933.xls and /dev/null differ diff --git a/SGGL/FineUIPro.Web/File/Excel/Temp/201904090940325540.xls b/SGGL/FineUIPro.Web/File/Excel/Temp/201904090940325540.xls deleted file mode 100644 index 36e6b608..00000000 Binary files a/SGGL/FineUIPro.Web/File/Excel/Temp/201904090940325540.xls and /dev/null differ diff --git a/SGGL/FineUIPro.Web/File/Excel/Temp/201904090940447730.xls b/SGGL/FineUIPro.Web/File/Excel/Temp/201904090940447730.xls deleted file mode 100644 index 36e6b608..00000000 Binary files a/SGGL/FineUIPro.Web/File/Excel/Temp/201904090940447730.xls and /dev/null differ diff --git a/SGGL/FineUIPro.Web/File/Excel/Temp/201904090940492127.xls b/SGGL/FineUIPro.Web/File/Excel/Temp/201904090940492127.xls deleted file mode 100644 index 36e6b608..00000000 Binary files a/SGGL/FineUIPro.Web/File/Excel/Temp/201904090940492127.xls and /dev/null differ diff --git a/SGGL/FineUIPro.Web/File/Excel/Temp/201904090943348203.xls b/SGGL/FineUIPro.Web/File/Excel/Temp/201904090943348203.xls deleted file mode 100644 index 36e6b608..00000000 Binary files a/SGGL/FineUIPro.Web/File/Excel/Temp/201904090943348203.xls and /dev/null differ diff --git a/SGGL/FineUIPro.Web/File/Excel/Temp/201904090944334590.xls b/SGGL/FineUIPro.Web/File/Excel/Temp/201904090944334590.xls deleted file mode 100644 index 36e6b608..00000000 Binary files a/SGGL/FineUIPro.Web/File/Excel/Temp/201904090944334590.xls and /dev/null differ diff --git a/SGGL/FineUIPro.Web/File/Excel/Temp/201904090954499801.xls b/SGGL/FineUIPro.Web/File/Excel/Temp/201904090954499801.xls deleted file mode 100644 index 36e6b608..00000000 Binary files a/SGGL/FineUIPro.Web/File/Excel/Temp/201904090954499801.xls and /dev/null differ diff --git a/SGGL/FineUIPro.Web/File/Excel/Temp/201904091001106848.xls b/SGGL/FineUIPro.Web/File/Excel/Temp/201904091001106848.xls deleted file mode 100644 index 36e6b608..00000000 Binary files a/SGGL/FineUIPro.Web/File/Excel/Temp/201904091001106848.xls and /dev/null differ diff --git a/SGGL/FineUIPro.Web/File/Excel/Temp/201904091002389253.xls b/SGGL/FineUIPro.Web/File/Excel/Temp/201904091002389253.xls deleted file mode 100644 index 1d522d31..00000000 Binary files a/SGGL/FineUIPro.Web/File/Excel/Temp/201904091002389253.xls and /dev/null differ diff --git a/SGGL/FineUIPro.Web/File/Excel/Temp/201904091003347141.xls b/SGGL/FineUIPro.Web/File/Excel/Temp/201904091003347141.xls deleted file mode 100644 index 1d522d31..00000000 Binary files a/SGGL/FineUIPro.Web/File/Excel/Temp/201904091003347141.xls and /dev/null differ diff --git a/SGGL/FineUIPro.Web/File/Excel/Temp/201911010700551385.xls b/SGGL/FineUIPro.Web/File/Excel/Temp/201911010700551385.xls deleted file mode 100644 index 624cfe27..00000000 Binary files a/SGGL/FineUIPro.Web/File/Excel/Temp/201911010700551385.xls and /dev/null differ diff --git a/SGGL/FineUIPro.Web/File/Excel/Temp/201911010702051905.xls b/SGGL/FineUIPro.Web/File/Excel/Temp/201911010702051905.xls deleted file mode 100644 index 93856bcb..00000000 Binary files a/SGGL/FineUIPro.Web/File/Excel/Temp/201911010702051905.xls and /dev/null differ diff --git a/SGGL/FineUIPro.Web/File/Excel/Temp/201911010705409273.xls b/SGGL/FineUIPro.Web/File/Excel/Temp/201911010705409273.xls deleted file mode 100644 index 93856bcb..00000000 Binary files a/SGGL/FineUIPro.Web/File/Excel/Temp/201911010705409273.xls and /dev/null differ diff --git a/SGGL/FineUIPro.Web/File/Excel/Temp/201911010726372310.xls b/SGGL/FineUIPro.Web/File/Excel/Temp/201911010726372310.xls deleted file mode 100644 index 72bd572b..00000000 Binary files a/SGGL/FineUIPro.Web/File/Excel/Temp/201911010726372310.xls and /dev/null differ diff --git a/SGGL/FineUIPro.Web/File/Excel/Temp/201911010727065817.xls b/SGGL/FineUIPro.Web/File/Excel/Temp/201911010727065817.xls deleted file mode 100644 index 72bd572b..00000000 Binary files a/SGGL/FineUIPro.Web/File/Excel/Temp/201911010727065817.xls and /dev/null differ diff --git a/SGGL/FineUIPro.Web/File/Excel/Temp/201911010728056629.xls b/SGGL/FineUIPro.Web/File/Excel/Temp/201911010728056629.xls deleted file mode 100644 index 0b28c4cd..00000000 Binary files a/SGGL/FineUIPro.Web/File/Excel/Temp/201911010728056629.xls and /dev/null differ diff --git a/SGGL/FineUIPro.Web/File/Excel/Temp/201911120756389277.xls b/SGGL/FineUIPro.Web/File/Excel/Temp/201911120756389277.xls deleted file mode 100644 index ba70cacd..00000000 Binary files a/SGGL/FineUIPro.Web/File/Excel/Temp/201911120756389277.xls and /dev/null differ diff --git a/SGGL/FineUIPro.Web/File/Excel/Temp/201911120758333836.xls b/SGGL/FineUIPro.Web/File/Excel/Temp/201911120758333836.xls deleted file mode 100644 index df47d9df..00000000 Binary files a/SGGL/FineUIPro.Web/File/Excel/Temp/201911120758333836.xls and /dev/null differ diff --git a/SGGL/FineUIPro.Web/File/Excel/Temp/201911120801437422.xls b/SGGL/FineUIPro.Web/File/Excel/Temp/201911120801437422.xls deleted file mode 100644 index df47d9df..00000000 Binary files a/SGGL/FineUIPro.Web/File/Excel/Temp/201911120801437422.xls and /dev/null differ diff --git a/SGGL/FineUIPro.Web/File/Excel/Temp/201911120802436321.xls b/SGGL/FineUIPro.Web/File/Excel/Temp/201911120802436321.xls deleted file mode 100644 index df47d9df..00000000 Binary files a/SGGL/FineUIPro.Web/File/Excel/Temp/201911120802436321.xls and /dev/null differ diff --git a/SGGL/FineUIPro.Web/File/Excel/Temp/201912101107151275.xls b/SGGL/FineUIPro.Web/File/Excel/Temp/201912101107151275.xls deleted file mode 100644 index a776414c..00000000 Binary files a/SGGL/FineUIPro.Web/File/Excel/Temp/201912101107151275.xls and /dev/null differ diff --git a/SGGL/FineUIPro.Web/File/Excel/Temp/201912101123579029.xls b/SGGL/FineUIPro.Web/File/Excel/Temp/201912101123579029.xls deleted file mode 100644 index a776414c..00000000 Binary files a/SGGL/FineUIPro.Web/File/Excel/Temp/201912101123579029.xls and /dev/null differ diff --git a/SGGL/FineUIPro.Web/File/Excel/Temp/202003101020099975.xls b/SGGL/FineUIPro.Web/File/Excel/Temp/202003101020099975.xls deleted file mode 100644 index 2e6d36ad..00000000 Binary files a/SGGL/FineUIPro.Web/File/Excel/Temp/202003101020099975.xls and /dev/null differ diff --git a/SGGL/FineUIPro.Web/File/Excel/Temp/202005111018228377.xls b/SGGL/FineUIPro.Web/File/Excel/Temp/202005111018228377.xls deleted file mode 100644 index a8e010db..00000000 Binary files a/SGGL/FineUIPro.Web/File/Excel/Temp/202005111018228377.xls and /dev/null differ diff --git a/SGGL/FineUIPro.Web/File/Excel/Temp/202005111018571925.xls b/SGGL/FineUIPro.Web/File/Excel/Temp/202005111018571925.xls deleted file mode 100644 index a8e010db..00000000 Binary files a/SGGL/FineUIPro.Web/File/Excel/Temp/202005111018571925.xls and /dev/null differ diff --git a/SGGL/FineUIPro.Web/File/Excel/Temp/202005111019013377.xls b/SGGL/FineUIPro.Web/File/Excel/Temp/202005111019013377.xls deleted file mode 100644 index 1e102817..00000000 Binary files a/SGGL/FineUIPro.Web/File/Excel/Temp/202005111019013377.xls and /dev/null differ diff --git a/SGGL/FineUIPro.Web/File/Excel/Temp/202012151136486685.xls b/SGGL/FineUIPro.Web/File/Excel/Temp/202012151136486685.xls deleted file mode 100644 index 3cd0c7ce..00000000 Binary files a/SGGL/FineUIPro.Web/File/Excel/Temp/202012151136486685.xls and /dev/null differ diff --git a/SGGL/FineUIPro.Web/File/Excel/Temp/202012151139439426.xls b/SGGL/FineUIPro.Web/File/Excel/Temp/202012151139439426.xls deleted file mode 100644 index ecb7ee43..00000000 Binary files a/SGGL/FineUIPro.Web/File/Excel/Temp/202012151139439426.xls and /dev/null differ diff --git a/SGGL/FineUIPro.Web/File/Excel/Temp/202012151140476264.xls b/SGGL/FineUIPro.Web/File/Excel/Temp/202012151140476264.xls deleted file mode 100644 index ecb7ee43..00000000 Binary files a/SGGL/FineUIPro.Web/File/Excel/Temp/202012151140476264.xls and /dev/null differ diff --git a/SGGL/FineUIPro.Web/File/Excel/Temp/202103110521419818.xls b/SGGL/FineUIPro.Web/File/Excel/Temp/202103110521419818.xls deleted file mode 100644 index 29aa7566..00000000 Binary files a/SGGL/FineUIPro.Web/File/Excel/Temp/202103110521419818.xls and /dev/null differ diff --git a/SGGL/FineUIPro.Web/File/Excel/Temp/202103110523323051.xls b/SGGL/FineUIPro.Web/File/Excel/Temp/202103110523323051.xls deleted file mode 100644 index d598d14a..00000000 Binary files a/SGGL/FineUIPro.Web/File/Excel/Temp/202103110523323051.xls and /dev/null differ diff --git a/SGGL/FineUIPro.Web/File/Excel/Temp/202103230446445093.xls b/SGGL/FineUIPro.Web/File/Excel/Temp/202103230446445093.xls deleted file mode 100644 index ce4f3233..00000000 Binary files a/SGGL/FineUIPro.Web/File/Excel/Temp/202103230446445093.xls and /dev/null differ diff --git a/SGGL/FineUIPro.Web/File/Excel/Temp/202103230446592082.xls b/SGGL/FineUIPro.Web/File/Excel/Temp/202103230446592082.xls deleted file mode 100644 index aa02b9c1..00000000 Binary files a/SGGL/FineUIPro.Web/File/Excel/Temp/202103230446592082.xls and /dev/null differ diff --git a/SGGL/FineUIPro.Web/File/Excel/Temp/202103290420057791.xls b/SGGL/FineUIPro.Web/File/Excel/Temp/202103290420057791.xls deleted file mode 100644 index 16e0c507..00000000 Binary files a/SGGL/FineUIPro.Web/File/Excel/Temp/202103290420057791.xls and /dev/null differ diff --git a/SGGL/FineUIPro.Web/File/Excel/Temp/202103290422164766.xls b/SGGL/FineUIPro.Web/File/Excel/Temp/202103290422164766.xls deleted file mode 100644 index 16e0c507..00000000 Binary files a/SGGL/FineUIPro.Web/File/Excel/Temp/202103290422164766.xls and /dev/null differ diff --git a/SGGL/FineUIPro.Web/File/Excel/Temp/202103290426242325.xls b/SGGL/FineUIPro.Web/File/Excel/Temp/202103290426242325.xls deleted file mode 100644 index 16e0c507..00000000 Binary files a/SGGL/FineUIPro.Web/File/Excel/Temp/202103290426242325.xls and /dev/null differ diff --git a/SGGL/FineUIPro.Web/File/Excel/Temp/202103290435409796.xls b/SGGL/FineUIPro.Web/File/Excel/Temp/202103290435409796.xls deleted file mode 100644 index 16e0c507..00000000 Binary files a/SGGL/FineUIPro.Web/File/Excel/Temp/202103290435409796.xls and /dev/null differ diff --git a/SGGL/FineUIPro.Web/File/Excel/Temp/202103290437426220.xls b/SGGL/FineUIPro.Web/File/Excel/Temp/202103290437426220.xls deleted file mode 100644 index 16e0c507..00000000 Binary files a/SGGL/FineUIPro.Web/File/Excel/Temp/202103290437426220.xls and /dev/null differ diff --git a/SGGL/FineUIPro.Web/File/Excel/Temp/202103300359255913.xls b/SGGL/FineUIPro.Web/File/Excel/Temp/202103300359255913.xls deleted file mode 100644 index d8cd4ce0..00000000 Binary files a/SGGL/FineUIPro.Web/File/Excel/Temp/202103300359255913.xls and /dev/null differ diff --git a/SGGL/FineUIPro.Web/File/Excel/Temp/202103300427472843.xls b/SGGL/FineUIPro.Web/File/Excel/Temp/202103300427472843.xls deleted file mode 100644 index 5ebf64e6..00000000 Binary files a/SGGL/FineUIPro.Web/File/Excel/Temp/202103300427472843.xls and /dev/null differ diff --git a/SGGL/FineUIPro.Web/File/Excel/Temp/202103300433217822.xls b/SGGL/FineUIPro.Web/File/Excel/Temp/202103300433217822.xls deleted file mode 100644 index 38f901bf..00000000 Binary files a/SGGL/FineUIPro.Web/File/Excel/Temp/202103300433217822.xls and /dev/null differ diff --git a/SGGL/FineUIPro.Web/File/Excel/Temp/202103300434002822.xls b/SGGL/FineUIPro.Web/File/Excel/Temp/202103300434002822.xls deleted file mode 100644 index d573d56a..00000000 Binary files a/SGGL/FineUIPro.Web/File/Excel/Temp/202103300434002822.xls and /dev/null differ diff --git a/SGGL/FineUIPro.Web/File/Excel/Temp/202103300435115569.xls b/SGGL/FineUIPro.Web/File/Excel/Temp/202103300435115569.xls deleted file mode 100644 index 894818f8..00000000 Binary files a/SGGL/FineUIPro.Web/File/Excel/Temp/202103300435115569.xls and /dev/null differ diff --git a/SGGL/FineUIPro.Web/File/Excel/Temp/202103300439572358.xls b/SGGL/FineUIPro.Web/File/Excel/Temp/202103300439572358.xls deleted file mode 100644 index ac5785fa..00000000 Binary files a/SGGL/FineUIPro.Web/File/Excel/Temp/202103300439572358.xls and /dev/null differ diff --git a/SGGL/FineUIPro.Web/File/Excel/Temp/202103300442004680.xls b/SGGL/FineUIPro.Web/File/Excel/Temp/202103300442004680.xls deleted file mode 100644 index 3b34f81d..00000000 Binary files a/SGGL/FineUIPro.Web/File/Excel/Temp/202103300442004680.xls and /dev/null differ diff --git a/SGGL/FineUIPro.Web/File/Excel/Temp/202103300446495208.xls b/SGGL/FineUIPro.Web/File/Excel/Temp/202103300446495208.xls deleted file mode 100644 index aed3f52b..00000000 Binary files a/SGGL/FineUIPro.Web/File/Excel/Temp/202103300446495208.xls and /dev/null differ diff --git a/SGGL/FineUIPro.Web/File/Excel/Temp/202103300453231058.xls b/SGGL/FineUIPro.Web/File/Excel/Temp/202103300453231058.xls deleted file mode 100644 index aed3f52b..00000000 Binary files a/SGGL/FineUIPro.Web/File/Excel/Temp/202103300453231058.xls and /dev/null differ diff --git a/SGGL/FineUIPro.Web/File/Excel/Temp/202103300453429000.xls b/SGGL/FineUIPro.Web/File/Excel/Temp/202103300453429000.xls deleted file mode 100644 index aed3f52b..00000000 Binary files a/SGGL/FineUIPro.Web/File/Excel/Temp/202103300453429000.xls and /dev/null differ diff --git a/SGGL/FineUIPro.Web/File/Excel/Temp/202103300453512966.xls b/SGGL/FineUIPro.Web/File/Excel/Temp/202103300453512966.xls deleted file mode 100644 index 34536c15..00000000 Binary files a/SGGL/FineUIPro.Web/File/Excel/Temp/202103300453512966.xls and /dev/null differ diff --git a/SGGL/FineUIPro.Web/File/Excel/Temp/202103300546171025.xls b/SGGL/FineUIPro.Web/File/Excel/Temp/202103300546171025.xls deleted file mode 100644 index aed3f52b..00000000 Binary files a/SGGL/FineUIPro.Web/File/Excel/Temp/202103300546171025.xls and /dev/null differ diff --git a/SGGL/FineUIPro.Web/File/Excel/Temp/202103310851038736.xls b/SGGL/FineUIPro.Web/File/Excel/Temp/202103310851038736.xls deleted file mode 100644 index 19daf002..00000000 Binary files a/SGGL/FineUIPro.Web/File/Excel/Temp/202103310851038736.xls and /dev/null differ diff --git a/SGGL/FineUIPro.Web/File/Excel/Temp/202103310855108110.xls b/SGGL/FineUIPro.Web/File/Excel/Temp/202103310855108110.xls deleted file mode 100644 index 19daf002..00000000 Binary files a/SGGL/FineUIPro.Web/File/Excel/Temp/202103310855108110.xls and /dev/null differ diff --git a/SGGL/FineUIPro.Web/File/Excel/Temp/202103310859291460.xls b/SGGL/FineUIPro.Web/File/Excel/Temp/202103310859291460.xls deleted file mode 100644 index 19daf002..00000000 Binary files a/SGGL/FineUIPro.Web/File/Excel/Temp/202103310859291460.xls and /dev/null differ diff --git a/SGGL/FineUIPro.Web/File/Excel/Temp/202103310907123503.xls b/SGGL/FineUIPro.Web/File/Excel/Temp/202103310907123503.xls deleted file mode 100644 index 19daf002..00000000 Binary files a/SGGL/FineUIPro.Web/File/Excel/Temp/202103310907123503.xls and /dev/null differ diff --git a/SGGL/FineUIPro.Web/File/Excel/Temp/202103310908151312.xls b/SGGL/FineUIPro.Web/File/Excel/Temp/202103310908151312.xls deleted file mode 100644 index 19daf002..00000000 Binary files a/SGGL/FineUIPro.Web/File/Excel/Temp/202103310908151312.xls and /dev/null differ diff --git a/SGGL/FineUIPro.Web/File/Excel/Temp/202103310910096813.xls b/SGGL/FineUIPro.Web/File/Excel/Temp/202103310910096813.xls deleted file mode 100644 index 19daf002..00000000 Binary files a/SGGL/FineUIPro.Web/File/Excel/Temp/202103310910096813.xls and /dev/null differ diff --git a/SGGL/FineUIPro.Web/File/Excel/Temp/202103310942205676.xls b/SGGL/FineUIPro.Web/File/Excel/Temp/202103310942205676.xls deleted file mode 100644 index 19daf002..00000000 Binary files a/SGGL/FineUIPro.Web/File/Excel/Temp/202103310942205676.xls and /dev/null differ diff --git a/SGGL/FineUIPro.Web/File/Excel/Temp/202104060230588633.xls b/SGGL/FineUIPro.Web/File/Excel/Temp/202104060230588633.xls deleted file mode 100644 index 1d267a0d..00000000 Binary files a/SGGL/FineUIPro.Web/File/Excel/Temp/202104060230588633.xls and /dev/null differ diff --git a/SGGL/FineUIPro.Web/File/Excel/Temp/202104060233464553.xls b/SGGL/FineUIPro.Web/File/Excel/Temp/202104060233464553.xls deleted file mode 100644 index ab6609d4..00000000 Binary files a/SGGL/FineUIPro.Web/File/Excel/Temp/202104060233464553.xls and /dev/null differ diff --git a/SGGL/FineUIPro.Web/File/Excel/Temp/202104060239295755.xls b/SGGL/FineUIPro.Web/File/Excel/Temp/202104060239295755.xls deleted file mode 100644 index ab6609d4..00000000 Binary files a/SGGL/FineUIPro.Web/File/Excel/Temp/202104060239295755.xls and /dev/null differ diff --git a/SGGL/FineUIPro.Web/File/Excel/Temp/202104060316374540.xls b/SGGL/FineUIPro.Web/File/Excel/Temp/202104060316374540.xls deleted file mode 100644 index ab6609d4..00000000 Binary files a/SGGL/FineUIPro.Web/File/Excel/Temp/202104060316374540.xls and /dev/null differ diff --git a/SGGL/FineUIPro.Web/File/Excel/Temp/202104060321003102.xls b/SGGL/FineUIPro.Web/File/Excel/Temp/202104060321003102.xls deleted file mode 100644 index ab6609d4..00000000 Binary files a/SGGL/FineUIPro.Web/File/Excel/Temp/202104060321003102.xls and /dev/null differ diff --git a/SGGL/FineUIPro.Web/File/Excel/Temp/202104120316177265.xls b/SGGL/FineUIPro.Web/File/Excel/Temp/202104120316177265.xls deleted file mode 100644 index b114d0f6..00000000 Binary files a/SGGL/FineUIPro.Web/File/Excel/Temp/202104120316177265.xls and /dev/null differ diff --git a/SGGL/FineUIPro.Web/File/Excel/Temp/202104150346289056.xls b/SGGL/FineUIPro.Web/File/Excel/Temp/202104150346289056.xls deleted file mode 100644 index e54afab3..00000000 Binary files a/SGGL/FineUIPro.Web/File/Excel/Temp/202104150346289056.xls and /dev/null differ diff --git a/SGGL/FineUIPro.Web/File/Excel/Temp/202104190843396760.xls b/SGGL/FineUIPro.Web/File/Excel/Temp/202104190843396760.xls deleted file mode 100644 index 9d691fbf..00000000 Binary files a/SGGL/FineUIPro.Web/File/Excel/Temp/202104190843396760.xls and /dev/null differ diff --git a/SGGL/FineUIPro.Web/File/Excel/Temp/202104200419393042.xls b/SGGL/FineUIPro.Web/File/Excel/Temp/202104200419393042.xls deleted file mode 100644 index 525120b2..00000000 Binary files a/SGGL/FineUIPro.Web/File/Excel/Temp/202104200419393042.xls and /dev/null differ diff --git a/SGGL/FineUIPro.Web/File/Excel/Temp/202104200421267933.xls b/SGGL/FineUIPro.Web/File/Excel/Temp/202104200421267933.xls deleted file mode 100644 index 525120b2..00000000 Binary files a/SGGL/FineUIPro.Web/File/Excel/Temp/202104200421267933.xls and /dev/null differ diff --git a/SGGL/FineUIPro.Web/File/Excel/Temp/202104200422528798.xls b/SGGL/FineUIPro.Web/File/Excel/Temp/202104200422528798.xls deleted file mode 100644 index 31e9c003..00000000 Binary files a/SGGL/FineUIPro.Web/File/Excel/Temp/202104200422528798.xls and /dev/null differ diff --git a/SGGL/FineUIPro.Web/File/Excel/Temp/202104221125066241.xls b/SGGL/FineUIPro.Web/File/Excel/Temp/202104221125066241.xls deleted file mode 100644 index 6bbddd7b..00000000 Binary files a/SGGL/FineUIPro.Web/File/Excel/Temp/202104221125066241.xls and /dev/null differ diff --git a/SGGL/FineUIPro.Web/File/Excel/Temp/202104270145024513.xls b/SGGL/FineUIPro.Web/File/Excel/Temp/202104270145024513.xls deleted file mode 100644 index 80026692..00000000 Binary files a/SGGL/FineUIPro.Web/File/Excel/Temp/202104270145024513.xls and /dev/null differ diff --git a/SGGL/FineUIPro.Web/File/Excel/Temp/202104270228076631.xls b/SGGL/FineUIPro.Web/File/Excel/Temp/202104270228076631.xls deleted file mode 100644 index 558067e6..00000000 Binary files a/SGGL/FineUIPro.Web/File/Excel/Temp/202104270228076631.xls and /dev/null differ diff --git a/SGGL/FineUIPro.Web/File/Excel/Temp/202104270228461033.xls b/SGGL/FineUIPro.Web/File/Excel/Temp/202104270228461033.xls deleted file mode 100644 index 558067e6..00000000 Binary files a/SGGL/FineUIPro.Web/File/Excel/Temp/202104270228461033.xls and /dev/null differ diff --git a/SGGL/FineUIPro.Web/File/Excel/Temp/202105010610145196.xls b/SGGL/FineUIPro.Web/File/Excel/Temp/202105010610145196.xls deleted file mode 100644 index eedafd3c..00000000 Binary files a/SGGL/FineUIPro.Web/File/Excel/Temp/202105010610145196.xls and /dev/null differ diff --git a/SGGL/FineUIPro.Web/File/Excel/Temp/202105010617373624.xls b/SGGL/FineUIPro.Web/File/Excel/Temp/202105010617373624.xls deleted file mode 100644 index eedafd3c..00000000 Binary files a/SGGL/FineUIPro.Web/File/Excel/Temp/202105010617373624.xls and /dev/null differ diff --git a/SGGL/FineUIPro.Web/File/Excel/Temp/202105010628301166.xls b/SGGL/FineUIPro.Web/File/Excel/Temp/202105010628301166.xls deleted file mode 100644 index 0e1c472a..00000000 Binary files a/SGGL/FineUIPro.Web/File/Excel/Temp/202105010628301166.xls and /dev/null differ diff --git a/SGGL/FineUIPro.Web/File/Excel/Temp/202106211034115669.xls b/SGGL/FineUIPro.Web/File/Excel/Temp/202106211034115669.xls deleted file mode 100644 index b9cbf6d2..00000000 Binary files a/SGGL/FineUIPro.Web/File/Excel/Temp/202106211034115669.xls and /dev/null differ diff --git a/SGGL/FineUIPro.Web/File/Excel/Temp/202107250453188462.xls b/SGGL/FineUIPro.Web/File/Excel/Temp/202107250453188462.xls deleted file mode 100644 index f8f817b9..00000000 Binary files a/SGGL/FineUIPro.Web/File/Excel/Temp/202107250453188462.xls and /dev/null differ diff --git a/SGGL/FineUIPro.Web/File/Excel/Temp/202107250455318606.xls b/SGGL/FineUIPro.Web/File/Excel/Temp/202107250455318606.xls deleted file mode 100644 index f8f817b9..00000000 Binary files a/SGGL/FineUIPro.Web/File/Excel/Temp/202107250455318606.xls and /dev/null differ diff --git a/SGGL/FineUIPro.Web/File/Excel/Temp/202107250455339961.xls b/SGGL/FineUIPro.Web/File/Excel/Temp/202107250455339961.xls deleted file mode 100644 index f8f817b9..00000000 Binary files a/SGGL/FineUIPro.Web/File/Excel/Temp/202107250455339961.xls and /dev/null differ diff --git a/SGGL/FineUIPro.Web/File/Excel/Temp/202107250455368303.xls b/SGGL/FineUIPro.Web/File/Excel/Temp/202107250455368303.xls deleted file mode 100644 index f8f817b9..00000000 Binary files a/SGGL/FineUIPro.Web/File/Excel/Temp/202107250455368303.xls and /dev/null differ diff --git a/SGGL/FineUIPro.Web/File/Excel/Temp/202108160435213114.xlsx b/SGGL/FineUIPro.Web/File/Excel/Temp/202108160435213114.xlsx deleted file mode 100644 index 0785b7b7..00000000 Binary files a/SGGL/FineUIPro.Web/File/Excel/Temp/202108160435213114.xlsx and /dev/null differ diff --git a/SGGL/FineUIPro.Web/File/Excel/Temp/202108160437039751.xls b/SGGL/FineUIPro.Web/File/Excel/Temp/202108160437039751.xls deleted file mode 100644 index e90e85e4..00000000 Binary files a/SGGL/FineUIPro.Web/File/Excel/Temp/202108160437039751.xls and /dev/null differ diff --git a/SGGL/FineUIPro.Web/File/Excel/Temp/202108160439474816.xls b/SGGL/FineUIPro.Web/File/Excel/Temp/202108160439474816.xls deleted file mode 100644 index e90e85e4..00000000 Binary files a/SGGL/FineUIPro.Web/File/Excel/Temp/202108160439474816.xls and /dev/null differ diff --git a/SGGL/FineUIPro.Web/File/Excel/Temp/202108180157473215.xls b/SGGL/FineUIPro.Web/File/Excel/Temp/202108180157473215.xls deleted file mode 100644 index 90024dde..00000000 Binary files a/SGGL/FineUIPro.Web/File/Excel/Temp/202108180157473215.xls and /dev/null differ diff --git a/SGGL/FineUIPro.Web/File/Excel/Temp/202108181024434903.xls b/SGGL/FineUIPro.Web/File/Excel/Temp/202108181024434903.xls deleted file mode 100644 index bcbe5c0b..00000000 Binary files a/SGGL/FineUIPro.Web/File/Excel/Temp/202108181024434903.xls and /dev/null differ diff --git a/SGGL/FineUIPro.Web/File/Excel/Temp/202108181123056668.xls b/SGGL/FineUIPro.Web/File/Excel/Temp/202108181123056668.xls deleted file mode 100644 index 75469643..00000000 Binary files a/SGGL/FineUIPro.Web/File/Excel/Temp/202108181123056668.xls and /dev/null differ diff --git a/SGGL/FineUIPro.Web/File/Excel/Temp/202108211005342003.xls b/SGGL/FineUIPro.Web/File/Excel/Temp/202108211005342003.xls deleted file mode 100644 index 31c5530d..00000000 Binary files a/SGGL/FineUIPro.Web/File/Excel/Temp/202108211005342003.xls and /dev/null differ diff --git a/SGGL/FineUIPro.Web/File/Excel/Temp/202108211050408504.xls b/SGGL/FineUIPro.Web/File/Excel/Temp/202108211050408504.xls deleted file mode 100644 index 08031425..00000000 Binary files a/SGGL/FineUIPro.Web/File/Excel/Temp/202108211050408504.xls and /dev/null differ diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj index f8c79c0d..32f696ba 100644 --- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj +++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj @@ -1486,6 +1486,7 @@ + @@ -14642,6 +14643,13 @@ AccidentStatisticsView.aspx + + OnPost.aspx + ASPXCodeBehind + + + OnPost.aspx + LeavePost.aspx ASPXCodeBehind diff --git a/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonIn.aspx.cs b/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonIn.aspx.cs index 0ee77d6c..eddc9f18 100644 --- a/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonIn.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonIn.aspx.cs @@ -1133,6 +1133,7 @@ namespace FineUIPro.Web.HSSE.SitePerson getPerson.Telephone = persons[i].Telephone; getPerson.IsUsed = persons[i].IsUsedName == "是" ? true : false; getPerson.IsCardUsed = persons[i].IsCardUsedName == "是" ? true : false; + getPerson.IsCardNoOK = IDCardValid.CheckIDCard(persons[i].IdentityCard); Funs.DB.SubmitChanges(); } } diff --git a/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonList.aspx.cs b/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonList.aspx.cs index b9b95851..b2d86771 100644 --- a/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonList.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonList.aspx.cs @@ -421,8 +421,13 @@ namespace FineUIPro.Web.HSSE.SitePerson foreach (var item in getPerfomances) { content += "人员绩效【" + item.PersonPerfomanceCode + "】"; - } + } + var getPerson = Funs.DB.SitePerson_Person.FirstOrDefault(x => x.PersonId == rowID && x.RealNameAddTime.HasValue); + if (getPerson != null) + { + content += "人员【" + getPerson.PersonName + "】已上传集团。"; + } if (!string.IsNullOrEmpty(content)) { content += "中已使用该人员【" + name + "】！"; diff --git a/SGGL/FineUIPro.Web/ZHGL/RealName/OnPost.aspx b/SGGL/FineUIPro.Web/ZHGL/RealName/OnPost.aspx new file mode 100644 index 00000000..07c8ce76 --- /dev/null +++ b/SGGL/FineUIPro.Web/ZHGL/RealName/OnPost.aspx @@ -0,0 +1,137 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="OnPost.aspx.cs" + Inherits="FineUIPro.Web.ZHGL.RealName.OnPost" %> + + + + + 实名制人员 + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/ZHGL/RealName/OnPost.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/RealName/OnPost.aspx.cs new file mode 100644 index 00000000..16432321 --- /dev/null +++ b/SGGL/FineUIPro.Web/ZHGL/RealName/OnPost.aspx.cs @@ -0,0 +1,219 @@ +using BLL; +using System; +using System.Linq; +using System.Text; +using AspNet = System.Web.UI.WebControls; + +namespace FineUIPro.Web.ZHGL.RealName +{ + public partial class OnPost : PageBase + { + /// + /// 加载 + /// + /// + /// + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + Funs.DropDownPageSize(this.ddlPageSize); + ProjectService.InitAllProjectShortNameDropDownList(this.drpProject, this.CurrUser.UserId, true); + if (!string.IsNullOrEmpty(this.CurrUser.LoginProjectId)) + { + this.drpProject.SelectedValue = this.CurrUser.LoginProjectId; + this.drpProject.Readonly = true; + } + this.GridBind(); + } + } + + /// + /// 获取数据，合并相同行 + /// + private void GridBind() + { + var getData = OnPostService.getListData(this.drpProject.SelectedValue, this.txtName.Text.Trim(), this.txtIdentityCard.Text.Trim(), + this.rblStates.SelectedValue,this.rbInfo.SelectedValue,this.rbIDCardNo.SelectedValue,this.rbRealName.SelectedValue, + Grid1); + Grid1.RecordCount = OnPostService.count; + Grid1.DataSource = getData; + Grid1.DataBind(); + } + + protected void btnSearch_Click(object sender, EventArgs e) + { + this.GridBind(); + } + + #region 导出按钮 + /// 导出按钮 + /// + /// + /// + protected void btnOut_Click(object sender, EventArgs e) + { + Response.ClearContent(); + string filename = Funs.GetNewFileName(); + Response.AddHeader("content-disposition", "attachment; filename=" + System.Web.HttpUtility.UrlEncode("人员记录" + filename, System.Text.Encoding.UTF8) + ".xls"); + Response.ContentType = "application/excel"; + Response.ContentEncoding = System.Text.Encoding.UTF8; + this.Grid1.PageSize = this.Grid1.RecordCount; + this.GridBind(); + Response.Write(GetGridTableHtml(Grid1)); + Response.End(); + } + + /// + /// 导出方法 + /// + /// + /// + private string GetGridTableHtml(Grid grid) + { + StringBuilder sb = new StringBuilder(); + sb.Append(""); + sb.Append(""); + sb.Append(""); + foreach (GridColumn column in grid.Columns) + { + sb.AppendFormat("", column.HeaderText); + } + sb.Append(""); + foreach (GridRow row in grid.Rows) + { + sb.Append(""); + foreach (GridColumn column in grid.Columns) + { + string html = row.Values[column.ColumnIndex].ToString(); + if (column.ColumnID == "tfNumber") + { + html = (row.FindControl("labNumber") as AspNet.Label).Text; + } + if (column.ColumnID == "tfAge") + { + html = (row.FindControl("lblAge") as AspNet.Label).Text; + } + if (column.ColumnID == "tfProvince") + { + html = (row.FindControl("lblProvince") as AspNet.Label).Text; + } + sb.AppendFormat("", html); + } + + sb.Append(""); + } + + sb.Append("
{0}
{0}
"); + + return sb.ToString(); + } + #endregion + + #region 分页 排序 + /// + /// 改变索引事件 + /// + /// + /// + protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e) + { + this.GridBind(); + } + + /// + /// 分页下拉选择事件 + /// + /// + /// + protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e) + { + this.Grid1.PageSize = Convert.ToInt32(this.ddlPageSize.SelectedValue); + this.GridBind(); + } + + /// + /// + /// + /// + /// + protected void Grid1_Sort(object sender, GridSortEventArgs e) + { + this.GridBind(); + } + #endregion + + #region 格式化字符串 + /// + /// 年龄 + /// + /// + /// + protected string ConvertAge(object rirthday) + { + string age = string.Empty; + if (rirthday != null) + { + DateTime? bDate = Funs.GetNewDateTime(rirthday.ToString()); + if (bDate.HasValue) + { + age = CommonService.CalculateAgeCorrect(bDate.Value).ToString(); + } + } + return age; + } + + /// + /// 籍贯 + /// + /// + /// + protected string ConvertProvinceCode(object ProvinceCode) + { + string name = string.Empty; + if (ProvinceCode != null) + { + var getCity = Funs.DB.RealName_City.FirstOrDefault(x => x.ProvinceCode == ProvinceCode.ToString()); + if (getCity != null) + { + name = getCity.Cname; + } + } + return name; + } + /// + /// + /// + /// + /// + protected string ConvertShortName(object projectId) + { + string name = string.Empty; + if (projectId != null) + { + var getproject = Funs.DB.Base_Project.FirstOrDefault(x => x.ProjectId == projectId.ToString()); + if (getproject != null) + { + var getRP = Funs.DB.RealName_Project.FirstOrDefault(x => x.ProCode == getproject.JTProjectCode); + if (getRP != null) + { + name = getRP.ProShortName; + } + } + } + return name; + } + #endregion + + protected void btnIDCard_Click(object sender, EventArgs e) + { + var getPersons = from x in Funs.DB.SitePerson_Person where !x.IsCardNoOK.HasValue select x; + foreach (var item in getPersons) + { + item.IsCardNoOK = IDCardValid.CheckIDCard(item.IdentityCard); + Funs.DB.SubmitChanges(); + } + ShowNotify("刷新完成！", MessageBoxIcon.Success); + } + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/ZHGL/RealName/OnPost.aspx.designer.cs b/SGGL/FineUIPro.Web/ZHGL/RealName/OnPost.aspx.designer.cs new file mode 100644 index 00000000..960ff93b --- /dev/null +++ b/SGGL/FineUIPro.Web/ZHGL/RealName/OnPost.aspx.designer.cs @@ -0,0 +1,222 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.ZHGL.RealName { + + + public partial class OnPost { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// Panel1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel1; + + /// + /// Grid1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid Grid1; + + /// + /// Toolbar2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar2; + + /// + /// rblStates 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.RadioButtonList rblStates; + + /// + /// rbInfo 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.RadioButtonList rbInfo; + + /// + /// rbIDCardNo 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.RadioButtonList rbIDCardNo; + + /// + /// rbRealName 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.RadioButtonList rbRealName; + + /// + /// Toolbar1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar1; + + /// + /// drpProject 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpProject; + + /// + /// txtName 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtName; + + /// + /// txtIdentityCard 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtIdentityCard; + + /// + /// btnSearch 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnSearch; + + /// + /// btnOut 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnOut; + + /// + /// btnIDCard 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnIDCard; + + /// + /// labNumber 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label labNumber; + + /// + /// lblShortName 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label lblShortName; + + /// + /// lblAge 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label lblAge; + + /// + /// lblProvince 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label lblProvince; + + /// + /// ToolbarSeparator1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1; + + /// + /// ToolbarText1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarText ToolbarText1; + + /// + /// ddlPageSize 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlPageSize; + } +} diff --git a/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml b/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml index 3f76f5fb..52386529 100644 --- a/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml +++ b/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml @@ -51,6 +51,7 @@ - + + \ No newline at end of file diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs index 0849073d..8d6686a0 100644 --- a/SGGL/Model/Model.cs +++ b/SGGL/Model/Model.cs @@ -15662,6 +15662,8 @@ namespace Model private EntitySet _Comprehensive_DesignChangeOrder; + private EntitySet _Comprehensive_DesignDrawings; + private EntitySet _Comprehensive_GeneralPlanApproval; private EntitySet _Comprehensive_InspectionEquipment; @@ -15702,6 +15704,7 @@ namespace Model this._Base_DesignProfessional = new EntitySet(new Action(this.attach_Base_DesignProfessional), new Action(this.detach_Base_DesignProfessional)); this._Comprehensive_DataDistribution = new EntitySet(new Action(this.attach_Comprehensive_DataDistribution), new Action(this.detach_Comprehensive_DataDistribution)); this._Comprehensive_DesignChangeOrder = new EntitySet(new Action(this.attach_Comprehensive_DesignChangeOrder), new Action(this.detach_Comprehensive_DesignChangeOrder)); + this._Comprehensive_DesignDrawings = new EntitySet(new Action(this.attach_Comprehensive_DesignDrawings), new Action(this.detach_Comprehensive_DesignDrawings)); this._Comprehensive_GeneralPlanApproval = new EntitySet(new Action(this.attach_Comprehensive_GeneralPlanApproval), new Action(this.detach_Comprehensive_GeneralPlanApproval)); this._Comprehensive_InspectionEquipment = new EntitySet(new Action(this.attach_Comprehensive_InspectionEquipment), new Action(this.detach_Comprehensive_InspectionEquipment)); this._Comprehensive_MajorPlanApproval = new EntitySet(new Action(this.attach_Comprehensive_MajorPlanApproval), new Action(this.detach_Comprehensive_MajorPlanApproval)); @@ -15847,6 +15850,19 @@ namespace Model } } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Comprehensive_DesignDrawings_Base_CNProfessional", Storage="_Comprehensive_DesignDrawings", ThisKey="CNProfessionalId", OtherKey="CNProfessionalId", DeleteRule="NO ACTION")] + public EntitySet Comprehensive_DesignDrawings + { + get + { + return this._Comprehensive_DesignDrawings; + } + set + { + this._Comprehensive_DesignDrawings.Assign(value); + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Comprehensive_GeneralPlanApproval_Base_CNProfessional", Storage="_Comprehensive_GeneralPlanApproval", ThisKey="CNProfessionalId", OtherKey="CNProfessionalId", DeleteRule="NO ACTION")] public EntitySet Comprehensive_GeneralPlanApproval { @@ -16045,6 +16061,18 @@ namespace Model entity.Base_CNProfessional = null; } + private void attach_Comprehensive_DesignDrawings(Comprehensive_DesignDrawings entity) + { + this.SendPropertyChanging(); + entity.Base_CNProfessional = this; + } + + private void detach_Comprehensive_DesignDrawings(Comprehensive_DesignDrawings entity) + { + this.SendPropertyChanging(); + entity.Base_CNProfessional = null; + } + private void attach_Comprehensive_GeneralPlanApproval(Comprehensive_GeneralPlanApproval entity) { this.SendPropertyChanging(); @@ -68325,6 +68353,8 @@ namespace Model private string _UnitWorkId; + private EntityRef _Base_CNProfessional; + private EntityRef _Base_Project; #region 可扩展性方法定义 @@ -68363,6 +68393,7 @@ namespace Model public Comprehensive_DesignDrawings() { + this._Base_CNProfessional = default(EntityRef); this._Base_Project = default(EntityRef); OnCreated(); } @@ -68422,6 +68453,10 @@ namespace Model { if ((this._CNProfessionalId != value)) { + if (this._Base_CNProfessional.HasLoadedOrAssignedValue) + { + throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException(); + } this.OnCNProfessionalIdChanging(value); this.SendPropertyChanging(); this._CNProfessionalId = value; @@ -68651,6 +68686,40 @@ namespace Model } } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Comprehensive_DesignDrawings_Base_CNProfessional", Storage="_Base_CNProfessional", ThisKey="CNProfessionalId", OtherKey="CNProfessionalId", IsForeignKey=true)] + public Base_CNProfessional Base_CNProfessional + { + get + { + return this._Base_CNProfessional.Entity; + } + set + { + Base_CNProfessional previousValue = this._Base_CNProfessional.Entity; + if (((previousValue != value) + || (this._Base_CNProfessional.HasLoadedOrAssignedValue == false))) + { + this.SendPropertyChanging(); + if ((previousValue != null)) + { + this._Base_CNProfessional.Entity = null; + previousValue.Comprehensive_DesignDrawings.Remove(this); + } + this._Base_CNProfessional.Entity = value; + if ((value != null)) + { + value.Comprehensive_DesignDrawings.Add(this); + this._CNProfessionalId = value.CNProfessionalId; + } + else + { + this._CNProfessionalId = default(string); + } + this.SendPropertyChanged("Base_CNProfessional"); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Comprehensive_DesignDrawings_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)] public Base_Project Base_Project { @@ -232210,6 +232279,8 @@ namespace Model private string _ProShortName; + private string _JTproCode; + #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -232222,6 +232293,8 @@ namespace Model partial void OnProNameChanged(); partial void OnProShortNameChanging(string value); partial void OnProShortNameChanged(); + partial void OnJTproCodeChanging(string value); + partial void OnJTproCodeChanged(); #endregion public RealName_Project() @@ -232309,6 +232382,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_JTproCode", DbType="NVarChar(50)")] + public string JTproCode + { + get + { + return this._JTproCode; + } + set + { + if ((this._JTproCode != value)) + { + this.OnJTproCodeChanging(value); + this.SendPropertyChanging(); + this._JTproCode = value; + this.SendPropertyChanged("JTproCode"); + this.OnJTproCodeChanged(); + } + } + } + public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged; @@ -244483,8 +244576,6 @@ namespace Model private EntityRef _SitePerson_Person; - private EntityRef _WBS_UnitWork; - #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -244517,7 +244608,6 @@ namespace Model { this._Base_Project = default(EntityRef); this._SitePerson_Person = default(EntityRef); - this._WBS_UnitWork = default(EntityRef); OnCreated(); } @@ -244585,7 +244675,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkAreaId", DbType="NVarChar(50)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkAreaId", DbType="NVarChar(MAX)", UpdateCheck=UpdateCheck.Never)] public string WorkAreaId { get @@ -244596,10 +244686,6 @@ namespace Model { if ((this._WorkAreaId != value)) { - if (this._WBS_UnitWork.HasLoadedOrAssignedValue) - { - throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException(); - } this.OnWorkAreaIdChanging(value); this.SendPropertyChanging(); this._WorkAreaId = value; @@ -244609,7 +244695,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IdentityCard", DbType="NVarChar(18)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IdentityCard", DbType="NVarChar(50)")] public string IdentityCard { get @@ -244669,7 +244755,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Address", DbType="NVarChar(50)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Address", DbType="NVarChar(2000)")] public string Address { get @@ -244733,7 +244819,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkAreaName", DbType="NVarChar(100)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkAreaName", DbType="NVarChar(MAX)", UpdateCheck=UpdateCheck.Never)] public string WorkAreaName { get @@ -244821,40 +244907,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_SitePerson_Checking_WBS_UnitWork", Storage="_WBS_UnitWork", ThisKey="WorkAreaId", OtherKey="UnitWorkId", IsForeignKey=true)] - public WBS_UnitWork WBS_UnitWork - { - get - { - return this._WBS_UnitWork.Entity; - } - set - { - WBS_UnitWork previousValue = this._WBS_UnitWork.Entity; - if (((previousValue != value) - || (this._WBS_UnitWork.HasLoadedOrAssignedValue == false))) - { - this.SendPropertyChanging(); - if ((previousValue != null)) - { - this._WBS_UnitWork.Entity = null; - previousValue.SitePerson_Checking.Remove(this); - } - this._WBS_UnitWork.Entity = value; - if ((value != null)) - { - value.SitePerson_Checking.Add(this); - this._WorkAreaId = value.UnitWorkId; - } - else - { - this._WorkAreaId = default(string); - } - this.SendPropertyChanged("WBS_UnitWork"); - } - } - } - public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged; @@ -247150,6 +247202,8 @@ namespace Model private System.Nullable _RealNameUpdateTime; + private System.Nullable _IsCardNoOK; + private EntitySet _Accident_AccidentPersonRecord; private EntitySet _Accident_AccidentReportOtherItem; @@ -247328,6 +247382,8 @@ namespace Model partial void OnRealNameAddTimeChanged(); partial void OnRealNameUpdateTimeChanging(System.Nullable value); partial void OnRealNameUpdateTimeChanged(); + partial void OnIsCardNoOKChanging(System.Nullable value); + partial void OnIsCardNoOKChanged(); #endregion public SitePerson_Person() @@ -248556,6 +248612,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsCardNoOK", DbType="Bit")] + public System.Nullable IsCardNoOK + { + get + { + return this._IsCardNoOK; + } + set + { + if ((this._IsCardNoOK != value)) + { + this.OnIsCardNoOKChanging(value); + this.SendPropertyChanging(); + this._IsCardNoOK = value; + this.SendPropertyChanged("IsCardNoOK"); + this.OnIsCardNoOKChanged(); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Accident_AccidentPersonRecord_SitePerson_Person", Storage="_Accident_AccidentPersonRecord", ThisKey="PersonId", OtherKey="PersonId", DeleteRule="NO ACTION")] public EntitySet Accident_AccidentPersonRecord { @@ -249494,6 +249570,8 @@ namespace Model private System.Nullable _RealNameUpdateTime; + private System.Nullable _IsCardNoOK; + public SitePerson_Person_Bak() { } @@ -250425,6 +250503,22 @@ namespace Model } } } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsCardNoOK", DbType="Bit")] + public System.Nullable IsCardNoOK + { + get + { + return this._IsCardNoOK; + } + set + { + if ((this._IsCardNoOK != value)) + { + this._IsCardNoOK = value; + } + } + } } [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.SitePerson_PersonInOut")] @@ -326248,7 +326342,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkAreaId", DbType="NVarChar(50)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkAreaId", DbType="NVarChar(MAX)", UpdateCheck=UpdateCheck.Never)] public string WorkAreaId { get @@ -326296,7 +326390,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Address", DbType="NVarChar(50)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Address", DbType="NVarChar(2000)")] public string Address { get @@ -326312,7 +326406,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkAreaName", DbType="NVarChar(100)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkAreaName", DbType="NVarChar(MAX)", UpdateCheck=UpdateCheck.Never)] public string WorkAreaName { get @@ -341805,8 +341899,6 @@ namespace Model private EntitySet _PTP_TestPackage; - private EntitySet _SitePerson_Checking; - private EntitySet _Solution_LargerHazardListItem; private EntitySet _WBS_ForeignBreakdownProject; @@ -341896,7 +341988,6 @@ namespace Model this._ProduceTestRun_TestRunRecord = new EntitySet(new Action(this.attach_ProduceTestRun_TestRunRecord), new Action(this.detach_ProduceTestRun_TestRunRecord)); this._ProduceTestRun_TestRunReport = new EntitySet(new Action(this.attach_ProduceTestRun_TestRunReport), new Action(this.detach_ProduceTestRun_TestRunReport)); this._PTP_TestPackage = new EntitySet(new Action(this.attach_PTP_TestPackage), new Action(this.detach_PTP_TestPackage)); - this._SitePerson_Checking = new EntitySet(new Action(this.attach_SitePerson_Checking), new Action(this.detach_SitePerson_Checking)); this._Solution_LargerHazardListItem = new EntitySet(new Action(this.attach_Solution_LargerHazardListItem), new Action(this.detach_Solution_LargerHazardListItem)); this._WBS_ForeignBreakdownProject = new EntitySet(new Action(this.attach_WBS_ForeignBreakdownProject), new Action(this.detach_WBS_ForeignBreakdownProject)); this._Base_Unit = default(EntityRef); @@ -342737,19 +342828,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_SitePerson_Checking_WBS_UnitWork", Storage="_SitePerson_Checking", ThisKey="UnitWorkId", OtherKey="WorkAreaId", DeleteRule="NO ACTION")] - public EntitySet SitePerson_Checking - { - get - { - return this._SitePerson_Checking; - } - set - { - this._SitePerson_Checking.Assign(value); - } - } - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Solution_LargerHazardListItem_WBS_UnitWork", Storage="_Solution_LargerHazardListItem", ThisKey="UnitWorkId", OtherKey="UnitWorkId", DeleteRule="NO ACTION")] public EntitySet Solution_LargerHazardListItem { @@ -343427,18 +343505,6 @@ namespace Model entity.WBS_UnitWork = null; } - private void attach_SitePerson_Checking(SitePerson_Checking entity) - { - this.SendPropertyChanging(); - entity.WBS_UnitWork = this; - } - - private void detach_SitePerson_Checking(SitePerson_Checking entity) - { - this.SendPropertyChanging(); - entity.WBS_UnitWork = null; - } - private void attach_Solution_LargerHazardListItem(Solution_LargerHazardListItem entity) { this.SendPropertyChanging();