From 0c7b13e91cd472e21e4a620355e6fcabc11f695a Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期二, 04 一月 2022 13:56:24 +0800
Subject: [PATCH] 计件登记，汇总，打印
---
zhengcaioa/Services/CooperOrderService.cs | 62 ++++++++++++++++++++++++++++++-
1 files changed, 60 insertions(+), 2 deletions(-)
diff --git a/zhengcaioa/Services/CooperOrderService.cs b/zhengcaioa/Services/CooperOrderService.cs
index d04c90f..834cf60 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;
}
@@ -962,6 +964,28 @@
}
+ 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;
+ }
+
+
public ResultEntity saveChallengeletter(TChallengeletterDTO dto)
{
ResultEntity resultEntity = new ResultEntity();
@@ -1826,6 +1850,7 @@
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();
@@ -1880,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();
@@ -1914,5 +1940,37 @@
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;
+ }
}
}
--
Gitblit v1.9.1