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

提交代码

Browse Source
This commit is contained in:
高飞
2024-03-05 11:22:03 +08:00
parent d28f7920d8
commit 8e60ae5b65
44 changed files with 4374 additions and 2209 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/TestRun/DriverScheme.aspx.cs
+36 -23
View File
@@ -100,7 +100,7 @@ namespace FineUIPro.Web.TestRun
{
string strSql = @"SELECT chec.ConstructSolutionId,chec.ProjectId,chec.UnitId,chec.UnitWorkIds,chec.CNProfessionalCodes,"
+ @" chec.CompileMan,chec.CompileDate,chec.code,chec.state,chec.SolutionType,chec.SolutionName,"
+ @" unit.UnitName,u.userName as CompileManName,chec.SpecialSchemeTypeId,"
+ @" unit.UnitName,u.userName as CompileManName,chec.SpecialSchemeTypeId,chec.System,"
+ @" t.SpecialSchemeTypeName"
+ @" FROM Solution_TestRunConstructSolution chec "
+ @" left join Base_Unit unit on unit.unitId=chec.UnitId "
@@ -113,30 +113,43 @@ namespace FineUIPro.Web.TestRun
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
Grid1.RecordCount = tb.Rows.Count;
var CNProfessional = CNProfessionalService.GetList();
var uniWork = UnitWorkService.GetUnitWorkLists(CurrUser.LoginProjectId);
if (tb.Rows.Count > 0)
{
for (int i = 0; i < tb.Rows.Count; i++)
{
if (tb.Rows[i]["CNProfessionalCodes"] != null)
{
var code = tb.Rows[i]["CNProfessionalCodes"].ToString().Split(',');
var listf = CNProfessional.Where(p => code.Contains(p.CNProfessionalId)).Select(p => p.ProfessionalName).ToArray();
tb.Rows[i]["CNProfessionalCodes"] = string.Join(",", listf);
}
if (tb.Rows[i]["UnitWorkIds"] != null)
{
var code = tb.Rows[i]["UnitWorkIds"].ToString().Split(',');
var workid = uniWork.Where(p => code.Contains(p.UnitWorkId)).Select(p => p.UnitWorkName + BLL.UnitWorkService.GetProjectType(p.ProjectType)).ToArray();
tb.Rows[i]["UnitWorkIds"] = string.Join(",", workid);
}
}
}
//var CNProfessional = CNProfessionalService.GetList();
//var uniWork = UnitWorkService.GetUnitWorkLists(CurrUser.LoginProjectId);
//if (tb.Rows.Count > 0)
//{
// for (int i = 0; i < tb.Rows.Count; i++)
// {
// if (tb.Rows[i]["CNProfessionalCodes"] != null)
// {
// var code = tb.Rows[i]["CNProfessionalCodes"].ToString().Split(',');
// var listf = CNProfessional.Where(p => code.Contains(p.CNProfessionalId)).Select(p => p.ProfessionalName).ToArray();
// tb.Rows[i]["CNProfessionalCodes"] = string.Join(",", listf);
// }
// if (tb.Rows[i]["UnitWorkIds"] != null)
// {
// var code = tb.Rows[i]["UnitWorkIds"].ToString().Split(',');
// var workid = uniWork.Where(p => code.Contains(p.UnitWorkId)).Select(p => p.UnitWorkName + BLL.UnitWorkService.GetProjectType(p.ProjectType)).ToArray();
// tb.Rows[i]["UnitWorkIds"] = string.Join(",", workid);
// }
// }
//}
tb = GetFilteredTable(Grid1.FilteredData, tb);
var table = GetPagedDataTable(Grid1, tb);
Grid1.DataSource = table;
Grid1.DataBind();
if (this.tvDataTypeInit.SelectedNodeID.Length > 1)
{
if (this.tvDataTypeInit.SelectedNodeID == "12")
{
this.Grid1.Columns[4].Hidden = true;
this.Grid1.Columns[5].Hidden = true;
}
else
{
this.Grid1.Columns[4].Hidden = false;
this.Grid1.Columns[5].Hidden = false;
}
}
}
#endregion
@@ -257,7 +270,7 @@ namespace FineUIPro.Web.TestRun
Model.Solution_TestRunConstructSolution constructSolution = TestRunConstructSolutionService.GetConstructSolutionByConstructSolutionId(id);
if (constructSolution.State == Const.TestRunConstructSolution_Complete)
{
Alert.ShowInTop("该方案已经审批完成,无法操作,请右键查看!", MessageBoxIcon.Warning);
Alert.ShowInTop("该方案已经发布,无法操作,请右键查看!", MessageBoxIcon.Warning);
return;
}
else if (constructSolution.State == Const.TestRunConstructSolution_Compile)
@@ -273,7 +286,7 @@ namespace FineUIPro.Web.TestRun
return;
}
}
else if (constructSolution.State == Const.TestRunConstructSolution_Audit || constructSolution.State == Const.TestRunConstructSolution_ReCompile)
else if (constructSolution.State == Const.TestRunConstructSolution_Audit || constructSolution.State == Const.TestRunConstructSolution_ReCompile || constructSolution.State == Const.TestRunConstructSolution_Audit2)
{
var approve = TestRunConstructSolutionApproveService.GetThisApproveByConstructSolutionId(id);
if (approve != null && approve.ApproveMan == this.CurrUser.UserId)