|
@@ -500,13 +500,13 @@ namespace OASystem.API.Controllers
|
|
|
|
|
|
if (tempId == 1405)
|
|
|
{
|
|
|
- tempPath += $"无商邀版Temp.xlsx";
|
|
|
+ tempPath += $"前期需客户提供信息_无商邀版Temp.xlsx";
|
|
|
fileNamePrefix = $"{data.Name}_无商邀版";
|
|
|
|
|
|
}
|
|
|
else if (tempId == 1406)
|
|
|
{
|
|
|
- tempPath += $"有商邀版Temp.xlsx";
|
|
|
+ tempPath += $"前期需客户提供信息_有商邀版Temp.xlsx";
|
|
|
fileNamePrefix = $"{data.Name}_有商邀版";
|
|
|
}
|
|
|
else
|
|
@@ -519,10 +519,23 @@ namespace OASystem.API.Controllers
|
|
|
foreach (var item in data.Items)
|
|
|
{
|
|
|
var obj = item.NewValue;
|
|
|
- if (obj is bool || obj is bool?)
|
|
|
+
|
|
|
+ if (obj == null) item.OriginVal = "";
|
|
|
+ else if (obj.Equals("有") || obj.Equals("无"))
|
|
|
+ {
|
|
|
+ item.OriginVal = obj.ToString();
|
|
|
+ }
|
|
|
+ else if (obj is object[] objArray)
|
|
|
{
|
|
|
- if ((bool)obj == true) item.OriginVal = "是";
|
|
|
- else item.OriginVal = "否";
|
|
|
+ string[] stringArray = Array.ConvertAll(objArray, item => item?.ToString() ?? string.Empty);
|
|
|
+ item.OriginVal = string.Join("、", stringArray);
|
|
|
+ }
|
|
|
+ else if (obj is string[] stringArray)
|
|
|
+ {
|
|
|
+ item.OriginVal = string.Join("、", stringArray);
|
|
|
+ } else if (obj.Equals("-"))
|
|
|
+ {
|
|
|
+ item.OriginVal = "";
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -533,7 +546,26 @@ namespace OASystem.API.Controllers
|
|
|
//载入模板
|
|
|
WorkbookDesigner designer = new WorkbookDesigner();
|
|
|
designer.Workbook = new Workbook(tempPath);
|
|
|
- designer.SetDataSource("View", data.Items);
|
|
|
+
|
|
|
+ if (tempId == 1406)
|
|
|
+ {
|
|
|
+ var view1 = data.Items.Where(x => x.Index < 11).ToArray();
|
|
|
+ var view2 = data.Items.Where(x => x.Index > 10).ToArray();
|
|
|
+
|
|
|
+ for (int i = 1; i <= view2.Length; i++)
|
|
|
+ {
|
|
|
+ view2[i - 1].Index = i;
|
|
|
+ }
|
|
|
+
|
|
|
+ designer.SetDataSource("View1", view1);
|
|
|
+ designer.SetDataSource("View2", view2);
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ designer.SetDataSource("View", data.Items);
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
designer.Process();
|
|
|
|
|
|
if (!Directory.Exists(savePath))
|