From 69a8bb4807c77d05b5b43328acbf4ad26fb5fc68 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 05 五月 2023 15:00:52 +0800
Subject: [PATCH] 提交
---
zhengcaioa/zhengcaioa/Controllers/admin/TongjiBaoBiaoController.cs | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/zhengcaioa/zhengcaioa/Controllers/admin/TongjiBaoBiaoController.cs b/zhengcaioa/zhengcaioa/Controllers/admin/TongjiBaoBiaoController.cs
index 1881378..f83cc95 100644
--- a/zhengcaioa/zhengcaioa/Controllers/admin/TongjiBaoBiaoController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/admin/TongjiBaoBiaoController.cs
@@ -201,10 +201,13 @@
xiangmuDTO.gongzuo = "閲囪喘椤圭洰褰曞叆";
//鏈湀鏁伴噺
var projectDTOsyue = _projectService.GetListsalary(curentuser.Id, dateminkaoqin, datemaxkaoqin);
- xiangmuDTO.benyueshuliang = projectDTOsyue.Count.ToString();
+ var zhengfuprojectDTOsyue = _projectService.GetListsalaryzhengfu(curentuser.Id, dateminkaoqin, datemaxkaoqin);
+
+ xiangmuDTO.benyueshuliang = (projectDTOsyue.Count+ zhengfuprojectDTOsyue .Count).ToString();
//鏈棩鏁伴噺
var projectDTOsri = projectDTOsyue.Where(x => x.Createtime >= chauxnshijian.Date && x.Createtime < chauxnshijian.Date.AddDays(1)).ToList();
- xiangmuDTO.benrishuliang = projectDTOsri.Count.ToString();
+ var zhengfuprojectDTOsri = zhengfuprojectDTOsyue.Where(x => x.Createtime >= chauxnshijian.Date && x.Createtime < chauxnshijian.Date.AddDays(1)).ToList();
+ xiangmuDTO.benrishuliang = (projectDTOsri.Count+ zhengfuprojectDTOsri.Count).ToString();
var jijianixiangmu = fiPiecerateDTOs.Where(x => x.Project == "閲囪喘椤圭洰褰曞叆").FirstOrDefault();
@@ -221,7 +224,7 @@
xiangmuDTO.benriqingkuang = jixiaotichengfangan.Renwu.Value.ToString("0.##");
if (jixiaotichengfangan.Tichengstandard == "01")
{
- decimal youxiaojijian = projectDTOsri.Count - jixiaotichengfangan.Renwu.Value;
+ decimal youxiaojijian = projectDTOsri.Count+ zhengfuprojectDTOsri.Count - jixiaotichengfangan.Renwu.Value;
if (youxiaojijian > 0)
{
xiangmuDTO.dangrijixiao = Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2).ToString("0.##");
@@ -244,7 +247,7 @@
}
}
}
- if(projectDTOsyue.Count > 0 || projectDTOsri.Count > 0 )
+ if(projectDTOsyue.Count > 0 || projectDTOsri.Count > 0 || zhengfuprojectDTOsri.Count > 0)
tuiguangDTOs.Add(xiangmuDTO);
#endregion
@@ -2027,10 +2030,12 @@
xiangmuDTO.gongzuo = "閲囪喘椤圭洰褰曞叆";
//鏈湀鏁伴噺
var projectDTOsyue = _projectService.GetListsalary(Userid, dateminkaoqin, datemaxkaoqin);
- xiangmuDTO.benyueshuliang = projectDTOsyue.Count.ToString();
+ var zhengfuprojectDTOsyue = _projectService.GetListsalaryzhengfu(Userid, dateminkaoqin, datemaxkaoqin);
+ xiangmuDTO.benyueshuliang = (projectDTOsyue.Count + zhengfuprojectDTOsyue.Count).ToString();
//鏈棩鏁伴噺
var projectDTOsri = projectDTOsyue.Where(x => x.Createtime >= chauxnshijian.Date && x.Createtime < chauxnshijian.Date.AddDays(1)).ToList();
- xiangmuDTO.benrishuliang = projectDTOsri.Count.ToString();
+ var zhengfuprojectDTOsri = zhengfuprojectDTOsyue.Where(x => x.Createtime >= chauxnshijian.Date && x.Createtime < chauxnshijian.Date.AddDays(1)).ToList();
+ xiangmuDTO.benrishuliang = (projectDTOsri.Count+ zhengfuprojectDTOsri.Count).ToString();
var jijianixiangmu = fiPiecerateDTOs.Where(x => x.Project == "閲囪喘椤圭洰褰曞叆").FirstOrDefault();
@@ -2047,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 + zhengfuprojectDTOsri.Count - jixiaotichengfangan.Renwu.Value;
if (youxiaojijian > 0)
{
xiangmuDTO.dangrijixiao = Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2).ToString("0.##");
--
Gitblit v1.9.1