This commit is contained in:
parent
fb3e337b12
commit
d0d46133a1
|
|
@ -67,7 +67,11 @@
|
||||||
</f:FormRow>
|
</f:FormRow>
|
||||||
<f:FormRow>
|
<f:FormRow>
|
||||||
<Items>
|
<Items>
|
||||||
<f:Label ID="lblBottom" runat="server" Text="说明:1 导入模板为.xls后缀的EXCEL文件,黑体字为必填项。2 对于导入信息中重复记录自动过滤插入一条记录。3 题型为单选题、多选题、判断题,多岗位时用,隔开。4 适合岗位空时为通用试题。 5 数据导入完成,成功后自动返回,如果有不成功数据页面弹出提示框,列表显示导入成功数据。">
|
<f:Label ID="lblBottom" runat="server" Text="说明:1、导入模板为.xls后缀的EXCEL文件,黑体字为必填项;
|
||||||
|
2、对于导入信息中重复记录自动过滤插入一条记录;
|
||||||
|
3、题型为单选题、多选题、判断题,多岗位时用,隔开,多选答案时用,隔开;
|
||||||
|
4、适合岗位空时为通用试题;
|
||||||
|
5、数据导入完成,成功后自动返回,如果有不成功数据页面弹出提示框,列表显示导入成功数据。">
|
||||||
</f:Label>
|
</f:Label>
|
||||||
</Items>
|
</Items>
|
||||||
</f:FormRow>
|
</f:FormRow>
|
||||||
|
|
|
||||||
|
|
@ -172,7 +172,7 @@ namespace FineUIPro.Web.HSSE.EduTrain
|
||||||
{
|
{
|
||||||
TrainingCode = pds.Rows[i][0].ToString().Trim(),
|
TrainingCode = pds.Rows[i][0].ToString().Trim(),
|
||||||
TrainingItemCode = pds.Rows[i][2].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(),
|
AItem = pds.Rows[i][6].ToString().Trim(),
|
||||||
BItem = pds.Rows[i][7].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 = "此项为必填项!" });
|
errorInfos.Add(new ErrorInfo { Row = (i + 2).ToString(), Column = "试题内容", Reason = "此项为必填项!" });
|
||||||
}
|
}
|
||||||
else
|
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
|
var addTrainingItem = Funs.DB.Training_TestTrainingItem.FirstOrDefault(x => x.Abstracts == newViewTrainingItem.Abstracts
|
||||||
&& x.TrainingId == newViewTrainingItem.TrainingId);
|
&& x.TrainingId == newViewTrainingItem.TrainingId);
|
||||||
if (addTrainingItem == null)
|
if (addTrainingItem == null)
|
||||||
|
|
@ -331,15 +341,7 @@ namespace FineUIPro.Web.HSSE.EduTrain
|
||||||
// Score = newViewTrainingItem.Score,
|
// Score = newViewTrainingItem.Score,
|
||||||
AnswerItems = newViewTrainingItem.AnswerItems,
|
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);
|
viewTrainingItems.Add(newViewTrainingItem);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue