From 3a864ec2d204077d34bd0b874540829702581c6c Mon Sep 17 00:00:00 2001 From: username@email.com <yzy2002yzy@163.com> Date: 星期五, 11 二月 2022 15:16:35 +0800 Subject: [PATCH] 删除知识点查询 --- zhengcaioa/Services/CooperOrderService.cs | 307 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 300 insertions(+), 7 deletions(-) diff --git a/zhengcaioa/Services/CooperOrderService.cs b/zhengcaioa/Services/CooperOrderService.cs index fca347f..99e418d 100644 --- a/zhengcaioa/Services/CooperOrderService.cs +++ b/zhengcaioa/Services/CooperOrderService.cs @@ -14,11 +14,13 @@ public class CooperOrderService: ICooperOrderService { private readonly zhengcaioaContext _context; + private readonly zcUserInfoN_dbContext _zcUserInfoN_dbContext; private readonly IMapper _mapper; - public CooperOrderService(zhengcaioaContext context, IMapper mapper) + public CooperOrderService(zhengcaioaContext context, IMapper mapper, zcUserInfoN_dbContext zcUserInfoN_dbContext) { _context = context; _mapper = mapper; + _zcUserInfoN_dbContext = zcUserInfoN_dbContext; } @@ -930,7 +932,57 @@ 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; + } + + + public List<TChallengeletterDTO> GetListChallengeletterChosen() + { + var query = (from a in _context.TChallengeletters + join b in _context.CooperOrders.Where(x => x.RecStatus == "A") + on a.OrderId equals b.Id + + select new TChallengeletterDTO + { + Id = b.Id, + OrderId = b.OrderNo, + khid = b.Khdw, + Createtime = b.Createtime, + } + ).OrderByDescending(x=>x.Createtime).ToList(); + + + + + return query; } @@ -1014,6 +1066,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 +1201,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 +1312,13 @@ updateproject.DocumentsDate = entity.DocumentsDate; updateproject.RequestInfo = entity.RequestInfo; - - + updateproject.Status = entity.Status; - - + + + + updateproject.Modifier = entity.Modifier; @@ -1179,6 +1349,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 +1850,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 +1905,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(); @@ -1692,5 +1940,50 @@ data.LoadData(searchEntity, lianlist); return data; } + + + + + public List<CooperOrderDTO> GetListComplaintsDisputeCount(string huiyuanid) + { + var query = (from a in _zcUserInfoN_dbContext.UsergGadeRoles + join b in _zcUserInfoN_dbContext.GadeRoles + on a.UserGadeRolesId equals b.Id + where a.UserId == Guid.Parse(huiyuanid) + select new CooperOrderDTO + { + Id = a.UserId.ToString(), + AnswerRoles = b.AnswerRoles, + XiaocaiKeTang = b.XiaocaiKeTang, + XiaoCaiQandA = b.XiaoCaiQandA, + Discount = b.Discount, + BiddingDocumentsCount = b.BiddingDocumentsCount, + ComplaintsDisputeCount = b.ComplaintsDisputeCount, + PerformanceDisputeCount = b.PerformanceDisputeCount, + BiddingDocumentsCountused = a.BiddingDocumentsCount, + ComplaintsDisputeCountused = a.ComplaintsDisputeCount, + PerformanceDisputeCountused = a.PerformanceDisputeCount, + + } + ).ToList(); + + + + + return query; + } + + + public FrameworkUser GetFrameworkUsers(string ID) + { + + + + var entity = _zcUserInfoN_dbContext.FrameworkUsers.Find(new Guid(ID)); + + + + return entity; + } } } -- Gitblit v1.9.1