面板任务完成提交

2022-04-07 15:23:36 +08:00
parent a17dc00ca8
commit 34dd484582
6 changed files with 169 additions and 20 deletions
@@ -11,6 +11,7 @@ using Microsoft.AspNetCore.Hosting;
 using Microsoft.EntityFrameworkCore;
 using IRaCIS.Core.Application.Contracts;
 using IRaCIS.Core.Infra.EFCore;
+using User = IRaCIS.Core.Domain.Models.User;

 namespace IRaCIS.Core.Application.Services
 {
@@ -22,12 +23,12 @@ namespace IRaCIS.Core.Application.Services
    {

        private readonly IWebHostEnvironment _hostEnvironment;
-        private readonly IRepository<SystemDocument> systemDocumentRepository;
+        private readonly IRepository<SystemDocument> _systemDocumentRepository;

        public SystemDocumentService(IWebHostEnvironment hostEnvironment, IRepository<SystemDocument> systemDocumentRepository)
        {
            _hostEnvironment = hostEnvironment;
-            this.systemDocumentRepository = systemDocumentRepository;
+            _systemDocumentRepository = systemDocumentRepository;
        }

        /// <summary>
@@ -36,9 +37,9 @@ namespace IRaCIS.Core.Application.Services
        /// <param name="querySystemDocument"></param>
        /// <returns></returns>
        [HttpPost]
-        public  async Task<PageOutput<SystemDocumentView>> GetSystemDocumentListAsync(SystemDocumentQuery querySystemDocument)
+        public async Task<PageOutput<SystemDocumentView>> GetSystemDocumentListAsync(SystemDocumentQuery querySystemDocument)
        {
-            var systemDocumentQueryable = systemDocumentRepository
+            var systemDocumentQueryable = _systemDocumentRepository
               .WhereIf(!string.IsNullOrEmpty(querySystemDocument.Name), t => t.Name.Contains(querySystemDocument.Name))
               .WhereIf(!string.IsNullOrEmpty(querySystemDocument.Type), t => t.Type.Contains(querySystemDocument.Type))
               .ProjectTo<SystemDocumentView>(_mapper.ConfigurationProvider, new { token = _userInfo.UserToken, userId = _userInfo.Id });
@@ -53,23 +54,23 @@ namespace IRaCIS.Core.Application.Services
                var entity = _mapper.Map<SystemDocument>(addOrEditSystemDocument);


-                if (await systemDocumentRepository.AnyAsync(t => t.Type == addOrEditSystemDocument.Type && t.Name == addOrEditSystemDocument.Name))
+                if (await _systemDocumentRepository.AnyAsync(t => t.Type == addOrEditSystemDocument.Type && t.Name == addOrEditSystemDocument.Name))
                {
                    return ResponseOutput.NotOk("同类型已存在该文件名");
                }

-                await systemDocumentRepository.AddAsync(entity,true);
+                await _systemDocumentRepository.AddAsync(entity, true);

                return ResponseOutput.Ok(entity.Id.ToString());

            }
            else
            {
-                var document = await systemDocumentRepository.Where(t => t.Id == addOrEditSystemDocument.Id, true).Include(t => t.NeedConfirmedUserTypeList).FirstOrDefaultAsync();
+                var document = await _systemDocumentRepository.Where(t => t.Id == addOrEditSystemDocument.Id, true).Include(t => t.NeedConfirmedUserTypeList).FirstOrDefaultAsync();

                if (document == null) return Null404NotFound(document);

-                if (await systemDocumentRepository.AnyAsync(t => t.Type == addOrEditSystemDocument.Type && t.Name == addOrEditSystemDocument.Name && t.Id != addOrEditSystemDocument.Id))
+                if (await _systemDocumentRepository.AnyAsync(t => t.Type == addOrEditSystemDocument.Type && t.Name == addOrEditSystemDocument.Name && t.Id != addOrEditSystemDocument.Id))
                {
                    return ResponseOutput.NotOk("同类型已存在该文件名");
                }
@@ -118,5 +119,49 @@ namespace IRaCIS.Core.Application.Services
        }


+        /// <summary>
+        /// 获取需要签署的系统文档列表
+        /// </summary>
+        /// <returns></returns>
+
+        public async Task<List<UnionDocumentWithConfirmInfoView>> GetWaitSignSysDocList()
+        {
+
+
+            var query = from sysDoc in _systemDocumentRepository.Where(t => t.NeedConfirmedUserTypeList.Any(t => t.NeedConfirmUserTypeId == _userInfo.UserTypeId))
+
+                        join confirm in _repository.GetQueryable<SystemDocConfirmedUser>() on new { ConfirmUserId = _userInfo.Id, SystemDocumentId = sysDoc.Id } equals new { confirm.ConfirmUserId, confirm.SystemDocumentId } into cc
+                        from confirm in cc.DefaultIfEmpty()
+
+                        join user in _repository.GetQueryable<User>() on _userInfo.Id equals user.Id
+
+                        select new UnionDocumentWithConfirmInfoView()
+                        {
+                            IsSystemDoc = true,
+
+                            Id = sysDoc.Id,
+                            CreateTime = sysDoc.CreateTime,
+                            IsAbandon = sysDoc.IsAbandon,
+                            SignViewMinimumMinutes = sysDoc.SignViewMinimumMinutes,
+                            Name = sysDoc.Name,
+                            Path = sysDoc.Path,
+                            Type = sysDoc.Type,
+                            UpdateTime = sysDoc.UpdateTime,
+
+                            FullFilePath = sysDoc.Path + "?access_token=" + _userInfo.UserToken,
+
+                            ConfirmUserId = confirm.ConfirmUserId,
+                            ConfirmTime = confirm.ConfirmTime,
+                            RealName = user.LastName + " / " + user.FirstName,
+                            UserName = user.UserName,
+                            UserTypeShortName = user.UserTypeRole.UserTypeShortName
+                        };
+
+            return await query.Where(t=>t.ConfirmTime==null).ToListAsync();
+
+
+
+        }
+
    }
 }
@@ -361,7 +361,11 @@ namespace IRaCIS.Core.Application.Services
        }


-
+        /// <summary>
+        /// 项目下面的参与用户下拉
+        /// </summary>
+        /// <param name="trialId"></param>
+        /// <returns></returns>
        [HttpGet("{trialId:guid}")]
        public async Task<List<TrialUserDto>> GetTrialUserSelect(Guid trialId)
        {
@@ -371,13 +375,17 @@ namespace IRaCIS.Core.Application.Services
        }


-
+        /// <summary>
+        /// 项目+系统的文档类型 下拉
+        /// </summary>
+        /// <param name="trialId"></param>
+        /// <returns></returns>
        [HttpGet("{trialId:guid}")]
        public async Task<List<string>> GetTrialDocAndSystemDocType(Guid trialId)
        {
-            return await _trialDocumentRepository.Where(t => t.TrialId == trialId).Select(t => t.Type).Union(_repository.GetQueryable<SystemDocument>().Select(t => t.Type)).Distinct()
-
-                  .ToListAsync();
+            return await _trialDocumentRepository.Where(t => t.TrialId == trialId).Select(t => t.Type)
+                .Union(_repository.GetQueryable<SystemDocument>().Select(t => t.Type)).Distinct()
+                .ToListAsync();
        }

        public async Task<IResponseOutput> AddOrUpdateTrialDocument(AddOrEditTrialDocument addOrEditTrialDocument)
@@ -565,6 +573,7 @@ namespace IRaCIS.Core.Application.Services
        /// <param name="trialId"></param>
        /// <returns></returns>
        [HttpGet("{trialId:guid}")]
+        [Obsolete]
        public List<TrialUserUnionDocumentView> GetTrialUserDocumentList(Guid trialId)
        {
            var query = _repository.Where<TrialUser>(t => t.TrialId == trialId)
@@ -593,6 +602,7 @@ namespace IRaCIS.Core.Application.Services
        /// <param name="querySystemDocument"></param>
        /// <returns></returns>
        [HttpPost]
+        [Obsolete]
        public PageOutput<DocumentUnionWithUserStatView> GetTrialSystemDocumentList(DocumentTrialUnionQuery querySystemDocument)
        {
            var systemDocumentQueryable = _repository