Merge branch 'Test_IRC_Net10' of https://gitea.frp.extimaging.com/XCKJ/irc-netcore-api into Test_IRC_Net10
continuous-integration/drone/push Build is running
Details
continuous-integration/drone/push Build is running
Details
commit
602cfe43d0
|
|
@ -1471,6 +1471,11 @@ namespace IRaCIS.Core.Application.Contracts
|
||||||
return ResponseOutput.Ok(list, config);
|
return ResponseOutput.Ok(list, config);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 调研表基本信息
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="inQuery"></param>
|
||||||
|
/// <returns></returns>
|
||||||
[HttpPost]
|
[HttpPost]
|
||||||
public async Task<IResponseOutput> GetSiteSurveyInfoList(SiteSurveyInfoQuery inQuery)
|
public async Task<IResponseOutput> GetSiteSurveyInfoList(SiteSurveyInfoQuery inQuery)
|
||||||
{
|
{
|
||||||
|
|
@ -1485,5 +1490,25 @@ namespace IRaCIS.Core.Application.Contracts
|
||||||
|
|
||||||
return ResponseOutput.Ok(list, config);
|
return ResponseOutput.Ok(list, config);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// SPM 是否参与流程
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="trialId"></param>
|
||||||
|
/// <returns></returns>
|
||||||
|
public async Task<bool> GetTrialIsSPMJoin(Guid trialId)
|
||||||
|
{
|
||||||
|
var hasSPMOrCPM = await _trialRepository.Where(t => t.Id == trialId).AnyAsync(t => t.TrialIdentityUserList.SelectMany(t => t.TrialUserRoleList).Any(t =>
|
||||||
|
t.UserRole.IdentityUser.Status == UserStateEnum.Enable
|
||||||
|
&& t.UserRole.IsUserRoleDisabled == false
|
||||||
|
&& (t.UserRole.UserTypeEnum == UserTypeEnum.SPM || t.UserRole.UserTypeEnum == UserTypeEnum.CPM))
|
||||||
|
);
|
||||||
|
|
||||||
|
var isTrialSPMJoin = await _trialRepository.AnyAsync(t => t.Id == trialId && t.IsSPMJoinSiteSurvey);
|
||||||
|
|
||||||
|
var isSPMjoin = isTrialSPMJoin && hasSPMOrCPM;
|
||||||
|
|
||||||
|
return isSPMjoin;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -131,5 +131,4 @@ public enum SiteSurveyOptTyp
|
||||||
Update = 4,
|
Update = 4,
|
||||||
|
|
||||||
Over=5,
|
Over=5,
|
||||||
|
|
||||||
}
|
}
|
||||||
Loading…
Reference in New Issue