From 83280d90d12545d36a301c437c7d9095f190aac3 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期一, 21 六月 2021 08:54:16 +0800
Subject: [PATCH] 算工资
---
zhengcaioa/Services/FiPiecerateService.cs | 34 +++++++++++++++++++++++++---------
1 files changed, 25 insertions(+), 9 deletions(-)
diff --git a/zhengcaioa/Services/FiPiecerateService.cs b/zhengcaioa/Services/FiPiecerateService.cs
index f209fcd..562a7d8 100644
--- a/zhengcaioa/Services/FiPiecerateService.cs
+++ b/zhengcaioa/Services/FiPiecerateService.cs
@@ -127,13 +127,13 @@
var query = (from a in _context.FiPiecerates
-
- join c in listCode.Where(x => x.CodeTable == "CooperVisit" && x.CodeField == "jtype")
- on a.Pieceratetype equals c.CodeSn
- join d in listCode.Where(x => x.CodeTable == "fi_piecerate" && x.CodeField == "Standard")
- on a.Standard equals d.CodeSn
+ join c in listCode.Where(x => x.CodeTable == "system" && x.CodeField == "shifou")
+ on a.Standard equals c.CodeSn
+
+ //join d in listCode.Where(x => x.CodeTable == "fi_piecerate" && x.CodeField == "Standard")
+ //on a.Standard equals d.CodeSn
@@ -144,20 +144,21 @@
&& (string.IsNullOrWhiteSpace(searchEntity.Pieceratetype) || a.Pieceratetype == searchEntity.Pieceratetype.Trim())
-
+ && (string.IsNullOrWhiteSpace(searchEntity.Standard) || a.Standard == searchEntity.Standard.Trim())
+
select new FiPiecerateDTO
{
Id = a.Id,
CreatedAtTime = a.CreatedAtTime,
Pieceratetype = a.Pieceratetype,
- PieceratetypeName = c.Comments,
+ PieceratetypeName = "",//c.Comments,
Project = a.Project,
Amount = a.Amount,
Standard = a.Standard,
- StandardName = d.Comments,
+ StandardName = c.Comments,
Percent = a.Percent,
@@ -214,11 +215,26 @@
{
- var listPosition = _context.FiPiecerates.Where(r => r.RecStatus == "A").ToList();
+ var listPosition = _context.FiPiecerates.Where(r => r.RecStatus == "A").OrderBy(x=>x.Createtime).ToList();
var list = _mapper.Map<List<FiPiecerateDTO>>(listPosition);
return list;
}
+
+ /// <summary>
+ /// 鑾峰彇鎵�鏈夎浠堕」鐩�
+ /// </summary>
+ /// <returns></returns>
+ public List<FiPiecerateDTO> GetListAll()
+ {
+
+ var listPosition = _context.FiPiecerates.OrderBy(x => x.Createtime).ToList();
+
+ var list = _mapper.Map<List<FiPiecerateDTO>>(listPosition);
+ return list;
+ }
+
+
}
}
--
Gitblit v1.9.1