From 072169e3c5446f94e2cf4e570e5c7952bb5b15b9 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期二, 27 七月 2021 14:47:44 +0800
Subject: [PATCH] 今日开发 考勤规则里增加 公司安排加班 调整请假时间计算 加班日考勤计算
---
zhengcaioa/zhengcaioa/Controllers/admin/SimCostController.cs | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/zhengcaioa/zhengcaioa/Controllers/admin/SimCostController.cs b/zhengcaioa/zhengcaioa/Controllers/admin/SimCostController.cs
index fad240b..f1cf0d5 100644
--- a/zhengcaioa/zhengcaioa/Controllers/admin/SimCostController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/admin/SimCostController.cs
@@ -77,6 +77,7 @@
public IActionResult GetList(int year, string sim)
{
var list = _simService.SearchSimCostByPage(sim, year);
+
//var result = new
//{
// total:"1",
@@ -143,7 +144,8 @@
/// <returns></returns>
public IActionResult GetSimYearList(SimCostDTOSearch search)
{
- return new JsonResult(_simService.SearchSimCostYearByPage(search));
+ var list = _simService.SearchSimCostYearByPage(search);
+ return new JsonResult(list);
}
[HttpPost]
--
Gitblit v1.9.1