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/BreakGroundView.aspx.cs
+94 -7
View File
@@ -48,7 +48,9 @@
this.txtApplyUnit.Text = UnitService.GetUnitNameByUnitId(getBreakGround.ApplyUnitId);
this.txtApplyManName.Text = UserService.GetUserNameByUserId(getBreakGround.ApplyManId);
this.txtWorkPalce.Text = getBreakGround.WorkPalce;
this.txtWorkDepth.Text = getBreakGround.WorkDepth;
this.txtWatchMan.Text = getBreakGround.WatchMan;
this.txtWorkMan.Text = getBreakGround.WorkMan;
this.txtIdNum.Text = getBreakGround.IdNum;
if (getBreakGround.ValidityStartTime.HasValue)
{
this.txtWorkDate.Text = getBreakGround.ValidityStartTime.Value.ToString("f") + " 至 ";
@@ -89,6 +91,8 @@
public string FlowOperateId1;
public string FlowOperateId2;
public string FlowOperateId3;
public string FlowOperateId4;
public string FlowOperateId5;
/// <summary>
///
/// </summary>
@@ -112,7 +116,16 @@
{
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);
}
}
@@ -131,7 +144,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);
}
}
@@ -150,28 +172,93 @@
{
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 = signUser3.UserName;
}
this.txtTime3.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF3.OperaterTime);
}
}
var getF4 = getFlows.FirstOrDefault(x => x.SortIndex == 4);
if (getF4 != null)
{
FlowOperateId4 = getF4.FlowOperateId;
this.txtForm4.Title = getF4.AuditFlowName + "：";
if (getF4.OperaterTime.HasValue)
{
if (getF4.IsAgree == true)
{
// this.txtOpinion4.Text = "同意。";
this.txtOpinion4.Text = "同意。";
}
else
{
this.txtOpinion4.Text = getF4.Opinion;
}
this.txtName4.Text = UserService.GetUserNameByUserId(getF4.OperaterId);
if (!string.IsNullOrEmpty(getF4.SignatureUrl))
{
this.Image4.ImageUrl = "~/" + getF4.SignatureUrl;
}
var signUser4 = UserService.GetUserByUserId(getF4.OperaterId);
if (signUser4 != null)
{
this.txtName4.Text = signUser4.UserName;
}
this.txtTime4.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF4.OperaterTime);
}
}
var getF5 = getFlows.FirstOrDefault(x => x.SortIndex == 5);
if (getF5 != null)
{
FlowOperateId5 = getF5.FlowOperateId;
this.txtForm5.Title = getF5.AuditFlowName + "：";
if (getF5.OperaterTime.HasValue)
{
if (getF5.IsAgree == true)
{
this.txtOpinion5.Text = "同意。";
}
else
{
this.txtOpinion5.Text = getF5.Opinion;
}
if (!string.IsNullOrEmpty(getF5.SignatureUrl))
{
this.Image5.ImageUrl = "~/" + getF5.SignatureUrl;
}
var signUser5= UserService.GetUserByUserId(getF5.OperaterId);
if (signUser5 != null)
{
this.txtName5.Text = signUser5.UserName;
}
this.txtTime5.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF5.OperaterTime);
}
}
var getF6 = getFlows.FirstOrDefault(x => x.SortIndex == 6);
if (getF6 != null)
{
this.txtForm6.Title = getF6.AuditFlowName + "：";
if (getF6.OperaterTime.HasValue)
{
if (getF6.IsAgree == true)
{
// this.txtOpinion4.Text = "同意。";
}
else
{
this.txtOpinion6.Text = getF6.Opinion;
}
this.txtName6.Text = UserService.GetUserNameByUserId(getF4.OperaterId);
this.txtTime6.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF4.OperaterTime);
}
}
}
}
@@ -182,7 +269,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.BreakGroundId +"'";