|
@@ -76,15 +76,16 @@ namespace TEAMModelOS.SDK
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+ string SummarySql = " c.id,c.code,c.name,c.no,c.periodId,c.scope,c.school,c.creatorId,c.type,c.year,c.tcount,c.scount,c.leader ";
|
|
|
if (groupTypes.IsEmpty() || groupTypes.Contains("teach")) {
|
|
|
//教学班
|
|
|
StringBuilder teachsql = new StringBuilder();
|
|
|
if (string.IsNullOrWhiteSpace(school) && memberType == 2) {
|
|
|
- teachsql.Append($"SELECT distinct value(c) FROM c join m in c.members where c.type='teach' and m.id={memberId} and m.school={school} and m.type=2 ");
|
|
|
+ teachsql.Append($"SELECT distinct {SummarySql} FROM c join m in c.members where c.type='teach' and m.id={memberId} and m.school={school} and m.type=2 ");
|
|
|
}
|
|
|
if (memberType == 1)
|
|
|
{
|
|
|
- teachsql.Append($"SELECT distinct value(c) FROM c join m in c.members where c.type='teach' and m.id={memberId}and m.type=1 ");
|
|
|
+ teachsql.Append($"SELECT distinct {SummarySql} FROM c join m in c.members where c.type='teach' and m.id={memberId} and m.type=1 ");
|
|
|
}
|
|
|
await foreach (var item in client.GetContainer(Constant.TEAMModelOS, "School").
|
|
|
GetItemQueryIterator<GroupList>(queryText: teachsql.ToString(), requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"GroupList-{school}") }))
|
|
@@ -100,11 +101,12 @@ namespace TEAMModelOS.SDK
|
|
|
groupLists.Add(new GroupListGrp(item, groupName));
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
if (!string.IsNullOrWhiteSpace(school) && (groupTypes.IsEmpty() || groupTypes.Contains("research")))
|
|
|
{
|
|
|
//教研组
|
|
|
StringBuilder teachsql = new StringBuilder();
|
|
|
- teachsql.Append($"SELECT distinct value(c) FROM c join m in c.members where c.type='research' and m.id={memberId}and m.type=1 ");
|
|
|
+ teachsql.Append($"SELECT distinct {SummarySql} FROM c join m in c.members where c.type='research' and m.id={memberId} and m.type=1 ");
|
|
|
await foreach (var item in client.GetContainer(Constant.TEAMModelOS, "School").
|
|
|
GetItemQueryIterator<GroupList>(queryText: teachsql.ToString(), requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"GroupList-{school}") }))
|
|
|
{
|
|
@@ -116,7 +118,7 @@ namespace TEAMModelOS.SDK
|
|
|
{
|
|
|
//研修名单
|
|
|
StringBuilder teachsql = new StringBuilder();
|
|
|
- teachsql.Append($"SELECT distinct value(c) FROM c join m in c.members where c.type='yxtrain' and m.id={memberId}and m.type=1 ");
|
|
|
+ teachsql.Append($"SELECT distinct {SummarySql} FROM c join m in c.members where c.type='yxtrain' and m.id={memberId} and m.type=1 ");
|
|
|
await foreach (var item in client.GetContainer(Constant.TEAMModelOS, "School").
|
|
|
GetItemQueryIterator<GroupList>(queryText: teachsql.ToString(), requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"GroupList-{school}") }))
|
|
|
{
|