1
This commit is contained in:
@@ -172,7 +172,7 @@ namespace FineUIPro.Web.HSSE.EduTrain
|
||||
{
|
||||
TrainingCode = pds.Rows[i][0].ToString().Trim(),
|
||||
TrainingItemCode = pds.Rows[i][2].ToString().Trim(),
|
||||
Abstracts = pds.Rows[i][5].ToString().Trim(),
|
||||
//Abstracts = pds.Rows[i][5].ToString().Trim(),
|
||||
AItem = pds.Rows[i][6].ToString().Trim(),
|
||||
BItem = pds.Rows[i][7].ToString().Trim(),
|
||||
};
|
||||
@@ -301,12 +301,22 @@ namespace FineUIPro.Web.HSSE.EduTrain
|
||||
}
|
||||
|
||||
////试题内容
|
||||
if (string.IsNullOrEmpty(newViewTrainingItem.Abstracts))
|
||||
string abstracts = pds.Rows[i][5].ToString().Trim();
|
||||
if (string.IsNullOrEmpty(abstracts))
|
||||
{
|
||||
errorInfos.Add(new ErrorInfo { Row = (i + 2).ToString(), Column = "试题内容", Reason = "此项为必填项!" });
|
||||
}
|
||||
else
|
||||
{
|
||||
if (abstracts.Contains("(") || abstracts.Contains(")")
|
||||
|| abstracts.Contains("(") || abstracts.Contains(")"))
|
||||
{
|
||||
newViewTrainingItem.Abstracts = abstracts;
|
||||
}
|
||||
else
|
||||
{
|
||||
newViewTrainingItem.Abstracts = abstracts + "( )";
|
||||
}
|
||||
var addTrainingItem = Funs.DB.Training_TestTrainingItem.FirstOrDefault(x => x.Abstracts == newViewTrainingItem.Abstracts
|
||||
&& x.TrainingId == newViewTrainingItem.TrainingId);
|
||||
if (addTrainingItem == null)
|
||||
@@ -331,15 +341,7 @@ namespace FineUIPro.Web.HSSE.EduTrain
|
||||
// Score = newViewTrainingItem.Score,
|
||||
AnswerItems = newViewTrainingItem.AnswerItems,
|
||||
};
|
||||
if (newViewTrainingItem.Abstracts.Contains("(") || newViewTrainingItem.Abstracts.Contains(")")
|
||||
|| newViewTrainingItem.Abstracts.Contains("(") || newViewTrainingItem.Abstracts.Contains(")"))
|
||||
{
|
||||
newTrainingItem.Abstracts = newViewTrainingItem.Abstracts;
|
||||
}
|
||||
else
|
||||
{
|
||||
newTrainingItem.Abstracts = newViewTrainingItem.Abstracts + "( )";
|
||||
}
|
||||
|
||||
|
||||
///加入培训试题库
|
||||
viewTrainingItems.Add(newViewTrainingItem);
|
||||
|
||||
Reference in New Issue
Block a user