From 1aa53fde5eb18a39c53daf910d69cb857913b08d Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期三, 06 七月 2022 15:23:02 +0800
Subject: [PATCH] 提交

---
 zhengcaioa/Services/CooperOrderService.cs |  105 +++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 102 insertions(+), 3 deletions(-)

diff --git a/zhengcaioa/Services/CooperOrderService.cs b/zhengcaioa/Services/CooperOrderService.cs
index d8facb5..0de12ce 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;
         }
 
 
@@ -88,6 +90,9 @@
                     updateproject.SonghuoTime1 = entity.SonghuoTime1;
                     updateproject.HuifangJdr = entity.HuifangJdr;
                     updateproject.HuifangKehuyijian = entity.HuifangKehuyijian;
+                    updateproject.Xmname = entity.Xmname;
+                    updateproject.Xmcode = entity.Xmcode;
+                    updateproject.Jichumoney = entity.Jichumoney;
 
                 }
 
@@ -962,6 +967,53 @@
         }
 
 
+        public List<TChallengeletterDTO> GetListChallengelettertousu(string customid, string XmCode)
+        {
+
+            var entity = (from a in _context.CooperOrders.Where(x=>x.OrderType1== "浠ｆ嫙璐ㄧ枒鍑�" && x.RecStatus == "A" && x.Khdw == customid)
+                          join b in _context.TChallengeletters.Where(x=>x.XmCode == XmCode) on a.Id equals b.OrderId 
+                          select b ).ToList();
+
+
+            //_context.TChallengeletters.Where(x =>/* x.Status == 1 && */x.OrderId == OrderId).ToList();
+
+
+
+            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
@@ -971,9 +1023,11 @@
                          select new TChallengeletterDTO
                          {
                              Id = b.Id,
-                             OrderId  = b.OrderNo
+                             OrderId  = b.OrderNo,
+                             khid = b.Khdw,
+                             Createtime = b.Createtime,
                          }
-                         ).ToList();
+                         ).OrderByDescending(x=>x.Createtime).ToList();
 
 
             
@@ -1936,5 +1990,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