From 1c4f3bce3d88557b7ddb5f0a49b4be5e91b416f1 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期四, 14 十月 2021 13:42:33 +0800
Subject: [PATCH] 专家测试--题库管理
---
zhengcaioa/zhengcaioa/Controllers/ExpertTest/ExpertTestTopicController.cs | 142 +++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 131 insertions(+), 11 deletions(-)
diff --git a/zhengcaioa/zhengcaioa/Controllers/ExpertTest/ExpertTestTopicController.cs b/zhengcaioa/zhengcaioa/Controllers/ExpertTest/ExpertTestTopicController.cs
index 4900f6e..66ac251 100644
--- a/zhengcaioa/zhengcaioa/Controllers/ExpertTest/ExpertTestTopicController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/ExpertTest/ExpertTestTopicController.cs
@@ -92,7 +92,21 @@
ViewBag.zhongdian = _liaotianService.GetSYScode("system", "shifou").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
ViewBag.jiexi_status = _liaotianService.GetSYScode("expert_test_topic", "jiexi_status").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
ViewBag.shenpi_status = _liaotianService.GetSYScode("expert_test_topic", "shenpi_status").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
- ViewBag.Area = _areaService.GetList().Where(x => x.ParentId == "0 ").Select(x => new { code = x.CodeId, label = x.Name }).ToList();
+ var areaDTOs = _areaService.GetList().Where(x => x.ParentId == "0 ").ToList();
+ foreach (var areaDTO in areaDTOs)
+ {
+ if (areaDTO.CodeId == "510000")
+ {
+ areaDTOs.Remove(areaDTO);
+ break;
+ }
+ }
+ var areaDTOsic = new AreaDTO();
+ areaDTOsic.CodeId = "510000";
+ areaDTOsic.Name = "鍥涘窛鐪�";
+ areaDTOsic.ParentId = "0 ";
+ areaDTOs.Insert(1, areaDTOsic);
+ ViewBag.Area = areaDTOs.Select(x => new { code = x.CodeId, label = x.Name }).ToList(); ;
return View();
@@ -114,6 +128,8 @@
ViewData["curentuser"] = curentuser;
var expertTestTopicanwserDTOs = new List<ExpertTestTopicanwserDTO>();
+ var expertTestTopicjiexiDTOs = new List<ExpertTestTopicjiexiDTO>();
+
ExpertTestTopicDTO dto = new ExpertTestTopicDTO();
if (!String.IsNullOrEmpty(id))
{
@@ -125,14 +141,83 @@
}
dto.expertTestTopicanwserDTOs = expertTestTopicanwserDTOs;
+
+
+ expertTestTopicjiexiDTOs = _expertTestTopicService.GetListjiexi(id);
+ if (expertTestTopicjiexiDTOs.Count == 0)
+ {
+ var ssssss = new ExpertTestTopicjiexiDTO();
+ ssssss.Flag = "A";
+ expertTestTopicjiexiDTOs.Add(ssssss);
+ }
+
+ dto.expertTestTopicjiexiDTOs = expertTestTopicjiexiDTOs;
+
}
else
{
- expertTestTopicanwserDTOs.Add(new ExpertTestTopicanwserDTO());
- dto.expertTestTopicanwserDTOs = expertTestTopicanwserDTOs;
- dto.Topictype = Topictype;
- dto.Zhishitype = Zhishitype;
- dto.Area = Area;
+
+ if (Topictype == "03")
+ {
+ var expertTestTopicanwserDTO = new ExpertTestTopicanwserDTO();
+ expertTestTopicanwserDTO.Anwserno = "鈭�";
+ expertTestTopicanwserDTOs.Add(expertTestTopicanwserDTO);
+ var expertTestTopicanwserDTO1 = new ExpertTestTopicanwserDTO();
+ expertTestTopicanwserDTO1.Anwserno = "脳";
+ expertTestTopicanwserDTOs.Add(expertTestTopicanwserDTO1);
+
+
+ dto.expertTestTopicanwserDTOs = expertTestTopicanwserDTOs;
+ }
+ else
+ {
+ var expertTestTopicanwserDTO = new ExpertTestTopicanwserDTO();
+ expertTestTopicanwserDTO.Anwserno = "A";
+ expertTestTopicanwserDTOs.Add(expertTestTopicanwserDTO);
+ var expertTestTopicanwserDTO1 = new ExpertTestTopicanwserDTO();
+ expertTestTopicanwserDTO1.Anwserno = "B";
+ expertTestTopicanwserDTOs.Add(expertTestTopicanwserDTO1);
+ var expertTestTopicanwserDT2 = new ExpertTestTopicanwserDTO();
+ expertTestTopicanwserDT2.Anwserno = "C";
+ expertTestTopicanwserDTOs.Add(expertTestTopicanwserDT2);
+ var expertTestTopicanwserDT3 = new ExpertTestTopicanwserDTO();
+ expertTestTopicanwserDT3.Anwserno = "D";
+ expertTestTopicanwserDTOs.Add(expertTestTopicanwserDT3);
+
+ dto.expertTestTopicanwserDTOs = expertTestTopicanwserDTOs;
+ }
+
+
+ var ssssss = new ExpertTestTopicjiexiDTO();
+ ssssss.Flag = "A";
+ expertTestTopicjiexiDTOs.Add(ssssss);
+ dto.expertTestTopicjiexiDTOs = expertTestTopicjiexiDTOs;
+
+ if (string.IsNullOrEmpty(Topictype))
+ {
+ dto.Topictype = "01";
+ }
+ else
+ {
+ dto.Topictype = Topictype;
+ }
+ if (string.IsNullOrEmpty(Zhishitype))
+ {
+ dto.Zhishitype = "01";
+ }
+ else
+ {
+ dto.Zhishitype = Zhishitype;
+ }
+ if (string.IsNullOrEmpty(Area))
+ {
+ dto.Area = "100000";
+ }
+ else
+ {
+ dto.Area = Area;
+ }
+
}
@@ -145,7 +230,26 @@
ViewBag.zhongdian = _liaotianService.GetSYScode("system", "shifou").OrderByDescending(x=>x.Sort).ToList();
ViewBag.jiexi_status = _liaotianService.GetSYScode("expert_test_topic", "jiexi_status");
ViewBag.shenpi_status = _liaotianService.GetSYScode("expert_test_topic", "shenpi_status");
- ViewBag.Area = _areaService.GetList().Where(x => x.ParentId == "0 ").ToList();
+
+ ViewBag.Flag = _liaotianService.GetSYScode("system", "shifou");
+ ViewBag.falv = _liaotianService.GetSYScode("expert_test_topicjiexi", "falv");
+
+
+ var areaDTOs = _areaService.GetList().Where(x => x.ParentId == "0 ").ToList();
+ foreach (var areaDTO in areaDTOs)
+ {
+ if(areaDTO.CodeId == "510000")
+ {
+ areaDTOs.Remove(areaDTO);
+ break;
+ }
+ }
+ var areaDTOsic = new AreaDTO();
+ areaDTOsic.CodeId = "510000";
+ areaDTOsic.Name = "鍥涘窛鐪�";
+ areaDTOsic.ParentId = "0 ";
+ areaDTOs.Insert(1, areaDTOsic);
+ ViewBag.Area = areaDTOs;
@@ -220,14 +324,22 @@
data.Creater = curentuser.Id;
data.Createtime = DateTime.Now;
data.ShenpiStatus = "D";
- data.JiexiStatus = "D";
+ //data.JiexiStatus = "D";
}
else
{
var ddd = _expertTestTopicService.Get(data.Id);
data.ShenpiStatus = "D";
- data.JiexiStatus = ddd.JiexiStatus;
+ //data.JiexiStatus = ddd.JiexiStatus;
+ }
+ if (string.IsNullOrEmpty(data.Jiexi))
+ {
+ data.JiexiStatus = "D";
+ }
+ else
+ {
+ data.JiexiStatus = "A";
}
data.Modifier = curentuser.Id;
data.Modifytime = DateTime.Now;
@@ -356,14 +468,22 @@
data.Creater = curentuser.Id;
data.Createtime = DateTime.Now;
data.ShenpiStatus = "A";
- data.JiexiStatus = "D";
+ //data.JiexiStatus = "D";
}
else
{
var ddd = _expertTestTopicService.Get(data.Id);
data.ShenpiStatus = "A";
- data.JiexiStatus = ddd.JiexiStatus;
+ //data.JiexiStatus = ddd.JiexiStatus;
+ }
+ if (string.IsNullOrEmpty(data.Jiexi))
+ {
+ data.JiexiStatus = "D";
+ }
+ else
+ {
+ data.JiexiStatus = "A";
}
data.Modifier = curentuser.Id;
data.Modifytime = DateTime.Now;
--
Gitblit v1.9.1