From 67a0042c5f29e4bb0e0b82f6190f2bc51480b45c Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期二, 28 二月 2023 13:25:09 +0800
Subject: [PATCH] 工资绩效改版
---
zhengcaioa/Services/CooperOrderService.cs | 267 +++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 257 insertions(+), 10 deletions(-)
diff --git a/zhengcaioa/Services/CooperOrderService.cs b/zhengcaioa/Services/CooperOrderService.cs
index d04c90f..2a8d1b0 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;
}
@@ -76,8 +78,9 @@
updateproject.Shoulitime = entity.Shoulitime;
updateproject.Songhuoer = entity.Songhuoer;
updateproject.Songhuotime = entity.Songhuotime;
- updateproject.Wangonger = entity.Wangonger;
- updateproject.Wangongtime = entity.Wangongtime;
+ //updateproject.WangongStatus = entity.WangongStatus;
+ //updateproject.Wangonger = entity.Wangonger;
+ //updateproject.Wangongtime = entity.Wangongtime;
updateproject.RecStatus = entity.RecStatus;
updateproject.Modifier = entity.Modifier;
@@ -88,6 +91,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;
}
@@ -240,6 +246,11 @@
into msssss
from mmm in msssss.DefaultIfEmpty()
+ join n in _context.PltUsers
+ on a.Creater equals n.Id
+ into nsssss
+ from nnn in nsssss.DefaultIfEmpty()
+
where a.RecStatus == "A"
&& (string.IsNullOrWhiteSpace(searchEntity.XdTime) || (a.XdTime >= XdTimestart && a.XdTime <= XdTimeend))
&& (string.IsNullOrWhiteSpace(searchEntity.Ywjl) || ggg.Ywjl == searchEntity.Ywjl.Trim())
@@ -284,7 +295,8 @@
Remark = a.Remark,
Creater = a.Creater,
- Createtime = a.Createtime,
+ CreaterName = nnn.UserName,
+ Createtime = a.Createtime,
RecStatus = a.RecStatus,
Modifier = a.Modifier,
@@ -336,7 +348,15 @@
//if (searchEntity.totalrows == 0)
searchEntity.totalrows = query.Count();
+ data.Heji1 = Math.Round(query.Sum(x => x.OrderNum) ?? 0, 2);
+ data.Heji2 = Math.Round(query.Sum(x => x.Price) ?? 0, 2);
+ data.Heji3 = Math.Round(query.Sum(x => x.Money) ?? 0, 2);
+ data.Heji4 = Math.Round(query.Sum(x => x.Youhui) ?? 0, 2);
var lianlist = query.Skip((searchEntity.page - 1) * searchEntity.rows).Take(searchEntity.rows).ToList();
+ data.DangyeHeji1 = Math.Round(lianlist.Sum(x => x.OrderNum) ?? 0, 2);
+ data.DangyeHeji2 = Math.Round(lianlist.Sum(x => x.Price) ?? 0, 2);
+ data.DangyeHeji3 = Math.Round(lianlist.Sum(x => x.Money) ?? 0, 2);
+ data.DangyeHeji4 = Math.Round(lianlist.Sum(x => x.Youhui) ?? 0, 2);
data.LoadData(searchEntity, lianlist);
return data;
}
@@ -422,7 +442,7 @@
updateproject.WangongStatus = dto.WangongStatus;
updateproject.Wangonger = dto.Wangonger;
updateproject.Wangongtime = dto.Wangongtime;
-
+ updateproject.ShouliStatus = dto.ShouliStatus;
_context.SaveChanges();
@@ -497,7 +517,7 @@
updateproject.ChedanStatus = dto.ChedanStatus;
updateproject.Chedan = dto.Chedan;
updateproject.ShouliStatus = dto.ShouliStatus;
-
+ updateproject.Remark = dto.Remark;
_context.SaveChanges();
resultEntity.ReturnID = dto.Id;
resultEntity.Result = true;
@@ -739,7 +759,7 @@
public List<CooperOrderDTO> GetList(string userid, DateTime datemin, DateTime datemax)
{
- var entity = _context.CooperOrders.Where(x => x.RecStatus == "A" && x.ShouliStatus != "0" && x.Creater == userid && x.Createtime >= datemin && x.Createtime < datemax).ToList();
+ var entity = _context.CooperOrders.Where(x => x.RecStatus == "A" && x.ShouliStatus != "0" && x.Creater == userid && ((x.OrderType != "08" && x.Createtime >= datemin && x.Createtime < datemax) || (x.OrderType == "08" && x.WangongStatus == "A" && x.Wangongtime >= datemin && x.Wangongtime < datemax)) ).ToList();
@@ -771,7 +791,7 @@
- var entity = (from a in _context.CooperOrders.Where(x => x.RecStatus == "A" && x.ShouliStatus != "0" && x.Creater == userid && x.Createtime >= datemin && x.Createtime < datemax)
+ var entity = (from a in _context.CooperOrders.Where(x => x.RecStatus == "A" && x.ShouliStatus != "0" && x.Creater == userid && ( (x.OrderType != "08" && x.Createtime >= datemin && x.Createtime < datemax) || (x.OrderType == "08" && x.WangongStatus=="A" && x.Wangongtime >= datemin && x.Wangongtime < datemax)))
join b in listCode.Where(x => x.CodeTable == "CooperOrder" && x.CodeField == "shouli_status")
on a.ShouliStatus equals b.CodeSn
@@ -959,6 +979,75 @@
return result;
+ }
+
+
+ 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
+ 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;
}
@@ -1151,6 +1240,7 @@
updateproject.Law = entity.Law;
updateproject.Sort = entity.Sort;
updateproject.Lawcoment = entity.Lawcoment;
+ updateproject.Questionname = entity.Questionname;
}
@@ -1433,7 +1523,7 @@
updateproject.Law = entity.Law;
updateproject.Sort = entity.Sort;
updateproject.Lawcoment = entity.Lawcoment;
-
+ updateproject.Questionname = entity.Questionname;
}
@@ -1826,6 +1916,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 +1971,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 +2006,160 @@
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;
+ }
+
+
+ public List<TChallengeRequestInfoDTO> GetListChallengeRequestInfo(string ChallengeId)
+ {
+
+ var entity = _context.TChallengeRequestInfos.Where(x => x.ChallengeId == ChallengeId).OrderBy(x => x.Id).ToList();
+
+
+
+ var result = _mapper.Map<List<TChallengeRequestInfoDTO>>(entity);
+
+
+ var request_info = (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 challengeItemDTO in result)
+ {
+ var codeDataEntity = request_info.Where(x => x.CodeSn == challengeItemDTO.RequestInfo).FirstOrDefault();
+ if (codeDataEntity != null)
+ {
+ challengeItemDTO.RequestInfoNameName = codeDataEntity.Comments;
+ }
+
+
+ }
+
+
+ return result;
+ }
+
+
+ public ResultEntity saveChallengeRequestInfo(TChallengeRequestInfoDTO dto)
+ {
+ ResultEntity resultEntity = new ResultEntity();
+ try
+ {
+
+
+ var entity = _mapper.Map<TChallengeRequestInfo>(dto);
+
+
+ if (entity.Id <= 0)
+ {
+
+
+ _context.TChallengeRequestInfos.Add(entity);
+ }
+ else
+ {
+ var updateproject = _context.TChallengeRequestInfos.Find(entity.Id);
+
+
+ updateproject.ChallengeId = entity.ChallengeId;
+ updateproject.RequestInfo = entity.RequestInfo;
+ updateproject.RequestInfoname = entity.RequestInfoname;
+
+
+ }
+
+ _context.SaveChanges();
+ resultEntity.ReturnID = entity.Id.ToString();
+ resultEntity.Result = true;
+ }
+ catch (Exception ex)
+ {
+ resultEntity.Result = false;
+ resultEntity.Message = "淇濆瓨澶辫触锛岃鑱旂郴绠＄悊鍛�";
+
+ }
+ return resultEntity;
+ }
+
+
+ /// <summary>
+ /// 鍒犻櫎璐ㄧ枒鍑藉瓙琛�
+ /// </summary>
+ /// <returns></returns>
+ public ResultEntity deleteChallengeRequestInfo(string ChallengeId)
+ {
+ ResultEntity result = new ResultEntity();
+ result.Result = true;
+
+ var models = _context.TChallengeRequestInfos.Where(x => x.ChallengeId == ChallengeId).ToList(); ;
+
+ foreach (var challengeItem in models)
+ {
+ _context.TChallengeRequestInfos.Remove(challengeItem);
+ }
+ _context.SaveChanges();
+ return result;
+ }
+
}
}
--
Gitblit v1.9.1