update

TEAMModelOS.SDK/Models/Service/Common/ActivityService.cs

@@ -8,6 +8,7 @@ using DocumentFormat.OpenXml.Math;
 using DocumentFormat.OpenXml.Spreadsheet;
 using DocumentFormat.OpenXml.Wordprocessing;
 using HTEXLib.COMM.Helpers;
+using OpenXmlPowerTools;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
@@ -560,11 +561,16 @@ namespace TEAMModelOS.SDK
                 var resultSchool = await _azureCosmos.GetCosmosClient().GetContainer(Constant.TEAMModelOS, Constant.Common).GetList<ActivityDto>(sqlSchool, "Activity");
                 activities.AddRange(resultSchool.list);
             }
+            long now = DateTimeOffset.Now.ToUnixTimeMilliseconds();
             activities.ForEach(z =>
             {
                 var (blob_uri, blob_sas) = _azureStorage.GetBlobContainerSAS(z.owner, BlobContainerSasPermissions.Read | BlobContainerSasPermissions.List);
                 z.sas=blob_sas;
                 z.url = blob_uri;
+                if (z.etime<now)
+                {
+                    z.publish=2;
+                }
             });
 
             return activities;
@@ -642,12 +648,16 @@ namespace TEAMModelOS.SDK
                 var resultSchool = await _azureCosmos.GetCosmosClient().GetContainer(Constant.TEAMModelOS, Constant.Common).GetList<TeacherActivityDto>(sqlSchool, "Activity");
                 activities.AddRange(resultSchool.list);
             }
-
+            long now=DateTimeOffset.Now.ToUnixTimeMilliseconds();
             activities.ForEach(z =>
             {
                 var (blob_uri, blob_sas) = _azureStorage.GetBlobContainerSAS(z.owner, BlobContainerSasPermissions.Read);
                 z.sas=blob_sas;
                 z.url=blob_uri;
+                if (z.etime<now)
+                {
+                    z.publish=2;
+                }
             });
             if (activities.IsNotEmpty())
             {

TEAMModelOS/ClientApp/src/view/elegant/BaseElegantDash.vue

@@ -156,7 +156,7 @@
 						scope: "school",
 						code: this.schoolCode || localStorage.getItem("login_schoolCode"),
 						periodId: isArea ? null : this.$store.state.user.curPeriod.id,
-						type: isArea ? this.$parent.$parent.periodId : null
+                        periodType: isArea ? this.$parent.$parent.periodId : null
 					})
 					.then((res) => {
 						console.log(res);

TEAMModelOS/Controllers/Common/ActivityController.cs

@@ -2748,6 +2748,7 @@ namespace TEAMModelOS.Controllers
                                     contestTasks=item.contestTasks,
                                     sas=blob_sas,
                                     url=blob_uri
+                                    
                                 }) ;
                             }
                         }
@@ -3841,11 +3842,15 @@ namespace TEAMModelOS.Controllers
                     activities.AddRange(resultOpen.list);
                 }
             }
+            long now = DateTimeOffset.Now.ToUnixTimeMilliseconds();
             activities.ForEach(z =>
             {
                 var (blob_uri, blob_sas) = _azureStorage.GetBlobContainerSAS(z.owner, BlobContainerSasPermissions.Read);
                 z.sas=blob_sas;
                 z.url=blob_uri;
+                if (z.etime<now) {
+                    z.publish=2;
+                }
             });
             return Ok(new { activities, website });
         }

TEAMModelOS/Controllers/School/ElegantController.cs

@@ -21,6 +21,7 @@ using Microsoft.AspNetCore.Cryptography.KeyDerivation;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Options;
 using Newtonsoft.Json;
+using OpenXmlPowerTools;
 using TEAMModelOS.Filter;
 using TEAMModelOS.Models;
 using TEAMModelOS.SDK.DI;
@@ -109,9 +110,21 @@ namespace TEAMModelOS.Controllers
             else if ($"{_scope}".Equals("school"))
             {
                 string sqlE = $"select value c from c ";
-                if (!string.IsNullOrWhiteSpace($"{_periodId}")) {
+
+
+                if (!string.IsNullOrWhiteSpace($"{_periodId}"))
+                {
                     sqlE=$"{sqlE}  where c.periodId='{_periodId}'";
                 }
+                else  if (!string.IsNullOrWhiteSpace($"{_periodType}"))
+                {
+                    School school = await _azureCosmos.GetCosmosClient().GetContainer(Constant.TEAMModelOS, Constant.School).ReadItemAsync<School>(_code.GetString(),new PartitionKey("Base"));
+                    var periods= school.period.FindAll(z => !string.IsNullOrWhiteSpace(z.periodType) && z.periodType.Equals($"{_periodType}"));
+                    if (periods.IsNotEmpty()) {
+                        sqlE=$"{sqlE}  where c.periodId='{periods.First().id}'";
+                    }
+                }
+
                 var resultE = await _azureCosmos.GetCosmosClient().GetContainer(Constant.TEAMModelOS, Constant.School).GetList<Elegant>(sqlE,$"Elegant-{_code}");
                 if (resultE.list.IsNotEmpty())
                 {