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

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

This commit is contained in:
李鹏飞 2023-11-02 15:35:27 +08:00
parent abf5432676 f31e39be20
commit f6b8c580e5
3 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SGGL/BLL/BLL.csproj
View File

@ -1016,7 +1016,7 @@
<Version>2.1.1</Version> <Version>2.1.1</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Newtonsoft.Json"> <PackageReference Include="Newtonsoft.Json">
<Version>13.0.3</Version> <Version>12.0.1</Version>
</PackageReference> </PackageReference>
<PackageReference Include="NPOI"> <PackageReference Include="NPOI">
<Version>2.5.5</Version> <Version>2.5.5</Version>

2
SGGL/FineUIPro.Web/HSSE/SecuritySystem/SafetyOrganization.aspx.cs
View File

@ -119,7 +119,7 @@ namespace FineUIPro.Web.HSSE.SecuritySystem
string strSql = @"SELECT p.PersonId,p.CardNo,p.PersonName,p.ProjectId,p.UnitId,w.WorkPostName,p.Telephone,w.Remark" string strSql = @"SELECT p.PersonId,p.CardNo,p.PersonName,p.ProjectId,p.UnitId,w.WorkPostName,p.Telephone,w.Remark"
+ @" FROM SitePerson_Person AS P" + @" FROM SitePerson_Person AS P"
+ @" LEFT JOIN Base_WorkPost AS W ON P.WorkPostId =W.WorkPostId" + @" LEFT JOIN Base_WorkPost AS W ON P.WorkPostId =W.WorkPostId"
+ @" WHERE w.PostType='1' AND p.ProjectId= '" + this.ProjectId + "' AND p.UnitId='" + unitIdSelect + "'"; + @" WHERE w.PostType='1' AND p.ProjectId= '" + this.ProjectId + "' AND p.UnitId='" + unitIdSelect + "' and P.IsUsed=1 and P.OutTime is null";
List<SqlParameter> listStr = new List<SqlParameter>(); List<SqlParameter> listStr = new List<SqlParameter>();
SqlParameter[] parameter = listStr.ToArray(); SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);

48
SGGL/Model/Model.cs
View File

@ -59742,8 +59742,6 @@ namespace Model
private string _CheckItemSetId; private string _CheckItemSetId;
private string _ReceiveMan;
private string _ResponsibleUnit; private string _ResponsibleUnit;
private string _WorkAreaId; private string _WorkAreaId;
@ -59752,6 +59750,8 @@ namespace Model
private string _ResponsibleMan; private string _ResponsibleMan;
private string _ReceiveMan;
private EntityRef<Base_Project> _Base_Project; private EntityRef<Base_Project> _Base_Project;
private EntityRef<Technique_CheckItemSet> _Technique_CheckItemSet; private EntityRef<Technique_CheckItemSet> _Technique_CheckItemSet;
@ -59792,8 +59792,6 @@ namespace Model
partial void OnPartInPersonNamesChanged(); partial void OnPartInPersonNamesChanged();
partial void OnCheckItemSetIdChanging(string value); partial void OnCheckItemSetIdChanging(string value);
partial void OnCheckItemSetIdChanged(); partial void OnCheckItemSetIdChanged();
partial void OnReceiveManChanging(string value);
partial void OnReceiveManChanged();
partial void OnResponsibleUnitChanging(string value); partial void OnResponsibleUnitChanging(string value);
partial void OnResponsibleUnitChanged(); partial void OnResponsibleUnitChanged();
partial void OnWorkAreaIdChanging(string value); partial void OnWorkAreaIdChanging(string value);
@ -59802,6 +59800,8 @@ namespace Model
partial void OnQuestionTypeChanged(); partial void OnQuestionTypeChanged();
partial void OnResponsibleManChanging(string value); partial void OnResponsibleManChanging(string value);
partial void OnResponsibleManChanged(); partial void OnResponsibleManChanged();
partial void OnReceiveManChanging(string value);
partial void OnReceiveManChanged();
#endregion #endregion
public Check_CheckSpecial() public Check_CheckSpecial()
@ -60139,26 +60139,6 @@ namespace Model
} }
} }
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ReceiveMan", DbType="NVarChar(2000)")]
public string ReceiveMan
{
get
{
return this._ReceiveMan;
}
set
{
if ((this._ReceiveMan != value))
{
this.OnReceiveManChanging(value);
this.SendPropertyChanging();
this._ReceiveMan = value;
this.SendPropertyChanged("ReceiveMan");
this.OnReceiveManChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ResponsibleUnit", DbType="NVarChar(50)")] [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ResponsibleUnit", DbType="NVarChar(50)")]
public string ResponsibleUnit public string ResponsibleUnit
{ {
@ -60239,6 +60219,26 @@ namespace Model
} }
} }
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ReceiveMan", DbType="NVarChar(2000)")]
public string ReceiveMan
{
get
{
return this._ReceiveMan;
}
set
{
if ((this._ReceiveMan != value))
{
this.OnReceiveManChanging(value);
this.SendPropertyChanging();
this._ReceiveMan = value;
this.SendPropertyChanged("ReceiveMan");
this.OnReceiveManChanged();
}
}
}
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Check_CheckSpecial_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)] [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Check_CheckSpecial_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)]
public Base_Project Base_Project public Base_Project Base_Project
{ {