From 67a0042c5f29e4bb0e0b82f6190f2bc51480b45c Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期二, 28 二月 2023 13:25:09 +0800
Subject: [PATCH] 工资绩效改版
---
zhengcaioa/zhengcaioa/Timer/TimerGetShopUsersService.cs | 35 ++++++++++++-----------------------
1 files changed, 12 insertions(+), 23 deletions(-)
diff --git a/zhengcaioa/zhengcaioa/Timer/TimerGetShopUsersService.cs b/zhengcaioa/zhengcaioa/Timer/TimerGetShopUsersService.cs
index b38cc0b..9d8d7f7 100644
--- a/zhengcaioa/zhengcaioa/Timer/TimerGetShopUsersService.cs
+++ b/zhengcaioa/zhengcaioa/Timer/TimerGetShopUsersService.cs
@@ -162,11 +162,11 @@
{
fbprojiectid.Add(project.Id);
}
- var fbprojectzhongbiaos = _context.Projectzhongbiaos.Where(x => fbprojiectid.Contains(x.ProjectId)).ToList();
+ var fbprojectzhongbiaos = projectzhongbiaos.Where(x => fbprojiectid.Contains(x.ProjectId)).ToList();
- var fbprojectreasons = _context.Projectreasons.Where(x => fbprojiectid.Contains(x.ProjectId)).ToList();
+ var fbprojectreasons = projectreasons.Where(x => fbprojiectid.Contains(x.ProjectId)).ToList();
- var fbprojectyouxiaos = _context.Projectyouxiaos.Where(x => fbprojiectid.Contains(x.ProjectId)).ToList();
+ var fbprojectyouxiaos = projectyouxiaos.Where(x => fbprojiectid.Contains(x.ProjectId)).ToList();
var projectfasongxiaoxiDTOsduanxin = new List<ProjectfasongxiaoxiDTO>();
@@ -775,7 +775,7 @@
{
fbprojiectid.Add(project.Id);
}
- var fbprojectzhongbiaos = _context.Projectzhongbiaos.Where(x => fbprojiectid.Contains(x.ProjectId)).ToList();
+ var fbprojectzhongbiaos = projectzhongbiaos.Where(x => fbprojiectid.Contains(x.ProjectId)).ToList();
var projectfasongxiaoxiDTOsduanxin = new List<ProjectfasongxiaoxiDTO>();
@@ -1204,7 +1204,7 @@
{
fbprojiectid.Add(project.Id);
}
- var fbprojectzhongbiaos = _context.Projectzhongbiaos.Where(x => fbprojiectid.Contains(x.ProjectId)).ToList();
+ var fbprojectzhongbiaos = projectzhongbiaos.Where(x => fbprojiectid.Contains(x.ProjectId)).ToList();
var projectfasongxiaoxiDTOsduanxin = new List<ProjectfasongxiaoxiDTO>();
@@ -1653,7 +1653,7 @@
{
fbprojiectid.Add(project.Id);
}
- var fbprojectzhongbiaos = _context.Projectzhongbiaos.Where(x => fbprojiectid.Contains(x.ProjectId)).ToList();
+ var fbprojectzhongbiaos = projectzhongbiaos.Where(x => fbprojiectid.Contains(x.ProjectId)).ToList();
var projectfasongxiaoxiDTOsduanxin = new List<ProjectfasongxiaoxiDTO>();
@@ -2097,25 +2097,14 @@
var fbprojectsDshxZhiyichengli = projects.Where(x => x.DshxZhiyichengli == "D").ToList();
var fbprojectsDshxTousuchengli = projects.Where(x => x.DshxTousuchengli == "D").ToList();
+ var fbprojectzhongbiaosZbZhiyichengli = projectzhongbiaos.Where(x => x.ZbZhiyichengli == "D" ).ToList();
+ var fbprojectzhongbiaosZbTousuchengli = projectzhongbiaos.Where(x => x.ZbTousuchengli == "D" ).ToList();
+ var fbprojectreasonsWxZhiyichengli = projectreasons.Where(x => x.WxZhiyichengli == "D" ).ToList();
+ var fbprojectreasonsWxTousuchengli = projectreasons.Where(x => x.WxTousuchengli == "D" ).ToList();
- var fbprojiectid = new List<string>();
- foreach (var project in projects)
- {
- fbprojiectid.Add(project.Id);
- }
- var fbprojectzhongbiaos = _context.Projectzhongbiaos.Where(x => fbprojiectid.Contains(x.ProjectId)).ToList();
-
-
-
- var fbprojectzhongbiaosZbZhiyichengli = _context.Projectzhongbiaos.Where(x => x.ZbZhiyichengli == "D" && fbprojiectid.Contains(x.ProjectId) ).ToList();
- var fbprojectzhongbiaosZbTousuchengli = _context.Projectzhongbiaos.Where(x => x.ZbTousuchengli == "D" && fbprojiectid.Contains(x.ProjectId)).ToList();
-
- var fbprojectreasonsWxZhiyichengli = _context.Projectreasons.Where(x => x.WxZhiyichengli == "D" && fbprojiectid.Contains(x.ProjectId)).ToList();
- var fbprojectreasonsWxTousuchengli = _context.Projectreasons.Where(x => x.WxTousuchengli == "D" && fbprojiectid.Contains(x.ProjectId)).ToList();
-
- var fbprojectyouxiaosYxZhiyichengli = _context.Projectyouxiaos.Where(x => x.YxZhiyichengli == "D" && fbprojiectid.Contains(x.ProjectId)).ToList();
- var fbprojectyouxiaosYxTousuchengli = _context.Projectyouxiaos.Where(x => x.YxTousuchengli == "D" && fbprojiectid.Contains(x.ProjectId)).ToList();
+ var fbprojectyouxiaosYxZhiyichengli = projectyouxiaos.Where(x => x.YxZhiyichengli == "D" ).ToList();
+ var fbprojectyouxiaosYxTousuchengli = projectyouxiaos.Where(x => x.YxTousuchengli == "D" ).ToList();
var projectfasongxiaoxiDTOsduanxin = new List<ProjectfasongxiaoxiDTO>();
--
Gitblit v1.9.1