From 0d96ff4e0833d6a2813a969e1ae0a48f27eee497 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期一, 27 三月 2023 14:24:05 +0800
Subject: [PATCH] 会员发送app后台消息

---
 zhengcaioa/zhengcaioa/Controllers/admin/TongjiBaoBiaoController.cs |   45 +++++++++++++++++++++++++++++++++++++--------
 1 files changed, 37 insertions(+), 8 deletions(-)

diff --git a/zhengcaioa/zhengcaioa/Controllers/admin/TongjiBaoBiaoController.cs b/zhengcaioa/zhengcaioa/Controllers/admin/TongjiBaoBiaoController.cs
index 992549a..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
 
@@ -773,6 +776,12 @@
 
                         //}
                     }
+                    else if (jixiaotichengfangan.Renwustandard == "05")
+                    {
+                        //鏈湀瑙勫畾
+                        pengyouquanDTO.benyueqingkuang = (4 * jixiaotichengfangan.Renwu.Value).ToString("0.##");
+
+                    }
                 }
             }
             if (decimal.Parse(pengyouquanDTO.benyueshuliang) > 0 || decimal.Parse(pengyouquanDTO.benrishuliang) > 0)
@@ -1252,6 +1261,12 @@
                         //    }
 
                         //}
+                    }
+                    else if (jixiaotichengfangan.Renwustandard == "05")
+                    {
+                        //鏈湀瑙勫畾
+                        shangmenbanfangDTO.benyueqingkuang = (4 * jixiaotichengfangan.Renwu.Value).ToString("0.##");
+                        
                     }
                 }
             }
@@ -2015,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();
 
@@ -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 + zhengfuprojectDTOsri.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.##");
@@ -2585,6 +2602,12 @@
                                 //    }
 
                                 //}
+                            }
+                            else if (jixiaotichengfangan.Renwustandard == "05")
+                            {
+                                //鏈湀瑙勫畾
+                                pengyouquanDTO.benyueqingkuang = (4 * jixiaotichengfangan.Renwu.Value).ToString("0.##");
+
                             }
                         }
                     }
@@ -3061,6 +3084,12 @@
 
                                 //}
                             }
+                            else if (jixiaotichengfangan.Renwustandard == "05")
+                            {
+                                //鏈湀瑙勫畾
+                                shangmenbanfangDTO.benyueqingkuang = (4 * jixiaotichengfangan.Renwu.Value).ToString("0.##");
+
+                            }
                         }
                     }
                     if (decimal.Parse(shangmenbanfangDTO.benyueshuliang) > 0 || decimal.Parse(shangmenbanfangDTO.benrishuliang) > 0)

--
Gitblit v1.9.1