修改查询bug

2022-10-20 17:55:58 +08:00
parent 64291078a0
commit b6a3391678
10 changed files with 111 additions and 25 deletions
@@ -6,6 +6,8 @@
 using System;
 using IRaCIS.Core.Domain.Share;
 using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+
 namespace IRaCIS.Core.Application.ViewModel
 {
    /// <summary> TrialEmailNoticeConfigView  列表视图模型 </summary>
@@ -24,19 +26,12 @@ namespace IRaCIS.Core.Application.ViewModel
    ///<summary>TrialEmailNoticeConfigQuery  列表查询参数模型</summary>
    public class TrialEmailNoticeConfigQuery
    {
-        public string AuthorizationCode { get; set; }
+        [NotDefault]
+        public Guid TrialId { get; set; }

-        public string ReceiveEmail { get; set; }
+        public CommonDocumentBusinessScenario? BusinessScenarioEnum { get; set; }

-        public string Code { get; set; }
-
-        public string CopyEmail { get; set; }
-
-        public string FromEmail { get; set; }
-
-        public string FilePath { get; set; }
-
-        public string FileName { get; set; }
+        public CriterionType? CriterionTypeEnum { get; set; }

    }

@@ -45,7 +40,7 @@ namespace IRaCIS.Core.Application.ViewModel
    {
        public Guid? Id { get; set; }

-        public int BusinessScenarioEnum { get; set; }
+        public CommonDocumentBusinessScenario BusinessScenarioEnum { get; set; }

        public string Code { get; set; }

@@ -8,6 +8,8 @@ using IRaCIS.Core.Domain.Models;
 using Microsoft.AspNetCore.Mvc;
 using IRaCIS.Core.Application.Interfaces;
 using IRaCIS.Core.Application.ViewModel;
+using IRaCIS.Core.Domain.Share;
+
 namespace IRaCIS.Core.Application.Service
 {
    /// <summary>
@@ -25,12 +27,44 @@ namespace IRaCIS.Core.Application.Service
        }


+        /// <summary>
+        /// 同步系统配置的文档到想项目中
+        /// </summary>
+        /// <param name="trialId"></param>
+        /// <returns></returns>
+        /// 
+        private async Task SyncSystemEmainCofigDocListAsync(Guid trialId, CriterionType? criterionTypeEnum)
+        {
+            if (criterionTypeEnum != null)
+            {
+                var docmentList = _repository.Where<CommonDocument>(t => t.CriterionTypeEnum == criterionTypeEnum).Select(t => new { t.Path, t.Name, t.Code, t.BusinessScenarioEnum }).ToList();
+
+                var trialDocCount = _trialEmailNoticeConfigRepository.Where(t => t.CriterionTypeEnum == criterionTypeEnum).Count();
+
+                if (trialDocCount == 0)
+                {
+
+                    foreach (var item in docmentList)
+                    {
+                        await _trialEmailNoticeConfigRepository.AddAsync(new TrialEmailNoticeConfig() { FileName = item.Name, FilePath = item.Path, BusinessScenarioEnum = item.BusinessScenarioEnum, Code = item.Code });
+                    }
+
+                }
+
+            }
+
+            await _trialEmailNoticeConfigRepository.SaveChangesAsync();
+        }
+
        public async Task<List<TrialEmailNoticeConfigView>> GetTrialEmailNoticeConfigList(TrialEmailNoticeConfigQuery inQuery)
        {

+            await SyncSystemEmainCofigDocListAsync(inQuery.TrialId, inQuery.CriterionTypeEnum);

            var trialEmailNoticeConfigQueryable = _trialEmailNoticeConfigRepository
-            .ProjectTo<TrialEmailNoticeConfigView>(_mapper.ConfigurationProvider);
+              .WhereIf(inQuery.CriterionTypeEnum != null, t => t.CriterionTypeEnum == inQuery.CriterionTypeEnum)
+              .WhereIf(inQuery.BusinessScenarioEnum != null, t => t.BusinessScenarioEnum == inQuery.BusinessScenarioEnum)
+              .ProjectTo<TrialEmailNoticeConfigView>(_mapper.ConfigurationProvider);

            return await trialEmailNoticeConfigQueryable.ToListAsync();
        }
@@ -71,6 +71,8 @@ namespace IRaCIS.Core.Application.Service

            CreateMap<TrialEmailNoticeConfig, TrialEmailNoticeConfigView>();

+            CreateMap<TrialEmailNoticeConfigAddOrEdit, TrialEmailNoticeConfig>();
+
        }
    }