From d14b82fec13361486c49165371b5dee1b7089c09 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期四, 09 十二月 2021 13:35:23 +0800
Subject: [PATCH] 提交
---
zhengcaioa/Services/CooperOrderService.cs | 236 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 230 insertions(+), 6 deletions(-)
diff --git a/zhengcaioa/Services/CooperOrderService.cs b/zhengcaioa/Services/CooperOrderService.cs
index fca347f..b3c3f01 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;
}
@@ -1071,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;
}
@@ -1143,12 +1288,13 @@
updateproject.DocumentsDate = entity.DocumentsDate;
updateproject.RequestInfo = entity.RequestInfo;
-
-
+ updateproject.Status = entity.Status;
-
-
+
+
+
+
updateproject.Modifier = entity.Modifier;
@@ -1179,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;
}
@@ -1604,13 +1826,14 @@
WeishouMoney = (a.Money ?? 0) /*- (a.Youhui ?? 0)*/ - (lll.YishouMoney ?? 0),
OrderType1 = a.OrderType1,
Status = b.Status.ToString(),
+ Modifytime = b.Modifytime.Value,
//StatusName = ddd.Comments
}
).ToList();
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
@@ -1658,11 +1881,12 @@
WeishouMoney = (a.Money ?? 0) /*- (a.Youhui ?? 0)*/ - (lll.YishouMoney ?? 0),
OrderType1 = a.OrderType1,
Status = b.Status.ToString(),
+ Modifytime = b.Modifytime.Value,
}
).ToList();
query2.AddRange(query1);
- var query = query2.Where(x => x.WeishouMoney <= 0).OrderByDescending(x => x.Createtime).ToList();
+ var query = query2.Where(x => x.WeishouMoney <= 0).OrderByDescending(x => x.Modifytime).ToList();
--
Gitblit v1.9.1