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/Services/WfNeeddeelService.cs | 46 +++++++++++++++++++++++++++++++++++++---------
1 files changed, 37 insertions(+), 9 deletions(-)
diff --git a/zhengcaioa/Services/WfNeeddeelService.cs b/zhengcaioa/Services/WfNeeddeelService.cs
index 7b01ff3..30f0f34 100644
--- a/zhengcaioa/Services/WfNeeddeelService.cs
+++ b/zhengcaioa/Services/WfNeeddeelService.cs
@@ -2,6 +2,7 @@
using DTO;
using DTO.Models;
using IServices;
+using Microsoft.EntityFrameworkCore;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -117,7 +118,7 @@
string[] Applytimes = searchEntity.Applytime.Split("|");
DateTime.TryParse(Applytimes[0], out Applytimestart);
DateTime.TryParse(Applytimes[1], out Applytimeend);
- //Applytimeend = Applytimeend.AddDays(1);
+ Applytimeend = Applytimeend.AddDays(1);
}
///WfNeeddeels
@@ -141,7 +142,9 @@
from fff in fsssss.DefaultIfEmpty()
join d in _context.WfApplytypes
- on k.Applytiye equals d.Id
+ on k.Applytiye equals d.Applyno
+ into dsssss
+ from ddd in dsssss.DefaultIfEmpty()
join b in _context.PltUsers
on k.Creater equals b.Id
@@ -160,7 +163,7 @@
&& (string.IsNullOrWhiteSpace(searchEntity.RunProcessId) || a.RunProcessId == searchEntity.RunProcessId.Trim())
&& (string.IsNullOrWhiteSpace(searchEntity.Applyno) || k.Applyno == searchEntity.Applyno.Trim())
-
+ && (string.IsNullOrWhiteSpace(searchEntity.Creater) || a.DeelUserId == searchEntity.Creater.Trim())
select new WfNeeddeelDTO
{
@@ -184,7 +187,7 @@
Applyno = k.Applyno,
CreaterName = b.UserName,
DeptName = c.DeptName,
- Applytiye = d.Applytiye,
+ Applytiye = ddd.Applytiye,
Content = k.Content,
ShenpiStatusName = eee.Comments,
Resivetime = a.Resivetime,
@@ -192,20 +195,20 @@
NeeddeelTypeName = fff.Comments,
Contentyijian = a.Content,
Sort = a.Sort,
-
+ Deelurl = a.Deelurl,
Creater = a.Creater,
Createtime = a.Createtime,
-
+ Step = a.Step,
RecStatus = a.RecStatus,
Modifier = a.Modifier,
Modifytime = a.Modifytime,
}
- ).OrderBy(x => x.Sort).ThenByDescending(x => x.Resivetime).ToList();
+ ).OrderByDescending(x=>x.Applyno).ThenBy(x => x.Sort).ThenByDescending(x => x.Resivetime).ToList();
- if (searchEntity.totalrows == 0)
+ //if (searchEntity.totalrows == 0)
searchEntity.totalrows = query.Count();
var lianlist = query.Skip((searchEntity.page - 1) * searchEntity.rows).Take(searchEntity.rows).ToList();
data.LoadData(searchEntity, lianlist);
@@ -236,12 +239,37 @@
/// 鑾峰彇鎵�鏈夋湁鏁堟祦绋嬬被鍨�
/// </summary>
/// <returns></returns>
- public List<WfNeeddeelDTO> GetList()
+ public List<WfNeeddeelDTO> GetList(string RunProcessId = "", string step = "")
+ {
+
+
+ var listRole = _context.WfNeeddeels.AsNoTracking().Where(r => r.RecStatus == "A").ToList();
+
+ if (!string.IsNullOrEmpty(RunProcessId) && !string.IsNullOrEmpty(step))
+ {
+ listRole = listRole.Where(x => x.RunProcessId == RunProcessId && x.Step == step).ToList();
+ }
+
+ var list = _mapper.Map<List<WfNeeddeelDTO>>(listRole);
+ return list;
+ }
+
+
+ /// <summary>
+ /// 鑾峰彇鎵�鏈夋湁鏁堟祦绋嬬被鍨�
+ /// </summary>
+ /// <returns></returns>
+ public List<WfNeeddeelDTO> GetListTracking(string RunProcessId = "", string step = "")
{
var listRole = _context.WfNeeddeels.Where(r => r.RecStatus == "A").ToList();
+ if (!string.IsNullOrEmpty(RunProcessId) && !string.IsNullOrEmpty(step))
+ {
+ listRole = listRole.Where(x => x.RunProcessId == RunProcessId && x.Step == step).ToList();
+ }
+
var list = _mapper.Map<List<WfNeeddeelDTO>>(listRole);
return list;
}
--
Gitblit v1.9.1