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/zhengcaioa/Controllers/admin/TongjiBaoBiaoController.cs | 165 +++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 135 insertions(+), 30 deletions(-)
diff --git a/zhengcaioa/zhengcaioa/Controllers/admin/TongjiBaoBiaoController.cs b/zhengcaioa/zhengcaioa/Controllers/admin/TongjiBaoBiaoController.cs
index 61b5848..992549a 100644
--- a/zhengcaioa/zhengcaioa/Controllers/admin/TongjiBaoBiaoController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/admin/TongjiBaoBiaoController.cs
@@ -249,6 +249,59 @@
#endregion
+
+ #region 閲囪喘鍏憡褰曞叆
+ TongjiBaoBiaoDTO caigougonggaoDTO = new TongjiBaoBiaoDTO();
+ caigougonggaoDTO.gongzuo = "閲囪喘鍏憡褰曞叆";
+ //鏈湀鏁伴噺
+ var caigougonggaoDTOsyue = _projectService.GetcaigougonggaoListsalary(curentuser.Id, dateminkaoqin, datemaxkaoqin);
+ caigougonggaoDTO.benyueshuliang = caigougonggaoDTOsyue.Count.ToString();
+ //鏈棩鏁伴噺
+ var caigougonggaoDTOsri = caigougonggaoDTOsyue.Where(x => x.Createtime >= chauxnshijian.Date && x.Createtime < chauxnshijian.Date.AddDays(1)).ToList();
+ caigougonggaoDTO.benrishuliang = caigougonggaoDTOsri.Count.ToString();
+
+ var jijianicaigougonggao = fiPiecerateDTOs.Where(x => x.Project == "閲囪喘鍏憡褰曞叆").FirstOrDefault();
+
+ if (jijianicaigougonggao != null)
+ {
+ var jixiaotichengfangan = hrJixiaotichengThis.Where(x => x.PiecerateId == jijianicaigougonggao.Id).OrderByDescending(x => x.Effecttime).FirstOrDefault();
+ if (jixiaotichengfangan != null && jixiaotichengfangan.Ticheng.HasValue && jixiaotichengfangan.Renwu.HasValue)
+ {
+ if (jixiaotichengfangan.Renwustandard == "01")
+ {
+ //鏈湀瑙勫畾
+ caigougonggaoDTO.benyueqingkuang = (Yingchuqin * jixiaotichengfangan.Renwu.Value).ToString("0.##");
+ //鏈棩瑙勫畾
+ caigougonggaoDTO.benriqingkuang = jixiaotichengfangan.Renwu.Value.ToString("0.##");
+ if (jixiaotichengfangan.Tichengstandard == "01")
+ {
+ decimal youxiaojijian = caigougonggaoDTOsri.Count - jixiaotichengfangan.Renwu.Value;
+ if (youxiaojijian > 0)
+ {
+ caigougonggaoDTO.dangrijixiao = Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2).ToString("0.##");
+ }
+ }
+ }
+ else if (jixiaotichengfangan.Renwustandard == "02")
+ {
+ //鏈湀瑙勫畾
+ caigougonggaoDTO.benyueqingkuang = jixiaotichengfangan.Renwu.Value.ToString("0.##"); ;
+ //if (jixiaotichengfangan.Tichengstandard == "01")
+ //{
+ // decimal youxiaojijian = _intentionCustomerDTOs.Count + cooperatecustomCustomerDTOs.Count - renwujishu;
+ // if (youxiaojijian > 0)
+ // {
+ // hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
+ // }
+
+ //}
+ }
+ }
+ }
+ if (caigougonggaoDTOsyue.Count > 0 || caigougonggaoDTOsri.Count > 0)
+ tuiguangDTOs.Add(caigougonggaoDTO);
+ #endregion
+
#region 瀹㈡埛璧勬枡褰曞叆
TongjiBaoBiaoDTO kehuluruDTO = new TongjiBaoBiaoDTO();
kehuluruDTO.gongzuo = "瀹㈡埛璧勬枡褰曞叆";
@@ -672,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)
{
@@ -726,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)
{
@@ -780,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)
{
@@ -1206,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)
{
@@ -1470,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)
{
@@ -2010,6 +2063,58 @@
#endregion
+ #region 閲囪喘鍏憡褰曞叆
+ TongjiBaoBiaoDTO caigougonggaoDTO = new TongjiBaoBiaoDTO();
+ caigougonggaoDTO.gongzuo = "閲囪喘鍏憡褰曞叆";
+ //鏈湀鏁伴噺
+ var caigougonggaoDTOsyue = _projectService.GetcaigougonggaoListsalary(Userid, dateminkaoqin, datemaxkaoqin);
+ caigougonggaoDTO.benyueshuliang = caigougonggaoDTOsyue.Count.ToString();
+ //鏈棩鏁伴噺
+ var caigougonggaoDTOsri = caigougonggaoDTOsyue.Where(x => x.Createtime >= chauxnshijian.Date && x.Createtime < chauxnshijian.Date.AddDays(1)).ToList();
+ caigougonggaoDTO.benrishuliang = caigougonggaoDTOsri.Count.ToString();
+
+ var jijianicaigougonggao = fiPiecerateDTOs.Where(x => x.Project == "閲囪喘鍏憡褰曞叆").FirstOrDefault();
+
+ if (jijianicaigougonggao != null)
+ {
+ var jixiaotichengfangan = hrJixiaotichengThis.Where(x => x.PiecerateId == jijianicaigougonggao.Id).OrderByDescending(x => x.Effecttime).FirstOrDefault();
+ if (jixiaotichengfangan != null && jixiaotichengfangan.Ticheng.HasValue && jixiaotichengfangan.Renwu.HasValue)
+ {
+ if (jixiaotichengfangan.Renwustandard == "01")
+ {
+ //鏈湀瑙勫畾
+ caigougonggaoDTO.benyueqingkuang = (Yingchuqin * jixiaotichengfangan.Renwu.Value).ToString("0.##");
+ //鏈棩瑙勫畾
+ caigougonggaoDTO.benriqingkuang = jixiaotichengfangan.Renwu.Value.ToString("0.##");
+ if (jixiaotichengfangan.Tichengstandard == "01")
+ {
+ decimal youxiaojijian = caigougonggaoDTOsri.Count - jixiaotichengfangan.Renwu.Value;
+ if (youxiaojijian > 0)
+ {
+ caigougonggaoDTO.dangrijixiao = Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2).ToString("0.##");
+ }
+ }
+ }
+ else if (jixiaotichengfangan.Renwustandard == "02")
+ {
+ //鏈湀瑙勫畾
+ caigougonggaoDTO.benyueqingkuang = jixiaotichengfangan.Renwu.Value.ToString("0.##"); ;
+ //if (jixiaotichengfangan.Tichengstandard == "01")
+ //{
+ // decimal youxiaojijian = _intentionCustomerDTOs.Count + cooperatecustomCustomerDTOs.Count - renwujishu;
+ // if (youxiaojijian > 0)
+ // {
+ // hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
+ // }
+
+ //}
+ }
+ }
+ }
+ if (caigougonggaoDTOsyue.Count > 0 || caigougonggaoDTOsri.Count > 0)
+ tuiguangDTOs.Add(caigougonggaoDTO);
+ #endregion
+
#region 瀹㈡埛璧勬枡褰曞叆
TongjiBaoBiaoDTO kehuluruDTO = new TongjiBaoBiaoDTO();
kehuluruDTO.gongzuo = "瀹㈡埛璧勬枡褰曞叆";
@@ -2433,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)
{
@@ -2487,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)
{
@@ -2541,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)
{
@@ -2962,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)
{
@@ -3226,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)
{
--
Gitblit v1.9.1