From c035a2e879d4340b0a6ab5c16770758cd62e4874 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期三, 08 十二月 2021 15:14:25 +0800
Subject: [PATCH] 提交
---
zhengcaioa/Services/CooperOrderService.cs | 126 ++++++++++++++++++++++++++++++++++++++++-
1 files changed, 121 insertions(+), 5 deletions(-)
diff --git a/zhengcaioa/Services/CooperOrderService.cs b/zhengcaioa/Services/CooperOrderService.cs
index 2c9098b..d04c90f 100644
--- a/zhengcaioa/Services/CooperOrderService.cs
+++ b/zhengcaioa/Services/CooperOrderService.cs
@@ -1177,6 +1177,45 @@
var result = _mapper.Map<List<TComplaintletterDTO>>(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
+ }
+ ).ToList();
+
+ var request_info = listCode.Where(x => x.CodeTable == "t_challengeletter" && x.CodeField == "request_info").ToList();
+ var shifou = listCode.Where(x => x.CodeTable == "system" && x.CodeField == "shifou").ToList();
+ foreach (var complaintletterDTO in result)
+ {
+ var codeDataEntity = request_info.Where(x => x.CodeSn == complaintletterDTO.RequestInfo).FirstOrDefault();
+ if (codeDataEntity != null)
+ {
+ complaintletterDTO.RequestInfoName = codeDataEntity.Comments;
+ }
+
+ codeDataEntity = shifou.Where(x => x.CodeSn == complaintletterDTO.IsNotice).FirstOrDefault();
+ if (codeDataEntity != null)
+ {
+ complaintletterDTO.IsNoticeName = codeDataEntity.Comments;
+ }
+ codeDataEntity = shifou.Where(x => x.CodeSn == complaintletterDTO.IsResultnotice).FirstOrDefault();
+ if (codeDataEntity != null)
+ {
+ complaintletterDTO.IsResultnoticeName = codeDataEntity.Comments;
+ }
+ }
return result;
}
@@ -1249,12 +1288,13 @@
updateproject.DocumentsDate = entity.DocumentsDate;
updateproject.RequestInfo = entity.RequestInfo;
-
-
+ updateproject.Status = entity.Status;
-
-
+
+
+
+
updateproject.Modifier = entity.Modifier;
@@ -1285,6 +1325,82 @@
var result = _mapper.Map<List<TComplaintItemDTO>>(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 complaintItemDTO in result)
+ {
+ var codeDataEntity = question.Where(x => x.CodeSn == complaintItemDTO.Question).FirstOrDefault();
+ if (codeDataEntity != null)
+ {
+ complaintItemDTO.QuestionName = codeDataEntity.Comments;
+ }
+
+ codeDataEntity = law.Where(x => x.CodeSn == complaintItemDTO.Law).FirstOrDefault();
+ if (codeDataEntity != null)
+ {
+ complaintItemDTO.LawName = codeDataEntity.Comments;
+ complaintItemDTO.Lawcoment = codeDataEntity.Contents;
+
+ codeDataEntity = falv.Where(x => x.CodeSn == complaintItemDTO.LawName).FirstOrDefault();
+ if (codeDataEntity != null)
+ {
+ complaintItemDTO.LawName = codeDataEntity.Comments;
+ }
+ }
+ }
return result;
}
@@ -1716,7 +1832,7 @@
var query1 =(from a in _context.CooperOrders
- join b in _context.TComplaintletters.Where(x => x.Status == 1)
+ join b in _context.TComplaintletters
on a.Id equals b.OrderId
--
Gitblit v1.9.1