lpf
/
SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/frane-yang/SGGL_SeDin_New

This commit is contained in:
高飞 2023-07-25 14:08:57 +08:00
parent b8dae5be20 3c141d8710
commit 0bdd467fdb
13 changed files with 278 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
DataBase/版本日志/SGGLDB_V2023-07-21.sql Normal file
View File

@ -0,0 +1,44 @@
ALTER VIEW [dbo].[View_InformationProject_ConstructionStandardSelectedItem]
/*±ê×¼¹æ·¶±æʶѡÔñÏîÁбíÊÓͼ*/
AS
SELECT Item.ConstructionStandardSelectedItemId,
Item.ConstructionStandardIdentifyId,
Item.StandardId,
Identify.ProjectId,
List.StandardGrade,
List.StandardNo,
List.StandardName,
List.AttachUrl,
List.IsSelected1,
List.IsSelected2,
List.IsSelected3,
List.IsSelected4,
List.IsSelected5,
List.IsSelected6,
List.IsSelected7,
List.IsSelected8,
List.IsSelected9,
List.IsSelected10,
List.IsSelected11,
List.IsSelected12,
List.IsSelected13,
List.IsSelected14,
List.IsSelected15,
List.IsSelected16,
List.IsSelected17,
List.IsSelected18,
List.IsSelected19,
List.IsSelected20,
List.IsSelected21,
List.IsSelected22,
List.IsSelected23,
List.IsSelected90
FROM dbo.Law_HSSEStandardsList AS List
LEFT JOIN dbo.InformationProject_ConstructionStandardSelectedItem AS Item ON List.StandardId =Item.StandardId
LEFT JOIN dbo.InformationProject_ConstructionStandardIdentify AS Identify ON Item.ConstructionStandardIdentifyId =Identify.ConstructionStandardIdentifyId
GO

4
DataBase/版本日志/SGGLDB_V2023-07-23.sql Normal file
View File

@ -0,0 +1,4 @@
ALTER TABLE Base_Certificate ADD Type VARCHAR(10) NULL
GO
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'类型（1特岗；2安管；3特种设备；-1其他）' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Base_Certificate', @level2type=N'COLUMN',@level2name=N'Type'
GO

2
SGGL/BLL/BaseInfo/CertificateService.cs
View File

@ -34,6 +34,7 @@ namespace BLL
CertificateName = certificate.CertificateName,
CertificateType = certificate.CertificateType,
IsRegisterHSSE = certificate.IsRegisterHSSE,
Type= certificate.Type,
Remark = certificate.Remark
};
db.Base_Certificate.InsertOnSubmit(newCertificate);
@ -54,6 +55,7 @@ namespace BLL
newCertificate.CertificateName = certificate.CertificateName;
newCertificate.CertificateType = certificate.CertificateType;
newCertificate.IsRegisterHSSE = certificate.IsRegisterHSSE;
newCertificate.Type = certificate.Type;
newCertificate.Remark = certificate.Remark;
db.SubmitChanges();
}

23
SGGL/BLL/DropListService.cs
View File

@ -34,6 +34,10 @@
{
dropName.DataSource = HSSE_getContractType();
}
else if (groupId == Group_CertificateType)
{
dropName.DataSource = HSSE_getCertificateType();
}
dropName.DataBind();
if (isShowPlease)
{
@ -102,6 +106,11 @@
/// 合同类型 组id
/// </summary>
public const string Group_ContractType = "ContractType";
/// <summary>
/// 证书类型 组id
/// </summary>
public const string Group_CertificateType = "CertificateType";
#endregion
#region 公共平台
@ -348,6 +357,20 @@
list[2] = new ListItem("以完成一定工作量", "3");
return list;
}
/// <summary>
/// 证书类型
/// </summary>
/// <returns></returns>
public static ListItem[] HSSE_getCertificateType()
{
ListItem[] list = new ListItem[4];
list[0] = new ListItem("特岗", "1");
list[1] = new ListItem("安管", "2");
list[2] = new ListItem("特种设备", "3");
list[3] = new ListItem("其他", "-1");
return list;
}
#endregion
#endregion

7
SGGL/BLL/Person/Person_PersonsService.cs
View File

@ -59,10 +59,9 @@ namespace BLL
}
if (!string.IsNullOrEmpty(projetcId) && projetcId != Const._Null)
{
getDataList = from x in getDataList
join y in db.SitePerson_PersonItem on x.PersonId equals y.PersonId
where y.ProjectId == projetcId && !y.OutTime.HasValue
select x;
var idLists=(from x in db.SitePerson_PersonItem where x.ProjectId == projetcId && !x.OutTime.HasValue
select x.PersonId).Distinct().ToList();
getDataList = getDataList.Where(x => idLists.Contains(x.PersonId));
}
if (!string.IsNullOrEmpty(personType) && personType != Const._Null)

33
SGGL/FineUIPro.Web/BaseInfo/Certificate.aspx
View File

@ -21,20 +21,20 @@
<body>
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
<f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" Title="特岗证书" Layout="HBox" ShowHeader="false">
<f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" Title="特岗证书" Layout="HBox" ShowHeader="false" ColumnWidth="70% 30%">
<Items >
<f:Grid ID="Grid1" Title="特岗证书" ShowHeader="false" EnableCollapse="true" PageSize="10" EnableColumnLines="true"
ShowBorder="true" AllowPaging="true" IsDatabasePaging="true" runat="server" Width="750px" ForceFit="true"
ShowBorder="true" AllowPaging="true" IsDatabasePaging="true" runat="server" Width="750px"
DataKeyNames="CertificateId" DataIDField="CertificateId" OnPageIndexChange="Grid1_PageIndexChange"
AllowFilters="true" OnFilterChange="Grid1_FilterChange" EnableTextSelection="True">
<Columns>
<f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center"
TextAlign="Center" />
<f:RenderField Width="150px" ColumnID="CertificateCode" DataField="CertificateCode"
FieldType="String" HeaderText="证书编号" HeaderTextAlign="Center" TextAlign="Center">
<f:RenderField Width="80px" ColumnID="CertificateCode" DataField="CertificateCode"
FieldType="String" HeaderText="编号" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField Width="250px" ColumnID="CertificateName" DataField="CertificateName"
FieldType="String" HeaderText="证书名称" HeaderTextAlign="Center" TextAlign="Left">
<f:RenderField Width="200px" ColumnID="CertificateName" DataField="CertificateName"
FieldType="String" HeaderText="名称" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="CertificateType" DataField="CertificateType" FieldType="String"
HeaderText="证件类别" HeaderTextAlign="Center" TextAlign="Center">
@ -43,8 +43,13 @@
RendererFunction="renderIsHsse" HeaderText="注安师" HeaderTextAlign="Center"
TextAlign="Center">
</f:RenderField>
<f:RenderField Width="250px" ColumnID="Remark" DataField="Remark" FieldType="String"
HeaderText="备注" HeaderTextAlign="Center" TextAlign="Center">
<f:TemplateField Width="120px" HeaderText="类型" HeaderTextAlign="Center" TextAlign="Center">
<ItemTemplate>
<asp:Label ID="Label1" runat="server" Text='<%# ConvertType(Eval("Type")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:RenderField Width="150px" ColumnID="Remark" DataField="Remark" FieldType="String"
HeaderText="备注" HeaderTextAlign="Center" TextAlign="Center" ExpandUnusedSpace="true">
</f:RenderField>
</Columns>
<Listeners>
@ -62,7 +67,7 @@
</PageItems>
</f:Grid>
<f:SimpleForm ID="SimpleForm1" runat="server" ShowBorder="true" ShowHeader="false"
LabelWidth="80px" BodyPadding="5px" Width="350px">
LabelWidth="110px" BodyPadding="5px" Width="450px" >
<Items>
<f:TextBox ID="hfFormID" Hidden="true"
runat="server" LabelAlign="right">
@ -73,14 +78,15 @@
<f:TextBox ID="txtCertificateName" Label="名称" ShowRedStar="true" Required="true"
runat="server" LabelAlign="right" AutoPostBack="true" OnTextChanged="TextBox_TextChanged">
</f:TextBox>
<f:DropDownList ID="drpCertificateType" runat="server" Label="证件类别" LabelAlign="Right"
LabelWidth="80px">
<f:DropDownList ID="drpCertificateType" runat="server" Label="类别(ABC)" LabelAlign="Right">
<f:ListItem Value="A" Text="A类" />
<f:ListItem Value="B" Text="B类" />
<f:ListItem Value="C" Text="C类" />
</f:DropDownList>
<f:CheckBox ID="ckbIsRegisterHSSE" runat="server" Label="注安师" LabelAlign="Right" LabelWidth="80px">
<f:CheckBox ID="ckbIsRegisterHSSE" runat="server" Label="注安师" LabelAlign="Right" >
</f:CheckBox>
<f:DropDownList ID="drpType" runat="server" Label="类型" LabelAlign="Right">
</f:DropDownList>
<f:TextArea ID="txtRemark" runat="server" Label="备注" LabelAlign="right">
</f:TextArea>
</Items>
@ -141,6 +147,8 @@
var txtNameClientID = '<%= txtCertificateName.ClientID %>';
var drpCertificateTypeClientID = '<%= drpCertificateType.ClientID %>';
var ckbIsRegisterHSSEClientID = '<%= ckbIsRegisterHSSE.ClientID %>';
var drpTypeClientID = '<%= drpType.ClientID %>';
var txtRemarkClientID = '<%=txtRemark.ClientID %>';
function onGridRowSelect(event, rowId) {
@ -158,6 +166,7 @@
F(txtNameClientID).setValue(rowValue['CertificateName']);
F(drpCertificateTypeClientID).setValue(rowValue['CertificateType']);
F(ckbIsRegisterHSSEClientID).setValue(rowValue['IsRegisterHSSE']);
F(drpTypeClientID).setValue(rowValue['Type']);
F(txtRemarkClientID).setValue(rowValue['Remark']);
// 更新保存按钮文本

32
SGGL/FineUIPro.Web/BaseInfo/Certificate.aspx.cs
View File

@ -24,6 +24,7 @@ namespace FineUIPro.Web.BaseInfo
this.GetButtonPower();
Funs.DropDownPageSize(this.ddlPageSize);
Funs.FineUIPleaseSelect(this.drpCertificateType);
BLL.DropListService.InitConstDropDownList(this.drpType, DropListService.Group_CertificateType, true);
ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
// 绑定表格
BindGrid();
@ -190,6 +191,10 @@ namespace FineUIPro.Web.BaseInfo
{
this.ckbIsRegisterHSSE.Checked = true;
}
if (!string.IsNullOrEmpty(certificate.Type))
{
this.drpType.SelectedValue = certificate.Type;
}
this.txtRemark.Text = certificate.Remark;
hfFormID.Text = Id;
this.btnDelete.Enabled = true;
@ -219,9 +224,13 @@ namespace FineUIPro.Web.BaseInfo
{
certificate.CertificateType = this.drpCertificateType.SelectedValue;
}
if (this.drpType.SelectedValue != BLL.Const._Null)
{
certificate.Type = this.drpType.SelectedValue;
}
if (string.IsNullOrEmpty(strRowID))
{
certificate.CertificateId = SQLHelper.GetNewID(typeof(Model.Base_Certificate));
certificate.CertificateId = SQLHelper.GetNewID();
BLL.CertificateService.AddCertificate(certificate);
BLL.LogService.AddSys_Log(this.CurrUser, certificate.CertificateCode, certificate.CertificateId, BLL.Const.CertificateMenuId, BLL.Const.BtnAdd);
}
@ -302,5 +311,26 @@ namespace FineUIPro.Web.BaseInfo
}
}
#endregion
#region 根据身份证号码获取年龄
/// <summary>
/// 根据身份证号码获取年龄
/// </summary>
/// <param name="IdentityCard"></param>
/// <returns></returns>
protected string ConvertType(object Type)
{
string name = string.Empty;
if (Type != null)
{
var doplist = DropListService.HSSE_getCertificateType().FirstOrDefault(x => x.Value == Type.ToString());
if (doplist != null)
{
name = doplist.Text;
}
}
return name;
}
#endregion
}
}

24
SGGL/FineUIPro.Web/BaseInfo/Certificate.aspx.designer.cs generated
View File

@ -7,10 +7,12 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.BaseInfo {
namespace FineUIPro.Web.BaseInfo
{
public partial class Certificate {
public partial class Certificate
{
/// <summary>
/// form1 控件。
@ -48,6 +50,15 @@ namespace FineUIPro.Web.BaseInfo {
/// </remarks>
protected global::FineUIPro.Grid Grid1;
/// <summary>
/// Label1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label1;
/// <summary>
/// ToolbarSeparator1 控件。
/// </summary>
@ -129,6 +140,15 @@ namespace FineUIPro.Web.BaseInfo {
/// </remarks>
protected global::FineUIPro.CheckBox ckbIsRegisterHSSE;
/// <summary>
/// drpType 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpType;
/// <summary>
/// txtRemark 控件。
/// </summary>

2
SGGL/FineUIPro.Web/FineUIPro.Web.csproj
View File

@ -13954,7 +13954,7 @@
<AutoAssignPort>True</AutoAssignPort>
<DevelopmentServerPort>0</DevelopmentServerPort>
<DevelopmentServerVPath>/</DevelopmentServerVPath>
<IISUrl>http://localhost:6562/</IISUrl>
<IISUrl>http://localhost:12528/</IISUrl>
<NTLMAuthentication>False</NTLMAuthentication>
<UseCustomServer>False</UseCustomServer>
<CustomServerUrl>

2
SGGL/FineUIPro.Web/HSSE/InformationProject/ConstructionStandardIdentifyEdit.aspx
View File

@ -49,7 +49,7 @@
</Toolbars>
<Items>
<f:Grid ID="Grid1" ShowBorder="false" ShowHeader="false" Title="标准规范辨识" EnableCollapse="true"
IsDatabasePaging="true" PageSize="10" AllowPaging="true" runat="server" BoxFlex="1"
IsDatabasePaging="true" PageSize="20" AllowPaging="true" runat="server" BoxFlex="1"
DataKeyNames="StandardId" DataIDField="StandardId" AllowCellEditing="true"
OnPageIndexChange="Grid1_PageIndexChange" EnableTextSelection="true"
EnableColumnLines="true" EnableCheckBoxSelect="true">

53
SGGL/FineUIPro.Web/HSSE/InformationProject/ConstructionStandardIdentifyEdit.aspx.cs
View File

@ -143,13 +143,56 @@ namespace FineUIPro.Web.HSSE.InformationProject
/// </summary>
private void BindGrid()
{
var q = from x in Funs.DB.View_InformationProject_ConstructionStandardSelectedItem
where x.StandardName != null
select x;
if (!this.ckbAll.Checked)
IQueryable<Model.View_InformationProject_ConstructionStandardSelectedItem> q;
if (this.ckbAll.Checked)
{
q = q.Where(e => e.ConstructionStandardIdentifyId == this.ConstructionStandardIdentifyId);
q = from x in Funs.DB.Law_HSSEStandardsList
join y in Funs.DB.InformationProject_ConstructionStandardSelectedItem on x.StandardId equals y.StandardId
join z in Funs.DB.InformationProject_ConstructionStandardIdentify on y.ConstructionStandardIdentifyId equals z.ConstructionStandardIdentifyId
where x.StandardName != null && z.ProjectId == this.CurrUser.LoginProjectId
select new Model.View_InformationProject_ConstructionStandardSelectedItem
{
ConstructionStandardSelectedItemId =y.ConstructionStandardSelectedItemId,
ConstructionStandardIdentifyId = y.ConstructionStandardIdentifyId,
ProjectId = this.CurrUser.LoginProjectId,
StandardId = x.StandardId,
StandardGrade = x.StandardGrade,
StandardNo = x.StandardNo,
StandardName = x.StandardName,
AttachUrl = x.AttachUrl,
IsSelected1 = x.IsSelected1,
IsSelected2 = x.IsSelected2,
IsSelected3 = x.IsSelected3,
IsSelected4 = x.IsSelected4,
IsSelected5 = x.IsSelected5,
IsSelected6 = x.IsSelected6,
IsSelected7 = x.IsSelected7,
IsSelected8 = x.IsSelected8,
IsSelected9 = x.IsSelected9,
IsSelected10 = x.IsSelected10,
IsSelected11 = x.IsSelected11,
IsSelected12 = x.IsSelected12,
IsSelected13 = x.IsSelected13,
IsSelected14 = x.IsSelected14,
IsSelected15 = x.IsSelected15,
IsSelected16 = x.IsSelected16,
IsSelected17 = x.IsSelected17,
IsSelected18 = x.IsSelected18,
IsSelected19 = x.IsSelected19,
IsSelected20 = x.IsSelected20,
IsSelected21 = x.IsSelected21,
IsSelected22 = x.IsSelected22,
IsSelected23 = x.IsSelected23,
IsSelected90 = x.IsSelected90
};
}
else
{
q = from x in Funs.DB.View_InformationProject_ConstructionStandardSelectedItem
where x.ConstructionStandardIdentifyId == this.ConstructionStandardIdentifyId
select x;
}
if (!string.IsNullOrEmpty(this.txtStandardGrade.Text.Trim()))
{
q = q.Where(e => e.StandardGrade.Contains(this.txtStandardGrade.Text.Trim()));

5
SGGL/FineUIPro.Web/Person/PersonEdit.aspx.cs
View File

@ -916,11 +916,8 @@ namespace FineUIPro.Web.Person
left join Base_Project P on C.ProjectId=P.ProjectId
where 1=1 ";
List<SqlParameter> listStr = new List<SqlParameter>();
if (this.CurrUser.PersonId != BLL.Const.sysglyId && this.CurrUser.PersonId != BLL.Const.hfnbdId)
{
strSql += " AND C.UserId=@UserId ";
listStr.Add(new SqlParameter("@UserId", this.PersonId));
}
listStr.Add(new SqlParameter("@UserId", this.PersonId ?? ""));
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);

48
SGGL/Model/Model.cs
View File

@ -11402,7 +11402,7 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveIdea", DbType="NVarChar(2000)")]
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveIdea", DbType="NVarChar(200)")]
public string ApproveIdea
{
get
@ -15709,6 +15709,8 @@ namespace Model
private System.Nullable<bool> _IsRegisterHSSE;
private string _Type;
private EntitySet<QualityAudit_EquipmentPersonQuality> _QualityAudit_EquipmentPersonQuality;
private EntitySet<QualityAudit_PersonQuality> _QualityAudit_PersonQuality;
@ -15729,6 +15731,8 @@ namespace Model
partial void OnCertificateTypeChanged();
partial void OnIsRegisterHSSEChanging(System.Nullable<bool> value);
partial void OnIsRegisterHSSEChanged();
partial void OnTypeChanging(string value);
partial void OnTypeChanged();
#endregion
public Base_Certificate()
@ -15858,6 +15862,26 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Type", DbType="VarChar(10)")]
public string Type
{
get
{
return this._Type;
}
set
{
if ((this._Type != value))
{
this.OnTypeChanging(value);
this.SendPropertyChanging();
this._Type = value;
this.SendPropertyChanged("Type");
this.OnTypeChanged();
}
}
}
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_QualityAudit_EquipmentPersonQuality_Base_Certificate", Storage="_QualityAudit_EquipmentPersonQuality", ThisKey="CertificateId", OtherKey="CertificateId", DeleteRule="NO ACTION")]
public EntitySet<QualityAudit_EquipmentPersonQuality> QualityAudit_EquipmentPersonQuality
{
@ -148689,7 +148713,7 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AttentPerson", DbType="NVarChar(3000)")]
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AttentPerson", DbType="NVarChar(500)")]
public string AttentPerson
{
get
@ -276127,6 +276151,8 @@ namespace Model
private string _StandardId;
private string _ProjectId;
private string _StandardGrade;
private string _StandardNo;
@ -276187,7 +276213,7 @@ namespace Model
{
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ConstructionStandardSelectedItemId", DbType="NVarChar(50) NOT NULL", CanBeNull=false)]
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ConstructionStandardSelectedItemId", DbType="NVarChar(50)")]
public string ConstructionStandardSelectedItemId
{
get
@ -276235,6 +276261,22 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50)")]
public string ProjectId
{
get
{
return this._ProjectId;
}
set
{
if ((this._ProjectId != value))
{
this._ProjectId = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_StandardGrade", DbType="NChar(12)")]
public string StandardGrade
{