diff --git a/.vs/SGGL_HBAZ/CopilotIndices/17.14.670.39694/CodeChunks.db b/.vs/SGGL_HBAZ/CopilotIndices/17.14.670.39694/CodeChunks.db new file mode 100644 index 0000000..2520342 Binary files /dev/null and b/.vs/SGGL_HBAZ/CopilotIndices/17.14.670.39694/CodeChunks.db differ diff --git a/.vs/SGGL_HBAZ/CopilotIndices/17.14.670.39694/SemanticSymbols.db b/.vs/SGGL_HBAZ/CopilotIndices/17.14.670.39694/SemanticSymbols.db new file mode 100644 index 0000000..8eeaed8 Binary files /dev/null and b/.vs/SGGL_HBAZ/CopilotIndices/17.14.670.39694/SemanticSymbols.db differ diff --git a/.vs/SGGL_HBAZ/FileContentIndex/26a4a266-df47-4939-8eae-067f48a60822.vsidx b/.vs/SGGL_HBAZ/FileContentIndex/26a4a266-df47-4939-8eae-067f48a60822.vsidx new file mode 100644 index 0000000..2cdc1b6 Binary files /dev/null and b/.vs/SGGL_HBAZ/FileContentIndex/26a4a266-df47-4939-8eae-067f48a60822.vsidx differ diff --git a/.vs/SGGL_HBAZ/FileContentIndex/2f42b184-19be-4c87-ad28-fd616c65e11c.vsidx b/.vs/SGGL_HBAZ/FileContentIndex/2f42b184-19be-4c87-ad28-fd616c65e11c.vsidx new file mode 100644 index 0000000..866bf0f Binary files /dev/null and b/.vs/SGGL_HBAZ/FileContentIndex/2f42b184-19be-4c87-ad28-fd616c65e11c.vsidx differ diff --git a/.vs/SGGL_HBAZ/FileContentIndex/62562b5b-a24b-4087-8c2f-979e32c73459.vsidx b/.vs/SGGL_HBAZ/FileContentIndex/62562b5b-a24b-4087-8c2f-979e32c73459.vsidx new file mode 100644 index 0000000..51bbe5b Binary files /dev/null and b/.vs/SGGL_HBAZ/FileContentIndex/62562b5b-a24b-4087-8c2f-979e32c73459.vsidx differ diff --git a/.vs/SGGL_HBAZ/FileContentIndex/9048055c-55bc-422d-8b0b-a9bf802a2f4c.vsidx b/.vs/SGGL_HBAZ/FileContentIndex/9048055c-55bc-422d-8b0b-a9bf802a2f4c.vsidx new file mode 100644 index 0000000..9b6123f Binary files /dev/null and b/.vs/SGGL_HBAZ/FileContentIndex/9048055c-55bc-422d-8b0b-a9bf802a2f4c.vsidx differ diff --git a/.vs/SGGL_HBAZ/FileContentIndex/a808676f-ea6d-4bec-96e2-b070f47ad5ca.vsidx b/.vs/SGGL_HBAZ/FileContentIndex/a808676f-ea6d-4bec-96e2-b070f47ad5ca.vsidx new file mode 100644 index 0000000..e9e01ab Binary files /dev/null and b/.vs/SGGL_HBAZ/FileContentIndex/a808676f-ea6d-4bec-96e2-b070f47ad5ca.vsidx differ diff --git a/.vs/SGGL_HBAZ/FileContentIndex/c7cab297-8938-4037-8477-a0f97d95ba61.vsidx b/.vs/SGGL_HBAZ/FileContentIndex/c7cab297-8938-4037-8477-a0f97d95ba61.vsidx new file mode 100644 index 0000000..56d0cbd Binary files /dev/null and b/.vs/SGGL_HBAZ/FileContentIndex/c7cab297-8938-4037-8477-a0f97d95ba61.vsidx differ diff --git a/.vs/SGGL_HBAZ/FileContentIndex/fdffcd56-3532-4a16-8a51-328edfe9ace5.vsidx b/.vs/SGGL_HBAZ/FileContentIndex/fdffcd56-3532-4a16-8a51-328edfe9ace5.vsidx new file mode 100644 index 0000000..7c58593 Binary files /dev/null and b/.vs/SGGL_HBAZ/FileContentIndex/fdffcd56-3532-4a16-8a51-328edfe9ace5.vsidx differ diff --git a/.vs/SGGL_HBAZ/v17/.wsuo b/.vs/SGGL_HBAZ/v17/.wsuo new file mode 100644 index 0000000..964aba1 Binary files /dev/null and b/.vs/SGGL_HBAZ/v17/.wsuo differ diff --git a/.vs/SGGL_HBAZ/v17/DocumentLayout.json b/.vs/SGGL_HBAZ/v17/DocumentLayout.json new file mode 100644 index 0000000..4786104 --- /dev/null +++ b/.vs/SGGL_HBAZ/v17/DocumentLayout.json @@ -0,0 +1,153 @@ +{ + "Version": 1, + "WorkspaceRootPath": "E:\\COMPANYPROJECT\\\u6CB3\u5317\u5B89\u88C5\\SGGL_HBAZ\\", + "Documents": [], + "DocumentGroupContainers": [ + { + "Orientation": 0, + "VerticalTabListWidth": 256, + "DocumentGroups": [ + { + "DockedWidth": 203, + "SelectedChildIndex": -1, + "Children": [ + { + "$type": "Bookmark", + "Name": "ST:0:0:{3ae79031-e1bc-11d0-8f78-00a0c9110057}" + }, + { + "$type": "Bookmark", + "Name": "ST:129:0:{1fc202d4-d401-403c-9834-5b218574bb67}" + }, + { + "$type": "Bookmark", + "Name": "ST:130:0:{1fc202d4-d401-403c-9834-5b218574bb67}" + }, + { + "$type": "Bookmark", + "Name": "ST:128:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}" + }, + { + "$type": "Bookmark", + "Name": "ST:0:0:{1c64b9c2-e352-428e-a56d-0ace190b99a6}" + }, + { + "$type": "Bookmark", + "Name": "ST:0:0:{e506b91c-c606-466a-90a9-123d1d1e12b3}" + }, + { + "$type": "Bookmark", + "Name": "ST:132:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}" + }, + { + "$type": "Bookmark", + "Name": "ST:133:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}" + }, + { + "$type": "Bookmark", + "Name": "ST:134:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}" + }, + { + "$type": "Bookmark", + "Name": "ST:1:0:{f2bd8fb8-fc94-3dae-a733-fd993c73cc87}" + }, + { + "$type": "Bookmark", + "Name": "ST:129:0:{13b12e3e-c1b4-4539-9371-4fe9a0d523fc}" + }, + { + "$type": "Bookmark", + "Name": "ST:2:0:{f2bd8fb8-fc94-3dae-a733-fd993c73cc87}" + }, + { + "$type": "Bookmark", + "Name": "ST:3:0:{f2bd8fb8-fc94-3dae-a733-fd993c73cc87}" + }, + { + "$type": "Bookmark", + "Name": "ST:129:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}" + }, + { + "$type": "Bookmark", + "Name": "ST:131:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}" + }, + { + "$type": "Bookmark", + "Name": "ST:0:0:{1a46fd64-28d5-434c-8eb3-17a02d419b53}" + }, + { + "$type": "Bookmark", + "Name": "ST:0:0:{5726b0e3-1012-5233-81f9-d1fad48e7a56}" + }, + { + "$type": "Bookmark", + "Name": "ST:0:0:{aa2115a1-9712-457b-9047-dbb71ca2cdd2}" + }, + { + "$type": "Bookmark", + "Name": "ST:0:0:{eefa5220-e298-11d0-8f78-00a0c9110057}" + }, + { + "$type": "Bookmark", + "Name": "ST:131:0:{1fc202d4-d401-403c-9834-5b218574bb67}" + }, + { + "$type": "Bookmark", + "Name": "ST:141:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}" + }, + { + "$type": "Bookmark", + "Name": "ST:142:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}" + }, + { + "$type": "Bookmark", + "Name": "ST:143:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}" + }, + { + "$type": "Bookmark", + "Name": "ST:144:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}" + }, + { + "$type": "Bookmark", + "Name": "ST:145:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}" + }, + { + "$type": "Bookmark", + "Name": "ST:140:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}" + }, + { + "$type": "Bookmark", + "Name": "ST:137:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}" + }, + { + "$type": "Bookmark", + "Name": "ST:139:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}" + }, + { + "$type": "Bookmark", + "Name": "ST:138:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}" + }, + { + "$type": "Bookmark", + "Name": "ST:0:0:{1c4feeaa-4718-4aa9-859d-94ce25d182ba}" + } + ] + }, + { + "DockedWidth": 183, + "SelectedChildIndex": -1, + "Children": [ + { + "$type": "Bookmark", + "Name": "ST:0:0:{d78612c7-9962-4b83-95d9-268046dad23a}" + }, + { + "$type": "Bookmark", + "Name": "ST:0:0:{34e76e81-ee4a-11d0-ae2e-00a0c90fffc3}" + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/.vs/SGGL_HBAZ/v17/workspaceFileList.bin b/.vs/SGGL_HBAZ/v17/workspaceFileList.bin new file mode 100644 index 0000000..a8f075b Binary files /dev/null and b/.vs/SGGL_HBAZ/v17/workspaceFileList.bin differ diff --git a/.vs/slnx.sqlite b/.vs/slnx.sqlite new file mode 100644 index 0000000..40a4b37 Binary files /dev/null and b/.vs/slnx.sqlite differ diff --git a/ReleasePackerALL2017.bat b/ReleasePackerALL2022.bat similarity index 99% rename from ReleasePackerALL2017.bat rename to ReleasePackerALL2022.bat index 3481d56..8064280 100644 --- a/ReleasePackerALL2017.bat +++ b/ReleasePackerALL2022.bat @@ -53,7 +53,7 @@ IF errorlevel 1 goto delReleasePackError @echo 设置.net控制台环境 @echo. -@call "%VS150%" +@call "%VS2022%" IF errorlevel 1 goto netEnvironmentError diff --git a/SGGL/BLL/API/HSSE/APIMeetingService.cs b/SGGL/BLL/API/HSSE/APIMeetingService.cs index 01d915f..5ab9d58 100644 --- a/SGGL/BLL/API/HSSE/APIMeetingService.cs +++ b/SGGL/BLL/API/HSSE/APIMeetingService.cs @@ -239,6 +239,7 @@ namespace BLL CompileManName = db.Sys_User.First(u => u.UserId == x.CompileMan).UserName, AttentPersonNum = x.AttentPersonNum ?? 0, AttachUrl = db.AttachFile.First(z => z.ToKeyId == x.ClassMeetingId).AttachUrl.Replace('\\', '/'), + Declare = x.Declare }).Skip(Funs.PageSize * (pageIndex - 1)).Take(Funs.PageSize).ToList(); } else if (meetingType == "W") @@ -407,6 +408,7 @@ namespace BLL ManagePersonNum = m_personum, InstallationId = meeting.InstallationId, InstallationName = meeting.InstallationName, + Declare = meeting.Declare } ; diff --git a/SGGL/BLL/HSSE/Meeting/ClassMeetingService.cs b/SGGL/BLL/HSSE/Meeting/ClassMeetingService.cs index 46d7d1f..48202f4 100644 --- a/SGGL/BLL/HSSE/Meeting/ClassMeetingService.cs +++ b/SGGL/BLL/HSSE/Meeting/ClassMeetingService.cs @@ -47,7 +47,8 @@ namespace BLL MeetingHostManOther=classMeeting.MeetingHostManOther, ManagePersonNum = classMeeting.ManagePersonNum, InstallationId = classMeeting.InstallationId, - InstallationName = classMeeting.InstallationName + InstallationName = classMeeting.InstallationName, + Declare = classMeeting.Declare }; db.Meeting_ClassMeeting.InsertOnSubmit(newClassMeeting); db.SubmitChanges(); @@ -81,7 +82,7 @@ namespace BLL newClassMeeting.AttentPerson = classMeeting.AttentPerson; newClassMeeting.AttentPersonNum = classMeeting.AttentPersonNum; newClassMeeting.MeetingHostManOther = classMeeting.MeetingHostManOther; - + newClassMeeting.Declare = classMeeting.Declare; db.SubmitChanges(); } } diff --git a/SGGL/Model/APIItem/HSSE/MeetingItem.cs b/SGGL/Model/APIItem/HSSE/MeetingItem.cs index 5d796cc..439aff5 100644 --- a/SGGL/Model/APIItem/HSSE/MeetingItem.cs +++ b/SGGL/Model/APIItem/HSSE/MeetingItem.cs @@ -163,6 +163,14 @@ namespace Model set; } /// + /// 鎯呭喌璇存槑 + /// + public string Declare + { + get; + set; + } + /// /// 鍙備細浜烘暟 /// public int AttentPersonNum diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs index 0055b25..5869ab7 100644 --- a/SGGL/Model/Model.cs +++ b/SGGL/Model/Model.cs @@ -299232,6 +299232,8 @@ namespace Model private string _InstallationName; + private string _Declare; + private EntityRef _Base_Project; private EntityRef _Base_Unit; @@ -299284,6 +299286,8 @@ namespace Model partial void OnInstallationIdChanged(); partial void OnInstallationNameChanging(string value); partial void OnInstallationNameChanged(); + partial void OnDeclareChanging(string value); + partial void OnDeclareChanged(); #endregion public Meeting_ClassMeeting() @@ -299711,6 +299715,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Declare", DbType="NVarChar(500)")] + public string Declare + { + get + { + return this._Declare; + } + set + { + if ((this._Declare != value)) + { + this.OnDeclareChanging(value); + this.SendPropertyChanging(); + this._Declare = value; + this.SendPropertyChanged("Declare"); + this.OnDeclareChanged(); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Meeting_ClassMeeting_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)] public Base_Project Base_Project { diff --git a/SGGL/WebAPI/Controllers/HSSE/MeetingController.cs b/SGGL/WebAPI/Controllers/HSSE/MeetingController.cs index 6a0874f..719f721 100644 --- a/SGGL/WebAPI/Controllers/HSSE/MeetingController.cs +++ b/SGGL/WebAPI/Controllers/HSSE/MeetingController.cs @@ -185,7 +185,7 @@ namespace WebAPI.Controllers using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) { - string sql = "SELECT p.ProjectId as projectId, p.ProjectName as projectName,(SELECT count(*) FROM [dbo].[Project_ProjectUser] as pu LEFT JOIN [dbo].[Sys_User] as u on u.UserId = pu.UserId WHERE pu.ProjectId = p.ProjectId) as manager,(SELECT SUM(AttentPersonNum) as cpunt FROM [dbo].[Meeting_ClassMeeting] as mc WHERE mc.ProjectId = p.ProjectId AND Year(ClassMeetingDate) = @year AND Month(ClassMeetingDate) = @month AND Day(ClassMeetingDate) = @day) as personCount FROM [dbo].[Base_Project] as p where p.ProjectState = @projectState;"; + string sql = "SELECT p.ProjectId as projectId, p.ProjectName as projectName,(SELECT count(*) FROM [dbo].[Project_ProjectUser] as pu LEFT JOIN [dbo].[Sys_User] as u on u.UserId = pu.UserId WHERE pu.ProjectId = p.ProjectId) as manager,(SELECT SUM(AttentPersonNum) as cpunt FROM [dbo].[Meeting_ClassMeeting] as mc WHERE mc.ProjectId = p.ProjectId AND Year(ClassMeetingDate) = @year AND Month(ClassMeetingDate) = @month AND Day(ClassMeetingDate) = @day) as personCount, (SELECT TOP 1 [Declare] FROM [dbo].[Meeting_ClassMeeting] as mc WHERE mc.ProjectId = p.ProjectId AND Year(ClassMeetingDate) = @year AND Month(ClassMeetingDate) = @month AND Day(ClassMeetingDate) = @day AND [Declare] IS NOT NULL ORDER BY ClassMeetingDate DESC) AS [Declare] FROM [dbo].[Base_Project] as p where p.ProjectState = @projectState;"; DateTime mdate = Funs.GetNewDateTimeOrNow(meetingDate); List listStr = new List(); listStr.Add(new SqlParameter("@year", mdate.Year));