最新代码

username@email.com

2023-10-17 3f4013e9283d1fe29ef40cc8b4d7ee7a590a1590

 DocumentServiceAPI.Application/WorkRemind/Services/WorkRemindService.cs

@@ -14,6 +14,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Runtime.Intrinsics.Arm;
using System.Security.Claims;
using System.Text;
using System.Threading.Tasks;
@@ -60,18 +61,30 @@
        {
            var a = GetJwtInfo();
            dw.LastUpTime = DateTime.Now;
            dw.CreatEmployeeId = a.EID;

            var tentlist = _db.Queryable<Document_EmployeeInfo>()
              .Where(x => x.EmployeeId == a.EID

            ).First();
            if (tentlist != null)
            if (dw.WorkRemindId > 0)
            {
                dw.CreatEmployeeName = tentlist.EmployeeName;

                _workRemindRepository.Update(dw);
            }
            return  _workRemindRepository.Insert(dw);
            else
            {
                dw.CreatEmployeeId = a.EID;

                var tentlist = _db.Queryable<Document_EmployeeInfo>()
                  .Where(x => x.EmployeeId == a.EID

                ).First();
                if (tentlist != null)
                {
                    dw.CreatEmployeeName = tentlist.EmployeeName;

                }
                _workRemindRepository.Insert(dw);
            }
           


            return true;



@@ -98,7 +111,7 @@
        /// </summary>
        /// <param name="page"></param>
        /// <returns></returns>
        public PageResult<Document_WorkRemind> postWorkRemindList(WorkRemindPageSearch page)
        public PageResult<DocumentWorkRemindDTO> postWorkRemindList(WorkRemindPageSearch page)
        {
            var a = GetJwtInfo();

@@ -107,26 +120,36 @@
            pg.PageIndex = page.PageIndex;
            page.ToEmployeeId = a.EID;
            int total = 0;
            PageResult<Document_WorkRemind> result = new PageResult<Document_WorkRemind>();
            PageResult<DocumentWorkRemindDTO> result = new PageResult<DocumentWorkRemindDTO>();
            //result.Items =  _db.Queryable<Document_WorkRemind>().Where(x => ((page.ToEmployeeId ==null || page.ToEmployeeId>0 ) || x.ToEmployeeId == page.ToEmployeeId) 
            //&& (!page.WorkRemindTimeStart.HasValue || x.WorkRemindTime >= page.WorkRemindTimeStart.Value)
            // && (!page.WorkRemindTimeEnd.HasValue || x.WorkRemindTime <= page.WorkRemindTimeEnd.Value)
            //)
            //   .OrderByDescending(x => x.WorkRemindTime).ToPageList(page.PageIndex, page.PageSize, ref total);

            var Document_WorkReminds =  _db.Queryable<Document_WorkRemind>()

            result.Items  = _db.Queryable<Document_WorkRemind>()

            .WhereIF(page.ToEmployeeId != null && page.ToEmployeeId > 0 , x => (x.ToEmployeeId == page.ToEmployeeId) )
            .WhereIF(page.ToEmployeeId != null && page.ToEmployeeId > 0 , x => (x.ToEmployeeId == page.ToEmployeeId || x.CreatEmployeeId == page.ToEmployeeId ) )
            .WhereIF(page.WorkRemindTimeStart.HasValue, x => x.WorkRemindTime >= page.WorkRemindTimeStart.Value)
            .WhereIF(page.WorkRemindTimeEnd.HasValue, x=>x.WorkRemindTime <= page.WorkRemindTimeEnd.Value)
             .WhereIF(!string.IsNullOrEmpty(page.ProjectName), x => x.ProjectName.Contains(page.ProjectName))
              .WhereIF(!string.IsNullOrEmpty(page.WorkRemindContent), x => x.WorkRemindContent.Contains(page.WorkRemindContent))
             .OrderByDescending(x => x.WorkRemindTime).ToPageList(page.PageIndex, page.PageSize, ref total);


            result.Items = _mapper.Map<List<DocumentWorkRemindDTO>>(Document_WorkReminds);
            result.TotalCount = total;
            result.TotalPage = total%page.PageSize==0 ? total / page.PageSize : total / page.PageSize + 1;

            foreach(var workRemindDTO in result.Items)
            {
               var employeeInfo  = _db.Queryable<Document_EmployeeInfo>().Where(x => x.EmployeeId == workRemindDTO.ToEmployeeId).First();
                if (employeeInfo != null)
                {
                    workRemindDTO.ToEmployeeIdName = employeeInfo.EmployeeName;
                }

            }

            return result;
        }

@@ -243,7 +266,7 @@

              new JoinQueryInfos
              (
             JoinType.Left, ei.EmployeeId == et.EmployeeID,
             JoinType.Inner, ei.EmployeeId == et.EmployeeID && et.TenantID == a.TEID,
              JoinType.Left, ei.EmployeeId == er.EmployeeId
                  )
             )