zhanghj/ChengDa_English
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

合并天辰 作业票

Browse Source
This commit is contained in:
李超
2023-06-10 12:00:41 +08:00
parent 1836f816cf
commit c4bcf04d74
72 changed files with 16423 additions and 2139 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/HSSE/License/HeightWorkView.aspx.cs
+32 -5
View File
@@ -48,7 +48,9 @@
this.txtApplyUnit.Text = UnitService.GetUnitNameByUnitId(getHeightWork.ApplyUnitId);
this.txtApplyManName.Text = UserService.GetUserNameByUserId(getHeightWork.ApplyManId);
this.txtWorkPalce.Text = getHeightWork.WorkPalce;
this.txtWorkType.Text = getHeightWork.WorkType;
this.txtSafeMan.Text = getHeightWork.SafeMan;
this.txtWatchMan.Text = getHeightWork.WatchMan;
this.txtWorkMan.Text = getHeightWork.WorkMan;
if (getHeightWork.ValidityStartTime.HasValue)
{
this.txtWorkDate.Text = getHeightWork.ValidityStartTime.Value.ToString("f") + " 至 ";
@@ -113,7 +115,15 @@
{
this.txtOpinion1.Text = getF1.Opinion;
}
this.txtName1.Text = UserService.GetUserNameByUserId(getF1.OperaterId);
if (!string.IsNullOrEmpty(getF1.SignatureUrl))
{
this.Image1.ImageUrl = "~/" + getF1.SignatureUrl;
}
var signUser1 = UserService.GetUserByUserId(getF1.OperaterId);
if (signUser1 != null)
{
this.txtName1.Text = signUser1.UserName;
}
this.txtTime1.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF1.OperaterTime);
}
}
@@ -133,7 +143,16 @@
{
this.txtOpinion2.Text = getF2.Opinion;
}
this.txtName2.Text = UserService.GetUserNameByUserId(getF2.OperaterId);
if (!string.IsNullOrEmpty(getF2.SignatureUrl))
{
this.Image2.ImageUrl = "~/" + getF2.SignatureUrl;
}
var signUser2 = UserService.GetUserByUserId(getF2.OperaterId);
if (signUser2 != null)
{
this.txtName2.Text = signUser2.UserName;
}
this.txtTime2.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF2.OperaterTime);
}
}
@@ -153,7 +172,15 @@
{
this.txtOpinion3.Text = getF3.Opinion;
}
this.txtName3.Text = UserService.GetUserNameByUserId(getF3.OperaterId);
if (!string.IsNullOrEmpty(getF3.SignatureUrl))
{
this.Image3.ImageUrl = "~/" + getF3.SignatureUrl;
}
var signUser3 = UserService.GetUserByUserId(getF3.OperaterId);
if (signUser3 != null)
{
this.txtName3.Text = UserService.GetUserNameByUserId(getF3.OperaterId);
}
this.txtTime3.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF3.OperaterTime);
}
}
@@ -185,7 +212,7 @@
/// </summary>
private void BindGrid()
{
string strSql = @"SELECT LicenseItemId,DataId,SortIndex,SafetyMeasures,(CASE WHEN IsUsed = 1 THEN '适用' ELSE '不适用' END) AS NoUsedName,ConfirmManId,U.UserName AS ConfirmManName"
string strSql = @"SELECT LicenseItemId,DataId,SortIndex,SafetyMeasures,(CASE WHEN IsUsed = 1 THEN '合格' ELSE '不合格' END) AS NoUsedName,ConfirmManId,U.UserName AS ConfirmManName"
+ @" FROM License_LicenseItem AS L "
+ @" LEFT JOIN Sys_User AS U ON L.ConfirmManId =U.UserId"
+ @" WHERE L.DataId ='" + this.HeightWorkId +"'";