From e75fce6031773dabf64d3ef019189c2362069c45 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期二, 10 八月 2021 17:14:41 +0800
Subject: [PATCH] Merge branch 'master' of http://47.108.235.38:8080/r/zhengcaioa
---
zhengcaioa/zhengcaioa/Controllers/HR/SalaryCheckController.cs | 24 ++++++++++++++++++++----
1 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/zhengcaioa/zhengcaioa/Controllers/HR/SalaryCheckController.cs b/zhengcaioa/zhengcaioa/Controllers/HR/SalaryCheckController.cs
index 0f7e907..dca6527 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,7 +306,7 @@
public IActionResult GetSearchList(HrSalaryDTOSearch search)
{
//鑷姩纭
- _hrSalaryService.AutoCheck();
+ //_hrSalaryService.AutoCheck();
return new JsonResult(_hrSalaryService.SearchByPagingFinish(search));
}
--
Gitblit v1.9.1