修改文档返回状态

2025-01-08 11:32:24 +08:00
parent cbfc2f9538
commit a21cca53f8
4 changed files with 20 additions and 13 deletions
@@ -58,12 +58,7 @@ namespace IRaCIS.Core.Application.Contracts
        public string RealName { get; set; } = string.Empty;


-        //[JsonIgnore]
-        //public string IdentityUserTypes { get; set; }
-
-        //[JsonIgnore]
-        //public string DocNeedSignUserTypes { get; set; }
-
+        public string DocTypeCode { get; set; }

        public List<string> UserConfirmedUserTypeList => (DocNeedSignUserTypeList != null && IdentityUserTypeList != null) ? IdentityUserTypeList.Intersect(DocNeedSignUserTypeList).ToList() : new List<string>();

@@ -150,7 +150,7 @@ namespace IRaCIS.Core.Application.Services
            var query = from sysDoc in _systemDocumentRepository.AsQueryable(true)
                        .Where(t => t.NeedConfirmedUserTypeList.Any(t => t.NeedConfirmUserTypeId == _userInfo.UserTypeId))
                    .WhereIf(!string.IsNullOrEmpty(inQuery.Name), t => t.Name.Contains(inQuery.Name))
-                    //外部人员 只签署 文档类型枚举值有值的
+                    //外部人员 只签署 外部需要签署的
                    .WhereIf(isInternal == false, t => t.DocUserSignType == DocUserSignType.InnerAndOuter)
                    .WhereIf(inQuery.FileTypeId != null, t => t.FileTypeId == inQuery.FileTypeId)
                        join confirm in _systemDocConfirmedUserRepository.Where() on new { ConfirmUserId = _userInfo.IdentityUserId, SystemDocumentId = sysDoc.Id } equals new { confirm.ConfirmUserId, confirm.SystemDocumentId } into cc
@@ -178,6 +178,8 @@ namespace IRaCIS.Core.Application.Services
                            RealName = user.FullName,
                            UserName = user.UserName,

+                            DocTypeCode=sysDoc.FileType.Code
+
                            //UserTypeId = user.UserTypeId,
                            //UserTypeShortName = user.UserTypeRole.UserTypeShortName
                        };
@@ -187,7 +189,7 @@ namespace IRaCIS.Core.Application.Services
                              .Where(t => !(t.IsDeleted == true && t.ConfirmTime == null))
                              .WhereIf(inQuery.IsSigned == true, t => t.ConfirmTime != null)
                              .WhereIf(inQuery.IsSigned == false, t => t.ConfirmTime == null)
-                              .ToPagedListAsync(inQuery);
+                              .ToPagedListAsync(inQuery,nameof(UnionDocumentWithConfirmInfoView.DocTypeCode));


            return list;