提交代码
This commit is contained in:
@@ -60,7 +60,7 @@ namespace FineUIPro.Web.ZHGL.TestRunPerformance
|
||||
join y in db.Sys_User on x.UserId equals y.UserId
|
||||
where x.UserId == this.drpUser.SelectedValue && x.RaiseDate >= startDate && x.RaiseDate < endDate
|
||||
orderby x.ProjectId
|
||||
select new { x.TestRunMonthSummaryId, x.ProjectId, x.UserId, y.UserName, x.ProcessName, x.RaiseDate, x.ProblemDescription, x.HandleMethod, x.ExperienceOrSuggestion }).ToList();
|
||||
select new { x.TestRunMonthSummaryId, x.ProjectId, x.UserId, y.UserName, x.Major, x.ProcessName, x.RaiseDate, x.ProblemDescription, x.HandleMethod, x.ExperienceOrSuggestion }).ToList();
|
||||
if (getTestRunMonthSummarys.Count() > 0)
|
||||
{
|
||||
DataTable table = new DataTable();
|
||||
@@ -76,6 +76,7 @@ namespace FineUIPro.Web.ZHGL.TestRunPerformance
|
||||
table.Columns.Add(new DataColumn("Id", typeof(String)));
|
||||
table.Columns.Add(new DataColumn("Code", typeof(String)));
|
||||
table.Columns.Add(new DataColumn("ProjectName", typeof(String)));
|
||||
table.Columns.Add(new DataColumn("Major", typeof(String)));
|
||||
table.Columns.Add(new DataColumn("ProcessName", typeof(String)));
|
||||
table.Columns.Add(new DataColumn("RaiseDate", typeof(String)));
|
||||
table.Columns.Add(new DataColumn("ProblemDescription", typeof(String)));
|
||||
@@ -86,7 +87,7 @@ namespace FineUIPro.Web.ZHGL.TestRunPerformance
|
||||
for (int i = 0; i < months.Count; i++)
|
||||
{
|
||||
row = table.NewRow();
|
||||
row["Id"] = i;
|
||||
row["Id"] = SQLHelper.GetNewID();
|
||||
row["Code"] = GetNum(i + 1);
|
||||
row["ProjectName"] = months[i].Year + "年" + months[i].Month + "月份开车技术总结";
|
||||
DateTime monthEndDate = months[i].AddMonths(1);
|
||||
@@ -97,7 +98,7 @@ namespace FineUIPro.Web.ZHGL.TestRunPerformance
|
||||
foreach (var item in monthList)
|
||||
{
|
||||
row = table.NewRow();
|
||||
row["Id"] = SQLHelper.GetNewID();
|
||||
row["Id"] = item.TestRunMonthSummaryId;
|
||||
var project = projects.FirstOrDefault(x => x.ProjectId == item.ProjectId);
|
||||
if (project != null)
|
||||
{
|
||||
@@ -115,6 +116,7 @@ namespace FineUIPro.Web.ZHGL.TestRunPerformance
|
||||
projectName = row["ProjectName"].ToString();
|
||||
}
|
||||
}
|
||||
row["Major"] = item.Major;
|
||||
row["ProcessName"] = item.ProcessName;
|
||||
row["RaiseDate"] = item.RaiseDate;
|
||||
row["ProblemDescription"] = item.ProblemDescription;
|
||||
@@ -242,5 +244,45 @@ namespace FineUIPro.Web.ZHGL.TestRunPerformance
|
||||
this.Grid1.DataBind();
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 获取整改前图片(放于Img中)
|
||||
/// </summary>
|
||||
/// <param name="TestRunMonthSummaryId"></param>
|
||||
/// <returns></returns>
|
||||
protected string ConvertImageUrlByImage(object TestRunMonthSummaryId)
|
||||
{
|
||||
string url = string.Empty;
|
||||
string httpUrl = string.Empty;
|
||||
if (TestRunMonthSummaryId != null)
|
||||
{
|
||||
var file = BLL.AttachFileService.GetAttachFileByToKeyId(TestRunMonthSummaryId.ToString());
|
||||
if (file != null)
|
||||
{
|
||||
url = BLL.UploadAttachmentService.ShowImage(Funs.SGGLUrl, file.AttachUrl);
|
||||
}
|
||||
}
|
||||
return url;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 获取整改前图片(放于Img中)
|
||||
/// </summary>
|
||||
/// <param name="TestRunMonthSummaryId"></param>
|
||||
/// <returns></returns>
|
||||
protected string ConvertImageUrlByImage2(object TestRunMonthSummaryId)
|
||||
{
|
||||
string url = string.Empty;
|
||||
string httpUrl = string.Empty;
|
||||
if (TestRunMonthSummaryId != null)
|
||||
{
|
||||
var file = BLL.AttachFileService.GetAttachFileByToKeyId(TestRunMonthSummaryId.ToString() + "R");
|
||||
if (file != null)
|
||||
{
|
||||
url = BLL.UploadAttachmentService.ShowImage(Funs.SGGLUrl, file.AttachUrl);
|
||||
}
|
||||
}
|
||||
return url;
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user