From 130e146e66da134e167b40dd792c79dd057f4255 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期一, 09 八月 2021 14:04:49 +0800
Subject: [PATCH] 今日开发 更换登录页面背景图 解决https访问的问题 客户提现申请增加银行账号，银行名称，收款人姓名
---
zhengcaioa/Services/AdmSigninService.cs | 61 +++++++++++++++++++++++++++---
1 files changed, 55 insertions(+), 6 deletions(-)
diff --git a/zhengcaioa/Services/AdmSigninService.cs b/zhengcaioa/Services/AdmSigninService.cs
index a9fe6b0..8fed0f5 100644
--- a/zhengcaioa/Services/AdmSigninService.cs
+++ b/zhengcaioa/Services/AdmSigninService.cs
@@ -85,6 +85,20 @@
return signin;
}
+ public AdmSignInDTO GetByUserAndDate(string userid, DateTime sgninDate)
+ {
+ AdmSignIn entity = _context.AdmSignIns.Where(x=>x.RecStatus == "A" && x.UserId == userid && x.SgninDate == sgninDate).FirstOrDefault();
+ AdmSignInDTO signin = null;
+ if (entity != null)
+ {
+ signin = _mapper.Map<AdmSignInDTO>(entity);
+ }
+
+ return signin;
+ }
+
+
+
public AdmSignInDTO GetTodaySignin(string userId)
{
ResultEntity resultEntity = new ResultEntity();
@@ -209,7 +223,7 @@
Afternoon = virtity(a.AfternoonIn, a.AfternoonOut),
Overtime = virtity(a.OvertimeIn, a.OvertimeOut)
}).ToList();
- if (searchEntity.totalrows == 0)
+ //if (searchEntity.totalrows == 0)
searchEntity.totalrows = dt.Count();
var signinList = dt.Skip((searchEntity.page - 1) * searchEntity.rows).Take(searchEntity.rows).ToList();
list = _mapper.Map<List<SigninListDTO>>(signinList);
@@ -252,11 +266,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;
@@ -295,6 +318,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;
@@ -317,9 +348,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,10 +359,28 @@
return leaveDTO;
}
-
- public AdmAskLeaveOffDTO GetAskLeaveOff(string signinId)
+
+ public List<AdmAskLeaveDTO> GetAskLeaveByUserId(string UserId)
{
- AdmAskLeaveOff entity = _context.AdmAskLeaveOffs.Where(e => e.RecStatus == "A" && e.SigninId == signinId).FirstOrDefault();
+ List<AdmAskLeave> admAskLeaveDTOs = _context.AdmAskLeaves.Where(e => e.RecStatus == "A" && e.ShenpiStatus == "A" && e.Creater == UserId).ToList();
+
+ List<AdmAskLeaveDTO> leaveDTOs = _mapper.Map< List <AdmAskLeaveDTO> >(admAskLeaveDTOs);
+ return leaveDTOs;
+
+ }
+
+ public List<AdmAskLeaveOffDTO> GetAskLeaveOffByUserId(string UserId)
+ {
+ List<AdmAskLeaveOff> admAskLeaveOffs = _context.AdmAskLeaveOffs.Where(e => e.RecStatus == "A" && e.ShenpiStatus == "A" && e.Creater == UserId).ToList();
+
+ List<AdmAskLeaveOffDTO> leaveDTOs = _mapper.Map<List<AdmAskLeaveOffDTO>>(admAskLeaveOffs);
+ return leaveDTOs;
+
+ }
+
+ public AdmAskLeaveOffDTO GetAskLeaveOff(string Id)
+ {
+ AdmAskLeaveOff entity = _context.AdmAskLeaveOffs.Where(e => e.RecStatus == "A" && e.Id == Id ).FirstOrDefault();
if (entity == null)
{
entity = new AdmAskLeaveOff();
--
Gitblit v1.9.1