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

bug 修改

Uat_Study
hang 2022-09-22 11:55:14 +08:00
parent e1100a5a39
commit ae5e79a314
6 changed files with 32 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
IRaCIS.Core.API/Controllers/InspectionController.cs
View File

@ -408,6 +408,8 @@ namespace IRaCIS.Core.API.Controllers
public async Task<IResponseOutput> UserConfirm(DataInspectionDto<UserConfirmCommand> opt) public async Task<IResponseOutput> UserConfirm(DataInspectionDto<UserConfirmCommand> opt)
{ {
var singid = await _inspectionService.RecordSing(opt.SignInfo); var singid = await _inspectionService.RecordSing(opt.SignInfo);
opt.Data.SignText = opt.SignInfo.SignText;
var result = await _trialDocumentService.UserConfirm(opt.Data); var result = await _trialDocumentService.UserConfirm(opt.Data);
await _inspectionService.CompletedSign(singid, result); await _inspectionService.CompletedSign(singid, result);
return result; return result;

2
IRaCIS.Core.Application/Service/Document/DTO/SystemDocumentViewModel.cs
View File

@ -124,6 +124,8 @@ namespace IRaCIS.Core.Application.Contracts
public bool isSystemDoc { get; set; } public bool isSystemDoc { get; set; }
public string SignText { get; set; } = string.Empty;
} }
public class DocumentTrialUnionQuery : TrialUserDocUnionQuery public class DocumentTrialUnionQuery : TrialUserDocUnionQuery

30
IRaCIS.Core.Application/Service/Document/TrialDocumentService.cs
View File

@ -543,35 +543,51 @@ namespace IRaCIS.Core.Application.Services
if (userConfirmCommand.isSystemDoc) if (userConfirmCommand.isSystemDoc)
{ {
if (await _repository.AnyAsync<SystemDocConfirmedUser>(t => t.SystemDocumentId == userConfirmCommand.DocumentId && t.ConfirmUserId == _userInfo.Id && t.ConfirmTime != null))
var sysDocConfirm = await _systemDocConfirmedUserRepository.FirstOrDefaultAsync(t => t.SystemDocumentId == userConfirmCommand.DocumentId && t.ConfirmUserId == _userInfo.Id,true);
if(sysDocConfirm.ConfirmTime != null)
{ {
return ResponseOutput.NotOk("该文件已经签名"); return ResponseOutput.NotOk("该文件已经签名");
} }
if (!await _systemDocumentRepository.AnyAsync(t => t.Id == userConfirmCommand.DocumentId) || await _systemDocumentRepository.AnyAsync(t => t.Id == userConfirmCommand.DocumentId && t.IsDeleted, true))
if (sysDocConfirm.IsDeleted)
{ {
return ResponseOutput.NotOk("文件已废除,签署失败！"); return ResponseOutput.NotOk("文件已废除,签署失败！");
} }
sysDocConfirm.ConfirmTime = DateTime.Now;
sysDocConfirm.SignText = userConfirmCommand.SignText;
await _systemDocConfirmedUserRepository.SaveChangesAsync();
await _systemDocConfirmedUserRepository.AddAsync(new SystemDocConfirmedUser() { ConfirmTime = DateTime.Now, ConfirmUserId = _userInfo.Id, IsDeleted = false, SystemDocumentId = userConfirmCommand.DocumentId }, true);
} }
else else
{ {
if (await _repository.AnyAsync<TrialDocUserTypeConfirmedUser>(t => t.TrialDocumentId == userConfirmCommand.DocumentId && t.ConfirmUserId == _userInfo.Id && t.ConfirmTime !=null))
var trialDocConfirm = await _trialDocUserTypeConfirmedUserRepository.FirstOrDefaultAsync(t => t.TrialDocumentId == userConfirmCommand.DocumentId && t.ConfirmUserId == _userInfo.Id, true);
if (trialDocConfirm.ConfirmTime != null)
{ {
return ResponseOutput.NotOk("该文件已经签名"); return ResponseOutput.NotOk("该文件已经签名");
} }
if (!await _trialDocumentRepository.AnyAsync(t => t.Id == userConfirmCommand.DocumentId) || await _trialDocumentRepository.AnyAsync(t => t.Id == userConfirmCommand.DocumentId && t.IsDeleted, true)) if (trialDocConfirm.IsDeleted)
{ {
return ResponseOutput.NotOk("文件已废除,签署失败！"); return ResponseOutput.NotOk("文件已废除,签署失败！");
} }
await _trialDocUserTypeConfirmedUserRepository.AddAsync(new TrialDocUserTypeConfirmedUser() { ConfirmTime = DateTime.Now, ConfirmUserId = _userInfo.Id, IsDeleted = false, TrialDocumentId = userConfirmCommand.DocumentId }, true); trialDocConfirm.ConfirmTime = DateTime.Now;
trialDocConfirm.SignText = userConfirmCommand.SignText;
await _trialDocUserTypeConfirmedUserRepository.SaveChangesAsync();
} }
await _repository.SaveChangesAsync();
return ResponseOutput.Ok(); return ResponseOutput.Ok();
} }

2
IRaCIS.Core.Domain/Document/SystemDocConfirmedUser.cs
View File

@ -51,7 +51,7 @@ namespace IRaCIS.Core.Domain.Models
/// <summary> /// <summary>
/// 是否废除 /// 是否废除
/// </summary> /// </summary>
public bool? IsDeleted { get; set; } public bool IsDeleted { get; set; }
} }

2
IRaCIS.Core.Domain/Document/TrialDocUserTypeConfirmedUser.cs
View File

@ -54,7 +54,7 @@ namespace IRaCIS.Core.Domain.Models
/// <summary> /// <summary>
/// 是否废除 /// 是否废除
/// </summary> /// </summary>
public bool? IsDeleted { get; set; } public bool IsDeleted { get; set; }
} }

6
IRaCIS.Core.Domain/SQLFile/Sql脚本.sql
View File

@ -36,11 +36,9 @@ update DataInspection set CreateUserRealName=(select LastName+' / '+FirstName
update TrialDocUserTypeConfirmedUser set CreateUserId=ConfirmUserId,CreateTime=SignFirstViewTime update TrialDocUserTypeConfirmedUser set CreateUserId=ConfirmUserId,CreateTime=SignFirstViewTime
update SystemDocConfirmedUser set CreateUserId=ConfirmUserId,CreateTime=SignFirstViewTime update SystemDocConfirmedUser set CreateUserId=ConfirmUserId,CreateTime=SignFirstViewTime
update TrialDocUserTypeConfirmedUser set CreateUserId=ConfirmUserId,CreateTime=getdate() where SignFirstViewTime is null update TrialDocUserTypeConfirmedUser set CreateUserId=ConfirmUserId,CreateTime=getdate() where SignFirstViewTime is null
update SystemDocConfirmedUser set CreateUserId=ConfirmUserId,CreateTime=getdate() where SignFirstViewTime is null update SystemDocConfirmedUser set CreateUserId=ConfirmUserId,CreateTime=getdate() where SignFirstViewTime is null
update TrialDocUserTypeConfirmedUser set IsDeleted=0 where IsDeleted is null
update SystemDocConfirmedUser set IsDeleted=0 where IsDeleted is null