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 | 69 +++++++++++++++++++++++++++++++++-
1 files changed, 67 insertions(+), 2 deletions(-)
diff --git a/zhengcaioa/Services/CooperOrderService.cs b/zhengcaioa/Services/CooperOrderService.cs
index 83b46c6..0de12ce 100644
--- a/zhengcaioa/Services/CooperOrderService.cs
+++ b/zhengcaioa/Services/CooperOrderService.cs
@@ -90,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;
}
@@ -964,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
@@ -973,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();
@@ -1970,5 +2022,18 @@
return query;
}
+
+
+ public FrameworkUser GetFrameworkUsers(string ID)
+ {
+
+
+
+ var entity = _zcUserInfoN_dbContext.FrameworkUsers.Find(new Guid(ID));
+
+
+
+ return entity;
+ }
}
}
--
Gitblit v1.9.1