From e8fc5d92457143ea8744e8f8b2bed45a0a651f18 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 24 二月 2023 16:26:43 +0800
Subject: [PATCH] 提交
---
zhengcaioa/zhengcaioa/Controllers/admin/TongjiBaoBiaoController.cs | 222 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 218 insertions(+), 4 deletions(-)
diff --git a/zhengcaioa/zhengcaioa/Controllers/admin/TongjiBaoBiaoController.cs b/zhengcaioa/zhengcaioa/Controllers/admin/TongjiBaoBiaoController.cs
index 6b1736e..31d2961 100644
--- a/zhengcaioa/zhengcaioa/Controllers/admin/TongjiBaoBiaoController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/admin/TongjiBaoBiaoController.cs
@@ -60,6 +60,7 @@
private readonly IHrPositionService _hrPositionService;
private readonly IHrDeptService _hrDeptService;
private readonly IAdmSigninService _admSigninService;
+ private readonly IExpertService _expertService;
public TongjiBaoBiaoController(ILogger<TongjiBaoBiaoController> logger
, IAdmAttendanceRuleService attendanceRuleService
@@ -90,6 +91,7 @@
, IHrPositionService hrPositionService
, IHrDeptService hrDeptService
, IAdmSigninService admSigninService
+ , IExpertService expertService
)
{
_logger = logger;
@@ -121,6 +123,7 @@
_hrPositionService = hrPositionService;
_hrDeptService = hrDeptService;
_admSigninService = admSigninService;
+ _expertService = expertService;
}
public async Task<IActionResult> IndexAsync(string Tongjitime="")
@@ -245,6 +248,59 @@
tuiguangDTOs.Add(xiangmuDTO);
#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();
@@ -987,7 +1043,7 @@
}
catch (Exception ex)
{
-
+ zhucehuiyuanDTO.benyueshuliang = "0";
}
//var zhucehuiyuansyue = _admPieceCheckService.GetList(curentuser.Id, dateminkaoqin, datemaxkaoqin).Where(x => x.WorkPro == jijianizhucehuiyuan.Id).ToList();
@@ -1091,6 +1147,59 @@
}
if (decimal.Parse(qianyueDTO.benyueshuliang) > 0 || decimal.Parse(qianyueDTO.benrishuliang) > 0)
tuiguangDTOs.Add(qianyueDTO);
+ #endregion
+
+
+ #region 涓撳褰曞叆
+ TongjiBaoBiaoDTO zhuanjialuruDTO = new TongjiBaoBiaoDTO();
+ zhuanjialuruDTO.gongzuo = "涓撳褰曞叆";
+ //鏈湀鏁伴噺
+ var zhuanjialuruDTOsyue = _expertService.GetListsalary(curentuser.Id, dateminkaoqin, datemaxkaoqin);
+ zhuanjialuruDTO.benyueshuliang = zhuanjialuruDTOsyue.Count.ToString();
+ //鏈棩鏁伴噺
+ var zhuanjialuruDTOsri = zhuanjialuruDTOsyue.Where(x => x.Createtime >= chauxnshijian.Date && x.Createtime < chauxnshijian.Date.AddDays(1)).ToList();
+ zhuanjialuruDTO.benrishuliang = zhuanjialuruDTOsri.Count.ToString();
+
+ var jijianizhuanjialuru = fiPiecerateDTOs.Where(x => x.Project == "涓撳褰曞叆").FirstOrDefault();
+
+ if (jijianizhuanjialuru != null)
+ {
+ var jixiaotichengfangan = hrJixiaotichengThis.Where(x => x.PiecerateId == jijianizhuanjialuru.Id).OrderByDescending(x => x.Effecttime).FirstOrDefault();
+ if (jixiaotichengfangan != null && jixiaotichengfangan.Ticheng.HasValue && jixiaotichengfangan.Renwu.HasValue)
+ {
+ if (jixiaotichengfangan.Renwustandard == "01")
+ {
+
+ zhuanjialuruDTO.benyueqingkuang = (Yingchuqin * jixiaotichengfangan.Renwu.Value).ToString("0.##");
+ zhuanjialuruDTO.benriqingkuang = jixiaotichengfangan.Renwu.Value.ToString("0.##");
+ if (jixiaotichengfangan.Tichengstandard == "01")
+ {
+ decimal youxiaojijian = zhuanjialuruDTOsri.Count - jixiaotichengfangan.Renwu.Value;
+ if (youxiaojijian > 0)
+ {
+ zhuanjialuruDTO.dangrijixiao = Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2).ToString("0.##");
+ }
+
+ }
+
+ }
+ else if (jixiaotichengfangan.Renwustandard == "02")
+ {
+ zhuanjialuruDTO.benyueqingkuang = jixiaotichengfangan.Renwu.Value.ToString("0.##"); ;
+ //if (jixiaotichengfangan.Tichengstandard == "01")
+ //{
+ // decimal youxiaojijian = intentionCustomerDTOs.Count - renwujishu;
+ // if (youxiaojijian > 0)
+ // {
+ // hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
+ // }
+
+ //}
+ }
+ }
+ }
+ if (zhuanjialuruDTOsyue.Count > 0 || zhuanjialuruDTOsri.Count > 0)
+ tuiguangDTOs.Add(zhuanjialuruDTO);
#endregion
@@ -1214,7 +1323,7 @@
var benyuezonge = dingdanDTOsyue.Sum(x => x.Money) ?? 0;
//鏈棩鏁伴噺
- var dingdanDTOsri = dingdanDTOsyue.Where(x => x.Createtime >= chauxnshijian.Date && x.Createtime < chauxnshijian.Date.AddDays(1)).ToList();
+ var dingdanDTOsri = dingdanDTOsyue.Where(x =>( x.Createtime >= chauxnshijian.Date && x.Createtime < chauxnshijian.Date.AddDays(1)) || (x.Wangongtime >= chauxnshijian.Date && x.Wangongtime < chauxnshijian.Date.AddDays(1)) ).ToList();
foreach (var cooperOrderDTO in dingdanDTOsri)
{
TongjiDingDanDTO dingdanDTO = new TongjiDingDanDTO();
@@ -1953,6 +2062,58 @@
tuiguangDTOs.Add(xiangmuDTO);
#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();
@@ -2695,7 +2856,7 @@
}
catch (Exception ex)
{
-
+ zhucehuiyuanDTO.benyueshuliang = "0";
}
@@ -2794,6 +2955,59 @@
}
if (decimal.Parse(qianyueDTO.benyueshuliang) > 0 || decimal.Parse(qianyueDTO.benrishuliang) > 0)
tuiguangDTOs.Add(qianyueDTO);
+ #endregion
+
+
+ #region 涓撳褰曞叆
+ TongjiBaoBiaoDTO zhuanjialuruDTO = new TongjiBaoBiaoDTO();
+ zhuanjialuruDTO.gongzuo = "涓撳褰曞叆";
+ //鏈湀鏁伴噺
+ var zhuanjialuruDTOsyue = _expertService.GetListsalary(Userid, dateminkaoqin, datemaxkaoqin);
+ zhuanjialuruDTO.benyueshuliang = zhuanjialuruDTOsyue.Count.ToString();
+ //鏈棩鏁伴噺
+ var zhuanjialuruDTOsri = zhuanjialuruDTOsyue.Where(x => x.Createtime >= chauxnshijian.Date && x.Createtime < chauxnshijian.Date.AddDays(1)).ToList();
+ zhuanjialuruDTO.benrishuliang = zhuanjialuruDTOsri.Count.ToString();
+
+ var jijianizhuanjialuru = fiPiecerateDTOs.Where(x => x.Project == "涓撳褰曞叆").FirstOrDefault();
+
+ if (jijianizhuanjialuru != null)
+ {
+ var jixiaotichengfangan = hrJixiaotichengThis.Where(x => x.PiecerateId == jijianizhuanjialuru.Id).OrderByDescending(x => x.Effecttime).FirstOrDefault();
+ if (jixiaotichengfangan != null && jixiaotichengfangan.Ticheng.HasValue && jixiaotichengfangan.Renwu.HasValue)
+ {
+ if (jixiaotichengfangan.Renwustandard == "01")
+ {
+
+ zhuanjialuruDTO.benyueqingkuang = (Yingchuqin * jixiaotichengfangan.Renwu.Value).ToString("0.##");
+ zhuanjialuruDTO.benriqingkuang = jixiaotichengfangan.Renwu.Value.ToString("0.##");
+ if (jixiaotichengfangan.Tichengstandard == "01")
+ {
+ decimal youxiaojijian = zhuanjialuruDTOsri.Count - jixiaotichengfangan.Renwu.Value;
+ if (youxiaojijian > 0)
+ {
+ zhuanjialuruDTO.dangrijixiao = Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2).ToString("0.##");
+ }
+
+ }
+
+ }
+ else if (jixiaotichengfangan.Renwustandard == "02")
+ {
+ zhuanjialuruDTO.benyueqingkuang = jixiaotichengfangan.Renwu.Value.ToString("0.##"); ;
+ //if (jixiaotichengfangan.Tichengstandard == "01")
+ //{
+ // decimal youxiaojijian = intentionCustomerDTOs.Count - renwujishu;
+ // if (youxiaojijian > 0)
+ // {
+ // hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
+ // }
+
+ //}
+ }
+ }
+ }
+ if (zhuanjialuruDTOsyue.Count > 0 || zhuanjialuruDTOsri.Count > 0)
+ tuiguangDTOs.Add(zhuanjialuruDTO);
#endregion
@@ -2917,7 +3131,7 @@
var benyuezonge = dingdanDTOsyue.Sum(x => x.Money) ?? 0;
//鏈棩鏁伴噺
- var dingdanDTOsri = dingdanDTOsyue.Where(x => x.Createtime >= chauxnshijian.Date && x.Createtime < chauxnshijian.Date.AddDays(1)).ToList();
+ var dingdanDTOsri = dingdanDTOsyue.Where(x => (x.Createtime >= chauxnshijian.Date && x.Createtime < chauxnshijian.Date.AddDays(1)) || (x.Wangongtime >= chauxnshijian.Date && x.Wangongtime < chauxnshijian.Date.AddDays(1))).ToList();
foreach (var cooperOrderDTO in dingdanDTOsri)
{
TongjiDingDanDTO dingdanDTO = new TongjiDingDanDTO();
--
Gitblit v1.9.1