From 11e11a51839529b17f70927524e086e90adf692d Mon Sep 17 00:00:00 2001
From: LR-20210131IOQH\Administrator <jackcold@163.com>
Date: 星期二, 10 八月 2021 15:31:19 +0800
Subject: [PATCH] 工资核对修改
---
zhengcaioa/zhengcaioa/Controllers/HR/SalaryCheckController.cs | 23 ++++++++++++++++++++++-
1 files changed, 22 insertions(+), 1 deletions(-)
diff --git a/zhengcaioa/zhengcaioa/Controllers/HR/SalaryCheckController.cs b/zhengcaioa/zhengcaioa/Controllers/HR/SalaryCheckController.cs
index 14d8836..3fc8724 100644
--- a/zhengcaioa/zhengcaioa/Controllers/HR/SalaryCheckController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/HR/SalaryCheckController.cs
@@ -62,6 +62,8 @@
/// <returns></returns>
public IActionResult GetList(HrSalaryDTOSearch search)
{
+ //_hrSalaryService.AutoCheck();
+
return new JsonResult(_hrSalaryService.SearchSalaryByPaging(search));
}
@@ -77,6 +79,22 @@
{
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();
}
@@ -87,7 +105,7 @@
/// <param name="data"></param>
/// <returns></returns>
[HttpPost]
- public IActionResult SaveCheck(HrSalaryDTO data)
+ public IActionResult SaveCheck(HrSalaryUpDTO data)
{
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
ResultEntity resultEntity = new ResultEntity();
@@ -212,6 +230,9 @@
/// <returns></returns>
public IActionResult GetSearchList(HrSalaryDTOSearch search)
{
+ //鑷姩纭
+ //_hrSalaryService.AutoCheck();
+
return new JsonResult(_hrSalaryService.SearchByPagingFinish(search));
}
--
Gitblit v1.9.1