XCKJ
/
irc-netcore-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

excel 增加英文名字字段
continuous-integration/drone/push Build is passing Details

IRC_NewDev
hang 2024-08-06 16:07:47 +08:00
parent a43ba04bf3
commit c1e496530d
5 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
IRaCIS.Core.Application/Service/Common/DTO/CommonDocumentViewModel.cs
View File

@ -48,6 +48,8 @@ namespace IRaCIS.Core.Application.ViewModel
{ {
public Guid? Id { get; set; } public Guid? Id { get; set; }
public string Name { get; set; } = String.Empty; public string Name { get; set; } = String.Empty;
public string NameCN { get; set; } = String.Empty;
public string Path { get; set; } = String.Empty; public string Path { get; set; } = String.Empty;
public string Description { get; set; } = String.Empty; public string Description { get; set; } = String.Empty;
public bool IsDeleted { get; set; } public bool IsDeleted { get; set; }

10
IRaCIS.Core.Application/Service/Common/MailService.cs
View File

@ -49,7 +49,7 @@ namespace IRaCIS.Application.Services
Task<Guid> DoctorJoinTrialEmail(Guid trialId, Guid doctorId, string baseUrl, string rootUrl); Task<Guid> DoctorJoinTrialEmail(Guid trialId, Guid doctorId, string baseUrl, string rootUrl);
Task UserFeedBackMail(Guid feedBackId);
} }
public class MailVerificationService : BaseService, IMailVerificationService public class MailVerificationService : BaseService, IMailVerificationService
@ -733,7 +733,7 @@ namespace IRaCIS.Application.Services
//用户反馈邮件 //用户反馈邮件
public async Task UserFeedBack(Guid feedBackId) public async Task UserFeedBackMail(Guid feedBackId)
{ {
var feedBack = await _repository.Where<UserFeedBack>(t => t.Id == feedBackId).Include(t => t.CreateUser).ThenInclude(t => t.UserTypeRole).FirstNotNullAsync(); var feedBack = await _repository.Where<UserFeedBack>(t => t.Id == feedBackId).Include(t => t.CreateUser).ThenInclude(t => t.UserTypeRole).FirstNotNullAsync();
@ -789,7 +789,7 @@ namespace IRaCIS.Application.Services
}; };
messageToSend = await GetEmailSubejctAndHtmlInfoAndBuildAsync(EmailBusinessScenario.UserResetEmail, messageToSend, emailConfigFunc); messageToSend = await GetEmailSubejctAndHtmlInfoAndBuildAsync(EmailBusinessScenario.IRImageError, messageToSend, emailConfigFunc);
} }
//项目相关的反馈 pm admin //项目相关的反馈 pm admin
@ -829,7 +829,7 @@ namespace IRaCIS.Application.Services
}; };
messageToSend = await GetEmailSubejctAndHtmlInfoAndBuildAsync(EmailBusinessScenario.UserResetEmail, messageToSend, emailConfigFunc); messageToSend = await GetEmailSubejctAndHtmlInfoAndBuildAsync(EmailBusinessScenario.TrialFeedBack, messageToSend, emailConfigFunc);
} }
//项目无关的反馈 admin zyss //项目无关的反馈 admin zyss
@ -862,7 +862,7 @@ namespace IRaCIS.Application.Services
}; };
messageToSend = await GetEmailSubejctAndHtmlInfoAndBuildAsync(EmailBusinessScenario.UserResetEmail, messageToSend, emailConfigFunc); messageToSend = await GetEmailSubejctAndHtmlInfoAndBuildAsync(EmailBusinessScenario.SysFeedBack, messageToSend, emailConfigFunc);
} }
await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig); await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig);

14
IRaCIS.Core.Application/Service/Management/UserFeedBackService.cs
View File

@ -11,6 +11,8 @@ using IRaCIS.Core.Application.ViewModel;
using Newtonsoft.Json; using Newtonsoft.Json;
using IRaCIS.Core.Domain.Share; using IRaCIS.Core.Domain.Share;
using IRaCIS.Core.Infrastructure; using IRaCIS.Core.Infrastructure;
using MailKit;
using IRaCIS.Application.Services;
namespace IRaCIS.Core.Application.Service namespace IRaCIS.Core.Application.Service
{ {
/// <summary> /// <summary>
@ -49,7 +51,7 @@ namespace IRaCIS.Core.Application.Service
.ProjectTo<UserFeedBackView>(_mapper.ConfigurationProvider); .ProjectTo<UserFeedBackView>(_mapper.ConfigurationProvider);
var pageList = await userFeedBackQueryable.ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, string.IsNullOrWhiteSpace(inQuery.SortField) ? nameof(UserFeedBackView.Id) : inQuery.SortField,inQuery.Asc); var pageList = await userFeedBackQueryable.ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, string.IsNullOrWhiteSpace(inQuery.SortField) ? nameof(UserFeedBackView.Id) : inQuery.SortField, inQuery.Asc);
return pageList; return pageList;
} }
@ -69,7 +71,8 @@ namespace IRaCIS.Core.Application.Service
} }
public async Task<IResponseOutput> AddOrUpdateUserFeedBack(UserFeedBackAddOrEdit addOrEditUserFeedBack) public async Task<IResponseOutput> AddOrUpdateUserFeedBack(UserFeedBackAddOrEdit addOrEditUserFeedBack,
[FromServices] IMailVerificationService mailService)
{ {
addOrEditUserFeedBack.ScreenshotListStr = JsonConvert.SerializeObject(addOrEditUserFeedBack.ScreenshotList); addOrEditUserFeedBack.ScreenshotListStr = JsonConvert.SerializeObject(addOrEditUserFeedBack.ScreenshotList);
@ -105,8 +108,15 @@ namespace IRaCIS.Core.Application.Service
} }
} }
var entity = await _userFeedBackRepository.InsertOrUpdateAsync(addOrEditUserFeedBack, true); var entity = await _userFeedBackRepository.InsertOrUpdateAsync(addOrEditUserFeedBack, true);
if (addOrEditUserFeedBack.VisitTaskId != null || addOrEditUserFeedBack.Id == null)
{
//await mailService.UserFeedBackMail(entity.Id);
}
return ResponseOutput.Ok(entity.Id.ToString()); return ResponseOutput.Ok(entity.Id.ToString());
} }

6
IRaCIS.Core.Domain.Share/Common/EmailScenarioEnum.cs
View File

@ -87,6 +87,12 @@ namespace IRaCIS.Core.Domain.Share
//不登陆通过邮箱重置密码 //不登陆通过邮箱重置密码
UnloginUseEmailResetPassword = 23, UnloginUseEmailResetPassword = 23,
IRImageError=24,
SysFeedBack=26,
TrialFeedBack=27
} }

2
IRaCIS.Core.Domain/Common/CommonDocument.cs
View File

@ -23,6 +23,8 @@ namespace IRaCIS.Core.Domain.Models
[Required] [Required]
public string Name { get; set; } = String.Empty; public string Name { get; set; } = String.Empty;
public string NameCN { get; set; } = string.Empty;
/// <summary> /// <summary>
/// Path /// Path
/// </summary> /// </summary>