wyw/mh_jy_safe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: wyw:0be8cc170ffd466c2640afb925abb37898755ffc
Branches Tags
wyw:master
...
compare: wyw:1747f162cadcf445c21cc51ed3d37cb7979332f6
Branches Tags
wyw:master

2 Commits
0be8cc170f ... 1747f162ca

Author SHA1 Message Date
wyw
1747f162ca Merge branch 'master' of http://121.41.2.71:3000/wyw/mh_jy_safe 2026-03-26 14:08:44 +08:00
wyw
86001d7586 题库导入 添加题目重复判断 与试题一致 2026-03-26 14:08:13 +08:00
1 changed files with 38 additions and 9 deletions
Show Stats Expand all files Collapse all files

47
APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/SECoursewearlibrary.cs
View File

@ -522,6 +522,14 @@ namespace APT.SE.WebApi.Controllers.Api
List<string> listPointNameEmpty = new List<string>(); List<string> listPointNameEmpty = new List<string>();
DateTime dtNow = DateTime.Now; DateTime dtNow = DateTime.Now;
//数据库现有题目 去重判断
List<T_SE_TEST> listDataAllCheck = GetEntities<T_SE_TEST>(e => !e.IS_DELETED, null, null).ToList();
T_SE_TEST check = null;
List<string> listRepeatDataIndex = new List<string>();
List<string> listNameTypeError = new List<string>();
List<string> listRepeatExcelIndex = new List<string>();
List<string> listNameTypeEError = new List<string>();
for (int i = 0; i < rowAll; i++) for (int i = 0; i < rowAll; i++)
{ {
#region 不能为空 #region 不能为空
@ -562,15 +570,15 @@ namespace APT.SE.WebApi.Controllers.Api
var testType = dtSource.Rows[i][1].ToString().Trim(); var testType = dtSource.Rows[i][1].ToString().Trim();
if (!string.IsNullOrEmpty(testType)) if (!string.IsNullOrEmpty(testType))
{ {
if (dtSource.Rows[i][1].ToString().Trim() == "是非题") if (testType == "是非题")
{ {
mainTable.TYPE = SETestTypeEnum.是非题; mainTable.TYPE = SETestTypeEnum.是非题;
} }
else if (dtSource.Rows[i][1].ToString().Trim() == "单选题") else if (testType == "单选题")
{ {
mainTable.TYPE = SETestTypeEnum.单选题; mainTable.TYPE = SETestTypeEnum.单选题;
} }
else if (dtSource.Rows[i][1].ToString().Trim() == "多选题") else if (testType == "多选题")
{ {
mainTable.TYPE = SETestTypeEnum.多选题; mainTable.TYPE = SETestTypeEnum.多选题;
} }
@ -583,6 +591,20 @@ namespace APT.SE.WebApi.Controllers.Api
{ {
throw new Exception("题型不能为空!"); throw new Exception("题型不能为空!");
} }
check = listDataAllCheck.FirstOrDefault(e => e.NAME == mainTable.NAME && e.TYPE == mainTable.TYPE);
if (check != null)
{
listRepeatDataIndex.Add((i + rowIndex).ToString());
listNameTypeError.Add(mainTable.NAME + "" + testType);
}
check = mainTables.FirstOrDefault(e => e.NAME == mainTable.NAME && e.TYPE == mainTable.TYPE);
if (check != null)
{
listRepeatExcelIndex.Add((i + rowIndex).ToString());
listNameTypeEError.Add(mainTable.NAME + "" + testType);
}
if (!string.IsNullOrEmpty(dtSource.Rows[i][2].ToString().Trim())) if (!string.IsNullOrEmpty(dtSource.Rows[i][2].ToString().Trim()))
{ {
mainTable.OPTION_A = (dtSource.Rows[i][2].ToString().Trim()); mainTable.OPTION_A = (dtSource.Rows[i][2].ToString().Trim());
@ -609,11 +631,11 @@ namespace APT.SE.WebApi.Controllers.Api
mainTable.ANSWERSHOW = strANSWER; mainTable.ANSWERSHOW = strANSWER;
if (mainTable.TYPE == SETestTypeEnum.是非题) if (mainTable.TYPE == SETestTypeEnum.是非题)
{ {
if (strANSWER == "是" || strANSWER == "A") if (strANSWER == "A" || strANSWER == "是" || strANSWER == "a")
{ {
mainTable.ANSWER = 1; mainTable.ANSWER = 1;
} }
else if (strANSWER == "否" || strANSWER == "B") else if (strANSWER == "B" || strANSWER == "否" || strANSWER == "b")
{ {
mainTable.ANSWER = 2; mainTable.ANSWER = 2;
} }
@ -626,8 +648,7 @@ namespace APT.SE.WebApi.Controllers.Api
listAnswerErrorIndex.Add((i + rowIndex).ToString()); listAnswerErrorIndex.Add((i + rowIndex).ToString());
} }
} }
else if (mainTable.TYPE == SETestTypeEnum.单选题)
if (mainTable.TYPE == SETestTypeEnum.单选题)
{ {
if (strANSWER == "A") if (strANSWER == "A")
{ {
@ -654,7 +675,7 @@ namespace APT.SE.WebApi.Controllers.Api
listAnswerErrorIndex.Add((i + rowIndex).ToString()); listAnswerErrorIndex.Add((i + rowIndex).ToString());
} }
} }
if (mainTable.TYPE == SETestTypeEnum.多选题) else if (mainTable.TYPE == SETestTypeEnum.多选题)
{ {
int answer = 0; int answer = 0;
if (strANSWER.Contains("A")) if (strANSWER.Contains("A"))
@ -809,7 +830,7 @@ namespace APT.SE.WebApi.Controllers.Api
#region 提示 #region 提示
string strEmptyError = string.Empty; string strEmptyError = string.Empty;
if (listPostNameEmpty.Count > 0 || dicIndexEmpty.Count > 0 || listPointNameEmpty.Count > 0) if (listPostNameEmpty.Count > 0 || dicIndexEmpty.Count > 0 || listPointNameEmpty.Count > 0 || listRepeatDataIndex.Count > 0 || listRepeatExcelIndex.Count > 0)
{ {
if (dicIndexEmpty.Count > 0) if (dicIndexEmpty.Count > 0)
{ {
@ -840,6 +861,14 @@ namespace APT.SE.WebApi.Controllers.Api
{ {
throw new Exception("答案有误，行：【" + string.Join(",", listAnswerErrorIndex) + "】值：" + string.Join(",", listAnswerError)); throw new Exception("答案有误，行：【" + string.Join(",", listAnswerErrorIndex) + "】值：" + string.Join(",", listAnswerError));
} }
if (listRepeatDataIndex.Count > 0)
{
throw new Exception("与现有题库重复，行：【" + string.Join(",", listRepeatDataIndex) + "】值：" + string.Join(",", listNameTypeError));
}
if (listRepeatExcelIndex.Count > 0)
{
throw new Exception("Excel中题目重复，行：【" + string.Join(",", listRepeatExcelIndex) + "】值：" + string.Join(",", listNameTypeEError));
}
} }
if (strEmptyError != string.Empty) if (strEmptyError != string.Empty)
throw new Exception(strEmptyError); throw new Exception(strEmptyError);