From 78fc801b71909db5b0e066dfd102592ad440e299 Mon Sep 17 00:00:00 2001
From: gaofei1985 <181547018@qq.com>
Date: Thu, 25 Jan 2024 16:16:18 +0800
Subject: [PATCH] update test run
---
.../DriverPrepareSchemePlanItemService.cs | 2 +-
.../File/Excel/TestRun/开车方案编制计划2.xlsx | Bin 0 -> 10712 bytes
SGGL/FineUIPro.Web/FineUIPro.Web.csproj | 1 +
.../TestRun/DriverPrepare/SchemePlan.aspx.cs | 269 +++++++++++++-----
.../DriverPrepare/SchemePlanItemAdd.aspx | 5 +
.../DriverPrepare/SchemePlanItemAdd.aspx.cs | 27 +-
.../SchemePlanItemAdd.aspx.designer.cs | 9 +
7 files changed, 240 insertions(+), 73 deletions(-)
create mode 100644 SGGL/FineUIPro.Web/File/Excel/TestRun/开车方案编制计划2.xlsx
diff --git a/SGGL/BLL/TestRun/DriverPrepare/DriverPrepareSchemePlanItemService.cs b/SGGL/BLL/TestRun/DriverPrepare/DriverPrepareSchemePlanItemService.cs
index 439d722c..2ee216e1 100644
--- a/SGGL/BLL/TestRun/DriverPrepare/DriverPrepareSchemePlanItemService.cs
+++ b/SGGL/BLL/TestRun/DriverPrepare/DriverPrepareSchemePlanItemService.cs
@@ -29,7 +29,7 @@ namespace BLL
///
public static List GetSchemePlanItemByschemePlanId(string schemePlanId)
{
- return (from x in Funs.DB.DriverPrepare_SchemePlanItem where x.SchemePlanId == schemePlanId orderby x.SortIndex select x).ToList();
+ return (from x in Funs.DB.DriverPrepare_SchemePlanItem where x.SchemePlanId == schemePlanId orderby x.SolutionType, x.SortIndex select x).ToList();
}
///
diff --git a/SGGL/FineUIPro.Web/File/Excel/TestRun/开车方案编制计划2.xlsx b/SGGL/FineUIPro.Web/File/Excel/TestRun/开车方案编制计划2.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..f1593bea66b51e09534081167c96d613578b0754
GIT binary patch
literal 10712
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
+
diff --git a/SGGL/FineUIPro.Web/TestRun/DriverPrepare/SchemePlan.aspx.cs b/SGGL/FineUIPro.Web/TestRun/DriverPrepare/SchemePlan.aspx.cs
index cb89735d..419f1737 100644
--- a/SGGL/FineUIPro.Web/TestRun/DriverPrepare/SchemePlan.aspx.cs
+++ b/SGGL/FineUIPro.Web/TestRun/DriverPrepare/SchemePlan.aspx.cs
@@ -1,5 +1,6 @@
using BLL;
using Newtonsoft.Json.Linq;
+using NPOI.SS.Util;
using System;
using System.Collections.Generic;
using System.Data;
@@ -38,6 +39,18 @@ namespace FineUIPro.Web.TestRun.DriverPrepare
var table = this.GetPagedDataTable(Grid1, tb);
Grid1.DataSource = table;
Grid1.DataBind();
+ var solutionType = (from x in Funs.DB.DriverPrepare_SchemePlan
+ join y in Funs.DB.DriverPrepare_SchemePlanItem on x.SchemePlanId equals y.SchemePlanId
+ where y.SolutionType != null && x.ProjectId == this.CurrUser.LoginProjectId
+ select y).FirstOrDefault();
+ if (solutionType == null)
+ {
+ this.Grid1.Columns[1].Hidden = true;
+ }
+ else
+ {
+ this.Grid1.Columns[1].Hidden = false;
+ }
}
#endregion
@@ -178,87 +191,201 @@ namespace FineUIPro.Web.TestRun.DriverPrepare
string uploadfilepath = string.Empty;
string newUrl = string.Empty;
string filePath = string.Empty;
- initTemplatePath = Const.SchemePlanTemplateUrl;
+ var solutionType = (from x in Funs.DB.DriverPrepare_SchemePlan
+ join y in Funs.DB.DriverPrepare_SchemePlanItem on x.SchemePlanId equals y.SchemePlanId
+ where y.SolutionType != null && x.ProjectId == this.CurrUser.LoginProjectId
+ select y).FirstOrDefault();
+ if (solutionType == null)
+ {
+ initTemplatePath = Const.SchemePlanTemplateUrl;
+ }
+ else
+ {
+ initTemplatePath = Const.SchemePlan2TemplateUrl;
+ }
uploadfilepath = rootPath + initTemplatePath;
Model.DriverPrepare_SchemePlan plan = BLL.DriverPrepareSchemePlanService.GetDriverPlanByProjectId(this.CurrUser.LoginProjectId);
if (plan != null)
{
string projectName = BLL.ProjectService.GetProjectNameByProjectId(plan.ProjectId);
- newUrl = uploadfilepath.Replace(".xlsx", "(" + projectName + ")" + ".xlsx");
- File.Copy(uploadfilepath, newUrl);
- // 第一步：读取文件流
- NPOI.SS.UserModel.IWorkbook workbook;
- using (FileStream stream = new FileStream(newUrl, FileMode.Open, FileAccess.Read))
- {
- workbook = new NPOI.XSSF.UserModel.XSSFWorkbook(stream);
- }
- // 创建单元格样式
- NPOI.SS.UserModel.ICellStyle cellStyle = workbook.CreateCellStyle();
- cellStyle.BorderTop = NPOI.SS.UserModel.BorderStyle.Thin;
- cellStyle.BorderRight = NPOI.SS.UserModel.BorderStyle.Thin;
- cellStyle.BorderBottom = NPOI.SS.UserModel.BorderStyle.Thin;
- cellStyle.BorderLeft = NPOI.SS.UserModel.BorderStyle.Thin;
- cellStyle.Alignment = NPOI.SS.UserModel.HorizontalAlignment.Center;
- cellStyle.VerticalAlignment = NPOI.SS.UserModel.VerticalAlignment.Center;
- var font = workbook.CreateFont();
- font.FontHeightInPoints = 11;
- cellStyle.SetFont(font);
- NPOI.SS.UserModel.ICellStyle cellStyle0 = workbook.CreateCellStyle();
- cellStyle0.BorderTop = NPOI.SS.UserModel.BorderStyle.Thin;
- cellStyle0.BorderRight = NPOI.SS.UserModel.BorderStyle.Thin;
- cellStyle0.BorderBottom = NPOI.SS.UserModel.BorderStyle.Thin;
- cellStyle0.BorderLeft = NPOI.SS.UserModel.BorderStyle.Thin;
- cellStyle0.Alignment = NPOI.SS.UserModel.HorizontalAlignment.Center;
- cellStyle0.VerticalAlignment = NPOI.SS.UserModel.VerticalAlignment.Center;
- var font0 = workbook.CreateFont();
- font0.FontHeightInPoints = 12;
- font0.IsBold = true;
- cellStyle0.SetFont(font0);
- // 第二步：创建新数据行
- NPOI.SS.UserModel.ISheet sheet = workbook.GetSheetAt(0);
- NPOI.SS.UserModel.IRow row = sheet.GetRow(0);
- NPOI.SS.UserModel.ICell cell;
- cell = row.GetCell(0);
- cell.CellStyle = cellStyle0;
- cell.SetCellValue(projectName + "试车方案");
- var items = BLL.DriverPrepareSchemePlanItemService.GetSchemePlanItemByschemePlanId(plan.SchemePlanId);
- int i = 2;
- foreach (var item in items)
+ if (solutionType == null)
{
+ newUrl = uploadfilepath.Replace(".xlsx", "(" + projectName + ")" + ".xlsx");
+ File.Copy(uploadfilepath, newUrl);
+ // 第一步：读取文件流
+ NPOI.SS.UserModel.IWorkbook workbook;
+ using (FileStream stream = new FileStream(newUrl, FileMode.Open, FileAccess.Read))
+ {
+ workbook = new NPOI.XSSF.UserModel.XSSFWorkbook(stream);
+ }
+ // 创建单元格样式
+ NPOI.SS.UserModel.ICellStyle cellStyle = workbook.CreateCellStyle();
+ cellStyle.BorderTop = NPOI.SS.UserModel.BorderStyle.Thin;
+ cellStyle.BorderRight = NPOI.SS.UserModel.BorderStyle.Thin;
+ cellStyle.BorderBottom = NPOI.SS.UserModel.BorderStyle.Thin;
+ cellStyle.BorderLeft = NPOI.SS.UserModel.BorderStyle.Thin;
+ cellStyle.Alignment = NPOI.SS.UserModel.HorizontalAlignment.Center;
+ cellStyle.VerticalAlignment = NPOI.SS.UserModel.VerticalAlignment.Center;
+ var font = workbook.CreateFont();
+ font.FontHeightInPoints = 11;
+ cellStyle.SetFont(font);
+ NPOI.SS.UserModel.ICellStyle cellStyle0 = workbook.CreateCellStyle();
+ cellStyle0.BorderTop = NPOI.SS.UserModel.BorderStyle.Thin;
+ cellStyle0.BorderRight = NPOI.SS.UserModel.BorderStyle.Thin;
+ cellStyle0.BorderBottom = NPOI.SS.UserModel.BorderStyle.Thin;
+ cellStyle0.BorderLeft = NPOI.SS.UserModel.BorderStyle.Thin;
+ cellStyle0.Alignment = NPOI.SS.UserModel.HorizontalAlignment.Center;
+ cellStyle0.VerticalAlignment = NPOI.SS.UserModel.VerticalAlignment.Center;
+ var font0 = workbook.CreateFont();
+ font0.FontHeightInPoints = 12;
+ font0.IsBold = true;
+ cellStyle0.SetFont(font0);
// 第二步：创建新数据行
- row = sheet.CreateRow(i);
- // 添加数据
- cell = row.CreateCell(0);
- cell.CellStyle = cellStyle;
- cell.SetCellValue((i-1).ToString());
- cell = row.CreateCell(1);
- cell.CellStyle = cellStyle;
- cell.SetCellValue(item.SolutionName);
- cell = row.CreateCell(2);
- cell.CellStyle = cellStyle;
- cell.SetCellValue(string.Empty);
- cell = row.CreateCell(3);
- cell.CellStyle = cellStyle;
- cell.SetCellValue(string.Empty);
- i++;
+ NPOI.SS.UserModel.ISheet sheet = workbook.GetSheetAt(0);
+ NPOI.SS.UserModel.IRow row = sheet.GetRow(0);
+ NPOI.SS.UserModel.ICell cell;
+ cell = row.GetCell(0);
+ cell.CellStyle = cellStyle0;
+ cell.SetCellValue(projectName + "试车方案");
+ var items = BLL.DriverPrepareSchemePlanItemService.GetSchemePlanItemByschemePlanId(plan.SchemePlanId);
+ int i = 2;
+ foreach (var item in items)
+ {
+ // 第二步：创建新数据行
+ row = sheet.CreateRow(i);
+ // 添加数据
+ cell = row.CreateCell(0);
+ cell.CellStyle = cellStyle;
+ cell.SetCellValue((i - 1).ToString());
+ cell = row.CreateCell(1);
+ cell.CellStyle = cellStyle;
+ cell.SetCellValue(item.SolutionName);
+ cell = row.CreateCell(2);
+ cell.CellStyle = cellStyle;
+ cell.SetCellValue(string.Empty);
+ cell = row.CreateCell(3);
+ cell.CellStyle = cellStyle;
+ cell.SetCellValue(string.Empty);
+ i++;
+ }
+ // 第三步：写入文件流
+ using (FileStream stream = new FileStream(newUrl, FileMode.Create, FileAccess.Write))
+ {
+ workbook.Write(stream);
+ workbook.Close();
+ }
+ string fileName = Path.GetFileName(newUrl);
+ FileInfo info = new FileInfo(newUrl);
+ long fileSize = info.Length;
+ Response.Clear();
+ Response.ContentType = "application/x-zip-compressed";
+ Response.AddHeader("Content-Disposition", "attachment;filename=" + System.Web.HttpUtility.UrlEncode(fileName, System.Text.Encoding.UTF8));
+ Response.AddHeader("Content-Length", fileSize.ToString());
+ Response.TransmitFile(newUrl, 0, fileSize);
+ Response.Flush();
+ Response.Close();
+ File.Delete(newUrl);
}
- // 第三步：写入文件流
- using (FileStream stream = new FileStream(newUrl, FileMode.Create, FileAccess.Write))
+ else
{
- workbook.Write(stream);
- workbook.Close();
+ newUrl = uploadfilepath.Replace("2.xlsx", "(" + projectName + ")" + ".xlsx");
+ File.Copy(uploadfilepath, newUrl);
+ // 第一步：读取文件流
+ NPOI.SS.UserModel.IWorkbook workbook;
+ using (FileStream stream = new FileStream(newUrl, FileMode.Open, FileAccess.Read))
+ {
+ workbook = new NPOI.XSSF.UserModel.XSSFWorkbook(stream);
+ }
+ // 创建单元格样式
+ NPOI.SS.UserModel.ICellStyle cellStyle = workbook.CreateCellStyle();
+ cellStyle.BorderTop = NPOI.SS.UserModel.BorderStyle.Thin;
+ cellStyle.BorderRight = NPOI.SS.UserModel.BorderStyle.Thin;
+ cellStyle.BorderBottom = NPOI.SS.UserModel.BorderStyle.Thin;
+ cellStyle.BorderLeft = NPOI.SS.UserModel.BorderStyle.Thin;
+ cellStyle.Alignment = NPOI.SS.UserModel.HorizontalAlignment.Center;
+ cellStyle.VerticalAlignment = NPOI.SS.UserModel.VerticalAlignment.Center;
+ var font = workbook.CreateFont();
+ font.FontHeightInPoints = 11;
+ cellStyle.SetFont(font);
+ NPOI.SS.UserModel.ICellStyle cellStyle0 = workbook.CreateCellStyle();
+ cellStyle0.BorderTop = NPOI.SS.UserModel.BorderStyle.Thin;
+ cellStyle0.BorderRight = NPOI.SS.UserModel.BorderStyle.Thin;
+ cellStyle0.BorderBottom = NPOI.SS.UserModel.BorderStyle.Thin;
+ cellStyle0.BorderLeft = NPOI.SS.UserModel.BorderStyle.Thin;
+ cellStyle0.Alignment = NPOI.SS.UserModel.HorizontalAlignment.Center;
+ cellStyle0.VerticalAlignment = NPOI.SS.UserModel.VerticalAlignment.Center;
+ var font0 = workbook.CreateFont();
+ font0.FontHeightInPoints = 12;
+ font0.IsBold = true;
+ cellStyle0.SetFont(font0);
+ // 第二步：创建新数据行
+ NPOI.SS.UserModel.ISheet sheet = workbook.GetSheetAt(0);
+ NPOI.SS.UserModel.IRow row = sheet.GetRow(0);
+ NPOI.SS.UserModel.ICell cell;
+ cell = row.GetCell(0);
+ cell.CellStyle = cellStyle0;
+ cell.SetCellValue(projectName + "试车方案");
+ var items = BLL.DriverPrepareSchemePlanItemService.GetSchemePlanItemByschemePlanId(plan.SchemePlanId);
+ int i = 2;
+ string type = string.Empty;
+ int firstRow = 2;
+ foreach (var item in items)
+ {
+ if (string.IsNullOrEmpty(type))
+ {
+ type = item.SolutionType;
+ }
+ // 第二步：创建新数据行
+ row = sheet.CreateRow(i);
+ // 添加数据
+ cell = row.CreateCell(0);
+ cell.CellStyle = cellStyle;
+ cell.SetCellValue((i - 1).ToString());
+ cell = row.CreateCell(1);
+ cell.CellStyle = cellStyle;
+ cell.SetCellValue(item.SolutionType);
+ cell = row.CreateCell(2);
+ cell.CellStyle = cellStyle;
+ cell.SetCellValue(item.SolutionName);
+ cell = row.CreateCell(3);
+ cell.CellStyle = cellStyle;
+ cell.SetCellValue(string.Empty);
+ cell = row.CreateCell(4);
+ cell.CellStyle = cellStyle;
+ cell.SetCellValue(string.Empty);
+ if (type != item.SolutionType)
+ {
+ type = item.SolutionType;
+ sheet.AddMergedRegion(new CellRangeAddress(firstRow, i - 1, 1, 1));
+ firstRow = i;
+ }
+ else
+ {
+ if (i == 1 + items.Count)
+ {
+ sheet.AddMergedRegion(new CellRangeAddress(firstRow, i, 1, 1));
+ }
+ }
+ i++;
+ }
+ // 第三步：写入文件流
+ using (FileStream stream = new FileStream(newUrl, FileMode.Create, FileAccess.Write))
+ {
+ workbook.Write(stream);
+ workbook.Close();
+ }
+ string fileName = Path.GetFileName(newUrl);
+ FileInfo info = new FileInfo(newUrl);
+ long fileSize = info.Length;
+ Response.Clear();
+ Response.ContentType = "application/x-zip-compressed";
+ Response.AddHeader("Content-Disposition", "attachment;filename=" + System.Web.HttpUtility.UrlEncode(fileName, System.Text.Encoding.UTF8));
+ Response.AddHeader("Content-Length", fileSize.ToString());
+ Response.TransmitFile(newUrl, 0, fileSize);
+ Response.Flush();
+ Response.Close();
+ File.Delete(newUrl);
}
- string fileName = Path.GetFileName(newUrl);
- FileInfo info = new FileInfo(newUrl);
- long fileSize = info.Length;
- Response.Clear();
- Response.ContentType = "application/x-zip-compressed";
- Response.AddHeader("Content-Disposition", "attachment;filename=" + System.Web.HttpUtility.UrlEncode(fileName, System.Text.Encoding.UTF8));
- Response.AddHeader("Content-Length", fileSize.ToString());
- Response.TransmitFile(newUrl, 0, fileSize);
- Response.Flush();
- Response.Close();
- File.Delete(newUrl);
}
else
{
diff --git a/SGGL/FineUIPro.Web/TestRun/DriverPrepare/SchemePlanItemAdd.aspx b/SGGL/FineUIPro.Web/TestRun/DriverPrepare/SchemePlanItemAdd.aspx
index d362434e..fab5528f 100644
--- a/SGGL/FineUIPro.Web/TestRun/DriverPrepare/SchemePlanItemAdd.aspx
+++ b/SGGL/FineUIPro.Web/TestRun/DriverPrepare/SchemePlanItemAdd.aspx
@@ -14,6 +14,11 @@
+
+
+
+
+
diff --git a/SGGL/FineUIPro.Web/TestRun/DriverPrepare/SchemePlanItemAdd.aspx.cs b/SGGL/FineUIPro.Web/TestRun/DriverPrepare/SchemePlanItemAdd.aspx.cs
index c6f319a4..6a48ebf1 100644
--- a/SGGL/FineUIPro.Web/TestRun/DriverPrepare/SchemePlanItemAdd.aspx.cs
+++ b/SGGL/FineUIPro.Web/TestRun/DriverPrepare/SchemePlanItemAdd.aspx.cs
@@ -21,8 +21,21 @@ namespace FineUIPro.Web.TestRun.DriverPrepare
if (item != null)
{
this.txtSolutionName.Text = item.SolutionName;
+ this.txtSolutionType.Text = item.SolutionType;
}
}
+ var solutionType = (from x in Funs.DB.DriverPrepare_SchemePlan
+ join y in Funs.DB.DriverPrepare_SchemePlanItem on x.SchemePlanId equals y.SchemePlanId
+ where y.SolutionType != null && x.ProjectId == this.CurrUser.LoginProjectId
+ select y).FirstOrDefault();
+ if (solutionType != null)
+ {
+ this.txtSolutionType.Hidden = false;
+ }
+ else
+ {
+ this.txtSolutionType.Hidden = true;
+ }
}
}
@@ -54,13 +67,25 @@ namespace FineUIPro.Web.TestRun.DriverPrepare
newItem.SchemePlanId = newData.SchemePlanId;
}
newItem.SortIndex = sortIndex;
+ var solutionType = (from x in Funs.DB.DriverPrepare_SchemePlan
+ join y in Funs.DB.DriverPrepare_SchemePlanItem on x.SchemePlanId equals y.SchemePlanId
+ where y.SolutionType != null && x.ProjectId == this.CurrUser.LoginProjectId
+ select y).FirstOrDefault();
+ if (solutionType != null)
+ {
+ newItem.SolutionType = this.txtSolutionType.Text.Trim();
+ }
+ else
+ {
+
+ }
if (string.IsNullOrEmpty(SchemePlanItemId))
{
newItem.SchemePlanItemId = SQLHelper.GetNewID();
BLL.DriverPrepareSchemePlanItemService.AddSchemePlanItem(newItem);
BLL.LogService.AddSys_Log(this.CurrUser, newItem.SolutionName, newItem.SolutionName, BLL.Const.ControlItemInitSetMenuId, "增加开车方案！");
}
- if (Request.Params["type"] == "modify")
+ else
{
newItem.SchemePlanItemId = SchemePlanItemId;
BLL.DriverPrepareSchemePlanItemService.UpdateSchemePlanItem(newItem);
diff --git a/SGGL/FineUIPro.Web/TestRun/DriverPrepare/SchemePlanItemAdd.aspx.designer.cs b/SGGL/FineUIPro.Web/TestRun/DriverPrepare/SchemePlanItemAdd.aspx.designer.cs
index 793f876e..3e0a5b44 100644
--- a/SGGL/FineUIPro.Web/TestRun/DriverPrepare/SchemePlanItemAdd.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/TestRun/DriverPrepare/SchemePlanItemAdd.aspx.designer.cs
@@ -39,6 +39,15 @@ namespace FineUIPro.Web.TestRun.DriverPrepare {
///
protected global::FineUIPro.Form SimpleForm1;
+ ///
+ /// txtSolutionType 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.TextBox txtSolutionType;
+
///
/// txtSolutionName 控件。
///