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

修改作业许可

Browse Source
This commit is contained in:
高飞
2023-09-13 08:31:05 +08:00
parent de3763f245
commit 2a4772c921
28 changed files with 1874 additions and 3916 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/HSSE/License/HeightWorkView.aspx.cs
+96 -92
View File
@@ -46,9 +46,13 @@
{
this.lbLicenseCode.Text = getHeightWork.LicenseCode;
this.txtApplyUnit.Text = UnitService.GetUnitNameByUnitId(getHeightWork.ApplyUnitId);
this.txtApplyManName.Text = UserService.GetUserNameByUserId(getHeightWork.ApplyManId);
//this.txtApplyManName.Text = UserService.GetUserNameByUserId(getHeightWork.ApplyManId);
txtWorkAreaName.Text = UnitWorkService.GetUnitWorkName(getHeightWork.WorkAreaId);
this.txtWorkPalce.Text = getHeightWork.WorkPalce;
this.txtWorkType.Text = getHeightWork.WorkType;
txtWorkLeaderName.Text = getHeightWork.WorkLeaderName;
txtFireWatchManName.Text = getHeightWork.FireWatchManName;
txtWorkHeight.Text = getHeightWork.WorkHeight;
if (getHeightWork.ValidityStartTime.HasValue)
{
this.txtWorkDate.Text = getHeightWork.ValidityStartTime.Value.ToString("f") + " 至 ";
@@ -113,96 +117,96 @@
this.txtTime1.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF1.OperaterTime);
}
}
var getF2 = getFlows.FirstOrDefault(x => x.SortIndex == 2);
if (getF2 != null)
{
this.txtForm2.Title = getF2.AuditFlowName + "：";
if (getF2.OperaterTime.HasValue)
{
if (getF2.IsAgree == true)
{
this.txtOpinion2.Text = "同意。";
}
else
{
this.txtOpinion2.Text = getF2.Opinion;
}
this.txtName2.Text = UserService.GetUserNameByUserId(getF2.OperaterId);
this.txtTime2.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF2.OperaterTime);
}
}
var getF3 = getFlows.FirstOrDefault(x => x.SortIndex == 3);
if (getF3 != null)
{
this.txtForm3.Title = getF3.AuditFlowName + "：";
if (getF3.OperaterTime.HasValue)
{
if (getF3.IsAgree == true)
{
this.txtOpinion3.Text = "同意。";
}
else
{
this.txtOpinion3.Text = getF3.Opinion;
}
this.txtName3.Text = UserService.GetUserNameByUserId(getF3.OperaterId);
this.txtTime3.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF3.OperaterTime);
}
}
var getF4 = getFlows.FirstOrDefault(x => x.SortIndex == 4);
if (getF4 != null)
{
this.txtForm4.Title = getF4.AuditFlowName + "：";
if (getF4.OperaterTime.HasValue)
{
if (getF4.IsAgree == true)
{
this.txtOpinion4.Text = "同意。";
}
else
{
this.txtOpinion4.Text = getF4.Opinion;
}
this.txtName4.Text = UserService.GetUserNameByUserId(getF4.OperaterId);
this.txtTime4.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF4.OperaterTime);
}
}
var getF5 = getFlows.FirstOrDefault(x => x.SortIndex == 5);
if (getF5 != null)
{
this.txtForm5.Title = getF5.AuditFlowName + "：";
if (getF5.OperaterTime.HasValue)
{
if (getF5.IsAgree == true)
{
this.txtOpinion5.Text = "同意。";
}
else
{
this.txtOpinion5.Text = getF5.Opinion;
}
this.txtName5.Text = UserService.GetUserNameByUserId(getF5.OperaterId);
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.txtOpinion6.Text = "同意。";
}
else
{
this.txtOpinion6.Text = getF6.Opinion;
}
this.txtName6.Text = UserService.GetUserNameByUserId(getF6.OperaterId);
this.txtTime6.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF6.OperaterTime);
}
}
//var getF2 = getFlows.FirstOrDefault(x => x.SortIndex == 2);
//if (getF2 != null)
//{
// this.txtForm2.Title = getF2.AuditFlowName + "：";
// if (getF2.OperaterTime.HasValue)
// {
// if (getF2.IsAgree == true)
// {
// this.txtOpinion2.Text = "同意。";
// }
// else
// {
// this.txtOpinion2.Text = getF2.Opinion;
// }
// this.txtName2.Text = UserService.GetUserNameByUserId(getF2.OperaterId);
// this.txtTime2.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF2.OperaterTime);
// }
//}
//var getF3 = getFlows.FirstOrDefault(x => x.SortIndex == 3);
//if (getF3 != null)
//{
// this.txtForm3.Title = getF3.AuditFlowName + "：";
// if (getF3.OperaterTime.HasValue)
// {
// if (getF3.IsAgree == true)
// {
// this.txtOpinion3.Text = "同意。";
// }
// else
// {
// this.txtOpinion3.Text = getF3.Opinion;
// }
// this.txtName3.Text = UserService.GetUserNameByUserId(getF3.OperaterId);
// this.txtTime3.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF3.OperaterTime);
// }
//}
//var getF4 = getFlows.FirstOrDefault(x => x.SortIndex == 4);
//if (getF4 != null)
//{
// this.txtForm4.Title = getF4.AuditFlowName + "：";
// if (getF4.OperaterTime.HasValue)
// {
// if (getF4.IsAgree == true)
// {
// this.txtOpinion4.Text = "同意。";
// }
// else
// {
// this.txtOpinion4.Text = getF4.Opinion;
// }
// this.txtName4.Text = UserService.GetUserNameByUserId(getF4.OperaterId);
// this.txtTime4.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF4.OperaterTime);
// }
//}
//var getF5 = getFlows.FirstOrDefault(x => x.SortIndex == 5);
//if (getF5 != null)
//{
// this.txtForm5.Title = getF5.AuditFlowName + "：";
// if (getF5.OperaterTime.HasValue)
// {
// if (getF5.IsAgree == true)
// {
// this.txtOpinion5.Text = "同意。";
// }
// else
// {
// this.txtOpinion5.Text = getF5.Opinion;
// }
// this.txtName5.Text = UserService.GetUserNameByUserId(getF5.OperaterId);
// 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.txtOpinion6.Text = "同意。";
// }
// else
// {
// this.txtOpinion6.Text = getF6.Opinion;
// }
// this.txtName6.Text = UserService.GetUserNameByUserId(getF6.OperaterId);
// this.txtTime6.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF6.OperaterTime);
// }
//}
}
}
#endregion
@@ -212,7 +216,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 +"'";