From fc4272a12ed0869df5a4119dc26706fad1ccead7 Mon Sep 17 00:00:00 2001 From: xiaju <1784803958@qq.com> Date: Thu, 5 Jun 2025 17:22:41 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=89=E7=B1=BB=E8=AF=81=E4=B9=A6=E7=BB=B4?= =?UTF-8?q?=E6=8A=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DataBase/版本日志/SUBQHSE_V2025-06-05.sql | 19 +++++++++++++++++++ .../HSSE/QualityAudit/PersonQualityService.cs | 6 ++++++ .../FineUIPro.Web/SysManage/UserListEdit.aspx | 4 +++- .../SysManage/UserListEdit.aspx.cs | 15 +++++++++++++++ .../SysManage/UserListEdit.aspx.designer.cs | 9 +++++++++ SGGL/WebAPI/WebAPI.csproj.user | 2 +- 6 files changed, 53 insertions(+), 2 deletions(-) create mode 100644 DataBase/版本日志/SUBQHSE_V2025-06-05.sql diff --git a/DataBase/版本日志/SUBQHSE_V2025-06-05.sql b/DataBase/版本日志/SUBQHSE_V2025-06-05.sql new file mode 100644 index 00000000..838b71f0 --- /dev/null +++ b/DataBase/版本日志/SUBQHSE_V2025-06-05.sql @@ -0,0 +1,19 @@ + + +--ȥPersonIdǿ +ALTER TABLE QualityAudit_PersonQuality ALTER COLUMN PersonId NVARCHAR(50) NULL; + + + +--˾³˾ܾ˾ܾ +IF NOT EXISTS (SELECT * FROM RealName_BasicData WHERE BasicDataId = '7658D84F-500E-465B-B31D-086651EEEA65') +BEGIN + INSERT INTO dbo.RealName_BasicData(BasicDataId,dictTypeCode,dictCode,dictName) + VALUES('17B37E8F-E3C0-48A2-8EBB-0974B71148A2','LAB_WORK_TYPE','WORK_TYPE_GSDSZ','˾³') + INSERT INTO dbo.RealName_BasicData(BasicDataId,dictTypeCode,dictCode,dictName) + VALUES('7658D84F-500E-465B-B31D-086651EEEA65','LAB_WORK_TYPE','WORK_TYPE_GSZJL','˾ܾ') + INSERT INTO dbo.RealName_BasicData(BasicDataId,dictTypeCode,dictCode,dictName) + VALUES('21D6A1D5-D304-4F4E-AA57-7ACB167F6208','LAB_WORK_TYPE','WORK_TYPE_GSFZJL','˾ܾ') +END + + diff --git a/SGGL/BLL/HSSE/QualityAudit/PersonQualityService.cs b/SGGL/BLL/HSSE/QualityAudit/PersonQualityService.cs index 59f90629..cbd44436 100644 --- a/SGGL/BLL/HSSE/QualityAudit/PersonQualityService.cs +++ b/SGGL/BLL/HSSE/QualityAudit/PersonQualityService.cs @@ -22,6 +22,11 @@ namespace BLL return Funs.DB.QualityAudit_PersonQuality.FirstOrDefault(e => e.PersonId == personId); } + public static List GetListPersonQualityByUserId(string userId) + { + return Funs.DB.QualityAudit_PersonQuality.Where(e => e.UserId == userId).ToList(); + } + /// /// 获取时间段的特岗资质集合 /// @@ -85,6 +90,7 @@ namespace BLL CompileDate = personQuality.CompileDate, AuditDate = personQuality.AuditDate, AuditorId = personQuality.AuditorId, + UserId = personQuality.UserId }; db.QualityAudit_PersonQuality.InsertOnSubmit(newPersonQuality); db.SubmitChanges(); diff --git a/SGGL/FineUIPro.Web/SysManage/UserListEdit.aspx b/SGGL/FineUIPro.Web/SysManage/UserListEdit.aspx index 12d29826..e2f82681 100644 --- a/SGGL/FineUIPro.Web/SysManage/UserListEdit.aspx +++ b/SGGL/FineUIPro.Web/SysManage/UserListEdit.aspx @@ -82,7 +82,9 @@ - + + + diff --git a/SGGL/FineUIPro.Web/SysManage/UserListEdit.aspx.cs b/SGGL/FineUIPro.Web/SysManage/UserListEdit.aspx.cs index 8bec16e5..2207b6de 100644 --- a/SGGL/FineUIPro.Web/SysManage/UserListEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/SysManage/UserListEdit.aspx.cs @@ -78,6 +78,7 @@ namespace FineUIPro.Web.SysManage DepartService.InitDepartDropDownList(this.drpDepart, true); CNProfessionalService.InitCNProfessionalDownList(this.drpMainCNProfessional, true); CNProfessionalService.InitCNProfessionalDownList(this.drpViceCNProfessional, true); + CertificateService.InitCertificateDropDownList(this.drpCertificate, false); if (!string.IsNullOrEmpty(this.UnitId)) { this.drpIsOffice.SelectedValue = "False"; @@ -126,6 +127,7 @@ namespace FineUIPro.Web.SysManage this.Image2.ImageUrl = "~/" + this.SignatureUrl; } this.drpDepart.SelectedValue = user.DepartId; + this.drpCertificate.SelectedValueArray = PersonQualityService.GetListPersonQualityByUserId(this.UserId)?.Select(x => x.CertificateId).ToArray(); if (!string.IsNullOrEmpty(user.MainCNProfessionalId)) { this.drpMainCNProfessional.SelectedValue = user.MainCNProfessionalId; @@ -222,6 +224,7 @@ namespace FineUIPro.Web.SysManage newUser.SignatureUrl = this.SignatureUrl; newUser.IsPost = Convert.ToBoolean(this.drpIsPost.SelectedValue); newUser.IsOffice = Convert.ToBoolean(this.drpIsOffice.SelectedValue); + newUser.CertificateId = drpCertificate.SelectedValue; if (this.drpMainCNProfessional.SelectedValue != Const._Null) { newUser.MainCNProfessionalId = this.drpMainCNProfessional.SelectedValue; @@ -258,6 +261,18 @@ namespace FineUIPro.Web.SysManage UserService.UpdateUser(newUser); LogService.AddSys_Log(this.CurrUser, newUser.UserCode, newUser.UserId, BLL.Const.UserMenuId, BLL.Const.BtnModify); } + foreach (var item in this.drpCertificate.SelectedValueArray) + { + Model.QualityAudit_PersonQuality newPersonQuality = new Model.QualityAudit_PersonQuality + { + PersonQualityId = SQLHelper.GetNewID(typeof(Model.QualityAudit_PersonQuality)), + UserId = this.UserId, + CompileMan = this.CurrUser.UserId, + CompileDate = DateTime.Now + }; + newPersonQuality.CertificateId = item; + BLL.PersonQualityService.AddPersonQuality(newPersonQuality); + } PageContext.RegisterStartupScript(ActiveWindow.GetHideRefreshReference()); } diff --git a/SGGL/FineUIPro.Web/SysManage/UserListEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/SysManage/UserListEdit.aspx.designer.cs index df6cc61f..7bbf80eb 100644 --- a/SGGL/FineUIPro.Web/SysManage/UserListEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/SysManage/UserListEdit.aspx.designer.cs @@ -194,6 +194,15 @@ namespace FineUIPro.Web.SysManage /// protected global::FineUIPro.RadioButtonList rblHomePageType; + /// + /// drpCertificate 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpCertificate; + /// /// cbIsInspectionBrigade 控件。 /// diff --git a/SGGL/WebAPI/WebAPI.csproj.user b/SGGL/WebAPI/WebAPI.csproj.user index 1a1a9a6c..17978b44 100644 --- a/SGGL/WebAPI/WebAPI.csproj.user +++ b/SGGL/WebAPI/WebAPI.csproj.user @@ -1,7 +1,7 @@  - Release|Any CPU + Debug|Any CPU true