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/AdmAttendanceService.cs | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/zhengcaioa/Services/AdmAttendanceService.cs b/zhengcaioa/Services/AdmAttendanceService.cs
index f5e84d7..e0ddddc 100644
--- a/zhengcaioa/Services/AdmAttendanceService.cs
+++ b/zhengcaioa/Services/AdmAttendanceService.cs
@@ -87,6 +87,19 @@
return AdmAttendanceDTO;
}
+ public AdmAttendanceDTO GetByUserAndDate(string userid, int year, int month)
+ {
+ var entity = _context.AdmAttendances.Where(x=>x.RecStatus=="A" && x.Userid == userid && x.Year == year && x.Month == month).FirstOrDefault();
+ AdmAttendanceDTO dto = null;
+ if (entity != null)
+ {
+ dto = _mapper.Map<AdmAttendanceDTO>(entity);
+ }
+
+ return dto;
+ }
+
+
public ResultDataEntity<AdmAttendanceDTO> SearchByPaging(AdmAttendanceDTOSearch searchEntity)
{
ResultDataEntity<AdmAttendanceDTO> data = new ResultDataEntity<AdmAttendanceDTO>();
@@ -137,7 +150,7 @@
- if (searchEntity.totalrows == 0)
+ //if (searchEntity.totalrows == 0)
searchEntity.totalrows = query.Count();
var rolelist = query.Skip((searchEntity.page - 1) * searchEntity.rows).Take(searchEntity.rows).ToList();
--
Gitblit v1.9.1