Merge branch 'Test_IRC_Net8' of https://gitea.frp.extimaging.com/XCKJ/irc-netcore-api into Test_IRC_Net8

2025-06-19 14:16:54 +08:00
parent 0dd73991f0 27e8e0e79c
commit 4de186a36b
19 changed files with 20195 additions and 284 deletions
@@ -39,6 +39,10 @@ namespace IRaCIS.Application.Contracts
        public string ValueCN { get; set; } = string.Empty;
    }

+    public class ChildInQuery:SortInput
+    {
+        public Guid ParentId { get; set; }
+    }

    public class AddOrEditBasicDic
    {
@@ -96,9 +96,6 @@ namespace IRaCIS.Core.Application.Contracts
        public bool IsDeleted { get; set; }


-
-        public CriterionType? CriterionTypeEnum { get; set; }
-
        /// <summary> 业务模块 /// </summary>
        public int BusinessModuleEnum { get; set; }

@@ -140,6 +137,13 @@ namespace IRaCIS.Core.Application.Contracts

        public int? EmailDelaySeconds { get; set; }

+
+
+        [Comment("邮件配置的多个标准")]
+        public List<CriterionType>? CriterionTypeList { get; set; }
+
+        //public CriterionType? CriterionTypeEnum { get; set; }
+
    }


@@ -182,13 +182,12 @@ namespace IRaCIS.Core.Application.Service
        /// <summary>
        /// 获取子项数组
        /// </summary>
-        /// <param name="parentId"></param>
        /// <returns></returns>
-        [HttpGet("{parentId:guid}")]
-        public async Task<List<BasicDicView>> GetChildList(Guid parentId)
+        [HttpPost]
+        public async Task<List<BasicDicView>> GetChildList(ChildInQuery inQuery)
        {
-            return await _dicRepository.Where(t => t.ParentId == parentId)
-                .OrderBy(t => t.ShowOrder).ProjectTo<BasicDicView>(_mapper.ConfigurationProvider).ToListAsync();
+            return await _dicRepository.Where(t => t.ParentId == inQuery.ParentId)
+                .ProjectTo<BasicDicView>(_mapper.ConfigurationProvider).SortToListAsync(inQuery);
        }


@@ -28,7 +28,7 @@ namespace IRaCIS.Core.Application.Contracts
            .WhereIf(inQuery.SystemLevel != null, t => t.SystemLevel == inQuery.SystemLevel)
            .WhereIf(inQuery.IsDistinguishCriteria != null, t => t.IsDistinguishCriteria == inQuery.IsDistinguishCriteria)
             .WhereIf(inQuery.BusinessLevelEnum != null, t => t.BusinessLevelEnum == inQuery.BusinessLevelEnum)
-            .WhereIf(inQuery.CriterionTypeEnum != null, t => t.CriterionTypeEnum == inQuery.CriterionTypeEnum)
+            .WhereIf(inQuery.CriterionTypeEnum != null, t => t.CriterionTypeList.Any(t=>t==inQuery.CriterionTypeEnum))
             .WhereIf(inQuery.BusinessModuleEnum != null, t => t.BusinessModuleEnum == inQuery.BusinessModuleEnum)
            .WhereIf(inQuery.BusinessScenarioEnum != null, t => t.BusinessScenarioEnum == inQuery.BusinessScenarioEnum)
            .WhereIf(inQuery.IsReturnRequired != null, t => t.IsReturnRequired == inQuery.IsReturnRequired)
@@ -82,13 +82,36 @@ namespace IRaCIS.Core.Application.Contracts

        public async Task<IResponseOutput> AddOrUpdateEmailNoticeConfig(EmailNoticeConfigAddOrEdit addOrEditEmailNoticeConfig)
        {
-            var verifyExp1 = new EntityVerifyExp<EmailNoticeConfig>()
+            //var verifyExp1 = new EntityVerifyExp<EmailNoticeConfig>()
+            //{
+            //    VerifyExp = t => t.BusinessScenarioEnum == addOrEditEmailNoticeConfig.BusinessScenarioEnum && t.CriterionTypeEnum == addOrEditEmailNoticeConfig.CriterionTypeEnum,
+
+            //    VerifyMsg = _localizer["EmailNoticeConfig_RepeatEmailScenario"]
+
+            //};
+
+            var criterionList = _emailNoticeConfigrepository.Where(t => t.BusinessScenarioEnum == addOrEditEmailNoticeConfig.BusinessScenarioEnum && t.IsEnable == true)
+                .Where(t => t.CriterionTypeList != null)
+                .WhereIf(addOrEditEmailNoticeConfig.Id != null, t => t.Id != addOrEditEmailNoticeConfig.Id)
+                .Select(t => t.CriterionTypeList).ToList();//不能使用selectMany  会当成关联对象，不能当成字符串
+
+
+            if (addOrEditEmailNoticeConfig.CriterionTypeList != null)
            {
-                VerifyExp = t => t.BusinessScenarioEnum == addOrEditEmailNoticeConfig.BusinessScenarioEnum && t.CriterionTypeEnum == addOrEditEmailNoticeConfig.CriterionTypeEnum,
+                foreach (var item in addOrEditEmailNoticeConfig.CriterionTypeList)
+                {
+                    foreach (var itemList in criterionList)
+                    {
+                        if (itemList.Any(t => t == item))
+                        {
+                            return ResponseOutput.NotOk(_localizer["EmailNoticeConfig_RepeatEmailScenario"]);
+                        }
+                    }
+
+                }
+            }

-                VerifyMsg = _localizer["EmailNoticeConfig_RepeatEmailScenario"]

-            };

            var verifyExp2 = new EntityVerifyExp<EmailNoticeConfig>()
            {
@@ -132,7 +155,7 @@ namespace IRaCIS.Core.Application.Contracts
                }


-                await _emailNoticeConfigrepository.AddAsync(entity, true, verifyExp1, verifyExp2);
+                await _emailNoticeConfigrepository.AddAsync(entity, true, verifyExp2);


            }
@@ -155,7 +178,7 @@ namespace IRaCIS.Core.Application.Contracts
                }


-                entity = await _emailNoticeConfigrepository.UpdateFromDTOAsync(addOrEditEmailNoticeConfig, true, false, verifyExp1, verifyExp2);
+                entity = await _emailNoticeConfigrepository.UpdateFromDTOAsync(addOrEditEmailNoticeConfig, true, false, verifyExp2);



@@ -409,7 +409,7 @@ namespace IRaCIS.Core.Application.Service.Common
            var systemDocQuery =
               from sysDoc in _systemDocumentRepository.AsQueryable(false)
                                              .Where(t => inQuery.UserTypeId != null ? t.NeedConfirmedUserTypeList.Any(t => t.NeedConfirmUserTypeId == inQuery.UserTypeId) : true)
-               from identityUser in _identityUserRepository.AsQueryable(false).Where(t => t.UserRoleList.Where(t => t.IsUserRoleDisabled == false).Any(t => sysDoc.NeedConfirmedUserTypeList.AsQueryable().Any(c => c.NeedConfirmUserTypeId == t.UserTypeId)))
+               from identityUser in _identityUserRepository.AsQueryable(false).Where(t => t.Status == UserStateEnum.Enable && t.UserRoleList.Where(t => t.IsUserRoleDisabled == false).Any(t => sysDoc.NeedConfirmedUserTypeList.AsQueryable().Any(c => c.NeedConfirmUserTypeId == t.UserTypeId)))
                  .Where(t => inQuery.UserId != null ? t.Id == inQuery.UserId : true)
                  .Where(t => inQuery.UserTypeId != null ? t.UserRoleList.Any(t => t.UserTypeId == inQuery.UserTypeId && t.IsUserRoleDisabled == false) : true)
               join confirm in _systemDocConfirmedUserRepository.Where() on new { ConfirmUserId = identityUser.Id, SystemDocumentId = sysDoc.Id } equals new { confirm.ConfirmUserId, confirm.SystemDocumentId } into cc