From 82645238a5855f6f7b8c397d1f8fa8b4a3155b94 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期三, 14 七月 2021 16:00:18 +0800
Subject: [PATCH] 提交
---
zhengcaioa/Services/CooperOrderService.cs | 39 ++++++++++++++++++++++++++++++++-------
1 files changed, 32 insertions(+), 7 deletions(-)
diff --git a/zhengcaioa/Services/CooperOrderService.cs b/zhengcaioa/Services/CooperOrderService.cs
index 6c62ba6..ad7f7a2 100644
--- a/zhengcaioa/Services/CooperOrderService.cs
+++ b/zhengcaioa/Services/CooperOrderService.cs
@@ -82,6 +82,12 @@
updateproject.Modifier = entity.Modifier;
updateproject.Modifytime = entity.Modifytime;
+ updateproject.SonghuoGongsi = entity.SonghuoGongsi;
+ updateproject.SonghuoDanhao = entity.SonghuoDanhao;
+ updateproject.SonghuoTime1 = entity.SonghuoTime1;
+ updateproject.HuifangJdr = entity.HuifangJdr;
+ updateproject.HuifangKehuyijian = entity.HuifangKehuyijian;
+
}
_context.SaveChanges();
@@ -205,6 +211,16 @@
into ksssss
from kkk in ksssss.DefaultIfEmpty()
+ join l in _context.FiBooks
+ on a.OrderType1 equals l.Id
+ into lsssss
+ from lll in lsssss.DefaultIfEmpty()
+
+ join m in _context.FiMembers
+ on a.OrderType1 equals m.Id
+ into msssss
+ from mmm in msssss.DefaultIfEmpty()
+
where a.RecStatus == "A"
&& (string.IsNullOrWhiteSpace(searchEntity.XdTime) || (a.XdTime >= XdTimestart && a.XdTime <= XdTimeend))
&& (string.IsNullOrWhiteSpace(searchEntity.Ywjl) || ggg.Ywjl == searchEntity.Ywjl.Trim())
@@ -221,12 +237,11 @@
&& (string.IsNullOrWhiteSpace(searchEntity.WangongStatus) || a.WangongStatus == searchEntity.WangongStatus.Trim())
&& (string.IsNullOrWhiteSpace(searchEntity.SonghuoStatus) || a.SonghuoStatus == searchEntity.SonghuoStatus.Trim())
&& (string.IsNullOrWhiteSpace(searchEntity.HuifangStatussss) || a.HuifangStatus == searchEntity.HuifangStatussss.Trim())
+ && (string.IsNullOrWhiteSpace(searchEntity.HuiyuanId) || ggg.HuiyuanId == searchEntity.HuiyuanId.Trim())
-
-
- select new CooperOrderDTO
+ select new CooperOrderDTO
{
Id = a.Id,
XdTime = a.XdTime,
@@ -288,6 +303,13 @@
YouhuiStatus = kkk.Id,
OrderType1 = a.OrderType1,
OrderType2 = a.OrderType2,
+ OrderType1Name = string.IsNullOrEmpty(lll.BookName)? string.IsNullOrEmpty(mmm.MemberType)? a.OrderType1 : mmm.MemberType : lll.BookName,
+
+ SonghuoGongsi = a.SonghuoGongsi,
+ SonghuoDanhao = a.SonghuoDanhao,
+ SonghuoTime1 = a.SonghuoTime1,
+ HuifangJdr = a.HuifangJdr,
+ HuifangKehuyijian = a.HuifangKehuyijian,
}
).OrderByDescending(x => x.OrderNo).ToList();
@@ -416,8 +438,11 @@
updateproject.SonghuoStatus = dto.SonghuoStatus;
updateproject.Songhuoer = dto.Songhuoer;
updateproject.Songhuotime = dto.Songhuotime;
+ updateproject.ShouliStatus = dto.ShouliStatus;
-
+ updateproject.SonghuoTime1 = dto.SonghuoTime1;
+ updateproject.SonghuoDanhao = dto.SonghuoDanhao;
+ updateproject.SonghuoGongsi = dto.SonghuoGongsi;
_context.SaveChanges();
resultEntity.ReturnID = dto.Id;
@@ -480,13 +505,13 @@
var updateproject = _context.CooperOrders.Find(dto.Id);
-
-
+ updateproject.HuifangKehuyijian = dto.HuifangKehuyijian;
+ updateproject.HuifangJdr = dto.HuifangJdr;
updateproject.Huifanger = dto.Huifanger;
updateproject.Huifangtime = dto.Huifangtime;
updateproject.HuifangStatus = dto.HuifangStatus;
updateproject.Huifangremark = dto.Huifangremark;
-
+ updateproject.PingjiaStatus = dto.PingjiaStatus;
_context.SaveChanges();
resultEntity.ReturnID = dto.Id;
--
Gitblit v1.9.1