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

修改导出

Temp_Event_IRC_Met8
hang 2025-04-27 16:24:24 +08:00
parent 80aaac997d
commit d5e747becd
2 changed files with 28 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
IRaCIS.Core.Application/Service/Common/EmailNoticeConfigService.cs
View File

@ -46,12 +46,20 @@ namespace IRaCIS.Core.Application.Contracts
{ {
var verifyExp1 = new EntityVerifyExp<EmailNoticeConfig>() var verifyExp1 = new EntityVerifyExp<EmailNoticeConfig>()
{ {
VerifyExp = t => t.BusinessScenarioEnum == addOrEditEmailNoticeConfig.BusinessScenarioEnum && t.CriterionTypeEnum== addOrEditEmailNoticeConfig.CriterionTypeEnum, VerifyExp = t => t.BusinessScenarioEnum == addOrEditEmailNoticeConfig.BusinessScenarioEnum && t.CriterionTypeEnum == addOrEditEmailNoticeConfig.CriterionTypeEnum,
VerifyMsg = _localizer["EmailNoticeConfig_RepeatEmailScenario"] VerifyMsg = _localizer["EmailNoticeConfig_RepeatEmailScenario"]
}; };
var verifyExp2 = new EntityVerifyExp<EmailNoticeConfig>()
{
VerifyExp = t => t.Code == addOrEditEmailNoticeConfig.Code && t.IsDistinguishCriteria == addOrEditEmailNoticeConfig.IsDistinguishCriteria && t.SystemLevel == addOrEditEmailNoticeConfig.SystemLevel,
VerifyMsg = _localizer["EmailNoticeConfig_RepeatCode"]
};
// 匹配所有占位符的正则表达式，允许包含空格的占位符 // 匹配所有占位符的正则表达式，允许包含空格的占位符
var regex = new Regex(@"\{\s*\d+\s*\}"); var regex = new Regex(@"\{\s*\d+\s*\}");
@ -65,7 +73,7 @@ namespace IRaCIS.Core.Application.Contracts
var entity=new EmailNoticeConfig() { }; var entity = new EmailNoticeConfig() { };
if (addOrEditEmailNoticeConfig.Id == null) if (addOrEditEmailNoticeConfig.Id == null)
{ {
@ -86,7 +94,7 @@ namespace IRaCIS.Core.Application.Contracts
} }
await _emailNoticeConfigrepository.AddAsync(entity, true, verifyExp1); await _emailNoticeConfigrepository.AddAsync(entity, true, verifyExp1, verifyExp2);
} }
@ -109,7 +117,7 @@ namespace IRaCIS.Core.Application.Contracts
} }
entity = await _emailNoticeConfigrepository.UpdateFromDTOAsync(addOrEditEmailNoticeConfig, true, false, verifyExp1); entity = await _emailNoticeConfigrepository.UpdateFromDTOAsync(addOrEditEmailNoticeConfig, true, false, verifyExp1, verifyExp2);
@ -117,13 +125,20 @@ namespace IRaCIS.Core.Application.Contracts
} }
if(entity.EmailCron != string.Empty && entity.IsAutoSend) if (entity.EmailCron != string.Empty)
{ {
var jobId = $"{entity.Id}_({entity.BusinessScenarioEnum})"; var jobId = $"{entity.Id}_({entity.BusinessScenarioEnum})";
//有的job 可能编辑控制直接不发，需要移除已存在的
HangfireJobHelper.RemoveCronJob(jobId);
if (entity.IsAutoSend && entity.IsEnable)
{
HangfireJobHelper.AddOrUpdateSystemCronJob(jobId, entity.BusinessScenarioEnum, entity.EmailCron); HangfireJobHelper.AddOrUpdateSystemCronJob(jobId, entity.BusinessScenarioEnum, entity.EmailCron);
} }
}
return ResponseOutput.Ok(entity.Id.ToString()); return ResponseOutput.Ok(entity.Id.ToString());

4
IRaCIS.Core.Application/Service/Common/ExcelExportService.cs
View File

@ -1658,8 +1658,8 @@ namespace IRaCIS.Core.Application.Service.Common
{ {
var emailNoticeConfigQueryable = _emailNoticeConfigrepository var emailNoticeConfigQueryable = _emailNoticeConfigrepository
//.WhereIf(inQuery.SystemLevel == null, t => t.SystemLevel == SysEmailLevel.not_sys) //.WhereIf(inQuery.SystemLevel == null, t => t.SystemLevel == SysEmailLevel.not_sys)
//.WhereIf(inQuery.SystemLevel != null, t => t.SystemLevel == inQuery.SystemLevel) .WhereIf(inQuery.SystemLevel != null, t => t.SystemLevel == inQuery.SystemLevel)
//.WhereIf(inQuery.IsDistinguishCriteria != null, t => t.IsDistinguishCriteria == inQuery.IsDistinguishCriteria) .WhereIf(inQuery.IsDistinguishCriteria != null, t => t.IsDistinguishCriteria == inQuery.IsDistinguishCriteria)
.WhereIf(inQuery.CriterionTypeEnum != null, t => t.CriterionTypeEnum == inQuery.CriterionTypeEnum) .WhereIf(inQuery.CriterionTypeEnum != null, t => t.CriterionTypeEnum == inQuery.CriterionTypeEnum)
.WhereIf(inQuery.BusinessScenarioEnum != null, t => t.BusinessScenarioEnum == inQuery.BusinessScenarioEnum) .WhereIf(inQuery.BusinessScenarioEnum != null, t => t.BusinessScenarioEnum == inQuery.BusinessScenarioEnum)
.WhereIf(inQuery.IsReturnRequired != null, t => t.IsReturnRequired == inQuery.IsReturnRequired) .WhereIf(inQuery.IsReturnRequired != null, t => t.IsReturnRequired == inQuery.IsReturnRequired)