From 0391bddfdda8f0b45a66d13f07ae87c0537a02c7 Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期四, 21 四月 2022 14:01:59 +0800
Subject: [PATCH] 标准工时完善
---
WebAPI/Controllers/SCGL/Sc_PackUnionBillController.cs | 43 ++++++++++++++++++++++++-------------------
1 files changed, 24 insertions(+), 19 deletions(-)
diff --git a/WebAPI/Controllers/SCGL/Sc_PackUnionBillController.cs b/WebAPI/Controllers/SCGL/Sc_PackUnionBillController.cs
index c455094..392da67 100644
--- a/WebAPI/Controllers/SCGL/Sc_PackUnionBillController.cs
+++ b/WebAPI/Controllers/SCGL/Sc_PackUnionBillController.cs
@@ -290,7 +290,7 @@
#region 鏍囧噯宸ユ椂瀵煎嚭Excel琛ㄦ牸鏁版嵁
[Route("Sc_PackUnionBill/Sc_StationInBillSetExcel")]
[HttpGet]
- public HttpResponseMessage Sc_StationInBillSetExcel()
+ public HttpResponseMessage Sc_StationInBillSetExcel(string sWhere)
{
HSSFWorkbook workbook = new HSSFWorkbook();
ISheet sheet = workbook.CreateSheet("sheet1");
@@ -301,14 +301,15 @@
row.CreateCell(1).SetCellValue("娴佽浆鍗″彿");
row.CreateCell(2).SetCellValue("杩涘嚭绔欐墍鐢ㄦ椂闂�");
row.CreateCell(3).SetCellValue("宸ユ椂");
- row.CreateCell(4).SetCellValue("涓嶈壇鏁伴噺");
- row.CreateCell(5).SetCellValue("鎶ュ簾鏁伴噺");
- row.CreateCell(6).SetCellValue("杩涚珯鏁伴噺");
- row.CreateCell(7).SetCellValue("鍑虹珯鏁伴噺");
- row.CreateCell(8).SetCellValue("鍑虹珯鏃堕棿");
- row.CreateCell(9).SetCellValue("杩涚珯鏃堕棿");
- row.CreateCell(10).SetCellValue("鍒跺崟浜�");
- row.CreateCell(11).SetCellValue("鍒跺崟鏃ユ湡");
+ row.CreateCell(4).SetCellValue("宸ュ簭鍚�");
+ row.CreateCell(5).SetCellValue("涓嶈壇鏁伴噺");
+ row.CreateCell(6).SetCellValue("鎶ュ簾鏁伴噺");
+ row.CreateCell(7).SetCellValue("杩涚珯鏁伴噺");
+ row.CreateCell(8).SetCellValue("鍑虹珯鏁伴噺");
+ row.CreateCell(9).SetCellValue("鍑虹珯鏃堕棿");
+ row.CreateCell(10).SetCellValue("杩涚珯鏃堕棿");
+ row.CreateCell(11).SetCellValue("鍒跺崟浜�");
+ row.CreateCell(12).SetCellValue("鍒跺崟鏃ユ湡");
//绮剧‘鎺у埗鍒楀
sheet.SetColumnWidth(1, 5000);
sheet.SetColumnWidth(2, 5000);
@@ -320,8 +321,11 @@
sheet.SetColumnWidth(8, 5000);
sheet.SetColumnWidth(9, 5000);
sheet.SetColumnWidth(10, 5000);
+ sheet.SetColumnWidth(11, 5000);
+ sheet.SetColumnWidth(12, 5000);
+ sheet.SetColumnWidth(13, 5000);
- DataSet ds = oCn.RunProcReturn("select * from h_v_Sc_StationInBillListMain order by hmainid desc", "h_v_Sc_StationInBillListMain");
+ DataSet ds = oCn.RunProcReturn("select * from h_v_Sc_StationInBillListMain" + sWhere + " order by hmainid desc", "h_v_Sc_StationInBillListMain");
for (var i = 0; i < ds.Tables[0].Rows.Count; i++)
{
IRow row1 = sheet.CreateRow(i + 1);
@@ -329,14 +333,15 @@
row1.CreateCell(1).SetCellValue(ds.Tables[0].Rows[i]["娴佽浆鍗″彿"].ToString());
row1.CreateCell(2).SetCellValue(ds.Tables[0].Rows[i]["杩涘嚭绔欐墍鐢ㄦ椂闂�"].ToString());
row1.CreateCell(3).SetCellValue(ds.Tables[0].Rows[i]["宸ユ椂"].ToString());
- row1.CreateCell(4).SetCellValue(ds.Tables[0].Rows[i]["涓嶈壇鏁伴噺"].ToString());
- row1.CreateCell(5).SetCellValue(ds.Tables[0].Rows[i]["鎶ュ簾鏁伴噺"].ToString());
- row1.CreateCell(6).SetCellValue(ds.Tables[0].Rows[i]["杩涚珯鏁伴噺"].ToString());
- row1.CreateCell(7).SetCellValue(ds.Tables[0].Rows[i]["鍑虹珯鏁伴噺"].ToString());
- row1.CreateCell(8).SetCellValue(ds.Tables[0].Rows[i]["鍑虹珯鏃堕棿"].ToString());
- row1.CreateCell(9).SetCellValue(ds.Tables[0].Rows[i]["杩涚珯鏃堕棿"].ToString());
- row1.CreateCell(10).SetCellValue(ds.Tables[0].Rows[i]["鍒跺崟浜�"].ToString());
- row1.CreateCell(11).SetCellValue(ds.Tables[0].Rows[i]["鍒跺崟鏃ユ湡"].ToString());
+ row1.CreateCell(4).SetCellValue(ds.Tables[0].Rows[i]["宸ュ簭鍚�"].ToString());
+ row1.CreateCell(5).SetCellValue(ds.Tables[0].Rows[i]["涓嶈壇鏁伴噺"].ToString());
+ row1.CreateCell(6).SetCellValue(ds.Tables[0].Rows[i]["鎶ュ簾鏁伴噺"].ToString());
+ row1.CreateCell(7).SetCellValue(ds.Tables[0].Rows[i]["杩涚珯鏁伴噺"].ToString());
+ row1.CreateCell(8).SetCellValue(ds.Tables[0].Rows[i]["鍑虹珯鏁伴噺"].ToString());
+ row1.CreateCell(9).SetCellValue(ds.Tables[0].Rows[i]["鍑虹珯鏃堕棿"].ToString());
+ row1.CreateCell(10).SetCellValue(ds.Tables[0].Rows[i]["杩涚珯鏃堕棿"].ToString());
+ row1.CreateCell(11).SetCellValue(ds.Tables[0].Rows[i]["鍒跺崟浜�"].ToString());
+ row1.CreateCell(12).SetCellValue(ds.Tables[0].Rows[i]["鍒跺崟鏃ユ湡"].ToString());
}
System.IO.MemoryStream ms = new System.IO.MemoryStream();
workbook.Write(ms);
@@ -346,7 +351,7 @@
response.Content = new StreamContent(ms);
response.Content.Headers.ContentType = new MediaTypeHeaderValue("application/octet-stream");
- var fileName = "鏍囧噯宸ユ椂_.xls";
+ var fileName = "鏍囧噯宸ユ椂.xls";
response.Content.Headers.ContentDisposition = new ContentDispositionHeaderValue("attachment")
{
--
Gitblit v1.9.1