算工资

username@email.com

2021-06-21 83280d90d12545d36a301c437c7d9095f190aac3

 zhengcaioa/Services/FiPiecerateService.cs

@@ -129,11 +129,11 @@
            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 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
                         //join d in listCode.Where(x => x.CodeTable == "fi_piecerate" && x.CodeField == "Standard")
                         //on a.Standard equals d.CodeSn



@@ -145,6 +145,7 @@

                          && (string.IsNullOrWhiteSpace(searchEntity.Pieceratetype) || a.Pieceratetype == searchEntity.Pieceratetype.Trim())
                           
                            && (string.IsNullOrWhiteSpace(searchEntity.Standard) || a.Standard == searchEntity.Standard.Trim())

                         select new FiPiecerateDTO
                         {
@@ -152,12 +153,12 @@
                             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;
        }

        
    }
}