From 56ac25efe5d470e08df3827de011c24d02817249 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期二, 07 十二月 2021 14:07:29 +0800
Subject: [PATCH] 提交
---
zhengcaioa/Services/CooperOrderService.cs | 106 +++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 106 insertions(+), 0 deletions(-)
diff --git a/zhengcaioa/Services/CooperOrderService.cs b/zhengcaioa/Services/CooperOrderService.cs
index fca347f..2c9098b 100644
--- a/zhengcaioa/Services/CooperOrderService.cs
+++ b/zhengcaioa/Services/CooperOrderService.cs
@@ -930,6 +930,34 @@
var result = _mapper.Map<List<TChallengeletterDTO>>(entity);
+ var listCode = (from a in _context.SysCodeDtls
+ join b in _context.SysCodes
+ on a.CodeId equals b.Id
+ where a.RecStatus == "A"
+ && b.RecStatus == "A"
+ select new CodeDataEntity()
+ {
+ CodeId = b.Id,
+ CodeTable = b.CodeTable,
+ CodeField = b.CodeField,
+ CodeSn = a.CodeSn,
+ Comments = a.Comments,
+ Contents = a.Contents,
+ RecStatus = a.RecStatus,
+ Sort = a.Sort
+ }
+ ).Where(x => x.CodeTable == "t_challengeletter" && x.CodeField == "request_info").ToList();
+ foreach(var challengeletterDTO in result)
+ {
+ var codeDataEntity = listCode.Where(x => x.CodeSn == challengeletterDTO.RequestInfo).FirstOrDefault();
+ if (codeDataEntity != null)
+ {
+ challengeletterDTO.RequestInfoName = codeDataEntity.Comments;
+ }
+
+ }
+
+
return result;
}
@@ -1014,6 +1042,84 @@
var result = _mapper.Map<List<TChallengeItemDTO>>(entity);
+ var question = (from a in _context.SysCodeDtls
+ join b in _context.SysCodes
+ on a.CodeId equals b.Id
+ where a.RecStatus == "A"
+ && b.RecStatus == "A"
+ select new CodeDataEntity()
+ {
+ CodeId = b.Id,
+ CodeTable = b.CodeTable,
+ CodeField = b.CodeField,
+ CodeSn = a.CodeSn,
+ Comments = a.Comments,
+ Contents = a.Contents,
+ RecStatus = a.RecStatus,
+ Sort = a.Sort
+ }
+ ).Where(x => x.CodeTable == "t_challenge_items" && x.CodeField == "question").ToList();
+
+
+ var law = (from a in _context.SysCodeDtls
+ join b in _context.SysCodes
+ on a.CodeId equals b.Id
+ where a.RecStatus == "A"
+ && b.RecStatus == "A"
+ select new CodeDataEntity()
+ {
+ CodeId = b.Id,
+ CodeTable = b.CodeTable,
+ CodeField = b.CodeField,
+ CodeSn = a.CodeSn,
+ Comments = a.Comments,
+ Contents = a.Contents,
+ RecStatus = a.RecStatus,
+ Sort = a.Sort
+ }
+ ).Where(x => x.CodeTable == "t_complaint_items" && x.CodeField == "law").ToList();
+
+ var falv = (from a in _context.SysCodeDtls
+ join b in _context.SysCodes
+ on a.CodeId equals b.Id
+ where a.RecStatus == "A"
+ && b.RecStatus == "A"
+ select new CodeDataEntity()
+ {
+ CodeId = b.Id,
+ CodeTable = b.CodeTable,
+ CodeField = b.CodeField,
+ CodeSn = a.CodeSn,
+ Comments = a.Comments,
+ Contents = a.Contents,
+ RecStatus = a.RecStatus,
+ Sort = a.Sort
+ }
+ ).Where(x => x.CodeTable == "expert_test_topicjiexi" && x.CodeField == "falv").ToList();
+
+ foreach (var challengeItemDTO in result)
+ {
+ var codeDataEntity = question.Where(x => x.CodeSn == challengeItemDTO.Question).FirstOrDefault();
+ if (codeDataEntity != null)
+ {
+ challengeItemDTO.QuestionName = codeDataEntity.Comments;
+ }
+
+ codeDataEntity = law.Where(x => x.CodeSn == challengeItemDTO.Law).FirstOrDefault();
+ if (codeDataEntity != null)
+ {
+ challengeItemDTO.LawName = codeDataEntity.Comments;
+ challengeItemDTO.Lawcoment = codeDataEntity.Contents;
+
+ codeDataEntity = falv.Where(x => x.CodeSn == challengeItemDTO.LawName).FirstOrDefault();
+ if (codeDataEntity != null)
+ {
+ challengeItemDTO.LawName = codeDataEntity.Comments;
+ }
+ }
+ }
+
+
return result;
}
--
Gitblit v1.9.1