提交代码
This commit is contained in:
@@ -48,10 +48,12 @@ namespace FineUIPro.Web.TestRun
|
||||
{
|
||||
drpModelType.Text = TestRunConstructSolutionService.ConvertSolutionType(constructSolution.SolutionType);
|
||||
}
|
||||
if (!string.IsNullOrEmpty(constructSolution.SpecialSchemeTypeId))
|
||||
if (constructSolution.SolutionType == "12")
|
||||
{
|
||||
txtSpecialType.Text = BLL.SpecialSchemeTypeService.GetSpecialSchemeTypeById(constructSolution.SpecialSchemeTypeId).SpecialSchemeTypeName;
|
||||
this.txtUnitWork.Hidden = true;
|
||||
this.txtSystem.Hidden = true;
|
||||
}
|
||||
txtSystem.Text = constructSolution.System;
|
||||
if (constructSolution.CompileDate != null)
|
||||
{
|
||||
txtCompileDate.Text = string.Format("{0:yyyy-MM-dd}", constructSolution.CompileDate);
|
||||
@@ -59,13 +61,9 @@ namespace FineUIPro.Web.TestRun
|
||||
txtSolutionName.Text = constructSolution.SolutionName;
|
||||
if (!string.IsNullOrWhiteSpace(constructSolution.UnitWorkIds))
|
||||
{
|
||||
txtUnitWork.Text = UnitWorkService.GetUnitWorkName(constructSolution.UnitWorkIds);
|
||||
txtUnitWork.Text = constructSolution.UnitWorkIds;
|
||||
|
||||
}
|
||||
if (!string.IsNullOrWhiteSpace(constructSolution.CNProfessionalCodes))
|
||||
{
|
||||
txtCNProfessional.Text = TestRunConstructSolutionService.GetProfessionalName(constructSolution.CNProfessionalCodes);
|
||||
}
|
||||
if (constructSolution.Edition != null)
|
||||
{
|
||||
txtEdition.Text = constructSolution.Edition.ToString();
|
||||
@@ -73,25 +71,7 @@ namespace FineUIPro.Web.TestRun
|
||||
txtDocContent.Text = HttpUtility.HtmlDecode(constructSolution.Content);
|
||||
|
||||
bindApprove();
|
||||
BindZYRole();
|
||||
BindAQRole();
|
||||
BindSGRole();
|
||||
//BindXMRole();
|
||||
var zyUserIds = TestRunConstructSolutionApproveService.GetUserIdsApprovesBySignType(ConstructSolutionId, "ZY");
|
||||
if (zyUserIds.Count > 0)
|
||||
{
|
||||
SetCheck(trOne, zyUserIds);
|
||||
}
|
||||
var aqUserIds = TestRunConstructSolutionApproveService.GetUserIdsApprovesBySignType(ConstructSolutionId, "AQ");
|
||||
if (aqUserIds.Count > 0)
|
||||
{
|
||||
SetCheck(trThree, aqUserIds);
|
||||
}
|
||||
var sgUserIds = TestRunConstructSolutionApproveService.GetUserIdsApprovesBySignType(ConstructSolutionId, "SG");
|
||||
if (sgUserIds.Count > 0)
|
||||
{
|
||||
SetCheck(trFive, sgUserIds);
|
||||
}
|
||||
//var xmUserIds = TestRunConstructSolutionApproveService.GetUserIdsApprovesBySignType(ConstructSolutionId, "XM");
|
||||
//if (xmUserIds.Count > 0)
|
||||
//{
|
||||
@@ -130,41 +110,6 @@ namespace FineUIPro.Web.TestRun
|
||||
}
|
||||
}
|
||||
|
||||
/// 加载角色树:动态加载
|
||||
/// </summary>
|
||||
private void BindZYRole()
|
||||
{
|
||||
|
||||
TreeNode rootNode = new TreeNode();//定义根节点
|
||||
rootNode.Text = "专业工程师";
|
||||
rootNode.NodeID = "0";
|
||||
rootNode.Expanded = true;
|
||||
rootNode.EnableCheckEvent = true;
|
||||
trOne.Nodes.Add(rootNode);
|
||||
trOne.EnableCheckBox = true;
|
||||
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
|
||||
{
|
||||
var userList = from x in db.Sys_User
|
||||
join y in db.Project_ProjectUnit
|
||||
on x.UnitId equals y.UnitId
|
||||
join p in db.Project_ProjectUser
|
||||
on x.UserId equals p.UserId
|
||||
where p.RoleId.Contains(Const.ZBCNEngineer)
|
||||
&& y.UnitType == Const.ProjectUnitType_1 && p.ProjectId == CurrUser.LoginProjectId && y.ProjectId == CurrUser.LoginProjectId
|
||||
select x;
|
||||
//var ss = LINQToDataTable(userList);
|
||||
foreach (var u in userList)
|
||||
{
|
||||
TreeNode Node = new TreeNode();
|
||||
Node.Text = u.UserName;
|
||||
Node.NodeID = u.UserId;
|
||||
Node.EnableCheckEvent = true;
|
||||
rootNode.Nodes.Add(Node);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 判断是否有选择
|
||||
/// </summary>
|
||||
@@ -187,67 +132,6 @@ namespace FineUIPro.Web.TestRun
|
||||
return res;
|
||||
}
|
||||
|
||||
private void BindAQRole()
|
||||
{
|
||||
TreeNode rootNode = new TreeNode();//定义根节点
|
||||
rootNode.Text = "HSE组";
|
||||
rootNode.NodeID = "0";
|
||||
rootNode.Expanded = true;
|
||||
rootNode.EnableCheckEvent = true;
|
||||
trThree.Nodes.Add(rootNode);
|
||||
trThree.EnableCheckBox = true;
|
||||
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
|
||||
{
|
||||
var userList = from x in db.Sys_User
|
||||
join y in db.Project_ProjectUnit
|
||||
on x.UnitId equals y.UnitId
|
||||
join p in db.Project_ProjectUser
|
||||
on x.UserId equals p.UserId
|
||||
where (p.RoleId.Contains(Const.HSSEManager) || p.RoleId.Contains(Const.HSSEEngineer))
|
||||
&& y.UnitType == Const.ProjectUnitType_1 && p.ProjectId == CurrUser.LoginProjectId && y.ProjectId == CurrUser.LoginProjectId
|
||||
orderby x.UserCode
|
||||
select x;
|
||||
foreach (var u in userList)
|
||||
{
|
||||
TreeNode roleNode = new TreeNode();
|
||||
roleNode.Text = u.UserName;
|
||||
roleNode.NodeID = u.UserId;
|
||||
rootNode.Nodes.Add(roleNode);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void BindSGRole()
|
||||
{
|
||||
|
||||
TreeNode rootNode = new TreeNode();//定义根节点
|
||||
rootNode.Text = "施工经理";
|
||||
rootNode.NodeID = "0";
|
||||
rootNode.Expanded = true;
|
||||
rootNode.EnableCheckEvent = true;
|
||||
trFive.Nodes.Add(rootNode);
|
||||
trFive.EnableCheckBox = true;
|
||||
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
|
||||
{
|
||||
var userList = from x in db.Sys_User
|
||||
join y in db.Project_ProjectUnit
|
||||
on x.UnitId equals y.UnitId
|
||||
join p in db.Project_ProjectUser
|
||||
on x.UserId equals p.UserId
|
||||
where (p.RoleId.Contains(Const.ConstructionManager) || p.RoleId.Contains(Const.ConstructionAssistantManager))
|
||||
&& y.UnitType == Const.ProjectUnitType_1 && p.ProjectId == CurrUser.LoginProjectId && y.ProjectId == CurrUser.LoginProjectId
|
||||
orderby x.UserCode
|
||||
select x;
|
||||
foreach (var u in userList)
|
||||
{
|
||||
TreeNode roleNode = new TreeNode();
|
||||
roleNode.Text = u.UserName;
|
||||
roleNode.NodeID = u.UserId;
|
||||
rootNode.Nodes.Add(roleNode);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
//private void BindXMRole()
|
||||
//{
|
||||
|
||||
|
||||
Reference in New Issue
Block a user