From ad97a60eb0ff674a4e7419d2102e5a635c2122f2 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期四, 28 十月 2021 14:42:52 +0800
Subject: [PATCH] 提交
---
zhengcaioa/Services/ExpertTestTopicService.cs | 71 +++++++++++++++++++++++++++++++++--
1 files changed, 66 insertions(+), 5 deletions(-)
diff --git a/zhengcaioa/Services/ExpertTestTopicService.cs b/zhengcaioa/Services/ExpertTestTopicService.cs
index fda7dfc..d98cbc3 100644
--- a/zhengcaioa/Services/ExpertTestTopicService.cs
+++ b/zhengcaioa/Services/ExpertTestTopicService.cs
@@ -132,6 +132,7 @@
expertTestTopicjiexi.Falv = dto.Falv[i];
expertTestTopicjiexi.Fatiao = dto.Fatiao[i];
expertTestTopicjiexi.Flag = dto.Flag[i];
+ expertTestTopicjiexi.Jiexi = dto.Fatiaomingxi[i];
expertTestTopicjiexi.Creater = dto.Modifier;
expertTestTopicjiexi.Createtime = DateTime.Now;
expertTestTopicjiexi.Modifier = dto.Modifier;
@@ -326,10 +327,34 @@
foreach (var quer in querydel)
{
- lian.Topic += quer.Anwserno + " " + quer.Anwser + " </br>";
+ if (lian.Topictype != "03")
+ {
+ lian.Topic += quer.Anwserno + " " + quer.Anwser + " </br>";
+ }
+
+ if(quer.Shifouzhengqu == "A")
+ {
+ lian.Anwsers += quer.Anwserno ;
+ }
+
}
}
+
+ var queryjiexis = (from aaa in _context.ExpertTestTopicjiexis.Where(x => x.RecStatus == "A" && lianlist11.Contains(x.Topic)) select aaa).ToList();
+ var falvs = listCode.Where(x => x.CodeTable == "expert_test_topicjiexi" && x.CodeField == "falv").ToList();
+ foreach (var lian in lianlist)
+ {
+ var queryjiexi = queryjiexis.Where(x => x.Topic == lian.Id).OrderBy(x => x.Flag).ToList();
+ var jiexi = "";
+ foreach (var quer in queryjiexi)
+ {
+ var falv = falvs.Where(x => x.CodeSn == quer.Falv).FirstOrDefault();
+
+ jiexi +=(falv!=null? "銆�" + falv.Comments + "銆�" : "") + " " + quer.Fatiao + " " + quer.Jiexi + " </br>" ;
+ }
+ lian.Jiexi = jiexi + lian.Jiexi + " </br>";
+ }
data.LoadData(searchEntity, lianlist);
return data;
@@ -760,7 +785,7 @@
Modifytime = a.Modifytime,
}
- ).OrderBy(x => x).ToList();
+ ).OrderBy(x => x.Resulttype).ToList();
return listRole;
}
@@ -813,9 +838,10 @@
TopictypeName = eee.Comments,
Zhishitype = a.Zhishitype,
ZhishitypeName = fff.Comments,
- Fenshu = a.Fenshu,
- Fenzhi = a.Fenzhi,
-
+ Fenshu = a.Fenshu ?? 0,
+ Fenzhi = a.Fenzhi??0,
+ FenshuName = (a.Fenshu ?? 0).ToString("0.##"),
+ FenzhiName = (a.Fenzhi ?? 0).ToString("0.##"),
Creater = a.Creater,
Createtime = a.Createtime,
@@ -927,5 +953,40 @@
return resultEntity;
}
+
+
+ public ExpertTestResultDTO GetResult(string Resulttype)
+ {
+
+ var entity = _context.ExpertTestResults.Where(x=>x.RecStatus =="A" && x.Resulttype == Resulttype).FirstOrDefault();
+
+ if (entity==null)
+ {
+ entity = new ExpertTestResult();
+ }
+
+ var result = _mapper.Map<ExpertTestResultDTO>(entity);
+
+
+ return result;
+ }
+
+
+ public ExpertTestTopicpeizhiDTO Getpeizhi(string Topictype, string Zhishitype)
+ {
+
+ var entity = _context.ExpertTestTopicpeizhis.Where(x => x.RecStatus == "A" && x.Topictype == Topictype && x.Zhishitype == Zhishitype).FirstOrDefault();
+
+ if (entity == null)
+ {
+ entity = new ExpertTestTopicpeizhi();
+ }
+
+ var result = _mapper.Map<ExpertTestTopicpeizhiDTO>(entity);
+
+
+ return result;
+ }
+
}
}
--
Gitblit v1.9.1