|
@@ -191,7 +191,7 @@ namespace TEAMModelOS.SDK
|
|
/// <param name="type"></param>
|
|
/// <param name="type"></param>
|
|
/// <param name="school"></param>
|
|
/// <param name="school"></param>
|
|
/// <returns></returns>
|
|
/// <returns></returns>
|
|
- public static async Task<(int status, GroupList stuList,Member member)> CodeJoinList(CosmosClient client,AzureRedisFactory _azureRedis, string _stuListNo, string userid, int type, string school,int year,string name ,string picture,string lang )
|
|
|
|
|
|
+ public static async Task<(int status, GroupList stuList,Member member)> CodeJoinList(CosmosClient client,AzureRedisFactory _azureRedis, string _stuListNo, string userid, int type, string school,int year,string name ,string picture,string lang,string courseId= null)
|
|
{
|
|
{
|
|
var queryNo = $"SELECT value(c) FROM c where c.no ='{_stuListNo}'";
|
|
var queryNo = $"SELECT value(c) FROM c where c.no ='{_stuListNo}'";
|
|
(int status, GroupList stuList,Member member) data = (-1, null,null);
|
|
(int status, GroupList stuList,Member member) data = (-1, null,null);
|
|
@@ -212,7 +212,6 @@ namespace TEAMModelOS.SDK
|
|
//状态=4 表示未开放加入。
|
|
//状态=4 表示未开放加入。
|
|
return (4, item, null) ;
|
|
return (4, item, null) ;
|
|
}
|
|
}
|
|
-
|
|
|
|
if (item.review ==1)
|
|
if (item.review ==1)
|
|
{
|
|
{
|
|
|
|
|
|
@@ -242,7 +241,7 @@ namespace TEAMModelOS.SDK
|
|
groupName= item.name,
|
|
groupName= item.name,
|
|
applyTime=now
|
|
applyTime=now
|
|
};
|
|
};
|
|
-
|
|
|
|
|
|
+ string sql = "select value c from c join b in c.schedules where b.groupId='60f92012-72cf-4d5c-a66a-552678303fad'";
|
|
string key = $"GroupList:GroupWaitingList:{item.scope}:{item.id}";
|
|
string key = $"GroupList:GroupWaitingList:{item.scope}:{item.id}";
|
|
string filed = !string.IsNullOrWhiteSpace(school) ? $"{school}_{userid}" : userid;
|
|
string filed = !string.IsNullOrWhiteSpace(school) ? $"{school}_{userid}" : userid;
|
|
await _azureRedis.GetRedisClient(8).HashSetAsync(key, filed, waitingList.ToJsonString());
|
|
await _azureRedis.GetRedisClient(8).HashSetAsync(key, filed, waitingList.ToJsonString());
|
|
@@ -294,6 +293,7 @@ namespace TEAMModelOS.SDK
|
|
/// 申请状态,-1 申请中,0 通过,1 拒绝,2 已过期。
|
|
/// 申请状态,-1 申请中,0 通过,1 拒绝,2 已过期。
|
|
/// </summary>
|
|
/// </summary>
|
|
public int status { get; set; } = -1;
|
|
public int status { get; set; } = -1;
|
|
|
|
+ public List<IdName> courses { get; set; }= new List<IdName>();
|
|
}
|
|
}
|
|
public static (int status, GroupList stuList, Member member) JoinList(GroupList stuList, string userid, int type, string school,int year)
|
|
public static (int status, GroupList stuList, Member member) JoinList(GroupList stuList, string userid, int type, string school,int year)
|
|
{
|
|
{
|