From fc1fe356e1cb43c7654c653e8921ee9e72150f96 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期三, 21 七月 2021 16:18:30 +0800
Subject: [PATCH] 今日开发 7月5日以及之前的订单删除 增加功能 账户转账 会员订单同步到会员端 员工获取会员邀请码
---
zhengcaioa/Services/AdmAttendanceDtlService.cs | 30 +++++++++++++++++++++++++-----
1 files changed, 25 insertions(+), 5 deletions(-)
diff --git a/zhengcaioa/Services/AdmAttendanceDtlService.cs b/zhengcaioa/Services/AdmAttendanceDtlService.cs
index 63f1cc4..e9978d4 100644
--- a/zhengcaioa/Services/AdmAttendanceDtlService.cs
+++ b/zhengcaioa/Services/AdmAttendanceDtlService.cs
@@ -52,9 +52,12 @@
updatepltRole.Createtime = AdmAttendanceDtl.Createtime;
updatepltRole.Modifier = AdmAttendanceDtl.Modifier;
updatepltRole.Modifytime = AdmAttendanceDtl.Modifytime;
- updatepltRole.Chidaofenzhong = AdmAttendanceDtl.Chidaofenzhong;
- updatepltRole.Zaotuifenzhong = AdmAttendanceDtl.Zaotuifenzhong;
+ updatepltRole.Shangwuchidaofenzhong = AdmAttendanceDtl.Shangwuchidaofenzhong;
+ updatepltRole.Xiawuchidaofenzhong = AdmAttendanceDtl.Xiawuchidaofenzhong;
+ updatepltRole.Shangwuzaotuifenzhong = AdmAttendanceDtl.Shangwuzaotuifenzhong;
+ updatepltRole.Xiawuzaotuifenzhong = AdmAttendanceDtl.Xiawuzaotuifenzhong;
updatepltRole.Kuanggongtianshu = AdmAttendanceDtl.Kuanggongtianshu;
+ updatepltRole.Iswork = AdmAttendanceDtl.Iswork;
}
}
@@ -84,7 +87,21 @@
return AdmAttendanceDtlDTO;
}
-
+ public AdmAttendanceDtlDTO GetByUserAndDate(string Attendanceid, DateTime SgninDate)
+ {
+ var entity = _context.AdmAttendanceDtls.Where(x => x.RecStatus == "A" && x.AttendanceId == Attendanceid && x.SgninDate == SgninDate ).FirstOrDefault();
+ AdmAttendanceDtlDTO dto = null;
+ if (entity != null)
+ {
+ dto = _mapper.Map<AdmAttendanceDtlDTO>(entity);
+ }
+
+ return dto;
+ }
+
+
+
+
public ResultEntity ModifyStatus(string id, string userid)
{
@@ -140,9 +157,12 @@
Modifier = a.Modifier,
Modifytime = a.Modifytime,
- Chidaofenzhong = a.Chidaofenzhong,
- Zaotuifenzhong = a.Zaotuifenzhong,
+ Shangwuchidaofenzhong = a.Shangwuchidaofenzhong,
+ Xiawuchidaofenzhong = a.Xiawuchidaofenzhong,
+ Shangwuzaotuifenzhong = a.Shangwuzaotuifenzhong,
+ Xiawuzaotuifenzhong = a.Xiawuzaotuifenzhong,
Kuanggongtianshu = a.Kuanggongtianshu,
+ Iswork = a.Iswork
}).OrderByDescending(x => x.Createtime).ToList();
return query;
--
Gitblit v1.9.1