From 15eb82df2d6ec539e9d4245bfe08d531e8eb6379 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期日, 27 四月 2025 14:33:26 +0800
Subject: [PATCH] 修改培训订单占多个座位
---
zhengcaioa/zhengcaioa/Controllers/admin/TongjiBaoBiaoController.cs | 93 ++++++++++++++++++++++++++++++----------------
1 files changed, 61 insertions(+), 32 deletions(-)
diff --git a/zhengcaioa/zhengcaioa/Controllers/admin/TongjiBaoBiaoController.cs b/zhengcaioa/zhengcaioa/Controllers/admin/TongjiBaoBiaoController.cs
index 31d2961..dfcf9da 100644
--- a/zhengcaioa/zhengcaioa/Controllers/admin/TongjiBaoBiaoController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/admin/TongjiBaoBiaoController.cs
@@ -201,9 +201,12 @@
xiangmuDTO.gongzuo = "閲囪喘椤圭洰褰曞叆";
//鏈湀鏁伴噺
var projectDTOsyue = _projectService.GetListsalary(curentuser.Id, dateminkaoqin, datemaxkaoqin);
+ // var zhengfuprojectDTOsyue = _projectService.GetListsalaryzhengfu(curentuser.Id, dateminkaoqin, datemaxkaoqin);
+
xiangmuDTO.benyueshuliang = projectDTOsyue.Count.ToString();
//鏈棩鏁伴噺
var projectDTOsri = projectDTOsyue.Where(x => x.Createtime >= chauxnshijian.Date && x.Createtime < chauxnshijian.Date.AddDays(1)).ToList();
+ // var zhengfuprojectDTOsri = zhengfuprojectDTOsyue.Where(x => x.Createtime >= chauxnshijian.Date && x.Createtime < chauxnshijian.Date.AddDays(1)).ToList();
xiangmuDTO.benrishuliang = projectDTOsri.Count.ToString();
var jijianixiangmu = fiPiecerateDTOs.Where(x => x.Project == "閲囪喘椤圭洰褰曞叆").FirstOrDefault();
@@ -725,10 +728,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)
{
@@ -773,16 +776,22 @@
//}
}
+ else if (jixiaotichengfangan.Renwustandard == "05")
+ {
+ //鏈湀瑙勫畾
+ pengyouquanDTO.benyueqingkuang = (4 * jixiaotichengfangan.Renwu.Value).ToString("0.##");
+
+ }
}
}
if (decimal.Parse(pengyouquanDTO.benyueshuliang) > 0 || decimal.Parse(pengyouquanDTO.benrishuliang) > 0)
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 +842,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)
{
@@ -1253,16 +1262,22 @@
//}
}
+ else if (jixiaotichengfangan.Renwustandard == "05")
+ {
+ //鏈湀瑙勫畾
+ shangmenbanfangDTO.benyueqingkuang = (4 * jixiaotichengfangan.Renwu.Value).ToString("0.##");
+
+ }
}
}
if (decimal.Parse(shangmenbanfangDTO.benyueshuliang) > 0 || decimal.Parse(shangmenbanfangDTO.benrishuliang) > 0)
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 +1538,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)
{
@@ -2015,9 +2030,11 @@
xiangmuDTO.gongzuo = "閲囪喘椤圭洰褰曞叆";
//鏈湀鏁伴噺
var projectDTOsyue = _projectService.GetListsalary(Userid, dateminkaoqin, datemaxkaoqin);
+ //var zhengfuprojectDTOsyue = _projectService.GetListsalaryzhengfu(Userid, dateminkaoqin, datemaxkaoqin);
xiangmuDTO.benyueshuliang = projectDTOsyue.Count.ToString();
//鏈棩鏁伴噺
var projectDTOsri = projectDTOsyue.Where(x => x.Createtime >= chauxnshijian.Date && x.Createtime < chauxnshijian.Date.AddDays(1)).ToList();
+ //var zhengfuprojectDTOsri = zhengfuprojectDTOsyue.Where(x => x.Createtime >= chauxnshijian.Date && x.Createtime < chauxnshijian.Date.AddDays(1)).ToList();
xiangmuDTO.benrishuliang = projectDTOsri.Count.ToString();
var jijianixiangmu = fiPiecerateDTOs.Where(x => x.Project == "閲囪喘椤圭洰褰曞叆").FirstOrDefault();
@@ -2035,7 +2052,7 @@
xiangmuDTO.benriqingkuang = jixiaotichengfangan.Renwu.Value.ToString("0.##");
if (jixiaotichengfangan.Tichengstandard == "01")
{
- decimal youxiaojijian = projectDTOsri.Count - jixiaotichengfangan.Renwu.Value;
+ decimal youxiaojijian = projectDTOsri.Count - jixiaotichengfangan.Renwu.Value;
if (youxiaojijian > 0)
{
xiangmuDTO.dangrijixiao = Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2).ToString("0.##");
@@ -2297,7 +2314,7 @@
weixnDTO.benriqingkuang = jixiaotichengfangan.Renwu.Value.ToString("0.##");
if (jixiaotichengfangan.Tichengstandard == "01")
{
- decimal youxiaojijian = cooperweixinDTOsri.Count + intentionweixinDTOsyue.Count - jixiaotichengfangan.Renwu.Value;
+ decimal youxiaojijian = cooperweixinDTOsri.Count + intentionweixinDTOsri.Count - jixiaotichengfangan.Renwu.Value;
if (youxiaojijian > 0)
{
weixnDTO.dangrijixiao = Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2).ToString("0.##");
@@ -2538,10 +2555,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)
{
@@ -2586,16 +2603,22 @@
//}
}
+ else if (jixiaotichengfangan.Renwustandard == "05")
+ {
+ //鏈湀瑙勫畾
+ pengyouquanDTO.benyueqingkuang = (4 * jixiaotichengfangan.Renwu.Value).ToString("0.##");
+
+ }
}
}
if (decimal.Parse(pengyouquanDTO.benyueshuliang) > 0 || decimal.Parse(pengyouquanDTO.benrishuliang) > 0)
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 +2669,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)
{
@@ -3061,16 +3084,22 @@
//}
}
+ else if (jixiaotichengfangan.Renwustandard == "05")
+ {
+ //鏈湀瑙勫畾
+ shangmenbanfangDTO.benyueqingkuang = (4 * jixiaotichengfangan.Renwu.Value).ToString("0.##");
+
+ }
}
}
if (decimal.Parse(shangmenbanfangDTO.benyueshuliang) > 0 || decimal.Parse(shangmenbanfangDTO.benrishuliang) > 0)
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 +3360,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