From 72e4a4d81cb1b9776ffb7287e0c5ed67592eda8b Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期一, 11 十二月 2023 15:20:28 +0800
Subject: [PATCH] 试用期工资计算
---
zhengcaioa/Services/OrderBanciOrderService.cs | 31 ++++++++++++++++++++++++++++++-
1 files changed, 30 insertions(+), 1 deletions(-)
diff --git a/zhengcaioa/Services/OrderBanciOrderService.cs b/zhengcaioa/Services/OrderBanciOrderService.cs
index debcdd8..4c9970d 100644
--- a/zhengcaioa/Services/OrderBanciOrderService.cs
+++ b/zhengcaioa/Services/OrderBanciOrderService.cs
@@ -41,6 +41,18 @@
entity.OrderId = dto.Id;
}
_context.OrderBanciOrders.Add(entity);
+
+ if (!string.IsNullOrEmpty(dto.SeatID))
+ {
+ var orderBanciZuowei = _context.OrderBanciZuoweis.Where(x => x.RecStatus == "A" && x.BanciId == dto.BanciId && x.ZuoweiId == dto.SeatID).FirstOrDefault();
+ if (orderBanciZuowei != null)
+ {
+ orderBanciZuowei.Status = "1";
+ orderBanciZuowei.Modifier = dto.Creater;
+ orderBanciZuowei.Modifytime = dto.Createtime;
+ }
+ }
+
}
else
{
@@ -65,6 +77,8 @@
updateproject.Shenfenzheng = entity.Shenfenzheng;
updateproject.Jifen = entity.Jifen;
updateproject.OrderId = entity.OrderId;
+ updateproject.SeatID = entity.SeatID;
+ updateproject.SeatName = entity.SeatName;
}
_context.SaveChanges();
@@ -179,7 +193,8 @@
Baomingrenshu = a.Baomingrenshu??0,
Jine = a.Jine??0,
Jifen = a.Jifen ?? 0,
-
+ SeatID = a.SeatID,
+ SeatName = a.SeatName,
Creater = a.Creater,
Createtime = a.Createtime,
@@ -280,6 +295,20 @@
model.RecStatus = "D";
model.Modifier = "1";
model.Modifytime = DateTime.Now;
+
+ if (!string.IsNullOrEmpty(model.SeatID))
+ {
+ var orderBanciZuowei = _context.OrderBanciZuoweis.Where(x => x.RecStatus == "A" && x.BanciId == model.BanciId && x.ZuoweiId == model.SeatID).FirstOrDefault();
+ if (orderBanciZuowei != null)
+ {
+ orderBanciZuowei.Status = "0";
+ orderBanciZuowei.Modifier = model.Modifier;
+ orderBanciZuowei.Modifytime = model.Modifytime;
+ }
+ }
+
+
+
_context.SaveChanges();
}
--
Gitblit v1.9.1