From f061925f659f68956dead643475e75e84b411bbd Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期二, 10 八月 2021 16:37:51 +0800
Subject: [PATCH] 提交
---
zhengcaioa/zhengcaioa/Timer/TimedBackgroundService.cs | 2 +-
zhengcaioa/zhengcaioa/Views/SalaryCheck/Appeal.cshtml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/zhengcaioa/zhengcaioa/Timer/TimedBackgroundService.cs b/zhengcaioa/zhengcaioa/Timer/TimedBackgroundService.cs
index 253e624..80e2b79 100644
--- a/zhengcaioa/zhengcaioa/Timer/TimedBackgroundService.cs
+++ b/zhengcaioa/zhengcaioa/Timer/TimedBackgroundService.cs
@@ -3597,7 +3597,7 @@
hrSalaryDTO.Yufagongziheji = hrSalaryDTOlast.Yufagongziheji;
}
- hrSalaryDTO.Yufagongziheji += (hrSalaryDTO.Daozhanggongzi- hrSalaryDTO.Yufagongzi);
+ hrSalaryDTO.Yufagongziheji += (hrSalaryDTO.Yufagongzi - hrSalaryDTO.Daozhanggongzi );
if (hrSalaryDTO.Daozhanggongzi < hrSalaryDTO.Yufagongzi)
{
hrSalaryDTO.Daozhanggongzi = hrSalaryDTO.Yufagongzi;
diff --git a/zhengcaioa/zhengcaioa/Views/SalaryCheck/Appeal.cshtml b/zhengcaioa/zhengcaioa/Views/SalaryCheck/Appeal.cshtml
index 816bd22..22dd5ab 100644
--- a/zhengcaioa/zhengcaioa/Views/SalaryCheck/Appeal.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/SalaryCheck/Appeal.cshtml
@@ -80,7 +80,7 @@
<div class="clearfix layer-area" style="padding-bottom:15px;">
<label class="text-right col-sm-1 col-md-1 control-label">宸ヨ祫鏈堜唤<i class="red">*</i></label>
<div class="col-sm-2 col-md-2">
- <input class="form-control" id="YearMonth" name="YearMonth" type="text" value="@Model.year-@Model.year" readonly="readonly">
+ <input class="form-control" id="YearMonth" name="YearMonth" type="text" value="@Model.year-@Model.month" readonly="readonly">
<input type="hidden" name="Year" value="@Model.year" />
<input type="hidden" name="Month" value="@Model.month" />
</div>
--
Gitblit v1.9.1