From eebda757cfc3f46f13a115e7f1709583ecb1ab15 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Fri, 20 May 2022 17:47:57 +0800 Subject: [PATCH] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E9=80=9A=E7=9F=A5=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../IRaCIS.Core.Application.xml | 26 ++--- .../TrialSiteUser/PersonalWorkstation.cs | 4 +- .../TrialSiteUser/TrialConfigService.cs | 109 +++++++++--------- 3 files changed, 71 insertions(+), 68 deletions(-) diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml index 97161d6ac..24b052347 100644 --- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml +++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml @@ -1718,19 +1718,6 @@ - - - 签名认证 + - - - - - - 业务接口操作成功后， 让签署数据生效 - - - - 签名确认 包括项目的三组配置 + QC问题确认 后修改状态 (适用于不会回退的，项目废除、状态修改， 存在回退 不在这里弄，提供单独接口修改状态) @@ -1789,6 +1776,19 @@ + + + 签名认证 + + + + + + + 业务接口操作成功后， 让签署数据生效 + + + + 添加访视计划 要给改项目下的所有Subject 添加该访视 diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/PersonalWorkstation.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/PersonalWorkstation.cs index 4273797d8..348a39adc 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/PersonalWorkstation.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/PersonalWorkstation.cs @@ -84,7 +84,9 @@ namespace IRaCIS.Core.Application TotalSystemNoticeCount= _userInfo.UserTypeEnumInt == (int)UserTypeEnum.SuperAdmin - ? 0:await _systemNoticeRepository.Where(t => t.NoticeUserTypeList.Any(t => t.UserTypeId == _userInfo.UserTypeId) && t.NoticeStateEnum== Domain.Share.Management.SystemNotice_NoticeStateEnum.HavePublished).CountAsync(), + ? 0:await _systemNoticeRepository.Where(t => t.NoticeUserTypeList.Any(t => t.UserTypeId == _userInfo.UserTypeId) && t.NoticeStateEnum== Domain.Share.Management.SystemNotice_NoticeStateEnum.HavePublished) + .Where(t => t.EndDate == null || t.EndDate != null && t.EndDate > DateTime.Now) + .CountAsync(), NeedReadSystemNoticeCount = _userInfo.UserTypeEnumInt == (int)UserTypeEnum.SuperAdmin ? 0 : await _systemNoticeRepository.Where(t => t.NoticeUserTypeList.Any(t => t.UserTypeId == _userInfo.UserTypeId) && t.NoticeStateEnum == Domain.Share.Management.SystemNotice_NoticeStateEnum.HavePublished diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs index 404f6b76a..60a77d0c1 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs @@ -1,12 +1,10 @@ using IRaCIS.Application.Interfaces; using IRaCIS.Core.Application.Contracts; using Microsoft.AspNetCore.Mvc; -using IRaCIS.Core.Infra.EFCore; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Http; using IRaCIS.Core.Domain.Share; using EasyCaching.Core; -using IRaCIS.Core.Application.Filter; using IRaCIS.Core.Infrastructure; namespace IRaCIS.Core.Application @@ -52,54 +50,7 @@ namespace IRaCIS.Core.Application }); } - /// - /// 签名认证 + - /// - /// - [HttpPost] - public async Task VerifySignature(SignDTO signDTO) - { - var user = await _repository.FirstOrDefaultAsync(u => u.UserName == signDTO.UserName && u.Password == signDTO.PassWord); - if (user == null) - { - return ResponseOutput.NotOk("password error"); - } - else if (user.Status == UserStateEnum.Disable) - { - return ResponseOutput.NotOk("The user has been disabled!"); - } - - //if (signDTO.IsAddSignData) - //{ - // 记录签名信息 - var add = await _repository.AddAsync(_mapper.Map(signDTO)); - - await _repository.SaveChangesAsync(); - - return ResponseOutput.Ok(add.Id); - //} - - //return ResponseOutput.Ok(); - - } - - - - - /// - /// 业务接口操作成功后， 让签署数据生效 - /// - /// - /// - [HttpPut("{signId:guid}")] - [Obsolete] - public async Task MakeSignEffective(Guid signId) - { - var success = await _repository.BatchUpdateAsync(t => t.Id == signId, u => new TrialSign() { IsCompleted = true }); - - return ResponseOutput.Result(success); - } @@ -299,8 +250,6 @@ namespace IRaCIS.Core.Application },true); - - return ResponseOutput.Ok(); } @@ -387,8 +336,7 @@ namespace IRaCIS.Core.Application - - + #region 调整废弃 [Obsolete] [HttpPost("{trialId:guid}/{type}")] public async Task UploadTrialFile(IFormFile file, string type, Guid trialId, [FromServices] IWebHostEnvironment _hostEnvironment) @@ -423,6 +371,59 @@ namespace IRaCIS.Core.Application }); } - + + /// + /// 签名认证 + + /// + /// + [HttpPost] + [Obsolete] + public async Task VerifySignature(SignDTO signDTO) + { + + var user = await _repository.FirstOrDefaultAsync(u => u.UserName == signDTO.UserName && u.Password == signDTO.PassWord); + if (user == null) + { + return ResponseOutput.NotOk("password error"); + } + else if (user.Status == UserStateEnum.Disable) + { + return ResponseOutput.NotOk("The user has been disabled!"); + } + + //if (signDTO.IsAddSignData) + //{ + // 记录签名信息 + var add = await _repository.AddAsync(_mapper.Map(signDTO)); + + await _repository.SaveChangesAsync(); + + return ResponseOutput.Ok(add.Id); + //} + + //return ResponseOutput.Ok(); + + } + + + + + /// + /// 业务接口操作成功后， 让签署数据生效 + /// + /// + /// + [HttpPut("{signId:guid}")] + [Obsolete] + public async Task MakeSignEffective(Guid signId) + { + var success = await _repository.BatchUpdateAsync(t => t.Id == signId, u => new TrialSign() { IsCompleted = true }); + + return ResponseOutput.Result(success); + } + #endregion + + + } }