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 |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/zhengcaioa/zhengcaioa/Controllers/admin/TongjiBaoBiaoController.cs b/zhengcaioa/zhengcaioa/Controllers/admin/TongjiBaoBiaoController.cs
index 1881378..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();
@@ -2027,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();
@@ -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  - jixiaotichengfangan.Renwu.Value;
                                     if (youxiaojijian > 0)
                                     {
                                         xiangmuDTO.dangrijixiao = Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2).ToString("0.##");

--
Gitblit v1.9.1