提交

username@email.com

2022-07-06 1aa53fde5eb18a39c53daf910d69cb857913b08d

 zhengcaioa/Services/FiAccountRecordService.cs

@@ -132,7 +132,8 @@
                                  && (string.IsNullOrWhiteSpace(searchEntity.PaymentUnit) || a.PaymentUnit.Contains(searchEntity.PaymentUnit.Trim()))
                                     && (string.IsNullOrWhiteSpace(searchEntity.CreaterName) || y.UserName.Contains(searchEntity.CreaterName.Trim()))
                                        && (string.IsNullOrWhiteSpace(searchEntity.RecordTypeId) || a.RecordTypeId == searchEntity.RecordTypeId.Trim())
                                           
                                           && (string.IsNullOrWhiteSpace(searchEntity.RecordTypeId) || a.RecordTypeId == searchEntity.RecordTypeId.Trim())

                         select new FiAccountRecordDTO
                         {
                             Id = a.Id,
@@ -159,6 +160,7 @@
                             QiyongStatus = a.QiyongStatus,
                             RecStatus = a.RecStatus,
                             Balance = z.Balance??0,
                             AccountMoney = a.AccountMoney??0,
                           
                         }).OrderByDescending(x => x.Modifytime).ToList();

@@ -168,7 +170,7 @@



            if (searchEntity.totalrows == 0)
            //if (searchEntity.totalrows == 0)
                searchEntity.totalrows = query.Count();
            var rolelist = query.Skip((searchEntity.page - 1) * searchEntity.rows).Take(searchEntity.rows).ToList();

@@ -199,12 +201,17 @@
        /// 获取所有有效角色
        /// </summary>
        /// <returns></returns>
        public List<FiAccountRecordDTO> GetList()
        public List<FiAccountRecordDTO> GetList(string OperationalMatters = null)
        {


            var listPosition = _context.FiAccountRecords.Where(r => r.RecStatus == "A" ).ToList();

            if (!string.IsNullOrEmpty(OperationalMatters))
            {
                listPosition = listPosition.Where(x => x.OperationalMatters == OperationalMatters).ToList();
            }

            var list = _mapper.Map<List<FiAccountRecordDTO>>(listPosition);
            return list;
        }