From 78efdf47dccf3d5a04aa25cebc6bed02c0c062db Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期三, 21 九月 2022 11:05:07 +0800
Subject: [PATCH] 提交
---
zhengcaioa/zhengcaioa/Controllers/admin/TongjiBaoBiaoController.cs | 135 +++++++++++++++++++++++++++++++++++++++++----
1 files changed, 123 insertions(+), 12 deletions(-)
diff --git a/zhengcaioa/zhengcaioa/Controllers/admin/TongjiBaoBiaoController.cs b/zhengcaioa/zhengcaioa/Controllers/admin/TongjiBaoBiaoController.cs
index 48124d5..61b5848 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="")
@@ -987,7 +990,7 @@
}
catch (Exception ex)
{
-
+ zhucehuiyuanDTO.benyueshuliang = "0";
}
//var zhucehuiyuansyue = _admPieceCheckService.GetList(curentuser.Id, dateminkaoqin, datemaxkaoqin).Where(x => x.WorkPro == jijianizhucehuiyuan.Id).ToList();
@@ -1091,6 +1094,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 +1270,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();
@@ -1821,12 +1877,12 @@
string[] Userids = null;
if (!string.IsNullOrEmpty(userid) && userid!= "null")
{
- Userids = userid.Split(','); ;
+ Userids = userDTOs.Where(x=> userid.Split(',').Contains(x.Id)).OrderBy(x => x.DeptId).ThenBy(x => x.HrPosition).Select(x => x.Id).ToArray();
}
else
{
- Userids = userDTOs.OrderBy(x => x.UserSn).Select(x => x.Id).ToArray();
+ Userids = userDTOs.OrderBy(x => x.DeptId).ThenBy(x=>x.HrPosition).Select(x => x.Id).ToArray();
}
List<TongjibaobiaobaobiaoDTO> tongjibaobiaobaobiaoDTOs = new List<TongjibaobiaobaobiaoDTO>();
@@ -2695,7 +2751,7 @@
}
catch (Exception ex)
{
-
+ zhucehuiyuanDTO.benyueshuliang = "0";
}
@@ -2794,6 +2850,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 +3026,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();
@@ -3505,18 +3614,20 @@
tongjibaobiaobaobiaoDTO.UserName = "";
if (deptDTO != null)
{
- tongjibaobiaobaobiaoDTO.UserName += "閮ㄩ棬锛�" + deptDTO.DeptName + " ";
+ tongjibaobiaobaobiaoDTO.UserName += "閮ㄩ棬锛�" + deptDTO.DeptName + "    ";
}
- tongjibaobiaobaobiaoDTO.UserName = "濮撳悕锛�" + userDTO.UserName + " ";
+ tongjibaobiaobaobiaoDTO.UserName += "濮撳悕锛�" + userDTO.UserName + "    ";
+
+ tongjibaobiaobaobiaoDTO.UserDaka = "";
if (hrPositionDTO != null)
{
- tongjibaobiaobaobiaoDTO.UserName += "鑱屽姟锛�" + hrPositionDTO.PostName + " ";
+ tongjibaobiaobaobiaoDTO.UserDaka += "鑱屽姟锛�" + hrPositionDTO.PostName + "    ";
}
if (admSignInDTO != null)
{
- tongjibaobiaobaobiaoDTO.UserName += "鎵撳崱鏃堕棿锛氫笂鍗� " + (admSignInDTO.MorningIn.HasValue? admSignInDTO.MorningIn.Value.ToString("HH:mm:ss"):"") + "-" + (admSignInDTO.MorningOut.HasValue ? admSignInDTO.MorningOut.Value.ToString("HH:mm:ss") : "")
- + "涓嬪崍 " + (admSignInDTO.AfternoonIn.HasValue ? admSignInDTO.AfternoonIn.Value.ToString("HH:mm:ss") : "") + "-" + (admSignInDTO.AfternoonOut.HasValue ? admSignInDTO.AfternoonOut.Value.ToString("HH:mm:ss") : "")
- + "鍔犵彮 " + (admSignInDTO.OvertimeIn.HasValue ? admSignInDTO.OvertimeIn.Value.ToString("HH:mm:ss") : "") + "-" + (admSignInDTO.OvertimeOut.HasValue ? admSignInDTO.OvertimeOut.Value.ToString("HH:mm:ss") : "");
+ tongjibaobiaobaobiaoDTO.UserDaka += " 鎵撳崱鏃堕棿锛氫笂鍗� " + (admSignInDTO.MorningIn.HasValue? admSignInDTO.MorningIn.Value.ToString("HH:mm:ss"):"") + "-" + (admSignInDTO.MorningOut.HasValue ? admSignInDTO.MorningOut.Value.ToString("HH:mm:ss") : "")
+ + "    涓嬪崍 " + (admSignInDTO.AfternoonIn.HasValue ? admSignInDTO.AfternoonIn.Value.ToString("HH:mm:ss") : "") + "-" + (admSignInDTO.AfternoonOut.HasValue ? admSignInDTO.AfternoonOut.Value.ToString("HH:mm:ss") : "")
+ + (admSignInDTO.OvertimeIn.HasValue ? " 鍔犵彮 " + admSignInDTO.OvertimeIn.Value.ToString("HH:mm:ss") + "-" : "") + (admSignInDTO.OvertimeOut.HasValue ? admSignInDTO.OvertimeOut.Value.ToString("HH:mm:ss") : "");
}
tongjibaobiaobaobiaoDTOs.Add(tongjibaobiaobaobiaoDTO);
--
Gitblit v1.9.1