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-11-23 09:28:55 +08:00
parent 5e5ad08320
commit 88d09e2602
66 changed files with 10754 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/TestRun/BeforeTestRun/TailTermApprove.aspx.cs
+13 -30
View File
@@ -59,28 +59,6 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
/// </summary>
public void PageInit()
{
////获取用户信息
//var userList = from user in Funs.DB.Sys_User
// join projectrole in Funs.DB.Project_ProjectUser on user.UserId equals projectrole.UserId
// where projectrole.ProjectId == this.CurrUser.LoginProjectId
// select user;
//var userids = new List<string>() { Const.sysglyId, Const.hfnbdId, Const.sedinId };
//var addUserList = Funs.DB.Sys_User.Where(x => userids.Contains(x.UserId));
//var users = userList.ToList();
//if (addUserList.Count() > 0)
//{
// users.AddRange(addUserList);
//}
//if (users.Count() > 0)
//{
// ddlApproveUser.DataTextField = "UserName";
// ddlApproveUser.DataValueField = "UserId";
// ddlApproveUser.DataSource = users;
// ddlApproveUser.DataBind();
//}
//txtApproveTime.Text = DateTime.Now.ToString("yyyy-MM-dd hh:mm:ss");
//ddlApproveUser.SelectedValue = this.CurrUser.UserId;
var data = from tail in Funs.DB.PreRun_InspectTailTerm
join unit in Funs.DB.Base_Unit on tail.ConstructionUnit equals unit.UnitId
join inspuser in Funs.DB.Sys_User on tail.InspectUser equals inspuser.UserId
@@ -102,6 +80,8 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
InspectUserName = inspuser.UserName,
tail.ApproveUser,
ApproveUserName = approuser.UserName,
termitem.PropertyTechnologyId,
tail.AdjustCompleteTime
};
if (data.Count() > 0)
@@ -116,30 +96,33 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
//问题类别
lblProblemType.Text = model.ProblemType == 1 ? "管道" : "设备";
//管道/设备
var propertyIds = model.PropertyTechnologyId.Split(',');
if (model.ProblemType == 1)
{
var piping = Funs.DB.PreRun_PropertySysPiping.FirstOrDefault(x => x.PropertyId == model.SubInspectId);
lblSubInspectName.Label = "管道号";
var piping = Funs.DB.PreRun_PropertySysPiping.Where(x => propertyIds.Contains(x.PropertyId)).ToList();
if (piping != null)
{
lblSubInspectId.Text = $"管道：{piping.PipingCode}";
lblSubInspectName.Text = $"{string.Join(",", piping.ConvertAll(x => x.PipingCode))}";
}
}
else
{
var piping = Funs.DB.PreRun_TechnologySysPiping.FirstOrDefault(x => x.TechnologyId == model.SubInspectId);
lblSubInspectName.Label = "设备位号";
var piping = Funs.DB.PreRun_TechnologySysPiping.Where(x => propertyIds.Contains(x.TechnologyId)).ToList();
if (piping != null)
{
lblSubInspectId.Text = $"设备：{piping.TagNumber}";
lblSubInspectName.Text = $"{string.Join(",", piping.ConvertAll(x => x.TagNumber))}";
}
}
//检查项
lblTermItemId.Text = model.TermItemName;
lblTermItemName.Text = model.TermItemName;
//问题描述
lblQuestionDesc.Text = model.QuestionDesc;
//整改意见
lblRectifyOpinion.Text = model.RectifyOpinion;
//整改时间
lblRectifyTime.Text = model.RectifyTime != null ? model.RectifyTime.Value.ToString("yyyy-MM-dd hh:mm:ss") : string.Empty;
//要求整改完成时间
lblAdjustCompleteTime.Text = model.AdjustCompleteTime != null ? model.AdjustCompleteTime.Value.ToString("yyyy-MM-dd hh:mm:ss") : string.Empty;
//检查人
lblInspectUser.Text = model.InspectUserName;
//审核人
@@ -155,7 +138,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
/// </summary>
public void gvHandleBrid()
{
string strSql = @"select a.InspectTermId,a.ApproveOpinion,a.ApproveTime,a.ApproveType,a.ApproveState,(case a.ApproveState when 0 then '处理退回' when 1 then '处理通过' else '' end) as ApproveStateName,b.ConstructionUnit,d.UnitName as ConstructionUnitName,a.AddUser,a.AddTime from PreRun_InspectTermApproveRecords as a inner join PreRun_InspectTailTerm as b on a.TailTermId=b.TailTermId inner join PreRun_SubInspectTermItem as c on c.TermItemId=a.TermItemId inner join Base_Unit as d on d.UnitId=b.ConstructionUnit where 1=1 and a.ApproveType=0 and a.ProjectId=@ProjectId and a.TailTermId=@TailTermId ";
string strSql = @"select a.InspectTermId,a.ApproveOpinion,a.ApproveTime,a.ApproveType,a.ApproveState,(case a.ApproveState when 0 then '处理退回' when 1 then '处理完成' else '' end) as ApproveStateName,b.ConstructionUnit,d.UnitName as ConstructionUnitName,a.AddUser,a.AddTime from PreRun_InspectTermApproveRecords as a inner join PreRun_InspectTailTerm as b on a.TailTermId=b.TailTermId inner join PreRun_SubInspectTermItem as c on c.TermItemId=a.TermItemId inner join Base_Unit as d on d.UnitId=b.ConstructionUnit where 1=1 and a.ApproveType=0 and a.ProjectId=@ProjectId and a.TailTermId=@TailTermId ";
List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
listStr.Add(new SqlParameter("@TailTermId", this.TailTermId));