diff --git a/DataBase/版本日志/SGGLDB_V2021-07-08-001.sql b/DataBase/版本日志/SGGLDB_V2021-07-08-001.sql new file mode 100644 index 00000000..5aac9a60 --- /dev/null +++ b/DataBase/版本日志/SGGLDB_V2021-07-08-001.sql @@ -0,0 +1,14 @@ +ALTER TABLE Base_Project ADD JTProjectCode nvarchar(50) null +go +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ŶԽĿ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Base_Project', @level2type=N'COLUMN',@level2name=N'JTProjectCode' +GO + +update Base_Project set JTProjectCode = ProjectCode +go +update RealName_SynchroSet set proCode=(select JTProjectCode from Base_Project where RealName_SynchroSet.proCode=ProjectCode) +GO +update SitePerson_PersonInOutNow set proCode=(select JTProjectCode from Base_Project where SitePerson_PersonInOutNow.proCode=ProjectCode) +GO +update RealName_PersonInOutNow set proCode=(select JTProjectCode from Base_Project where RealName_PersonInOutNow.proCode=ProjectCode) +GO + diff --git a/DataBase/版本日志/SGGLDB_V2021-07-09-001.sql b/DataBase/版本日志/SGGLDB_V2021-07-09-001.sql new file mode 100644 index 00000000..bb89c622 --- /dev/null +++ b/DataBase/版本日志/SGGLDB_V2021-07-09-001.sql @@ -0,0 +1,98 @@ +ALTER VIEW [dbo].[View_SitePerson_Person] +AS +SELECT Person.PersonId, + Person.CardNo, + Person.PersonName, + Person.Sex, + (Case Person.Sex WHEN '1' THEN '' WHEN '2' THEN 'Ů' ELSE '' END) AS SexName, + Person.IdentityCard, + Person.Address, + Person.ProjectId, + Person.UnitId, + Person.Birthday, + Person.TeamGroupId, + Person.WorkAreaId, + Person.WorkPostId, + Person.InTime, + Person.OutTime, + Person.OutResult, + Person.Telephone, + Person.PositionId, + Person.PostTitleId, + Person.PhotoUrl, + Person.IsUsed, + (CASE Person.IsUsed WHEN 'TRUE' THEN '' ELSE '' END) AS IsUsedName, + Person.IsCardUsed, + (CASE Person.IsCardUsed WHEN 'TRUE' THEN '' ELSE '' END) AS IsCardUsedName, + Person.PersonIndex, + Project.ProjectCode, + Project.ProjectName, + Unit.UnitCode, + Unit.UnitName, + TeamGroup.TeamGroupName, + --WorkArea.UnitWorkCode AS WorkAreaCode, + WorkAreaCode= STUFF((SELECT ',' + UnitWorkCode FROM dbo.WBS_UnitWork where PATINDEX('%,' + RTRIM(UnitWorkId) + ',%',',' +Person.WorkAreaId + ',')>0 FOR XML PATH('')), 1, 1,''), + --WorkArea.UnitWorkName AS WorkAreaName + WorkAreaName= STUFF((SELECT ',' + UnitWorkName FROM dbo.WBS_UnitWork where PATINDEX('%,' + RTRIM(UnitWorkId) + ',%',',' +Person.WorkAreaId + ',')>0 FOR XML PATH('')), 1, 1,''), + Post.WorkPostName, + Position.PositionName, + Title.PostTitleName, + Depart.DepartName, + Post.PostType, + Post.IsHsse, + (SELECT COUNT(*) FROM EduTrain_TrainRecordDetail T WHERE T.PersonId=Person.PersonId) AS TrainCount, + Person.AuditorId, + sysUser.UserName AS AuditorName, + Person.AuditorDate, + Person.IDCardUrl, + Person.IsForeign, + case when Person.IsForeign=1 then '' else '' end as IsForeignStr, + Person.IdcardType, + BasicData1.dictName as IdcardTypeName, + Person.IdcardStartDate, + Person.IdcardEndDate, + Person.IdcardForever, + case when Person.IdcardForever='Y' then '' else '' end as IdcardForeverStr, + Person.PoliticsStatus, + BasicData2.dictName as PoliticsStatusName, + Person.IdcardAddress, + Person.Nation, + BasicData3.dictName as NationName, + Person.EduLevel, + BasicData4.dictName as EduLevelName, + Person.MaritalStatus, + BasicData5.dictName as MaritalStatusName, + Person.CountryCode, + Country.cname as CountryName, + Person.ProvinceCode, + City.cname as ProvinceName, + Person.MainCNProfessionalId, + CNProfessional.ProfessionalName as MainCNProfessionalName, + Person.ViceCNProfessionalId, + '' as ViceCNProfessionalName, + Person.IsOutside, + case when Person.IsOutside=1 then '' else '' end as IsOutsideStr, + Person.HeadImage +FROM SitePerson_Person AS Person +LEFT JOIN Base_Project AS Project ON Project.ProjectId=Person.ProjectId +LEFT JOIN Base_Unit AS Unit ON Unit.UnitId = Person.UnitId +LEFT JOIN ProjectData_TeamGroup AS TeamGroup ON TeamGroup.TeamGroupId=Person.TeamGroupId +--LEFT JOIN WBS_UnitWork AS WorkArea ON WorkArea.UnitWorkId = Person.WorkAreaId +LEFT JOIN Base_WorkPost AS Post ON Post.WorkPostId = Person.WorkPostId +LEFT JOIN Base_Position AS Position ON Position.PositionId = Person.PositionId +Left JOIN Base_PostTitle AS Title ON Title.PostTitleId = Person.PostTitleId +Left JOIN Base_Depart AS Depart ON Depart.DepartId = Person.DepartId +Left JOIN Sys_User AS sysUser ON sysUser.UserId = Person.AuditorId +Left JOIN RealName_BasicData AS BasicData1 ON BasicData1.dictCode = Person.IdcardType +Left JOIN RealName_BasicData AS BasicData2 ON BasicData2.dictCode = Person.PoliticsStatus +Left JOIN RealName_BasicData AS BasicData3 ON BasicData3.dictCode = Person.Nation +Left JOIN RealName_BasicData AS BasicData4 ON BasicData4.dictCode = Person.EduLevel +Left JOIN RealName_BasicData AS BasicData5 ON BasicData5.dictCode = Person.MaritalStatus +Left JOIN RealName_Country AS Country ON Country.CountryId = Person.CountryCode +Left JOIN RealName_City AS City ON City.provinceCode = Person.ProvinceCode +Left JOIN Base_CNProfessional AS CNProfessional ON CNProfessional.CNProfessionalId = Person.MainCNProfessionalId + + +GO + + diff --git a/DataBase/版本日志/SGGLDB_V2021-07-09-002.sql b/DataBase/版本日志/SGGLDB_V2021-07-09-002.sql new file mode 100644 index 00000000..1ef1833b --- /dev/null +++ b/DataBase/版本日志/SGGLDB_V2021-07-09-002.sql @@ -0,0 +1,100 @@ +ALTER VIEW [dbo].[View_SitePerson_Person] +AS +SELECT Person.PersonId, + Person.CardNo, + Person.PersonName, + Person.Sex, + (Case Person.Sex WHEN '1' THEN '' WHEN '2' THEN 'Ů' ELSE '' END) AS SexName, + Person.IdentityCard, + Person.Address, + Person.ProjectId, + Person.UnitId, + Person.Birthday, + Person.TeamGroupId, + Person.WorkAreaId, + Person.WorkPostId, + Person.InTime, + Person.OutTime, + Person.OutResult, + Person.Telephone, + Person.PositionId, + Person.PostTitleId, + Person.PhotoUrl, + Person.IsUsed, + (CASE Person.IsUsed WHEN 'TRUE' THEN '' ELSE '' END) AS IsUsedName, + Person.IsCardUsed, + (CASE Person.IsCardUsed WHEN 'TRUE' THEN '' ELSE '' END) AS IsCardUsedName, + Person.PersonIndex, + Project.ProjectCode, + Project.ProjectName, + Unit.UnitCode, + Unit.UnitName, + TeamGroup.TeamGroupName, + --WorkArea.UnitWorkCode AS WorkAreaCode, + WorkAreaCode= STUFF((SELECT ',' + UnitWorkCode FROM dbo.WBS_UnitWork where PATINDEX('%,' + RTRIM(UnitWorkId) + ',%',',' +Person.WorkAreaId + ',')>0 FOR XML PATH('')), 1, 1,''), + --WorkArea.UnitWorkName AS WorkAreaName + WorkAreaName= STUFF((SELECT ',' + UnitWorkName FROM dbo.WBS_UnitWork where PATINDEX('%,' + RTRIM(UnitWorkId) + ',%',',' +Person.WorkAreaId + ',')>0 FOR XML PATH('')), 1, 1,''), + Post.WorkPostName, + Position.PositionName, + Title.PostTitleName, + Depart.DepartName, + Post.PostType, + Post.IsHsse, + (SELECT COUNT(*) FROM EduTrain_TrainRecordDetail T WHERE T.PersonId=Person.PersonId) AS TrainCount, + Person.AuditorId, + sysUser.UserName AS AuditorName, + Person.AuditorDate, + Person.IDCardUrl, + Person.IsForeign, + case when Person.IsForeign=1 then '' else '' end as IsForeignStr, + Person.IdcardType, + BasicData1.dictName as IdcardTypeName, + Person.IdcardStartDate, + Person.IdcardEndDate, + Person.IdcardForever, + case when Person.IdcardForever='Y' then '' else '' end as IdcardForeverStr, + Person.PoliticsStatus, + BasicData2.dictName as PoliticsStatusName, + Person.IdcardAddress, + Person.Nation, + BasicData3.dictName as NationName, + Person.EduLevel, + BasicData4.dictName as EduLevelName, + Person.MaritalStatus, + BasicData5.dictName as MaritalStatusName, + Person.CountryCode, + Country.cname as CountryName, + Person.ProvinceCode, + City.cname as ProvinceName, + Person.MainCNProfessionalId, + CNProfessional.ProfessionalName as MainCNProfessionalName, + Person.ViceCNProfessionalId, + '' as ViceCNProfessionalName, + Person.IsOutside, + case when Person.IsOutside=1 then '' else '' end as IsOutsideStr, + Person.HeadImage, + RealNameAddTime +FROM SitePerson_Person AS Person +LEFT JOIN Base_Project AS Project ON Project.ProjectId=Person.ProjectId +LEFT JOIN Base_Unit AS Unit ON Unit.UnitId = Person.UnitId +LEFT JOIN ProjectData_TeamGroup AS TeamGroup ON TeamGroup.TeamGroupId=Person.TeamGroupId +--LEFT JOIN WBS_UnitWork AS WorkArea ON WorkArea.UnitWorkId = Person.WorkAreaId +LEFT JOIN Base_WorkPost AS Post ON Post.WorkPostId = Person.WorkPostId +LEFT JOIN Base_Position AS Position ON Position.PositionId = Person.PositionId +Left JOIN Base_PostTitle AS Title ON Title.PostTitleId = Person.PostTitleId +Left JOIN Base_Depart AS Depart ON Depart.DepartId = Person.DepartId +Left JOIN Sys_User AS sysUser ON sysUser.UserId = Person.AuditorId +Left JOIN RealName_BasicData AS BasicData1 ON BasicData1.dictCode = Person.IdcardType +Left JOIN RealName_BasicData AS BasicData2 ON BasicData2.dictCode = Person.PoliticsStatus +Left JOIN RealName_BasicData AS BasicData3 ON BasicData3.dictCode = Person.Nation +Left JOIN RealName_BasicData AS BasicData4 ON BasicData4.dictCode = Person.EduLevel +Left JOIN RealName_BasicData AS BasicData5 ON BasicData5.dictCode = Person.MaritalStatus +Left JOIN RealName_Country AS Country ON Country.CountryId = Person.CountryCode +Left JOIN RealName_City AS City ON City.provinceCode = Person.ProvinceCode +Left JOIN Base_CNProfessional AS CNProfessional ON CNProfessional.CNProfessionalId = Person.MainCNProfessionalId + + + +GO + + diff --git a/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonList.aspx b/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonList.aspx index ab185f56..c9fcac18 100644 --- a/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonList.aspx +++ b/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonList.aspx @@ -24,7 +24,7 @@ EnableCollapse="true" Width="250" Title="人员信息" TitleToolTip="人员信息" ShowBorder="true" ShowHeader="false" AutoScroll="true" BodyPadding="5px" IconFont="ArrowCircleLeft" Layout="Fit"> - @@ -70,13 +70,15 @@ - - - + + - + + + + + - - + + - - - + - - - - - - diff --git a/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonListEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonListEdit.aspx.designer.cs index b4321b7f..c2303253 100644 --- a/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonListEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonListEdit.aspx.designer.cs @@ -273,6 +273,15 @@ namespace FineUIPro.Web.HSSE.SitePerson { /// protected global::FineUIPro.DatePicker txtInTime; + /// + /// txtOutTime 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtOutTime; + /// /// Panel4 控件。 /// @@ -390,6 +399,15 @@ namespace FineUIPro.Web.HSSE.SitePerson { /// protected global::FineUIPro.RadioButtonList rblIsUsed; + /// + /// txtOutResult 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtOutResult; + /// /// Panel5 控件。 /// @@ -552,24 +570,6 @@ namespace FineUIPro.Web.HSSE.SitePerson { /// protected global::FineUIPro.TextBox txtAddress; - /// - /// txtOutTime 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.DatePicker txtOutTime; - - /// - /// txtOutResult 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextBox txtOutResult; - /// /// Window1 控件。 /// diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs index 549dfbad..dfd305ba 100644 --- a/SGGL/Model/Model.cs +++ b/SGGL/Model/Model.cs @@ -326566,6 +326566,10 @@ namespace Model private string _IsOutsideStr; + private System.Data.Linq.Binary _HeadImage; + + private System.Nullable _RealNameAddTime; + public View_SitePerson_Person() { } @@ -327689,6 +327693,38 @@ namespace Model } } } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_HeadImage", DbType="Image", CanBeNull=true, UpdateCheck=UpdateCheck.Never)] + public System.Data.Linq.Binary HeadImage + { + get + { + return this._HeadImage; + } + set + { + if ((this._HeadImage != value)) + { + this._HeadImage = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RealNameAddTime", DbType="DateTime")] + public System.Nullable RealNameAddTime + { + get + { + return this._RealNameAddTime; + } + set + { + if ((this._RealNameAddTime != value)) + { + this._RealNameAddTime = value; + } + } + } } [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.View_Solution_LargerHazardListItem")]