lpf
/
CNCEC_SUBQHSE_WUHUAN
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

三类证书维护

This commit is contained in:
夏菊 2025-06-05 17:22:41 +08:00
parent 42085d148e
commit fc4272a12e
6 changed files with 53 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
DataBase/版本日志/SUBQHSE_V2025-06-05.sql Normal file
View File

@ -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

6
SGGL/BLL/HSSE/QualityAudit/PersonQualityService.cs
View File

@ -22,6 +22,11 @@ namespace BLL
return Funs.DB.QualityAudit_PersonQuality.FirstOrDefault(e => e.PersonId == personId);
}
public static List<Model.QualityAudit_PersonQuality> GetListPersonQualityByUserId(string userId)
{
return Funs.DB.QualityAudit_PersonQuality.Where(e => e.UserId == userId).ToList();
}
/// <summary>
/// 获取时间段的特岗资质集合
/// </summary>
@ -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();

4
SGGL/FineUIPro.Web/SysManage/UserListEdit.aspx
View File

@ -82,7 +82,9 @@
</f:FormRow>
<f:FormRow runat="server">
<items>
<f:CheckBox runat="server" Label="是否督查人员" LabelAlign="Right" ID="cbIsInspectionBrigade" />
<f:DropDownList ID="drpCertificate" runat="server" Label="特岗证书" LabelAlign="Right" LabelWidth="90px" EnableEdit="true" EnableCheckBoxSelect="True" EnableMultiSelect="True" EmptyText="--请选择--" AutoSelectFirstItem="false" >
</f:DropDownList>
<f:CheckBox runat="server" Label="是否督查人员" LabelAlign="Right" ID="cbIsInspectionBrigade" LabelWidth="100px" />
</items>
</f:FormRow>
</Rows>

15
SGGL/FineUIPro.Web/SysManage/UserListEdit.aspx.cs
View File

@ -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());
}

9
SGGL/FineUIPro.Web/SysManage/UserListEdit.aspx.designer.cs generated
View File

@ -194,6 +194,15 @@ namespace FineUIPro.Web.SysManage
/// </remarks>
protected global::FineUIPro.RadioButtonList rblHomePageType;
/// <summary>
/// drpCertificate 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpCertificate;
/// <summary>
/// cbIsInspectionBrigade 控件。
/// </summary>

2
SGGL/WebAPI/WebAPI.csproj.user
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
<IISExpressSSLPort />