合并最新

This commit is contained in:
2022-12-20 09:32:32 +08:00
parent 844e9f1488
commit 1abdaa9476
654 changed files with 73563 additions and 9746 deletions
@@ -10,6 +10,7 @@ namespace FineUIPro.Web.HSSE.EduTrain
{
public partial class TestTrainingItemIn : PageBase
{
#region
/// <summary>
/// 上传预设的虚拟路径
@@ -161,15 +162,16 @@ namespace FineUIPro.Web.HSSE.EduTrain
var trainings = from x in Funs.DB.Training_TestTraining select x;
///岗位
var workPosts = from x in Funs.DB.Base_WorkPost select x;
var departs = from x in Funs.DB.Base_Depart select x;
for (int i = 0; i < ir; i++)
{
Model.View_Training_TestTrainingItem newViewTrainingItem = new Model.View_Training_TestTrainingItem
{
TrainingCode = pds.Rows[i][0].ToString().Trim(),
TrainingItemCode = pds.Rows[i][2].ToString().Trim(),
Abstracts = pds.Rows[i][5].ToString().Trim(),
AItem = pds.Rows[i][6].ToString().Trim(),
BItem = pds.Rows[i][7].ToString().Trim(),
Abstracts = pds.Rows[i][6].ToString().Trim(),
AItem = pds.Rows[i][7].ToString().Trim(),
BItem = pds.Rows[i][8].ToString().Trim(),
};
////试题类型
@@ -209,8 +211,8 @@ namespace FineUIPro.Web.HSSE.EduTrain
{
newViewTrainingItem.TestType = "1";
//newViewTrainingItem.Score = SValue;
newViewTrainingItem.CItem = pds.Rows[i][8].ToString().Trim();
newViewTrainingItem.DItem = pds.Rows[i][9].ToString().Trim();
newViewTrainingItem.CItem = pds.Rows[i][9].ToString().Trim();
newViewTrainingItem.DItem = pds.Rows[i][10].ToString().Trim();
//if (string.IsNullOrEmpty(newViewTrainingItem.AItem) || string.IsNullOrEmpty(newViewTrainingItem.BItem) || string.IsNullOrEmpty(newViewTrainingItem.CItem) || string.IsNullOrEmpty(newViewTrainingItem.DItem))
//{
// result += "第" + (i + 2).ToString() + "行," + "单选题ABCD都不能为空!" + "|";
@@ -221,9 +223,9 @@ namespace FineUIPro.Web.HSSE.EduTrain
{
newViewTrainingItem.TestType = "2";
//newViewTrainingItem.Score = MValue;
newViewTrainingItem.CItem = pds.Rows[i][8].ToString().Trim();
newViewTrainingItem.DItem = pds.Rows[i][9].ToString().Trim();
newViewTrainingItem.EItem = pds.Rows[i][10].ToString().Trim();
newViewTrainingItem.CItem = pds.Rows[i][9].ToString().Trim();
newViewTrainingItem.DItem = pds.Rows[i][10].ToString().Trim();
newViewTrainingItem.EItem = pds.Rows[i][11].ToString().Trim();
//if (string.IsNullOrEmpty(newViewTrainingItem.AItem) || string.IsNullOrEmpty(newViewTrainingItem.BItem) || string.IsNullOrEmpty(newViewTrainingItem.CItem) || string.IsNullOrEmpty(newViewTrainingItem.DItem))
//{
// result += "第" + (i + 2).ToString() + "行," + "多选题ABCD都不能为空!" + "|";
@@ -266,18 +268,46 @@ namespace FineUIPro.Web.HSSE.EduTrain
newViewTrainingItem.WorkPostIds = ids.Substring(0, ids.LastIndexOf(","));
}
}
} ////适合部门
string col5 = pds.Rows[i][5].ToString().Trim();
if (!string.IsNullOrEmpty(col5))
{
List<string> DepartSels = Funs.GetStrListByStr(col5, ',');
if (DepartSels.Count() > 0)
{
string ids = string.Empty;
foreach (var item in DepartSels)
{
var wp = departs.FirstOrDefault(x => x.DepartName == item);
if (wp != null)
{
ids += wp.DepartId + ",";
}
else
{
result += "第" + (i + 2).ToString() + "行," + "导入适合部门" + item + "," + "此项基础表不存在!" + "|";
}
}
if (!string.IsNullOrEmpty(ids))
{
newViewTrainingItem.DepartNames = col5;
newViewTrainingItem.DepartIds = ids.Substring(0, ids.LastIndexOf(","));
}
}
}
////正确答案
string col11 = pds.Rows[i][11].ToString().Trim();
if (string.IsNullOrEmpty(col11))
string col12 = pds.Rows[i][12].ToString().Trim();
if (string.IsNullOrEmpty(col12))
{
result += "第" + (i + 2).ToString() + "行," + "导入正确答案项" + "," + "为必填项!" + "|";
}
else
{
int icount = 0;
List<string> selecItem = Funs.GetStrListByStr(col11, ',');
List<string> selecItem = Funs.GetStrListByStr(col12, ',');
foreach (var item in selecItem)
{
if (item != "A" && item != "a" && item != "B" && item != "b" && item != "C" && item != "c" && item != "D" && item != "d" && item != "E" && item != "e")
@@ -287,7 +317,7 @@ namespace FineUIPro.Web.HSSE.EduTrain
}
if (icount == 0)
{
newViewTrainingItem.AnswerItems = col11.Replace("a", "A").Replace("b", "B").Replace("c", "C").Replace("d", "D").Replace("e", "E");
newViewTrainingItem.AnswerItems = col12.Replace("a", "A").Replace("b", "B").Replace("c", "C").Replace("d", "D").Replace("e", "E");
}
else
{
@@ -441,4 +471,4 @@ namespace FineUIPro.Web.HSSE.EduTrain
}
#endregion
}
}
}