ソースを参照

更新代码。

CrazyIter_Bin 3 年 前
コミット
3abdd90353

+ 1 - 1
TEAMModelFunction/TriggerStudy.cs

@@ -52,7 +52,7 @@ namespace TEAMModelFunction
                             {
                             {
                                 pk = "Activity",
                                 pk = "Activity",
                                 id = study.id,
                                 id = study.id,
-                                code = $"Activity-{x}",
+                                code = $"Activity-{x.id}",
                                 type = "Study",
                                 type = "Study",
                                 name = study.name,
                                 name = study.name,
                                 startTime = study.startTime,
                                 startTime = study.startTime,

+ 2 - 2
TEAMModelFunction/TriggerSurvey.cs

@@ -142,7 +142,7 @@ namespace TEAMModelFunction
                                     {
                                     {
                                         pk = "Activity",
                                         pk = "Activity",
                                         id = survey.id,
                                         id = survey.id,
-                                        code = $"Activity-{x}",
+                                        code = $"Activity-{x.id}",
                                         type = "Survey",
                                         type = "Survey",
                                         name = survey.name,
                                         name = survey.name,
                                         startTime = survey.startTime,
                                         startTime = survey.startTime,
@@ -156,7 +156,7 @@ namespace TEAMModelFunction
                                         owner = survey.owner,
                                         owner = survey.owner,
                                         createTime = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds(),
                                         createTime = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds(),
                                         taskStatus = -1,
                                         taskStatus = -1,
-                                        classIds = classes
+                                        classIds = survey.tchLists
                                     });
                                     });
                                 });
                                 });
                             }
                             }

+ 5 - 2
TEAMModelFunction/TriggerVote.cs

@@ -139,7 +139,7 @@ namespace TEAMModelFunction
                                     });
                                     });
                                 });
                                 });
                             }
                             }
-
+                           
                             (List<TmdInfo> tchList, _) = await TriggerStuActivity.GetTchList(client, _dingDing, vote.tchLists, vote.school);
                             (List<TmdInfo> tchList, _) = await TriggerStuActivity.GetTchList(client, _dingDing, vote.tchLists, vote.school);
                             if (tchList.IsNotEmpty())
                             if (tchList.IsNotEmpty())
                             {
                             {
@@ -148,7 +148,7 @@ namespace TEAMModelFunction
                                     {
                                     {
                                         pk = "Activity",
                                         pk = "Activity",
                                         id = vote.id,
                                         id = vote.id,
-                                        code = $"Activity-{x}",
+                                        code = $"Activity-{x.id}",
                                         type = "Vote",
                                         type = "Vote",
                                         name = vote.name,
                                         name = vote.name,
                                         startTime = vote.startTime,
                                         startTime = vote.startTime,
@@ -166,6 +166,9 @@ namespace TEAMModelFunction
                                     });
                                     });
                                 });
                                 });
                             }
                             }
+                            await _dingDing.SendBotMsg($"{Environment.GetEnvironmentVariable("Option:Location")}投票活动,:教研组活动:" +
+                             
+                               $"{tchActivities.ToJsonString()}\n", GroupNames.成都开发測試群組);
                             await TriggerStuActivity.SaveStuActivity(client, _dingDing, stuActivities, tmdActivities, tchActivities);
                             await TriggerStuActivity.SaveStuActivity(client, _dingDing, stuActivities, tmdActivities, tchActivities);
                             //向学生或醍摩豆账号发起通知
                             //向学生或醍摩豆账号发起通知
                             #region
                             #region

+ 1 - 1
TEAMModelOS.SDK/Models/Service/TriggerStuActivity.cs

@@ -111,7 +111,7 @@ namespace TEAMModelOS.SDK
                 }
                 }
                 if (tchActivities.IsNotEmpty())
                 if (tchActivities.IsNotEmpty())
                 {
                 {
-                    foreach (var x in tmdActivities)
+                    foreach (var x in tchActivities)
                     {
                     {
                         await client.GetContainer(Constant.TEAMModelOS, "Teacher").UpsertItemAsync(x, new PartitionKey(x.code));
                         await client.GetContainer(Constant.TEAMModelOS, "Teacher").UpsertItemAsync(x, new PartitionKey(x.code));
                     }
                     }

+ 21 - 2
TEAMModelOS/Controllers/XTest/TestController.cs

@@ -13,6 +13,7 @@ using System.Net.Http.Json;
 using System.Text;
 using System.Text;
 using System.Text.Json;
 using System.Text.Json;
 using System.Threading.Tasks;
 using System.Threading.Tasks;
+using TEAMModelOS.SDK;
 using TEAMModelOS.SDK.DI;
 using TEAMModelOS.SDK.DI;
 using TEAMModelOS.SDK.Extension;
 using TEAMModelOS.SDK.Extension;
 using TEAMModelOS.SDK.Models;
 using TEAMModelOS.SDK.Models;
@@ -277,9 +278,27 @@ namespace TEAMModelOS.Controllers
             {
             {
                 return BadRequest(e.StackTrace);
                 return BadRequest(e.StackTrace);
             }
             }
+        }/// <summary>
+         /// 删除
+         /// </summary>
+         /// <param name="request"></param>
+         /// <returns></returns>
+        [ProducesDefaultResponseType]
+        //[AuthToken(Roles = "teacher")]
+        [HttpPost("get-data")]
+        public async Task<IActionResult> GetData(JsonElement request)
+        {
+            try
+            {
+                var client = _azureCosmos.GetCosmosClient();
+                (List<TmdInfo> tchList, _) =await TriggerStuActivity.GetTchList(client, _dingDing, new List<string> { "76739d39-b9c1-d34f-8407-836369a4f3a2", "82c216a2-2595-ffc7-1b80-5455e064bc03" }, "hbcn");
+                return Ok(new { code = 1, tchList });
+            }
+            catch (Exception e)
+            {
+                return BadRequest(e.StackTrace);
+            }
         }
         }
-
-       
     }
     }
     public class IdCode
     public class IdCode
     {
     {