From 3b9bf8c309d77d9817e973aa036e045695c78d70 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期一, 26 七月 2021 16:17:45 +0800
Subject: [PATCH] 今日开发 加班申请· 统计报表：没有任何工作的人，不显示。显示人员的 部门 职位 姓名 工作时间 在计算考勤的时候只有有加班申请的加班才算加班
---
zhengcaioa/Services/IntentionVisitService.cs | 32 +++++++++++++++++++++++++++++++-
1 files changed, 31 insertions(+), 1 deletions(-)
diff --git a/zhengcaioa/Services/IntentionVisitService.cs b/zhengcaioa/Services/IntentionVisitService.cs
index 05b58f5..31c5e9b 100644
--- a/zhengcaioa/Services/IntentionVisitService.cs
+++ b/zhengcaioa/Services/IntentionVisitService.cs
@@ -231,7 +231,7 @@
- if (searchEntity.totalrows == 0)
+ //if (searchEntity.totalrows == 0)
searchEntity.totalrows = query.Count();
var lianlist = query.Skip((searchEntity.page - 1) * searchEntity.rows).Take(searchEntity.rows).ToList();
data.LoadData(searchEntity, lianlist);
@@ -304,5 +304,35 @@
return result;
}
+
+ public IntentionVisitDuanxinDTO GetDuanxin(string id)
+ {
+
+ var entity = _context.IntentionVisitDuanxins.Find(id);
+
+ if (entity.RecStatus != "A")
+ {
+ entity = new IntentionVisitDuanxin();
+ }
+
+ var result = _mapper.Map<IntentionVisitDuanxinDTO>(entity);
+
+
+ return result;
+ }
+
+ /// <summary>
+ /// 鑾峰彇鎵�鏈夋湁鏁堟剰鍚戝鎴�
+ /// </summary>
+ /// <returns></returns>
+ public List<IntentionVisitDuanxinDTO> GetListDuanxin()
+ {
+
+ var listIntentionCustomers = _context.IntentionVisitDuanxins.Where(r => r.RecStatus == "A").ToList();
+
+ var result = _mapper.Map<List<IntentionVisitDuanxinDTO>>(listIntentionCustomers);
+
+ return result;
+ }
}
}
--
Gitblit v1.9.1