From 15eb82df2d6ec539e9d4245bfe08d531e8eb6379 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期日, 27 四月 2025 14:33:26 +0800
Subject: [PATCH] 修改培训订单占多个座位
---
zhengcaioa/Services/CooperOrderService.cs | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/zhengcaioa/Services/CooperOrderService.cs b/zhengcaioa/Services/CooperOrderService.cs
index 6226e19..2a8d1b0 100644
--- a/zhengcaioa/Services/CooperOrderService.cs
+++ b/zhengcaioa/Services/CooperOrderService.cs
@@ -78,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;
@@ -441,7 +442,7 @@
updateproject.WangongStatus = dto.WangongStatus;
updateproject.Wangonger = dto.Wangonger;
updateproject.Wangongtime = dto.Wangongtime;
-
+ updateproject.ShouliStatus = dto.ShouliStatus;
_context.SaveChanges();
@@ -516,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;
@@ -758,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();
@@ -790,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
--
Gitblit v1.9.1