Simon
/
Tiobon.Web.Core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

题库定制化导入Excwl开发

Browse Source
master
xiaochanghai 1 year ago
parent 4b30ebe974
commit d5631012a5
10 changed files with 1215 additions and 21 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 9
      Tiobon.Core.Api/Controllers/Ghre/Ghre_QuestionController.cs
  2. 375
      Tiobon.Core.Common/Helper/DateTimeHelper.cs
  3. 661
      Tiobon.Core.Common/Helper/NPOIHelper.cs
  4. 1
      Tiobon.Core.Common/Tiobon.Core.Common.csproj
  5. 5
      Tiobon.Core.IServices/Ghre/IGhre_QuestionServices.cs
  6. 36
      Tiobon.Core.Services/BASE/BaseServices.cs
  7. 4
      Tiobon.Core.Services/Ghre/Ghre_CourseServices.cs
  8. 4
      Tiobon.Core.Services/Ghre/Ghre_ExamServices.cs
  9. 139
      Tiobon.Core.Services/Ghre/Ghre_QuestionServices.cs
  10. 2
      Tiobon.Core.Services/Ghre/Ghre_RequiredCourseServices.cs

9
Tiobon.Core.Api/Controllers/Ghre/Ghre_QuestionController.cs
Unescape View File

@ -58,5 +58,14 @@ public class Ghre_QuestionController : BaseController<IGhre_QuestionServices, Gh
} }
#endregion #endregion
#endregion\
#region Excel导入
[HttpPost("ImportExcel")]
public async Task<ServiceResult> ImportExcelAsync(IFormFile file)
{
return await _service.ImportExcelAsync(file);
}
#endregion #endregion
} }

375
Tiobon.Core.Common/Helper/DateTimeHelper.cs
Unescape View File

@ -0,0 +1,375 @@
namespace Tiobon.Core.Common.Helper;
public class DateTimeHelper
{
public static string FriendlyDate(DateTime? date)
{
if (!date.HasValue) return string.Empty;
string strDate = date.Value.ToString("yyyy-MM-dd");
string vDate = string.Empty;
if (DateTime.Now.ToString("yyyy-MM-dd") == strDate)
{
vDate = "今天";
}
else if (DateTime.Now.AddDays(1).ToString("yyyy-MM-dd") == strDate)
{
vDate = "明天";
}
else if (DateTime.Now.AddDays(2).ToString("yyyy-MM-dd") == strDate)
{
vDate = "后天";
}
else if (DateTime.Now.AddDays(-1).ToString("yyyy-MM-dd") == strDate)
{
vDate = "昨天";
}
else if (DateTime.Now.AddDays(2).ToString("yyyy-MM-dd") == strDate)
{
vDate = "前天";
}
else
{
vDate = strDate;
}
return vDate;
}
/// <summary>
/// 格式化DateTime类型为字符串类型，精确到年，如：2008
/// </summary>
/// <param name="dateTime"></param>
/// <returns></returns>
public static string ConvertToYearString(DateTime dateTime)
{
if (string.IsNullOrEmpty(Convert.ToString(dateTime)))
{
return "";
}
return dateTime.ToString(@"yyyy");
}
/// <summary>
/// 格式化DateTime类型为字符串类型，精确到年，如：2008
/// </summary>
/// <param name="dateTime"></param>
/// <returns></returns>
public static string ConvertToYearString(object dateTime)
{
if (string.IsNullOrEmpty(Convert.ToString(dateTime)))
{
return "";
}
return ConvertToYearString((DateTime)dateTime);
}
/// <summary>
/// 格式化DateTime类型为字符串类型，精确到月，如：2008/01
/// </summary>
/// <param name="dateTime"></param>
/// <returns></returns>
public static string ConvertToMonthString(DateTime dateTime)
{
if (string.IsNullOrEmpty(Convert.ToString(dateTime)))
{
return "";
}
return dateTime.ToString(@"yyyy\/MM");
}
/// <summary>
/// 格式化object类型为字符串类型，精确到月，如：2008/01
/// </summary>
/// <param name="dateTime"></param>
/// <returns></returns>
public static string ConvertToMonthString(object dateTime)
{
if (string.IsNullOrEmpty(Convert.ToString(dateTime)))
{
return "";
}
return ConvertToMonthString((DateTime)dateTime);
}
/// <summary>
/// 格式化DateTime类型为字符串类型，精确到天，如：2008/01/01
/// </summary>
/// <param name="dateTime"></param>
/// <returns></returns>
public static string ConvertToDayString(DateTime dateTime)
{
if (string.IsNullOrEmpty(Convert.ToString(dateTime)))
{
return "";
}
return dateTime.ToString(@"yyyy\/MM\/dd");
}
public static DateTime ConvertToDay(DateTime dateTime)
{
string result = ConvertToDayString(dateTime);
if (string.IsNullOrEmpty(result))
{
return DateTime.MinValue;
}
else
{
return Convert.ToDateTime(result);
}
}
/// <summary>
/// 格式化DateTime类型为字符串类型，精确到小时，如：2008/01/01 18
/// </summary>
/// <param name="dateTime"></param>
/// <returns></returns>
public static string ConvertToHourString(DateTime dateTime)
{
if (string.IsNullOrEmpty(Convert.ToString(dateTime)))
{
return "";
}
return dateTime.ToString(@"yyyy\/MM\/dd HH");
}
/// <summary>
/// 格式化object类型为字符串类型，精确到小时，如：2008/01/01 18
/// </summary>
/// <param name="dateTime"></param>
/// <returns></returns>
public static string ConvertToHourString(object dateTime)
{
if (string.IsNullOrEmpty(Convert.ToString(dateTime)))
{
return "";
}
return ConvertToHourString((DateTime)dateTime);
}
/// <summary>
/// 格式化object类型为字符串类型，精确到天，如：2008/01/01
/// </summary>
/// <param name="dateTime"></param>
/// <returns></returns>
public static string ConvertToDayString(object dateTime)
{
if (string.IsNullOrEmpty(Convert.ToString(dateTime)))
{
return "";
}
return ConvertToDayString(Convert.ToDateTime(dateTime));
}
/// <summary>
/// 格式化DateTime类型为字符串类型，精确到分钟，如：2008/01/01 18:09
/// </summary>
/// <param name="dateTime"></param>
/// <returns></returns>
public static string ConvertToMiniuteString(DateTime dateTime)
{
if (string.IsNullOrEmpty(Convert.ToString(dateTime)))
{
return "";
}
return dateTime.ToString(@"yyyy\/MM\/dd HH:mm");
}
/// <summary>
/// 格式化object类型为字符串类型，精确到分钟，如：2008/01/01 18:09
/// </summary>
/// <param name="dateTime"></param>
/// <returns></returns>
public static string ConvertToMiniuteString(object dateTime)
{
if (string.IsNullOrEmpty(Convert.ToString(dateTime)))
{
return "";
}
return ConvertToMiniuteString(Convert.ToDateTime(dateTime));
}
/// <summary>
/// 格式化DateTime类型为字符串类型，精确到秒，如：2008/01/01 18:09:20
/// </summary>
/// <param name="dateTime"></param>
/// <returns></returns>
public static string ConvertToSecondString(DateTime dateTime)
{
if (string.IsNullOrEmpty(Convert.ToString(dateTime)))
{
return "";
}
return dateTime.ToString(@"yyyy\/MM\/dd HH:mm:ss");
}
/// <summary>
/// 格式化object类型为字符串类型，精确到秒，如：2008/01/01 18:09:20
/// </summary>
/// <param name="dateTime"></param>
/// <returns></returns>
public static string ConvertToSecondString(object dateTime)
{
if (string.IsNullOrEmpty(Convert.ToString(dateTime)))
{
return "";
}
return ConvertToSecondString(Convert.ToDateTime(dateTime));
}
/// <summary>
/// 格式化DateTime类型为字符串类型，如：01/01
/// </summary>
/// <param name="dateTime"></param>
/// <returns></returns>
public static string ConvertToOnlyMonthDayString(DateTime dateTime)
{
if (string.IsNullOrEmpty(Convert.ToString(dateTime)))
{
return "";
}
return dateTime.ToString(@"MM\/dd");
}
/// <summary>
/// 格式化object类型为字符串类型，如：01/01
/// </summary>
/// <param name="dateTime"></param>
/// <returns></returns>
public static string ConvertToOnlyMonthDayString(object dateTime)
{
if (string.IsNullOrEmpty(Convert.ToString(dateTime)))
{
return "";
}
return ConvertToOnlyMonthDayString(Convert.ToDateTime(dateTime));
}
/// <summary>
/// 格式化DateTime类型为字符串类型，如：12:12
/// </summary>
/// <param name="dateTime"></param>
/// <returns></returns>
public static string ConvertToOnlyHourMinuteString(DateTime dateTime)
{
if (string.IsNullOrEmpty(Convert.ToString(dateTime)))
{
return "";
}
return dateTime.ToString(@"HH:mm");
}
/// <summary>
/// 格式化object类型为字符串类型，如：12:12
/// </summary>
/// <param name="dateTime"></param>
/// <returns></returns>
public static string ConvertToOnlyHourMinuteString(object dateTime)
{
if (string.IsNullOrEmpty(Convert.ToString(dateTime)))
{
return "";
}
return ConvertToOnlyHourMinuteString(Convert.ToDateTime(dateTime));
}
/// <summary>
/// 格式化DateTime类型为字符串类型，如：12:12:12
/// </summary>
/// <param name="dateTime"></param>
/// <returns></returns>
public static string ConvertToOnlySecondString(DateTime dateTime)
{
if (string.IsNullOrEmpty(Convert.ToString(dateTime)))
{
return "";
}
return dateTime.ToString(@"HH:mm:ss");
}
/// <summary>
/// 格式化object类型为字符串类型，如：12:12:12
/// </summary>
/// <param name="dateTime"></param>
/// <returns></returns>
public static string ConvertToOnlySecondString(object dateTime)
{
if (string.IsNullOrEmpty(Convert.ToString(dateTime)))
{
return "";
}
return ConvertToOnlySecondString(Convert.ToDateTime(dateTime));
}
/// <summary>
/// 格式化DateTime类型为字符串类型，如：2020/05
/// </summary>
/// <param name="dateTime"></param>
/// <returns></returns>
public static string ConvertToYearMonthString(DateTime dateTime)
{
if (string.IsNullOrEmpty(Convert.ToString(dateTime)))
{
return "";
}
return dateTime.ToString(@"yyyy\/MM");
}
/// <summary>
/// 格式化object类型为字符串类型，如：2020/05
/// </summary>
/// <param name="dateTime"></param>
/// <returns></returns>
public static string ConvertToYearMonthString(object dateTime)
{
if (string.IsNullOrEmpty(Convert.ToString(dateTime)))
{
return "";
}
return ConvertToYearMonthString(Convert.ToDateTime(dateTime));
}
/// <summary>
/// 格式化DateTime类型为字符串类型，如：2020-05
/// </summary>
/// <param name="dateTime"></param>
/// <returns></returns>
public static string ConvertToYearMonthString1(DateTime dateTime)
{
if (string.IsNullOrEmpty(Convert.ToString(dateTime)))
{
return "";
}
return dateTime.ToString(@"yyyy-MM");
}
/// <summary>
/// 格式化object类型为字符串类型，如：2020-05
/// </summary>
/// <param name="dateTime"></param>
/// <returns></returns>
public static string ConvertToYearMonthString1(object dateTime)
{
if (string.IsNullOrEmpty(Convert.ToString(dateTime)))
{
return "";
}
return ConvertToYearMonthString1(Convert.ToDateTime(dateTime));
}
/// <summary>
/// 毫秒转天时分秒
/// </summary>
/// <param name="ms"></param>
/// <returns></returns>
public static string FormatTime(long ms)
{
int ss = 1000;
int mi = ss * 60;
int hh = mi * 60;
int dd = hh * 24;
long day = ms / dd;
long hour = (ms - day * dd) / hh;
long minute = (ms - day * dd - hour * hh) / mi;
long second = (ms - day * dd - hour * hh - minute * mi) / ss;
long milliSecond = ms - day * dd - hour * hh - minute * mi - second * ss;
string sDay = day < 10 ? "0" + day : "" + day; //天
string sHour = hour < 10 ? "0" + hour : "" + hour;//小时
string sMinute = minute < 10 ? "0" + minute : "" + minute;//分钟
string sSecond = second < 10 ? "0" + second : "" + second;//秒
string sMilliSecond = milliSecond < 10 ? "0" + milliSecond : "" + milliSecond;//毫秒
sMilliSecond = milliSecond < 100 ? "0" + sMilliSecond : "" + sMilliSecond;
return string.Format("{0} 天 {1} 小时 {2} 分 {3} 秒", sDay, sHour, sMinute, sSecond);
}
}

661
Tiobon.Core.Common/Helper/NPOIHelper.cs
Unescape View File

@ -0,0 +1,661 @@
using System.Data;
using System.Text;
using NPOI.HPSF;
using NPOI.HSSF.UserModel;
using NPOI.SS.UserModel;
using NPOI.XSSF.UserModel;
namespace Tiobon.Core.Common.Helper;
public class NPOIHelper
{
#region DataTable 导出到 Excel 的 MemoryStream
/// <summary>
/// DataTable 导出到 Excel 的 MemoryStream
/// </summary>
/// <param name="dtSource">源 DataTable</param>
/// <param name="strHeaderText">表头文本 空值未不要表头标题</param>
/// <returns></returns>
public static MemoryStream ExportExcel(DataTable dtSource, string strHeaderText)
{
//HSSFWorkbook workbook = new HSSFWorkbook();
XSSFWorkbook workbook = new XSSFWorkbook();
ISheet sheet = workbook.CreateSheet();
#region 文件属性
DocumentSummaryInformation dsi = PropertySetFactory.CreateDocumentSummaryInformation();
dsi.Company = "EUCloud";
//workbook.DocumentSummaryInformation = dsi;
SummaryInformation si = PropertySetFactory.CreateSummaryInformation();
si.Author = "EUCloud";
si.ApplicationName = "EUCloud";
si.LastAuthor = "EUCloud";
si.Comments = "";
si.Title = "";
si.Subject = "";
si.CreateDateTime = DateTime.Now;
//workbook.SummaryInformation = si;
#endregion
ICellStyle dateStyle = workbook.CreateCellStyle();
IDataFormat format = workbook.CreateDataFormat();
dateStyle.DataFormat = format.GetFormat("yyyy-mm-dd");
ICellStyle datetimeStyle = workbook.CreateCellStyle();
datetimeStyle.DataFormat = format.GetFormat("yyyy-mm-dd hh:mm");
ICellStyle datetimesStyle = workbook.CreateCellStyle();
datetimesStyle.DataFormat = format.GetFormat("yyyy-mm-dd hh:mm:ss");
int[] arrColWidth = new int[dtSource.Columns.Count];
foreach (DataColumn item in dtSource.Columns)
{
arrColWidth[item.Ordinal] = Encoding.GetEncoding("utf-8").GetBytes(item.ColumnName.ToString()).Length;
}
for (int i = 0; i < dtSource.Rows.Count; i++)
{
for (int j = 0; j < dtSource.Columns.Count; j++)
{
int intTemp = Encoding.GetEncoding("utf-8").GetBytes(dtSource.Rows[i][j].ToString()).Length;
if (intTemp > arrColWidth[j])
{
arrColWidth[j] = intTemp;
}
}
}
int rowIndex = 0;
int intTop = 0;
foreach (DataRow row in dtSource.Rows)
{
#region 新建表、填充表头、填充列头，样式
if (rowIndex == 655350 || rowIndex == 0)
{
if (rowIndex != 0)
{
sheet = workbook.CreateSheet();
}
intTop = 0;
#region 表头及样式
{
if (strHeaderText.Length > 0)
{
IRow headerRow = sheet.CreateRow(intTop);
intTop += 1;
headerRow.HeightInPoints = 25;
headerRow.CreateCell(0).SetCellValue(strHeaderText);
ICellStyle headStyle = workbook.CreateCellStyle();
headStyle.Alignment = HorizontalAlignment.Center;
IFont font = workbook.CreateFont();
font.FontHeightInPoints = 20;
font.Boldweight = 700;
headStyle.SetFont(font);
headerRow.GetCell(0).CellStyle = headStyle;
sheet.AddMergedRegion(new NPOI.SS.Util.CellRangeAddress(0, 0, 0, dtSource.Columns.Count - 1));
}
}
#endregion
#region 列头及样式
{
IRow headerRow = sheet.CreateRow(intTop);
intTop += 1;
ICellStyle headStyle = workbook.CreateCellStyle();
headStyle.Alignment = HorizontalAlignment.Center;
headStyle.BorderBottom = BorderStyle.Medium;
headStyle.FillBackgroundColor = NPOI.HSSF.Util.HSSFColor.LightGreen.Index;
headStyle.FillPattern = FillPattern.NoFill;
IFont font = workbook.CreateFont();
font.Boldweight = 700;
headStyle.SetFont(font);
foreach (DataColumn column in dtSource.Columns)
{
headerRow.CreateCell(column.Ordinal).SetCellValue(column.ColumnName);
headerRow.GetCell(column.Ordinal).CellStyle = headStyle;
//设置列宽
//sheet.SetColumnWidth(column.Ordinal, (arrColWidth[column.Ordinal] + 1) * 256);
if (arrColWidth[column.Ordinal] > 255)
{
arrColWidth[column.Ordinal] = 254;
}
else
{
sheet.SetColumnWidth(column.Ordinal, (arrColWidth[column.Ordinal] + 1) * 256);
}
}
}
#endregion
rowIndex = intTop;
}
#endregion
#region 填充内容
IRow dataRow = sheet.CreateRow(rowIndex);
foreach (DataColumn column in dtSource.Columns)
{
ICell newCell = dataRow.CreateCell(column.Ordinal);
string drValue = row[column].ToString();
switch (column.DataType.ToString())
{
case "System.String"://字符串类型
newCell.SetCellValue(drValue);
break;
case "System.DateTime"://日期类型
DateTime dateV;
if (!string.IsNullOrEmpty(drValue))
{
DateTime.TryParse(drValue, out dateV);
//dateV = DateTimeHelper.ConvertToSecondString(dateV);
newCell.SetCellValue(dateV);
if (column.Caption == "renderDateTime")
{
newCell.CellStyle = datetimeStyle;//格式化显示到分钟
}
else if (column.Caption == "renderDate")
{
newCell.CellStyle = dateStyle;//格式化显示到天
}
else
{
newCell.CellStyle = datetimesStyle;//格式化显示到秒
}
}
break;
case "System.Boolean"://布尔型
bool boolV = false;
bool.TryParse(drValue, out boolV);
newCell.SetCellValue(boolV);
break;
case "System.Int16":
case "System.Int32":
case "System.Int64":
case "System.Byte":
int intV = 0;
int.TryParse(drValue, out intV);
newCell.SetCellValue(intV);
break;
case "System.Decimal":
case "System.Double":
double doubV = 0;
double.TryParse(drValue, out doubV);
newCell.SetCellValue(doubV);
break;
case "System.DBNull"://空值处理
newCell.SetCellValue("");
break;
default:
newCell.SetCellValue("");
break;
}
}
#endregion
rowIndex++;
}
using (MemoryStream ms = new MemoryStream())
{
workbook.Write(ms);
ms.Flush();
//ms.Position = 0;
return ms;
}
}
#endregion
#region DaataTable 导出到 Excel 文件
/// <summary>
/// DaataTable 导出到 Excel 文件
/// </summary>
/// <param name="dtSource">源 DataaTable</param>
/// <param name="strHeaderText">表头文本</param>
/// <param name="strFileName">保存位置(文件名及路径)</param>
public static void ExportExcel(DataTable dtSource, string strHeaderText, string strFileName)
{
using (MemoryStream ms = ExportExcel(dtSource, strHeaderText))
{
using (FileStream fs = new FileStream(strFileName, FileMode.Create, FileAccess.Write))
{
byte[] data = ms.ToArray();
fs.Write(data, 0, data.Length);
fs.Flush();
}
}
}
#endregion
#region 读取 excel,默认第一行为标头
/// <summary>
/// 读取 excel,默认第一行为标头
/// </summary>
/// <param name="strFileName">excel 文档路径</param>
/// <returns></returns>
public static DataTable ImportExcel(string strFileName, string sheetName = "")
{
DataTable dt = new DataTable();
//HSSFWorkbook hssfworkbook;
IWorkbook hssfworkbook;
ISheet sheet;
using (FileStream file = new FileStream(strFileName, FileMode.Open, FileAccess.Read))
{
//hssfworkbook = new HSSFWorkbook(file);
//hssfworkbook = new XSSFWorkbook(file);
hssfworkbook = NPOI.SS.UserModel.WorkbookFactory.Create(file);
}
if (hssfworkbook == null) throw new Exception("未能加载excel");
int sheetCount = hssfworkbook.NumberOfSheets;
if (sheetCount == 0) throw new Exception("未能加载excel");
if (string.IsNullOrEmpty(sheetName))
{
sheet = hssfworkbook.GetSheetAt(0);
}
else
{
int sheetIndex = hssfworkbook.GetSheetIndex(sheetName);
if (sheetIndex >= 0)
{
sheet = hssfworkbook.GetSheetAt(sheetIndex);
}
else
{
throw new Exception($"未能找到{sheetName}这个sheet页");
}
}
System.Collections.IEnumerator rows = sheet.GetRowEnumerator();
IRow headerRow = sheet.GetRow(0);
int cellCount = headerRow.LastCellNum;
for (int j = 0; j < cellCount; j++)
{
ICell cell = headerRow.GetCell(j);
dt.Columns.Add(cell.ToString());
}
for (int i = (sheet.FirstRowNum + 1); i <= sheet.LastRowNum; i++)
{
IRow row = sheet.GetRow(i);
if (row.GetCell(row.FirstCellNum) != null && row.GetCell(row.FirstCellNum).ToString().Length > 0)
//if (row.GetCell(row.FirstCellNum) != null)
{
DataRow dataRow = dt.NewRow();
for (int j = row.FirstCellNum; j < cellCount; j++)
{
if (row.GetCell(j) != null)
{
DateTime dateV = DateTime.MinValue;
try
{
dataRow[j] = GetCellValue(row.GetCell(j));
//if (row.GetCell(j).IsDate())
//{
// dateV = row.GetCell(j).DateCellValue;
// dataRow[j] = DateTimeHelper.ConvertToSecondString(dateV);
//}
//else
//{
// dataRow[j] = row.GetCell(j).ToString();
//}
}
catch { }
//if (dateV == DateTime.MinValue)
//{
// dataRow[j] = row.GetCell(j).ToString();
//}
//else
//{
// dataRow[j] = DateTimeHelper.ConvertToSecondString(dateV);
//}
}
}
dt.Rows.Add(dataRow);
}
}
return dt;
}
#endregion
/// <summary>
/// 获取单元格类型
/// </summary>
/// <param name="cell"></param>
/// <returns></returns>
private static string GetCellValue(ICell cell)
{
if (cell == null)
return null;
switch (cell.CellType)
{
case CellType.Blank: //BLANK:
return null;
case CellType.Boolean: //BOOLEAN:
return Convert.ToString(cell.BooleanCellValue);
case CellType.Numeric: //NUMERIC:
if (DateUtil.IsCellDateFormatted(cell))
{
return DateTimeHelper.ConvertToSecondString(cell.DateCellValue);
}
else
{
return Convert.ToString(cell);
}
case CellType.String: //STRING:
return cell.StringCellValue;
case CellType.Error: //ERROR:
return Convert.ToString(cell.ErrorCellValue);
case CellType.Formula: //FORMULA:
default:
return "=" + cell.CellFormula;
}
}
/// <summary>
/// DataSet 导出到 Excel 的 MemoryStream
/// </summary>
/// <param name="dsSource">源 DataSet</param>
/// <param name="strHeaderText">表头文本 空值未不要表头标题(多个表对应多个表头以英文逗号(,)分开，个数应与表相同)</param>
/// <returns></returns>
public static MemoryStream ExportExcel(DataSet dsSource, string strHeaderText)
{
HSSFWorkbook workbook = new HSSFWorkbook();
#region 文件属性
DocumentSummaryInformation dsi = PropertySetFactory.CreateDocumentSummaryInformation();
dsi.Company = "517best.com";
workbook.DocumentSummaryInformation = dsi;
SummaryInformation si = PropertySetFactory.CreateSummaryInformation();
si.Author = "517best.com";
si.ApplicationName = "517best.com";
si.LastAuthor = "517best.com";
si.Comments = "";
si.Title = "";
si.Subject = "";
si.CreateDateTime = DateTime.Now;
workbook.SummaryInformation = si;
#endregion
#region 注释
//ICellStyle dateStyle = workbook.CreateCellStyle();
//IDataFormat format = workbook.CreateDataFormat();
//dateStyle.DataFormat = format.GetFormat("yyyy-mm-dd");
//ISheet sheet = workbook.CreateSheet();
//int[] arrColWidth = new int[dtSource.Columns.Count];
//foreach (DataColumn item in dtSource.Columns)
//{
// arrColWidth[item.Ordinal] = Encoding.GetEncoding("gb2312").GetBytes(item.ColumnName.ToString()).Length;
//}
//for (int i = 0; i < dtSource.Rows.Count; i++)
//{
// for (int j = 0; j < dtSource.Columns.Count; j++)
// {
// int intTemp = Encoding.GetEncoding("gb2312").GetBytes(dtSource.Rows[i][j].ToString()).Length;
// if (intTemp > arrColWidth[j])
// {
// arrColWidth[j] = intTemp;
// }
// }
//}
//int rowIndex = 0;
//int intTop = 0;
//foreach (DataRow row in dtSource.Rows)
//{
// #region 新建表、填充表头、填充列头，样式
// if (rowIndex == 65535 || rowIndex == 0)
// {
// if (rowIndex != 0)
// {
// sheet = workbook.CreateSheet();
// }
// intTop = 0;
// #region 表头及样式
// {
// if (strHeaderText.Length > 0)
// {
// IRow headerRow = sheet.CreateRow(intTop);
// intTop += 1;
// headerRow.HeightInPoints = 25;
// headerRow.CreateCell(0).SetCellValue(strHeaderText);
// ICellStyle headStyle = workbook.CreateCellStyle();
// headStyle.Alignment = HorizontalAlignment.CENTER;
// IFont font = workbook.CreateFont();
// font.FontHeightInPoints = 20;
// font.Boldweight = 700;
// headStyle.SetFont(font);
// headerRow.GetCell(0).CellStyle = headStyle;
// sheet.AddMergedRegion(new NPOI.SS.Util.CellRangeAddress(0, 0, 0, dtSource.Columns.Count - 1));
// }
// }
// #endregion
// #region 列头及样式
// {
// IRow headerRow = sheet.CreateRow(intTop);
// intTop += 1;
// ICellStyle headStyle = workbook.CreateCellStyle();
// headStyle.Alignment = HorizontalAlignment.CENTER;
// IFont font = workbook.CreateFont();
// font.Boldweight = 700;
// headStyle.SetFont(font);
// foreach (DataColumn column in dtSource.Columns)
// {
// headerRow.CreateCell(column.Ordinal).SetCellValue(column.ColumnName);
// headerRow.GetCell(column.Ordinal).CellStyle = headStyle;
// //设置列宽
// sheet.SetColumnWidth(column.Ordinal, (arrColWidth[column.Ordinal] + 1) * 256);
// }
// }
// #endregion
// rowIndex = intTop;
// }
// #endregion
// #region 填充内容
// IRow dataRow = sheet.CreateRow(rowIndex);
// foreach (DataColumn column in dtSource.Columns)
// {
// ICell newCell = dataRow.CreateCell(column.Ordinal);
// string drValue = row[column].ToString();
// switch (column.DataType.ToString())
// {
// case "System.String"://字符串类型
// newCell.SetCellValue(drValue);
// break;
// case "System.DateTime"://日期类型
// DateTime dateV;
// DateTime.TryParse(drValue, out dateV);
// newCell.SetCellValue(dateV);
// newCell.CellStyle = dateStyle;//格式化显示
// break;
// case "System.Boolean"://布尔型
// bool boolV = false;
// bool.TryParse(drValue, out boolV);
// newCell.SetCellValue(boolV);
// break;
// case "System.Int16":
// case "System.Int32":
// case "System.Int64":
// case "System.Byte":
// int intV = 0;
// int.TryParse(drValue, out intV);
// newCell.SetCellValue(intV);
// break;
// case "System.Decimal":
// case "System.Double":
// double doubV = 0;
// double.TryParse(drValue, out doubV);
// newCell.SetCellValue(doubV);
// break;
// case "System.DBNull"://空值处理
// newCell.SetCellValue("");
// break;
// default:
// newCell.SetCellValue("");
// break;
// }
// }
// #endregion
// rowIndex++;
//}
#endregion
string[] strNewText = strHeaderText.Split(Convert.ToChar(","));
if (dsSource.Tables.Count == strNewText.Length)
{
for (int i = 0; i < dsSource.Tables.Count; i++)
{
ExportFromDSExcel(workbook, dsSource.Tables[i], strNewText[i]);
}
}
using (MemoryStream ms = new MemoryStream())
{
workbook.Write(ms);
ms.Flush();
ms.Position = 0;
return ms;
}
}
/// <summary>
/// DataTable 导出到 Excel 的 MemoryStream
/// </summary>
/// <param name="workbook">源 workbook</param>
/// <param name="dtSource">源 DataTable</param>
/// <param name="strHeaderText">表头文本 空值未不要表头标题(多个表对应多个表头以英文逗号(,)分开，个数应与表相同)</param>
/// <returns></returns>
public static void ExportFromDSExcel(HSSFWorkbook workbook, DataTable dtSource, string strHeaderText)
{
ICellStyle dateStyle = workbook.CreateCellStyle();
IDataFormat format = workbook.CreateDataFormat();
dateStyle.DataFormat = format.GetFormat("yyyy-MM-dd HH:mm:ss");
ISheet sheet = workbook.CreateSheet(strHeaderText);
int[] arrColWidth = new int[dtSource.Columns.Count];
foreach (DataColumn item in dtSource.Columns)
{
arrColWidth[item.Ordinal] = Encoding.GetEncoding("utf-8").GetBytes(item.ColumnName.ToString()).Length;
}
for (int i = 0; i < dtSource.Rows.Count; i++)
{
for (int j = 0; j < dtSource.Columns.Count; j++)
{
int intTemp = Encoding.GetEncoding("utf-8").GetBytes(dtSource.Rows[i][j].ToString()).Length;
if (intTemp > arrColWidth[j])
{
arrColWidth[j] = intTemp;
}
}
}
int rowIndex = 0;
int intTop = 0;
foreach (DataRow row in dtSource.Rows)
{
#region 新建表、填充表头、填充列头，样式
if (rowIndex == 65535 || rowIndex == 0)
{
if (rowIndex != 0)
{
sheet = workbook.CreateSheet();
}
intTop = 0;
#region 表头及样式
{
if (strHeaderText.Length > 0)
{
IRow headerRow = sheet.CreateRow(intTop);
intTop += 1;
headerRow.HeightInPoints = 25;
headerRow.CreateCell(0).SetCellValue(strHeaderText);
ICellStyle headStyle = workbook.CreateCellStyle();
headStyle.Alignment = HorizontalAlignment.Center;
IFont font = workbook.CreateFont();
font.FontHeightInPoints = 20;
font.Boldweight = 700;
headStyle.SetFont(font);
headerRow.GetCell(0).CellStyle = headStyle;
sheet.AddMergedRegion(new NPOI.SS.Util.CellRangeAddress(0, 0, 0, dtSource.Columns.Count - 1));
}
}
#endregion
#region 列头及样式
{
IRow headerRow = sheet.CreateRow(intTop);
intTop += 1;
ICellStyle headStyle = workbook.CreateCellStyle();
headStyle.Alignment = HorizontalAlignment.Center;
IFont font = workbook.CreateFont();
font.Boldweight = 700;
headStyle.SetFont(font);
foreach (DataColumn column in dtSource.Columns)
{
headerRow.CreateCell(column.Ordinal).SetCellValue(column.ColumnName);
headerRow.GetCell(column.Ordinal).CellStyle = headStyle;
//设置列宽
// sheet.SetColumnWidth(column.Ordinal, (arrColWidth[column.Ordinal] + 1) * 256); // 设置设置列宽 太长会报错 修改2014 年9月22日
int dd = (arrColWidth[column.Ordinal] + 1) * 256;
if (dd > 200 * 256)
{
dd = 100 * 256;
}
sheet.SetColumnWidth(column.Ordinal, dd);
}
}
#endregion
rowIndex = intTop;
}
#endregion
#region 填充内容
IRow dataRow = sheet.CreateRow(rowIndex);
foreach (DataColumn column in dtSource.Columns)
{
ICell newCell = dataRow.CreateCell(column.Ordinal);
string drValue = row[column].ToString();
switch (column.DataType.ToString())
{
case "System.String"://字符串类型
newCell.SetCellValue(drValue);
break;
case "System.DateTime"://日期类型
if (drValue.Length > 0)
{
DateTime dateV;
DateTime.TryParse(drValue, out dateV);
newCell.SetCellValue(dateV);
newCell.CellStyle = dateStyle;//格式化显示
}
else { newCell.SetCellValue(drValue); }
break;
case "System.Boolean"://布尔型
bool boolV = false;
bool.TryParse(drValue, out boolV);
newCell.SetCellValue(boolV);
break;
case "System.Int16":
case "System.Int32":
case "System.Int64":
case "System.Byte":
int intV = 0;
int.TryParse(drValue, out intV);
newCell.SetCellValue(intV);
break;
case "System.Decimal":
case "System.Double":
double doubV = 0;
double.TryParse(drValue, out doubV);
newCell.SetCellValue(doubV);
break;
case "System.DBNull"://空值处理
newCell.SetCellValue("");
break;
default:
newCell.SetCellValue("");
break;
}
}
#endregion
rowIndex++;
}
}
}

1
Tiobon.Core.Common/Tiobon.Core.Common.csproj
Unescape View File

@ -27,6 +27,7 @@
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="8.0.0" /> <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" /> <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
<PackageReference Include="MySql.Data" Version="8.3.0" /> <PackageReference Include="MySql.Data" Version="8.3.0" />
<PackageReference Include="NPOI" Version="2.7.0" />
<PackageReference Include="PinYinConverterCore" Version="1.0.2" /> <PackageReference Include="PinYinConverterCore" Version="1.0.2" />
<PackageReference Include="MiniProfiler.Shared" Version="4.3.8" /> <PackageReference Include="MiniProfiler.Shared" Version="4.3.8" />
<PackageReference Include="RestSharp" Version="110.2.0" /> <PackageReference Include="RestSharp" Version="110.2.0" />

5
Tiobon.Core.IServices/Ghre/IGhre_QuestionServices.cs
Unescape View File

@ -1,4 +1,5 @@
using Tiobon.Core.IServices.BASE; using Microsoft.AspNetCore.Http;
using Tiobon.Core.IServices.BASE;
using Tiobon.Core.Model; using Tiobon.Core.Model;
using Tiobon.Core.Model.Models; using Tiobon.Core.Model.Models;
@ -13,5 +14,7 @@ namespace Tiobon.Core.IServices
Task<ServiceResult> InsertFrom(FromGhre_QuestionPageData insertModel); Task<ServiceResult> InsertFrom(FromGhre_QuestionPageData insertModel);
Task<ServiceResult> UpdareFrom(long Id, FromGhre_QuestionPageData insertModel); Task<ServiceResult> UpdareFrom(long Id, FromGhre_QuestionPageData insertModel);
Task<ServiceResult> ImportExcelAsync(IFormFile file);
} }
} }

36
Tiobon.Core.Services/BASE/BaseServices.cs
Unescape View File

@ -309,15 +309,19 @@ public class BaseServices<TEntity, TEntityDto, TInsertDto, TEditDto> : IBaseServ
/// <returns></returns> /// <returns></returns>
public virtual async Task<long> Add(TInsertDto entity) public virtual async Task<long> Add(TInsertDto entity)
{ {
HttpRequest request = UserContext.Context.Request;
var api = request.Path.ObjToString().TrimEnd('/').ToLower();
var ip = GetUserIp(UserContext.Context);
var entity1 = Mapper.Map(entity).ToANew<TEntity>(); var entity1 = Mapper.Map(entity).ToANew<TEntity>();
BasePoco ent = entity1 as BasePoco; if (UserContext.Context != null)
{
HttpRequest request = UserContext.Context.Request;
var api = request.Path.ObjToString().TrimEnd('/').ToLower();
var ip = GetUserIp(UserContext.Context);
BasePoco ent = entity1 as BasePoco;
ent.CreateIP = ip;
ent.CreateProg = api;
}
ent.CreateIP = ip;
ent.CreateProg = api;
#region 检查是否存在相同值 #region 检查是否存在相同值
CheckOnly(entity1); CheckOnly(entity1);
@ -335,10 +339,16 @@ public class BaseServices<TEntity, TEntityDto, TInsertDto, TEditDto> : IBaseServ
{ {
if (listEntity != null && listEntity.Any()) if (listEntity != null && listEntity.Any())
{ {
var userId = UserContext.Current.User_Id; var userId = App.User.ID;
HttpRequest request = UserContext.Context.Request; var api = string.Empty;
var api = request.Path.ObjToString().TrimEnd('/').ToLower(); var ip = string.Empty;
var ip = GetUserIp(UserContext.Context); if (UserContext.Context != null)
{
HttpRequest request = UserContext.Context.Request;
api = request.Path.ObjToString().TrimEnd('/').ToLower();
ip = GetUserIp(UserContext.Context);
}
var list = Mapper.Map(listEntity).ToANew<List<TEntity>>(); var list = Mapper.Map(listEntity).ToANew<List<TEntity>>();
list.ForEach(entity => list.ForEach(entity =>
{ {
@ -704,7 +714,7 @@ public class BaseServices<TEntity, TEntityDto, TInsertDto, TEditDto> : IBaseServ
public virtual async Task<ServicePageResult<TEntityDto>> QueryFilterPage(QueryBody filter, string condition) public virtual async Task<ServicePageResult<TEntityDto>> QueryFilterPage(QueryBody filter, string condition)
{ {
if (string.IsNullOrWhiteSpace(filter.orderBy)) if (string.IsNullOrWhiteSpace(filter.orderBy))
filter.orderBy = "UpdateTime DESC,CreateTime DESC"; filter.orderBy = "CreateTime1 DESC";
if (filter.pageSize == 0) if (filter.pageSize == 0)
filter.pageSize = 10000; filter.pageSize = 10000;
@ -721,7 +731,7 @@ public class BaseServices<TEntity, TEntityDto, TInsertDto, TEditDto> : IBaseServ
ISNULL ((SELECT CASE WHEN @langId = 1 THEN UserName ELSE UserEname END ISNULL ((SELECT CASE WHEN @langId = 1 THEN UserName ELSE UserEname END
FROM Ghrs_User B FROM Ghrs_User B
WHERE B.UserId = A.UpdateBy), WHERE B.UserId = A.UpdateBy),
'') UpdateDataInfo '') UpdateDataInfo, ISNULL(A.UpdateTime, A.CreateTime) CreateTime1
FROM {entityType.GetEntityTableName()} A"; FROM {entityType.GetEntityTableName()} A";
string conditions = " WHERE IsEnable = 1"; string conditions = " WHERE IsEnable = 1";

4
Tiobon.Core.Services/Ghre/Ghre_CourseServices.cs
Unescape View File

@ -52,7 +52,7 @@ public class Ghre_CourseServices : BaseServices<Ghre_Course, Ghre_CourseDto, Ins
CASE A.InOrOut CASE A.InOrOut
WHEN 'In' THEN F.StaffName WHEN 'In' THEN F.StaffName
WHEN 'Out' THEN J.TeacherName WHEN 'Out' THEN J.TeacherName
END TeacherName END TeacherName, ISNULL(A.UpdateTime, A.CreateTime) CreateTime1
FROM Ghre_Course A FROM Ghre_Course A
LEFT JOIN Ghre_CourseClass B ON A.CourseClassId = B.Id LEFT JOIN Ghre_CourseClass B ON A.CourseClassId = B.Id
LEFT JOIN Ghre_CourseClass C ON A.CourseClassId2 = C.Id LEFT JOIN Ghre_CourseClass C ON A.CourseClassId2 = C.Id
@ -66,7 +66,7 @@ public class Ghre_CourseServices : BaseServices<Ghre_Course, Ghre_CourseDto, Ins
WHERE A.IsEnable = 1) A"; WHERE A.IsEnable = 1) A";
if (string.IsNullOrWhiteSpace(filter.orderBy)) if (string.IsNullOrWhiteSpace(filter.orderBy))
filter.orderBy = "UpdateTime DESC,CreateTime DESC"; filter.orderBy = "CreateTime1 DESC";
string conditions = "1=1"; string conditions = "1=1";
if (filter.jsonParam != null) if (filter.jsonParam != null)

4
Tiobon.Core.Services/Ghre/Ghre_ExamServices.cs
Unescape View File

@ -458,7 +458,7 @@ public class Ghre_ExamServices : BaseServices<Ghre_Exam, Ghre_ExamDto, InsertGhr
END CourseName, END CourseName,
C.Id CourseTypeId, C.Id CourseTypeId,
C.ClassName CourseType, C.ClassName CourseType,
E.PaperName ExamPaperName E.PaperName ExamPaperName, ISNULL(A.UpdateTime, A.CreateTime) CreateTime1
FROM Ghre_Exam A FROM Ghre_Exam A
LEFT JOIN Ghre_Course B ON A.CourseId = B.Id LEFT JOIN Ghre_Course B ON A.CourseId = B.Id
LEFT JOIN Ghre_CourseClass C ON B.CourseClassId = C.Id LEFT JOIN Ghre_CourseClass C ON B.CourseClassId = C.Id
@ -467,7 +467,7 @@ public class Ghre_ExamServices : BaseServices<Ghre_Exam, Ghre_ExamDto, InsertGhr
WHERE A.IsEnable = 1) A"; WHERE A.IsEnable = 1) A";
if (string.IsNullOrWhiteSpace(filter.orderBy)) if (string.IsNullOrWhiteSpace(filter.orderBy))
filter.orderBy = "UpdateTime DESC,CreateTime DESC"; filter.orderBy = "CreateTime1 DESC";
string conditions = "1=1"; string conditions = "1=1";
if (filter.jsonParam != null) if (filter.jsonParam != null)

139
Tiobon.Core.Services/Ghre/Ghre_QuestionServices.cs
Unescape View File

@ -1,11 +1,14 @@
using System.Data; using System.Data;
using System.Net; using System.Net;
using AgileObjects.AgileMapper; using AgileObjects.AgileMapper;
using Microsoft.AspNetCore.Http;
using Newtonsoft.Json; using Newtonsoft.Json;
using Newtonsoft.Json.Linq; using Newtonsoft.Json.Linq;
using SharpCompress.Common;
using SqlSugar; using SqlSugar;
using Tiobon.Core.Common; using Tiobon.Core.Common;
using Tiobon.Core.Common.Caches; using Tiobon.Core.Common.Caches;
using Tiobon.Core.Common.Helper;
using Tiobon.Core.IRepository.Base; using Tiobon.Core.IRepository.Base;
using Tiobon.Core.IServices; using Tiobon.Core.IServices;
using Tiobon.Core.Model; using Tiobon.Core.Model;
@ -164,7 +167,7 @@ public class Ghre_QuestionServices : BaseServices<Ghre_Question, Ghre_QuestionDt
C.Id CourseTypeId, C.Id CourseTypeId,
G.UserName CreateDataInfo, G.UserName CreateDataInfo,
H.UserName UpdateDataInfo, H.UserName UpdateDataInfo,
C.ClassName CourseType C.ClassName CourseType, ISNULL(A.UpdateTime, A.CreateTime) CreateTime1
FROM Ghre_Question A FROM Ghre_Question A
LEFT JOIN Ghre_Course B ON A.CourseId = B.Id LEFT JOIN Ghre_Course B ON A.CourseId = B.Id
LEFT JOIN Ghre_CourseClass C ON B.CourseClassId = C.Id LEFT JOIN Ghre_CourseClass C ON B.CourseClassId = C.Id
@ -173,7 +176,7 @@ public class Ghre_QuestionServices : BaseServices<Ghre_Question, Ghre_QuestionDt
WHERE A.IsEnable = 1) A"; WHERE A.IsEnable = 1) A";
if (string.IsNullOrWhiteSpace(filter.orderBy)) if (string.IsNullOrWhiteSpace(filter.orderBy))
filter.orderBy = "UpdateTime DESC,CreateTime DESC"; filter.orderBy = "CreateTime1 DESC";
string conditions = " WHERE 1=1"; string conditions = " WHERE 1=1";
if (filter.jsonParam != null) if (filter.jsonParam != null)
@ -719,6 +722,35 @@ public class Ghre_QuestionServices : BaseServices<Ghre_Question, Ghre_QuestionDt
questionTypeName = "困难"; questionTypeName = "困难";
return questionTypeName; return questionTypeName;
} }
public static string ConvertQuestionType1(string type)
{
string questionTypeName = string.Empty;
if (type == "单选题")
questionTypeName = "Single";
else if (type == "多选题")
questionTypeName = "Multiple";
else if (type == "判断题")
questionTypeName = "TrueOrFalse";
else if (type == "填空题")
questionTypeName = "Completion";
else if (type == "简答题")
questionTypeName = "ShortAnswer";
return questionTypeName;
}
public static string ConvertDifficultyLevel1(string type)
{
string questionTypeName = string.Empty;
if (type == "简单")
questionTypeName = "Easy";
else if (type == "普通")
questionTypeName = "Normal";
else if (type == "困难")
questionTypeName = "Hard";
return questionTypeName;
}
public static void ValidForm(FromGhre_QuestionPageData model) public static void ValidForm(FromGhre_QuestionPageData model)
{ {
if (model.baseData.courseID is null || (model.baseData.courseID != null && !model.baseData.courseID.Any())) if (model.baseData.courseID is null || (model.baseData.courseID != null && !model.baseData.courseID.Any()))
@ -751,4 +783,107 @@ public class Ghre_QuestionServices : BaseServices<Ghre_Question, Ghre_QuestionDt
if (string.IsNullOrWhiteSpace(questionType.detail.RemarkSz)) if (string.IsNullOrWhiteSpace(questionType.detail.RemarkSz))
throw new Exception("题目解析必填！"); throw new Exception("题目解析必填！");
} }
#region Excel导入
public async Task<ServiceResult> ImportExcelAsync(IFormFile file)
{
long id = SnowFlakeSingle.instance.getID();
var path = $"{$"{Environment.CurrentDirectory}{Path.DirectorySeparatorChar}wwwroot{Path.DirectorySeparatorChar}files{Path.DirectorySeparatorChar}import{Path.DirectorySeparatorChar}{id}{Path.DirectorySeparatorChar}"}";
if (!Directory.Exists(path))
Directory.CreateDirectory(path);
var filepath = path + file.FileName;
using (var stream = File.Create(filepath))
{
await file.CopyToAsync(stream);
}
var types = new List<string>
{
"单选题",
//"多选题",
//"判断题",
//"填空题",
//"简答题",
};
var answers = new List<string>
{
"A",
"B",
"C",
"D",
"E",
"F",
"G",
"H",
};
types.ForEach(async x =>
{
string questionType = ConvertQuestionType1(x);
DataTable dt = NPOIHelper.ImportExcel(filepath, "单选题");
for (int i = 0; i < dt.Rows.Count; i++)
{
var course = await _ghre_CourseServices.Query(x => x.CourseName == dt.Rows[i]["课程（必填）"].ToString());
var questionContent = dt.Rows[i]["题干（必填）"].ToString();
var correctAnswer = dt.Rows[i]["正确答案（必填）"].ToString();
var questionAnalysis = dt.Rows[i]["解析"].ToString();
var difficultyLevel = dt.Rows[i]["难度"].ToString();
var question = await base.Query(x => x.QuestionContent == questionContent);
if (!question.Any())
{
var insert = new InsertGhre_QuestionInput()
{
CourseId = course.FirstOrDefault().Id,
QuestionNo = await GenerateContinuousSequence(questionType.Substring(0, 1)),
DifficultyLevel = ConvertDifficultyLevel1(difficultyLevel),
QuestionType = questionType,
QuestionContent = questionContent,
QuestionAnalysis = questionAnalysis
};
var id = await base.Add(insert);
var insertAnswers = new List<InsertGhre_QuestionAnswerInput>();
int j = 100;
answers.ForEach(a =>
{
var answer = dt.Rows[i]["选项" + a].ToString();
if (!string.IsNullOrWhiteSpace(answer))
{
var isCorrect = false;
if (x == "单选题" && correctAnswer == a)
isCorrect = true;
insertAnswers.Add(new InsertGhre_QuestionAnswerInput()
{
TaxisNo = j,
QuestionNo = a,
QuestionId = id,
AnswerContent = answer,
IsCorrect = isCorrect
});
}
j = j + 100;
});
await _ghre_QuestionAnswerServices.Add(insertAnswers);
}
else
{
}
}
});
return ServiceResult.OprateSuccess("新增成功！");
}
#endregion
} }

2
Tiobon.Core.Services/Ghre/Ghre_RequiredCourseServices.cs
Unescape View File

@ -28,7 +28,7 @@ public class Ghre_RequiredCourseServices : BaseServices<Ghre_RequiredCourse, Ghr
public override async Task<ServicePageResult<Ghre_RequiredCourseDto>> QueryFilterPage(QueryBody filter) public override async Task<ServicePageResult<Ghre_RequiredCourseDto>> QueryFilterPage(QueryBody filter)
{ {
if (string.IsNullOrWhiteSpace(filter.orderBy)) if (string.IsNullOrWhiteSpace(filter.orderBy))
filter.orderBy = "UpdateTime DESC,CreateTime DESC"; filter.orderBy = "CreateTime1 DESC";
if (filter.pageSize == 0) if (filter.pageSize == 0)
filter.pageSize = 10000; filter.pageSize = 10000;

Write Preview
Loading…
Cancel
Save