From 1eaeeb1efd83e7b0b04cdb1bdc1076e839bfebfe Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期二, 17 八月 2021 17:29:37 +0800
Subject: [PATCH] 提交
---
zhengcaioa/zhengcaioa/Controllers/HR/SalaryCheckController.cs | 72 +++++++++++++++++++++++++++++++++--
1 files changed, 67 insertions(+), 5 deletions(-)
diff --git a/zhengcaioa/zhengcaioa/Controllers/HR/SalaryCheckController.cs b/zhengcaioa/zhengcaioa/Controllers/HR/SalaryCheckController.cs
index 0f7e907..328529a 100644
--- a/zhengcaioa/zhengcaioa/Controllers/HR/SalaryCheckController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/HR/SalaryCheckController.cs
@@ -69,7 +69,7 @@
/// <returns></returns>
public IActionResult GetList(HrSalaryDTOSearch search)
{
- _hrSalaryService.AutoCheck();
+ //_hrSalaryService.AutoCheck();
return new JsonResult(_hrSalaryService.SearchSalaryByPaging(search));
}
@@ -85,6 +85,22 @@
if (!string.IsNullOrEmpty(id))
{
dto = _hrSalaryService.Get(id);
+ }
+ if(!dto.Jiangjin.HasValue)
+ {
+ dto.Jiangjin = 0;
+ }
+ if (!dto.Bufagongzi.HasValue)
+ {
+ dto.Bufagongzi = 0;
+ }
+ if (!dto.Peichang.HasValue)
+ {
+ dto.Peichang = 0;
+ }
+ if (!dto.Jiucuo.HasValue)
+ {
+ dto.Jiucuo = 0;
}
ViewData.Model = dto;
return View();
@@ -172,8 +188,8 @@
var salaryDTO = _hrSalaryService.Get(salaryId);
dto = new HrSalaryAppeal();
dto.salary_id = salaryId;
- dto.Year = salaryDTO.Year;
- dto.Month = salaryDTO.Month;
+ dto.year = salaryDTO.Year;
+ dto.month = salaryDTO.Month;
dto.createrName = curentuser.UserName;
dto.tittle = "宸ヨ祫鐢宠瘔锛�" + curentuser.UserName + "锛�";
}
@@ -290,11 +306,57 @@
public IActionResult GetSearchList(HrSalaryDTOSearch search)
{
//鑷姩纭
- _hrSalaryService.AutoCheck();
+ //_hrSalaryService.AutoCheck();
return new JsonResult(_hrSalaryService.SearchByPagingFinish(search));
}
-
+
+ #endregion
+
+
+
+ #region 宸ヨ祫鏌ヨ
+
+ public IActionResult SearchIndexRenshi(string UserId)
+ {
+ List<ActionEntity> actionlist = new List<ActionEntity>();
+ ActionEntity actionEntity = new ActionEntity();
+ actionEntity.OpenType = 0;
+ actionEntity.ActionUrl = "";
+ actionEntity.ActionFun = "Search";
+ actionEntity.PageIco = "fa fa-search";
+ actionEntity.ActionName = "鏌ヨ";
+ actionlist.Add(actionEntity);
+ ViewData["ActionInfo"] = actionlist;
+
+ //ViewBag.dept = _hrDeptService.GetList().Select(x => new { code = x.Id, label = x.DeptName }).ToList();
+ ViewBag.stime = new DateTime(DateTime.Now.Year,1,1).ToString("yyyy-MM-dd");
+ ViewBag.etime = DateTime.Now.AddDays(1 - DateTime.Now.Day).Date.AddMonths(1).AddSeconds(-1).ToString("yyyy-MM-dd");
+
+ ViewBag.UserId = UserId;
+
+ return View();
+ }
+
+ /// <summary>
+ /// 鍒楄〃鍐呭
+ /// </summary>
+ /// <param name="search"></param>
+ /// <returns></returns>
+ public IActionResult GetSearchListRenshi(HrSalaryDTOSearch search)
+ {
+
+ //鑷姩纭
+ //_hrSalaryService.AutoCheck();
+
+ if (string.IsNullOrEmpty(search.searchDate))
+ {
+ search.searchDate = new DateTime(DateTime.Now.Year, 1, 1).ToString("yyyy-MM-dd") + "|" + DateTime.Now.AddDays(1 - DateTime.Now.Day).Date.AddMonths(1).AddSeconds(-1).ToString("yyyy-MM-dd");
+ }
+
+ return new JsonResult(_hrSalaryService.SearchByPagingFinish(search));
+ }
+
#endregion
}
}
--
Gitblit v1.9.1