From bef853fc5adf095c54415e7fc23574655ac0859a Mon Sep 17 00:00:00 2001
From: LR-20210131IOQH\Administrator <jackcold@163.com>
Date: 星期二, 10 八月 2021 17:06:28 +0800
Subject: [PATCH] 预发工资计算逻辑调整
---
zhengcaioa/zhengcaioa/Controllers/HR/SalaryCheckController.cs | 34 +++++++++++++++++++++++++++++-----
1 files changed, 29 insertions(+), 5 deletions(-)
diff --git a/zhengcaioa/zhengcaioa/Controllers/HR/SalaryCheckController.cs b/zhengcaioa/zhengcaioa/Controllers/HR/SalaryCheckController.cs
index 12c1eea..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 + "锛�";
}
@@ -188,7 +204,7 @@
else
{
dangqianbuzhou = wfRunProcessDTO.Step;
- //鏌ヨ鍘嗗彶鎰忚
+ //鏌ヨ瀹℃壒杩涘害
lishiyijian = _wfHistoryService.GetListshenpi(wfRunProcessDTO.Id);
if (wfRunProcessDTO.Step != "鎻愪氦")
{
@@ -240,12 +256,20 @@
data.shenpi_status = "D";
data.status = "A";
resultEntity = _hrSalaryService.CheckAppea(data);
+ if (!resultEntity.Result)
+ {
+ return new JsonResult(resultEntity);
+ }
}
//鍙戣捣娴佺▼鐩稿叧
resultEntity = _wfRunProcessService.WfSalaryAppeal(data.id, data.Step, data.Tongguojujue, curentuser.Id, data.Content, data.tittle, "v1");
+ if (!resultEntity.Result)
+ {
+ return new JsonResult(resultEntity);
+ }
scope.Complete();
}
return new JsonResult(resultEntity);
@@ -282,7 +306,7 @@
public IActionResult GetSearchList(HrSalaryDTOSearch search)
{
//鑷姩纭
- _hrSalaryService.AutoCheck();
+ //_hrSalaryService.AutoCheck();
return new JsonResult(_hrSalaryService.SearchByPagingFinish(search));
}
--
Gitblit v1.9.1