From f71a02229c1ba00fbecaead19256593ffb052753 Mon Sep 17 00:00:00 2001
From: duan <dante@isaints.net>
Date: 星期三, 21 八月 2024 17:18:40 +0800
Subject: [PATCH] 1
---
src/DIXWeb.Business/Common/ToExcelTemplate.cs | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/src/DIXWeb.Business/Common/ToExcelTemplate.cs b/src/DIXWeb.Business/Common/ToExcelTemplate.cs
index 7558fa6..03179fb 100644
--- a/src/DIXWeb.Business/Common/ToExcelTemplate.cs
+++ b/src/DIXWeb.Business/Common/ToExcelTemplate.cs
@@ -13,7 +13,7 @@
{
public class ToExcelTemplate:ExcelBaseNPOI
{
- private ToExcelTemplate() { }
+ public ToExcelTemplate() { }
public ToExcelTemplate(string filePath, string sheetName = "") : base(filePath, sheetName) { }
public static string FileName
@@ -505,28 +505,29 @@
#endregion
- private string[] GetOrg() {
+ public string[] GetOrg() {
List<string> list = new List<string>();
using (DBContext db = new DBContext())
{
- list = db.Database.SqlQuery<string>("select CONVERT(varchar,Id)+'>'+[Name] as text from DIX.dbo.OrgInfo with(nolock) order by Id asc ").ToList();
+ list = db.Database.SqlQuery<string>("select CONVERT(varchar,Id)+'>'+[Name] as text from DIX.dbo.OrgInfo with(nolock) where parentId = 0 order by Id asc ").ToList();
}
string[] arr = list.ToArray<string>();
return arr;
}
- private string[] GetInspectObjectType()
+ public string[] GetInspectObjectType()
{
+ string GetInspectObjectTypeExcel = System.Configuration.ConfigurationManager.AppSettings["GetInspectObjectTypeExcel"].ToString();
List<string> list = new List<string>();
using (DBContext db = new DBContext())
{
- list = db.Database.SqlQuery<string>("select CONVERT(varchar,Id)+'>'+[Name] as text from DIX.meta.InspectObjectType with(nolock) order by Id asc ").ToList();
+ list = db.Database.SqlQuery<string>("meta.p_GetInspectObjectTypeExcel '"+ GetInspectObjectTypeExcel + "' ").ToList();
}
string[] arr = list.ToArray<string>();
return arr;
}
- private string[] GetInspectArea()
+ public string[] GetInspectArea()
{
List<string> list = new List<string>();
using (DBContext db = new DBContext())
@@ -537,7 +538,7 @@
return arr;
}
- private string[] GetInspectType()
+ public string[] GetInspectType()
{
List<string> list = new List<string>();
using (DBContext db = new DBContext())
@@ -548,7 +549,7 @@
return arr;
}
- private string[] GetInspectFrequency()
+ public string[] GetInspectFrequency()
{
List<string> list = new List<string>();
using (DBContext db = new DBContext())
@@ -559,7 +560,7 @@
return arr;
}
- private string[] GetInspectStatu()
+ public string[] GetInspectStatu()
{
List<string> list = new List<string>();
using (DBContext db = new DBContext())
--
Gitblit v1.8.0