From ac4f98f9d24552d1c43935f20a969a2fda0723f0 Mon Sep 17 00:00:00 2001
From: LR-20210131IOQH\Administrator <jackcold@163.com>
Date: 星期五, 25 六月 2021 10:40:03 +0800
Subject: [PATCH] Merge branch 'master' of http://47.108.235.38:8080/r/zhengcaioa
---
zhengcaioa/Services/AdmSigninService.cs | 26 ++++++++++++++++++++++----
1 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/zhengcaioa/Services/AdmSigninService.cs b/zhengcaioa/Services/AdmSigninService.cs
index bb0bf22..6c628cc 100644
--- a/zhengcaioa/Services/AdmSigninService.cs
+++ b/zhengcaioa/Services/AdmSigninService.cs
@@ -20,6 +20,7 @@
}
#region 鑰冨嫟鎵撳崱
+
public ResultEntity save(string id, int signinType)
{
ResultEntity resultEntity = new ResultEntity();
@@ -251,11 +252,20 @@
if (string.IsNullOrEmpty(admAsk.Id))
{
ask.Id = Guid.NewGuid().ToString();
+ admAsk.Id = ask.Id;
_context.AdmAskLeaves.Add(ask);
}
else
{
var entity = _context.AdmAskLeaves.Find(admAsk.Id);
+
+ entity.SigninId = admAsk.SigninId;
+ entity.StratPoint = admAsk.StratPoint;
+ entity.EndPoint = admAsk.EndPoint;
+ entity.ShenpiStatus = admAsk.ShenpiStatus;
+ entity.CreaterName = admAsk.CreaterName;
+ entity.Tittle = admAsk.Tittle;
+
entity.LaveDay = admAsk.LaveDay;
entity.LavehHour = admAsk.LavehHour;
entity.Remark = admAsk.Remark;
@@ -294,6 +304,14 @@
else
{
var entity = _context.AdmAskLeaveOffs.Find(leaveOff.Id);
+
+ entity.SigninId = leaveOff.SigninId;
+ entity.StratPoint = leaveOff.StratPoint;
+ entity.EndPoint = leaveOff.EndPoint;
+ entity.ShenpiStatus = leaveOff.ShenpiStatus;
+ entity.CreaterName = leaveOff.CreaterName;
+ entity.Tittle = leaveOff.Tittle;
+
entity.MedicalRecord = leaveOff.MedicalRecord;
entity.Remark = leaveOff.Remark;
entity.Lavetype = leaveOff.Lavetype;
@@ -316,9 +334,9 @@
return resultEntity;
}
- public AdmAskLeaveDTO GetAskLeave(string signinId)
+ public AdmAskLeaveDTO GetAskLeave(string Id)
{
- AdmAskLeave entity = _context.AdmAskLeaves.Where(e => e.RecStatus == "A" && e.SigninId == signinId).FirstOrDefault();
+ AdmAskLeave entity = _context.AdmAskLeaves.Where(e => e.RecStatus == "A" && e.Id == Id).FirstOrDefault();
if (entity == null)
{
entity = new AdmAskLeave();
@@ -328,9 +346,9 @@
}
- public AdmAskLeaveOffDTO GetAskLeaveOff(string signinId)
+ public AdmAskLeaveOffDTO GetAskLeaveOff(string Id)
{
- AdmAskLeaveOff entity = _context.AdmAskLeaveOffs.Where(e => e.RecStatus == "A" && e.SigninId == signinId).FirstOrDefault();
+ AdmAskLeaveOff entity = _context.AdmAskLeaveOffs.Where(e => e.RecStatus == "A" && e.Id == Id ).FirstOrDefault();
if (entity == null)
{
entity = new AdmAskLeaveOff();
--
Gitblit v1.9.1