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/TailTermApprove.aspx.cs
+60 -27
View File
@@ -2,6 +2,8 @@
using Model;
using System;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.Linq;
using System.Web;
using System.Web.UI;
@@ -47,6 +49,8 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
this.RectifyEditImg = -1;
//数据绑定
PageInit();
//处理意见绑定
gvHandleBrid();
}
}
@@ -55,27 +59,27 @@ 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 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
@@ -94,7 +98,9 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
tail.RectifyOpinion,
tail.RectifyTime,
tail.ProblemType,
tail.InspectUser,
InspectUserName = inspuser.UserName,
tail.ApproveUser,
ApproveUserName = approuser.UserName,
};
@@ -136,9 +142,30 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
lblRectifyTime.Text = model.RectifyTime != null ? model.RectifyTime.Value.ToString("yyyy-MM-dd hh:mm:ss") : string.Empty;
//检查人
lblInspectUser.Text = model.InspectUserName;
//审核人
lblApproveUser.Text = model.ApproveUserName;
hidApproveUserId.Text = model.ApproveUser;
//审核时间
lblApproveTime.Text = DateTime.Now.ToString("yyyy-MM-dd hh:mm:ss");
}
}
/// <summary>
/// 处理意见绑定
/// </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,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.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));
strSql += " order by a.AddTime asc";
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
gvHandle.DataSource = tb;
gvHandle.DataBind();
}
/// <summary>
/// 问题图片
/// </summary>
@@ -163,15 +190,18 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
var tailTerm = Funs.DB.PreRun_InspectTailTerm.FirstOrDefault(x => x.TailTermId == this.TailTermId);
if (tailTerm != null)
{
tailTerm.ApproveState = 1;
tailTerm.ApproveState = 3;
var model = new PreRun_InspectTermApproveRecords();
model.InspectTermId = Guid.NewGuid().ToString();
model.ProjectId = this.CurrUser.LoginProjectId;
model.TermItemId = tailTerm.TermItemId;
model.TailTermId = this.TailTermId;
model.ApproveOpinion = txtApproveOpinion.Text;
model.ApproveTime = DateTime.Parse(txtApproveTime.Text);
model.ApproveUser = ddlApproveUser.SelectedValue;
model.ApproveTime = DateTime.Parse(lblApproveTime.Text);
model.ApproveUser = hidApproveUserId.Text;
//0:处理记录1:审核记录
model.ApproveType = 1;
//0:退回1:通过
model.ApproveState = 0;
model.AddUser = this.CurrUser.UserId;
model.AddTime = DateTime.Now;
@@ -208,15 +238,18 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
}
}
}
tailTerm.ApproveState = 3;
tailTerm.ApproveState = 5;
var model = new PreRun_InspectTermApproveRecords();
model.InspectTermId = Guid.NewGuid().ToString();
model.ProjectId = this.CurrUser.LoginProjectId;
model.TermItemId = tailTerm.TermItemId;
model.TailTermId = this.TailTermId;
model.ApproveOpinion = txtApproveOpinion.Text;
model.ApproveTime = DateTime.Parse(txtApproveTime.Text);
model.ApproveUser = ddlApproveUser.SelectedValue;
model.ApproveTime = DateTime.Parse(lblApproveTime.Text);
model.ApproveUser = hidApproveUserId.Text;
//0:处理记录1:审核记录
model.ApproveType = 1;
//0:退回1:通过
model.ApproveState = 1;
model.AddUser = this.CurrUser.UserId;
model.AddTime = DateTime.Now;