From 2369258bc0b452cf3cab2dd5e8e2d9fde112b8d0 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期一, 26 七月 2021 16:17:25 +0800
Subject: [PATCH] 今日开发 加班申请· 统计报表：没有任何工作的人，不显示。显示人员的 部门 职位 姓名 工作时间 在计算考勤的时候只有有加班申请的加班才算加班
---
zhengcaioa/zhengcaioa/Controllers/Finance/FiPiecerateController.cs | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/zhengcaioa/zhengcaioa/Controllers/Finance/FiPiecerateController.cs b/zhengcaioa/zhengcaioa/Controllers/Finance/FiPiecerateController.cs
index 00ad5ff..5b753ea 100644
--- a/zhengcaioa/zhengcaioa/Controllers/Finance/FiPiecerateController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/Finance/FiPiecerateController.cs
@@ -62,10 +62,10 @@
ViewBag.Pieceratetype = _liaotianService.GetSYScode("CooperVisit", "jtype").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
-
+ ViewBag.Standard = _liaotianService.GetSYScode("system", "shifou").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
-
+
return View();
@@ -95,13 +95,13 @@
-
- ViewData["Pieceratetype"] = _liaotianService.GetSYScode("CooperVisit", "jtype");
- ViewData["Standard"] = _liaotianService.GetSYScode("fi_piecerate", "standard");
+ //ViewData["Pieceratetype"] = _liaotianService.GetSYScode("CooperVisit", "jtype");
+ //ViewData["Standard"] = _liaotianService.GetSYScode("fi_piecerate", "standard");
+ ViewData["Standard"] = _liaotianService.GetSYScode("system", "shifou");
ViewData.Model = dto;
return View();
}
@@ -119,6 +119,8 @@
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
ViewData["curentuser"] = curentuser;
data.RecStatus = "A";
+ //data.Standard = "01";
+ data.CreatedAtTime = DateTime.Now;
if (String.IsNullOrEmpty(data.Id))
{
data.Creater = curentuser.Id;
--
Gitblit v1.9.1