From 760eede869d8bc0b1b5a4ff38b2d3d94f5e2cb86 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期三, 04 八月 2021 14:29:15 +0800
Subject: [PATCH] 今日开发 专家派工-没有审批的专家不能派工 意向客户访问新增，短信发送不要红星 合作客户 在客户资料列表增加快捷访问链接 工作报表 修改排版 问题维护 试用法条 改为1000字， 问题查询打开直接默认未审核，不要停两秒再刷新 项目新增 增加字段：采购预算 万元 工作考评 考聘不称职当天无工资
---
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