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-10-24 10:17:27 +08:00
parent aa4f2bbe25
commit 75581e1eef
30 changed files with 2332 additions and 310 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectTailTermEdit.aspx.cs
+85 -36
View File
@@ -68,8 +68,8 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
this.IsView = string.IsNullOrWhiteSpace(Request["IsView"]) ? false : bool.Parse(Request["IsView"]);
//数据绑定
PageInit();
//审批已经绑定
gvApproveBrid();
//处理和审批意见绑定
gvRecordBrid();
//判断是否查看
if (IsView)
{
@@ -84,9 +84,8 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
ddlTermItemId.Enabled = false;
txtQuestionDesc.Enabled = false;
txtRectifyOpinion.Enabled = false;
txtRectifyTime.Enabled = false;
ddlInspectUser.Enabled = false;
ddlApproveUser.Enabled = false;
ddlHandleUser.Enabled = false;
}
}
}
@@ -101,12 +100,6 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
var selectList = new List<SelectPropertyTechnology>();
//施工单位
UnitService.InitUnitByProjectIdUnitTypeDropDownList(ddlConstructionUnit, this.CurrUser.LoginProjectId, BLL.Const.ProjectUnitType_2, false);
//获取用户信息
//var users = 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 userList = from user in Funs.DB.Sys_User
join projectrole in Funs.DB.Project_ProjectUser on user.UserId equals projectrole.UserId
@@ -122,12 +115,12 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
//检查人和审核人
if (users.Count() > 0)
{
//检查人
ddlInspectUser.DataTextField = "UserName";
ddlInspectUser.DataValueField = "UserId";
ddlInspectUser.DataSource = users;
ddlInspectUser.DataBind();
ddlInspectUser.SelectedValue = this.CurrUser.UserId;
//处理人
ddlHandleUser.DataTextField = "UserName";
ddlHandleUser.DataValueField = "UserId";
ddlHandleUser.DataSource = users;
ddlHandleUser.DataBind();
ddlHandleUser.SelectedValue = this.CurrUser.UserId;
//审核人
ddlApproveUser.DataTextField = "UserName";
ddlApproveUser.DataValueField = "UserId";
@@ -146,6 +139,13 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
ddlConstructionUnit.SelectedValue = model.ConstructionUnit;
//问题类别
ddlProblemType.SelectedValue = model.ProblemType.ToString();
//提出人
var inspectModel = users.FirstOrDefault(x => x.UserId == model.InspectUser);
if (inspectModel != null)
{
lblInspectUser.Text = inspectModel.UserName;
hidInspectUserId.Text = inspectModel.UserId;
}
//绑定管道或者设备
var termitemlist = Funs.DB.PreRun_SubInspectTermItem.Where(x => x.InspectionResults == 0 && x.WorkPackType == model.ProblemType).GroupBy(x => new { x.SubInspectId, x.InspectionResults, x.PropertyTechnologyId, x.WorkPackType });
if (termitemlist.Count() > 0)
@@ -220,12 +220,14 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
txtQuestionDesc.Text = model.QuestionDesc;
//整改意见
txtRectifyOpinion.Text = model.RectifyOpinion;
//整改时间
txtRectifyTime.Text = model.RectifyTime != null ? model.RectifyTime.Value.ToString("yyyy-MM-dd hh:mm:ss") : string.Empty;
//检查人
ddlInspectUser.SelectedValue = model.InspectUser;
//提出时间
lblRectifyTime.Text = model.RectifyTime != null ? model.RectifyTime.Value.ToString("yyyy-MM-dd") : string.Empty;
//处理人
ddlHandleUser.SelectedValue = model.HandleUser;
//审核人
ddlApproveUser.SelectedValue = model.ApproveUser;
//整改完成日期
txtAdjustCompleteTime.Text = model.AdjustCompleteTime != null ? model.AdjustCompleteTime.Value.ToString("yyyy-MM-dd") : string.Empty;
if (model.ApproveState > 1)
{
QuestionEditImg = -1;
@@ -242,7 +244,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
string code = projectModel.ProjectCode + "-06-CM03-XJ-";
txtTailTermCode.Text = SQLHelper.RunProcNewId("SpGetNewCode5", "dbo.PreRun_InspectTailTerm", "TailTermCode", code);
}
if (!string.IsNullOrWhiteSpace(TermItemId))
if (!string.IsNullOrWhiteSpace(this.TermItemId))
{
var itemTerm = Funs.DB.PreRun_SubInspectTermItem.FirstOrDefault(x => x.TermItemId == this.TermItemId);
if (itemTerm != null)
@@ -266,24 +268,39 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
//检查项
ddlSubInspectId_SelectedIndexChanged(null, null);
ddlTermItemId.SelectedValue = itemTerm.TermItemId;
//提出人
var inspectModel = users.FirstOrDefault(x => x.UserId == itemTerm.InspectedUser);
if (inspectModel != null)
{
lblInspectUser.Text = inspectModel.UserName;
hidInspectUserId.Text = inspectModel.UserId;
}
//提出时间
lblRectifyTime.Text = DateTime.Now.ToString("yyyy-MM-dd");
}
}
}
}
/// <summary>
/// 审批意见绑定
/// 处理和审批意见绑定
/// </summary>
public void gvApproveBrid()
public void gvRecordBrid()
{
string strSql = @"select a.InspectTermId,a.ApproveOpinion,a.ApproveTime,a.ApproveState,(case a.ApproveState when 0 then '退回' when 1 then '通过' else '' end) as ApproveStateName,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 where 1=1 and a.ProjectId=@ProjectId and a.TailTermId=@TailTermId ";
string strSql = @"select a.InspectTermId,a.ApproveOpinion,a.ApproveTime,a.ApproveType,a.ApproveState,(case a.ApproveType when 0 then (case a.ApproveState when 0 then '处理退回' when 1 then '处理通过' else '' end) else (case a.ApproveState when 0 then '审批退回' when 1 then '审批通过' else '' end) end) as ApproveStateName,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 where 1=1 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));
strSql += " order by a.AddTime asc";
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
gvApprove.DataSource = tb;
//处理意见
var handleTb = tb.AsEnumerable().Where(row => row.Field<int>("ApproveType") == 0);
gvHandle.DataSource = handleTb;
gvHandle.DataBind();
//审批意见
var approveTb = tb.AsEnumerable().Where(row => row.Field<int>("ApproveType") == 1);
gvApprove.DataSource = approveTb;
gvApprove.DataBind();
}
@@ -314,9 +331,9 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
ShowNotify("请选择检查项!", MessageBoxIcon.Warning);
return;
}
if (string.IsNullOrWhiteSpace(ddlInspectUser.SelectedValue))
if (string.IsNullOrWhiteSpace(ddlHandleUser.SelectedValue))
{
ShowNotify("请选择检查人!", MessageBoxIcon.Warning);
ShowNotify("请选择处理人!", MessageBoxIcon.Warning);
return;
}
if (string.IsNullOrWhiteSpace(ddlApproveUser.SelectedValue))
@@ -341,9 +358,11 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
model.TermItemId = ddlTermItemId.SelectedValue;
model.QuestionDesc = txtQuestionDesc.Text.Trim();
model.RectifyOpinion = txtRectifyOpinion.Text.Trim();
model.RectifyTime = DateTime.Parse(txtRectifyTime.Text);
model.InspectUser = ddlInspectUser.SelectedValue;
model.RectifyTime = DateTime.Parse(lblRectifyTime.Text);
model.InspectUser = hidInspectUserId.Text;
model.HandleUser = ddlHandleUser.SelectedValue;
model.ApproveUser = ddlApproveUser.SelectedValue;
model.AdjustCompleteTime = DateTime.Parse(txtAdjustCompleteTime.Text);
model.ApproveState = 0;
model.AddUser = this.CurrUser.LoginProjectId;
model.AddTime = DateTime.Now;
@@ -386,9 +405,9 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
ShowNotify("请选择检查项!", MessageBoxIcon.Warning);
return;
}
if (string.IsNullOrWhiteSpace(ddlInspectUser.SelectedValue))
if (string.IsNullOrWhiteSpace(ddlHandleUser.SelectedValue))
{
ShowNotify("请选择检查人!", MessageBoxIcon.Warning);
ShowNotify("请选择处理人!", MessageBoxIcon.Warning);
return;
}
if (string.IsNullOrWhiteSpace(ddlApproveUser.SelectedValue))
@@ -413,10 +432,12 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
model.TermItemId = ddlTermItemId.SelectedValue;
model.QuestionDesc = txtQuestionDesc.Text.Trim();
model.RectifyOpinion = txtRectifyOpinion.Text.Trim();
model.RectifyTime = DateTime.Parse(txtRectifyTime.Text);
model.InspectUser = ddlInspectUser.SelectedValue;
model.RectifyTime = DateTime.Parse(lblRectifyTime.Text);
model.InspectUser = hidInspectUserId.Text;
model.HandleUser = ddlHandleUser.SelectedValue;
model.ApproveUser = ddlApproveUser.SelectedValue;
model.ApproveState = 2;
model.AdjustCompleteTime = DateTime.Parse(txtAdjustCompleteTime.Text);
model.ApproveState = 1;
model.AddUser = this.CurrUser.LoginProjectId;
model.AddTime = DateTime.Now;
var workPack = Funs.DB.PreRun_SubInspectTermItem.FirstOrDefault(x => x.TermItemId == model.TermItemId);
@@ -507,6 +528,15 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
ddlSubInspectId.Items.Insert(0, new ListItem("==无数据==", ""));
}
}
else
{
ddlSubInspectId.DataSource = null;
ddlSubInspectId.DataBind();
ddlSubInspectId.Items.Insert(0, new ListItem("==无数据==", ""));
ddlTermItemId.DataSource = null;
ddlTermItemId.DataBind();
ddlTermItemId.Items.Insert(0, new ListItem("==无数据==", ""));
}
}
}
@@ -541,13 +571,32 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
}
/// <summary>
///
/// 检查项
/// </summary>
protected void ddlTermItemId_SelectedIndexChanged(object sender, EventArgs e)
{
var itemTerm = Funs.DB.PreRun_SubInspectTermItem.FirstOrDefault(x => x.TermItemId == ddlTermItemId.SelectedValue);
if (itemTerm != null)
{
//提出人
var inspectModel = Funs.DB.Sys_User.FirstOrDefault(x => x.UserId == itemTerm.InspectedUser);
if (inspectModel != null)
{
lblInspectUser.Text = inspectModel.UserName;
hidInspectUserId.Text = inspectModel.UserId;
}
//提出时间
lblRectifyTime.Text = DateTime.Now.ToString("yyyy-MM-dd");
}
}
/// <summary>
/// 关闭
/// </summary>
protected void WindowAtt_Close(object sender, WindowCloseEventArgs e)
{
}
}
/// <summary>