From 67a0042c5f29e4bb0e0b82f6190f2bc51480b45c Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期二, 28 二月 2023 13:25:09 +0800
Subject: [PATCH] 工资绩效改版
---
zhengcaioa/Model/HrJibengongzi.cs | 2 +
zhengcaioa/zhengcaioa/Controllers/admin/TongjiBaoBiaoController.cs | 60 +++++++++++++++---------------
zhengcaioa/zhengcaioa/Views/HrJibengongzi/Index.cshtml | 3 +
zhengcaioa/zhengcaioa/Views/HrJibengongzi/Edit.cshtml | 9 ++++
zhengcaioa/zhengcaioa/Controllers/HR/HrJibengongziController.cs | 2
zhengcaioa/Services/CooperatecustomCustomerService.cs | 2
zhengcaioa/zhengcaioa/Timer/TimedBackgroundService.cs | 13 +++++-
zhengcaioa/Services/IntentionCustomerService.cs | 2
zhengcaioa/Services/HrJibengongziService.cs | 6 +-
zhengcaioa/DTO/HrJibengongziDTO.cs | 4 ++
zhengcaioa/Model/zhengcaioaContext.cs | 4 ++
11 files changed, 69 insertions(+), 38 deletions(-)
diff --git a/zhengcaioa/DTO/HrJibengongziDTO.cs b/zhengcaioa/DTO/HrJibengongziDTO.cs
index 6d6c194..e47720c 100644
--- a/zhengcaioa/DTO/HrJibengongziDTO.cs
+++ b/zhengcaioa/DTO/HrJibengongziDTO.cs
@@ -32,6 +32,10 @@
public DateTime? Effecttime { get; set; }
public string EffecttimeName { get; set; }
+
+ public decimal? Jiabangongzi { get; set; }
+
+ public string JiabangongziName { get; set; }
}
public class HrJibengongziDTOSearch : SearchEntity
diff --git a/zhengcaioa/Model/HrJibengongzi.cs b/zhengcaioa/Model/HrJibengongzi.cs
index a9e8498..afe79fa 100644
--- a/zhengcaioa/Model/HrJibengongzi.cs
+++ b/zhengcaioa/Model/HrJibengongzi.cs
@@ -22,5 +22,7 @@
public DateTime Createtime { get; set; }
public string Modifier { get; set; }
public DateTime Modifytime { get; set; }
+
+ public decimal? Jiabangongzi { get; set; }
}
}
diff --git a/zhengcaioa/Model/zhengcaioaContext.cs b/zhengcaioa/Model/zhengcaioaContext.cs
index ef8cb43..1548672 100644
--- a/zhengcaioa/Model/zhengcaioaContext.cs
+++ b/zhengcaioa/Model/zhengcaioaContext.cs
@@ -3746,6 +3746,10 @@
.HasColumnType("money")
.HasColumnName("jibengongzi");
+ entity.Property(e => e.Jiabangongzi)
+ .HasColumnType("money")
+ .HasColumnName("jiabangongzi");
+
entity.Property(e => e.Modifier)
.IsRequired()
.HasMaxLength(50)
diff --git a/zhengcaioa/Services/CooperatecustomCustomerService.cs b/zhengcaioa/Services/CooperatecustomCustomerService.cs
index 3007480..aaef706 100644
--- a/zhengcaioa/Services/CooperatecustomCustomerService.cs
+++ b/zhengcaioa/Services/CooperatecustomCustomerService.cs
@@ -60,7 +60,7 @@
cooperatecustomCustomer.Ywjltime = DateTime.Now;
var Cooper = _context.CooperatecustomCustomers.Count(x => x.RecStatus == "A" && x.Ywjl == cooperatecustomCustomer.Ywjl);
var Inten = _context.IntentionCustomers.Count(x => x.RecStatus == "A" && x.Ywjl == cooperatecustomCustomer.Ywjl);
- if (Cooper + Inten >= 2000)
+ if (Cooper + Inten > 2000)
{
resultEntity.Result = false;
resultEntity.Message = "璇ヤ笟鍔＄粡鐞嗭紝瀹㈡埛鍗曚綅鍜屽悎浣滃鎴峰悎璁¤秴杩�2000锛�";
diff --git a/zhengcaioa/Services/HrJibengongziService.cs b/zhengcaioa/Services/HrJibengongziService.cs
index 9da90b9..6058817 100644
--- a/zhengcaioa/Services/HrJibengongziService.cs
+++ b/zhengcaioa/Services/HrJibengongziService.cs
@@ -44,7 +44,7 @@
updatepltRole.Shebaogeren = model.Shebaogeren;
updatepltRole.Quanqingjiang = model.Quanqingjiang;
updatepltRole.Dianhuabutie = model.Dianhuabutie;
-
+ updatepltRole.Jiabangongzi = model.Jiabangongzi;
updatepltRole.Jiaotongbutie = model.Jiaotongbutie;
@@ -130,7 +130,7 @@
Dianhuabutie = a.Dianhuabutie,
Quanqingjiang = a.Quanqingjiang,
Jiaotongbutie = a.Jiaotongbutie,
-
+ Jiabangongzi = a.Jiabangongzi,
JibengongziName = a.Jibengongzi.HasValue? a.Jibengongzi.Value.ToString("F2"):"",
BaomifeiName = a.Baomifei.HasValue ? a.Baomifei.Value.ToString("F2") : "",
ShebaodanweiName = a.Shebaodanwei.HasValue ? a.Shebaodanwei.Value.ToString("F2") : "",
@@ -140,7 +140,7 @@
JiaotongbutieName = a.Jiaotongbutie.HasValue ? a.Jiaotongbutie.Value.ToString("F2") : "",
Effecttime = a.Effecttime,
EffecttimeName = a.Effecttime.HasValue ? a.Effecttime.Value.ToString("yyyy-MM-dd") : "",
-
+ JiabangongziName = a.Jiabangongzi.HasValue ? a.Jiabangongzi.Value.ToString("F2") : "",
diff --git a/zhengcaioa/Services/IntentionCustomerService.cs b/zhengcaioa/Services/IntentionCustomerService.cs
index 404a3f7..29c77ff 100644
--- a/zhengcaioa/Services/IntentionCustomerService.cs
+++ b/zhengcaioa/Services/IntentionCustomerService.cs
@@ -54,7 +54,7 @@
intentionCustomer.Ywjltime = DateTime.Now;
var Cooper = _context.CooperatecustomCustomers.Count(x => x.RecStatus == "A" && x.Ywjl == intentionCustomer.Ywjl);
var Inten = _context.IntentionCustomers.Count(x => x.RecStatus == "A" && x.Ywjl == intentionCustomer.Ywjl);
- if(Cooper+ Inten >= 2000)
+ if(Cooper+ Inten > 2000)
{
resultEntity.Result = false;
resultEntity.Message = "璇ヤ笟鍔＄粡鐞嗭紝瀹㈡埛鍗曚綅鍜屽悎浣滃鎴峰悎璁¤秴杩�2000锛�";
diff --git a/zhengcaioa/zhengcaioa/Controllers/HR/HrJibengongziController.cs b/zhengcaioa/zhengcaioa/Controllers/HR/HrJibengongziController.cs
index e245aa7..521e71a 100644
--- a/zhengcaioa/zhengcaioa/Controllers/HR/HrJibengongziController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/HR/HrJibengongziController.cs
@@ -108,7 +108,7 @@
dto.QuanqingjiangName = dto.Quanqingjiang.HasValue ? dto.Quanqingjiang.Value.ToString("F2") : "";
dto.JiaotongbutieName = dto.Jiaotongbutie.HasValue ? dto.Jiaotongbutie.Value.ToString("F2") : "";
dto.EffecttimeName = dto.Effecttime.HasValue ? dto.Effecttime.Value.ToString("yyyy-MM-dd") : DateTime.Now.ToString("yyyy-MM-dd");
-
+ dto.JiabangongziName = dto.Jiabangongzi.HasValue ? dto.Jiabangongzi.Value.ToString("F2") : "";
diff --git a/zhengcaioa/zhengcaioa/Controllers/admin/TongjiBaoBiaoController.cs b/zhengcaioa/zhengcaioa/Controllers/admin/TongjiBaoBiaoController.cs
index 31d2961..992549a 100644
--- a/zhengcaioa/zhengcaioa/Controllers/admin/TongjiBaoBiaoController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/admin/TongjiBaoBiaoController.cs
@@ -725,10 +725,10 @@
tuiguangDTOs.Add(qunzutuiguangDTO);
#endregion
- #region 鏈嬪弸鍦堝師鍒�
+ #region 鏈嬪弸鍦堣浆鍙�
TongjiBaoBiaoDTO pengyouquanDTO = new TongjiBaoBiaoDTO();
- pengyouquanDTO.gongzuo = "鏈嬪弸鍦堝師鍒�";
- var jijianipengyouquan = fiPiecerateDTOs.Where(x => x.Project == "鏈嬪弸鍦堝師鍒�").FirstOrDefault();
+ pengyouquanDTO.gongzuo = "鏈嬪弸鍦堣浆鍙�";
+ var jijianipengyouquan = fiPiecerateDTOs.Where(x => x.Project == "鏈嬪弸鍦堣浆鍙�").FirstOrDefault();
if (jijianipengyouquan != null)
{
@@ -779,10 +779,10 @@
tuiguangDTOs.Add(pengyouquanDTO);
#endregion
- #region 璁哄潧鍙戝笘
+ #region 璁哄潧鎺ㄥ箍
TongjiBaoBiaoDTO luntanfatieDTO = new TongjiBaoBiaoDTO();
- luntanfatieDTO.gongzuo = "璁哄潧鍙戝笘";
- var jijianiluntanfatie = fiPiecerateDTOs.Where(x => x.Project == "璁哄潧鍙戝笘").FirstOrDefault();
+ luntanfatieDTO.gongzuo = "璁哄潧鎺ㄥ箍";
+ var jijianiluntanfatie = fiPiecerateDTOs.Where(x => x.Project == "璁哄潧鎺ㄥ箍").FirstOrDefault();
if (jijianiluntanfatie != null)
{
@@ -833,10 +833,10 @@
tuiguangDTOs.Add(luntanfatieDTO);
#endregion
- #region 璺熷笘璇勮
+ #region 璐村惂鎺ㄥ箍
TongjiBaoBiaoDTO gentiepinglunDTO = new TongjiBaoBiaoDTO();
- gentiepinglunDTO.gongzuo = "璺熷笘璇勮";
- var jijianigentiepinglun = fiPiecerateDTOs.Where(x => x.Project == "璺熷笘璇勮").FirstOrDefault();
+ gentiepinglunDTO.gongzuo = "璐村惂鎺ㄥ箍";
+ var jijianigentiepinglun = fiPiecerateDTOs.Where(x => x.Project == "璐村惂鎺ㄥ箍").FirstOrDefault();
if (jijianigentiepinglun != null)
{
@@ -1259,10 +1259,10 @@
baifangkehuDTOs.Add(shangmenbanfangDTO);
#endregion
- #region 鎺ュ緟鏉ヨ瀹㈡埛
+ #region 褰曞叆瀹㈡埛鍜ㄨ
TongjiBaoBiaoDTO jiedailaifangDTO = new TongjiBaoBiaoDTO();
- jiedailaifangDTO.gongzuo = "鎺ュ緟鏉ヨ瀹㈡埛";
- var jijianijiedailaifang = fiPiecerateDTOs.Where(x => x.Project == "鎺ュ緟鏉ヨ瀹㈡埛").FirstOrDefault();
+ jiedailaifangDTO.gongzuo = "褰曞叆瀹㈡埛鍜ㄨ";
+ var jijianijiedailaifang = fiPiecerateDTOs.Where(x => x.Project == "褰曞叆瀹㈡埛鍜ㄨ").FirstOrDefault();
if (jijianijiedailaifang != null)
{
@@ -1523,10 +1523,10 @@
ziliaoweihuDTOs.Add(zhengcaizhishiDTO);
#endregion
- #region 鏂板鍏紬鍙峰叧娉�
+ #region 寰俊寰崥鍏紬鍙锋柊澧炵矇涓�
TongjiBaoBiaoDTO gongzhonghaoDTO = new TongjiBaoBiaoDTO();
- gongzhonghaoDTO.gongzuo = "鏂板鍏紬鍙峰叧娉�";
- var jijianigongzhonghao = fiPiecerateDTOs.Where(x => x.Project == "鏂板鍏紬鍙峰叧娉�").FirstOrDefault();
+ gongzhonghaoDTO.gongzuo = "寰俊寰崥鍏紬鍙锋柊澧炵矇涓�";
+ var jijianigongzhonghao = fiPiecerateDTOs.Where(x => x.Project == "寰俊寰崥鍏紬鍙锋柊澧炵矇涓�").FirstOrDefault();
if (jijianigongzhonghao != null)
{
@@ -2538,10 +2538,10 @@
tuiguangDTOs.Add(qunzutuiguangDTO);
#endregion
- #region 鏈嬪弸鍦堝師鍒�
+ #region 鏈嬪弸鍦堣浆鍙�
TongjiBaoBiaoDTO pengyouquanDTO = new TongjiBaoBiaoDTO();
- pengyouquanDTO.gongzuo = "鏈嬪弸鍦堝師鍒�";
- var jijianipengyouquan = fiPiecerateDTOs.Where(x => x.Project == "鏈嬪弸鍦堝師鍒�").FirstOrDefault();
+ pengyouquanDTO.gongzuo = "鏈嬪弸鍦堣浆鍙�";
+ var jijianipengyouquan = fiPiecerateDTOs.Where(x => x.Project == "鏈嬪弸鍦堣浆鍙�").FirstOrDefault();
if (jijianipengyouquan != null)
{
@@ -2592,10 +2592,10 @@
tuiguangDTOs.Add(pengyouquanDTO);
#endregion
- #region 璁哄潧鍙戝笘
+ #region 璁哄潧鎺ㄥ箍
TongjiBaoBiaoDTO luntanfatieDTO = new TongjiBaoBiaoDTO();
- luntanfatieDTO.gongzuo = "璁哄潧鍙戝笘";
- var jijianiluntanfatie = fiPiecerateDTOs.Where(x => x.Project == "璁哄潧鍙戝笘").FirstOrDefault();
+ luntanfatieDTO.gongzuo = "璁哄潧鎺ㄥ箍";
+ var jijianiluntanfatie = fiPiecerateDTOs.Where(x => x.Project == "璁哄潧鎺ㄥ箍").FirstOrDefault();
if (jijianiluntanfatie != null)
{
@@ -2646,10 +2646,10 @@
tuiguangDTOs.Add(luntanfatieDTO);
#endregion
- #region 璺熷笘璇勮
+ #region 璐村惂鎺ㄥ箍
TongjiBaoBiaoDTO gentiepinglunDTO = new TongjiBaoBiaoDTO();
- gentiepinglunDTO.gongzuo = "璺熷笘璇勮";
- var jijianigentiepinglun = fiPiecerateDTOs.Where(x => x.Project == "璺熷笘璇勮").FirstOrDefault();
+ gentiepinglunDTO.gongzuo = "璐村惂鎺ㄥ箍";
+ var jijianigentiepinglun = fiPiecerateDTOs.Where(x => x.Project == "璐村惂鎺ㄥ箍").FirstOrDefault();
if (jijianigentiepinglun != null)
{
@@ -3067,10 +3067,10 @@
baifangkehuDTOs.Add(shangmenbanfangDTO);
#endregion
- #region 鎺ュ緟鏉ヨ瀹㈡埛
+ #region 褰曞叆瀹㈡埛鍜ㄨ
TongjiBaoBiaoDTO jiedailaifangDTO = new TongjiBaoBiaoDTO();
- jiedailaifangDTO.gongzuo = "鎺ュ緟鏉ヨ瀹㈡埛";
- var jijianijiedailaifang = fiPiecerateDTOs.Where(x => x.Project == "鎺ュ緟鏉ヨ瀹㈡埛").FirstOrDefault();
+ jiedailaifangDTO.gongzuo = "褰曞叆瀹㈡埛鍜ㄨ";
+ var jijianijiedailaifang = fiPiecerateDTOs.Where(x => x.Project == "褰曞叆瀹㈡埛鍜ㄨ").FirstOrDefault();
if (jijianijiedailaifang != null)
{
@@ -3331,10 +3331,10 @@
ziliaoweihuDTOs.Add(zhengcaizhishiDTO);
#endregion
- #region 鏂板鍏紬鍙峰叧娉�
+ #region 寰俊寰崥鍏紬鍙锋柊澧炵矇涓�
TongjiBaoBiaoDTO gongzhonghaoDTO = new TongjiBaoBiaoDTO();
- gongzhonghaoDTO.gongzuo = "鏂板鍏紬鍙峰叧娉�";
- var jijianigongzhonghao = fiPiecerateDTOs.Where(x => x.Project == "鏂板鍏紬鍙峰叧娉�").FirstOrDefault();
+ gongzhonghaoDTO.gongzuo = "寰俊寰崥鍏紬鍙锋柊澧炵矇涓�";
+ var jijianigongzhonghao = fiPiecerateDTOs.Where(x => x.Project == "寰俊寰崥鍏紬鍙锋柊澧炵矇涓�").FirstOrDefault();
if (jijianigongzhonghao != null)
{
diff --git a/zhengcaioa/zhengcaioa/Timer/TimedBackgroundService.cs b/zhengcaioa/zhengcaioa/Timer/TimedBackgroundService.cs
index 2574791..8ecf6f0 100644
--- a/zhengcaioa/zhengcaioa/Timer/TimedBackgroundService.cs
+++ b/zhengcaioa/zhengcaioa/Timer/TimedBackgroundService.cs
@@ -1675,7 +1675,12 @@
hrSalaryDTO.Queqin += queqingkoukuan;
}
}
- hrSalaryDTO.Jiabangongzi += Math.Round((admAttendanceDTO.Jiaban / jiabangongzibiaozhun) * userList[i].ShiyongPrice.Value, 2);
+ if (hrJibengongzi.Jiabangongzi.HasValue)
+ {
+ hrSalaryDTO.Jiabangongzi += Math.Round(admAttendanceDTO.Jiaban * hrJibengongzi.Jiabangongzi.Value, 2); //(admAttendanceDTO.Jiaban / jiabangongzibiaozhun) * userList[i].ShiyongPrice.Value
+ }
+
+
//宸ヤ綔璇勪环涓嶅悎鏍肩綒娆�
hrSalaryDTO.Fakuan += Math.Round(userList[i].ShiyongPrice.Value * admEvaluateDTOs.Count / admAttendanceDTO.Yingchuqin, 2);
@@ -1753,7 +1758,11 @@
hrSalaryDTO.Queqin += queqingkoukuan;
}
}
- hrSalaryDTO.Jiabangongzi += Math.Round((admAttendanceDTO.Jiaban / jiabangongzibiaozhun) * BasicPrice, 2);
+ if (hrJibengongzi.Jiabangongzi.HasValue)
+ {
+ hrSalaryDTO.Jiabangongzi += Math.Round(admAttendanceDTO.Jiaban * hrJibengongzi.Jiabangongzi.Value, 2); // hrSalaryDTO.Jiabangongzi += Math.Round((admAttendanceDTO.Jiaban / jiabangongzibiaozhun) * BasicPrice, 2);
+ }
+
}
diff --git a/zhengcaioa/zhengcaioa/Views/HrJibengongzi/Edit.cshtml b/zhengcaioa/zhengcaioa/Views/HrJibengongzi/Edit.cshtml
index f2963bf..0c151af 100644
--- a/zhengcaioa/zhengcaioa/Views/HrJibengongzi/Edit.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/HrJibengongzi/Edit.cshtml
@@ -144,7 +144,11 @@
</div>
+ <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">鍔犵彮宸ヨ祫锛堝厓/澶╋級<i class="red">*</i></label>
+ <div class="col-sm-2 col-md-2" grouptype="Vdata">
+ <input class="form-control" label="鍔犵彮宸ヨ祫锛堝厓/澶╋級" name="Jiabangongzi" id="Jiabangongzi" labtype="txt" addvisible="true" editvisible="true" reg="" ismust="true" type="text" value="@Model.JiabangongziName" oninput="if(value.length>8)value=value.slice(0,18)" onkeyup="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)">
+ </div>
</div>
@@ -363,6 +367,11 @@
return;
}
+ if ($("#Jiabangongzi").val() == '') {
+ toastr.warning("鍔犵彮宸ヨ祫涓嶈兘涓虹┖");
+ return;
+ }
+
//if ($("#Shebaodanwei").val() == '') {
// toastr.warning("绀句繚鍏徃涓嶈兘涓虹┖");
// return;
diff --git a/zhengcaioa/zhengcaioa/Views/HrJibengongzi/Index.cshtml b/zhengcaioa/zhengcaioa/Views/HrJibengongzi/Index.cshtml
index 08f6e60..50fa6ca 100644
--- a/zhengcaioa/zhengcaioa/Views/HrJibengongzi/Index.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/HrJibengongzi/Index.cshtml
@@ -32,6 +32,9 @@
{ label: '鍏ㄥ嫟濂�', name: 'QuanqingjiangName', labtype: 'txt', hidden: false, width: 100 },
{ label: '浜ら�氳ˉ璐�', name: 'JiaotongbutieName', labtype: 'txt', hidden: false, width: 100 },
+ {
+ label: '鍔犵彮宸ヨ祫', name: 'JiabangongziName', labtype: 'txt', hidden: false, width: 100
+ },
{ label: '鐢熸晥鏃ユ湡', name: 'EffecttimeName', labtype: 'txt', hidden: false, width: 100 },
];
dataUrl = "/HrJibengongzi/GetList";
--
Gitblit v1.9.1