Browse Source

版本号

CrazyIter_Bin 1 year ago
parent
commit
0c3f69b047

+ 3 - 3
TEAMModelBI/TEAMModelBI.csproj

@@ -65,9 +65,9 @@
 		<SpaRoot>ClientApp\</SpaRoot>
 		<DefaultItemExcludes>$(DefaultItemExcludes);$(SpaRoot)node_modules\**</DefaultItemExcludes>
 		<UserSecretsId>078b5d89-7d90-4f6a-88fc-7d96025990a8</UserSecretsId>
-		<Version>5.2308.23</Version>
-		<AssemblyVersion>5.2308.23.1</AssemblyVersion>
-		<FileVersion>5.2308.23.1</FileVersion>
+		<Version>5.2308.30</Version>
+		<AssemblyVersion>5.2308.30.1</AssemblyVersion>
+		<FileVersion>5.2308.30.1</FileVersion>
 		<Description>TEAMModelBI(BI)</Description>
 		<PackageReleaseNotes>BI版本说明版本切换标记2022000908</PackageReleaseNotes>
 		<PackageId>TEAMModelBI</PackageId>

+ 3 - 3
TEAMModelOS.FunctionV4/TEAMModelOS.FunctionV4.csproj

@@ -5,9 +5,9 @@
 		<OutputType>Exe</OutputType>
 		<_FunctionsSkipCleanOutput>true</_FunctionsSkipCleanOutput>
 		<SignAssembly>true</SignAssembly>
-		<Version>5.2308.23</Version>
-		<AssemblyVersion>5.2308.23.1</AssemblyVersion>
-		<FileVersion>5.2308.23.1</FileVersion>
+		<Version>5.2308.30</Version>
+		<AssemblyVersion>5.2308.30.1</AssemblyVersion>
+		<FileVersion>5.2308.30.1</FileVersion>
 		<PackageId>TEAMModelOS.FunctionV4</PackageId>
 		<Authors>teammodel</Authors>
 		<Company>醍摩豆(成都)信息技术有限公司</Company>

+ 16 - 3
TEAMModelOS/Controllers/Both/GroupListController.cs

@@ -1632,16 +1632,29 @@ namespace TEAMModelOS.Controllers
         [Authorize(Roles = "IES")]
 #endif
         public async Task<IActionResult> Backups(JsonElement json) {
-            if (!json.TryGetProperty("semesterId", out JsonElement semesterId)) { return BadRequest(); }
-            if (!json.TryGetProperty("targetStudyYear", out JsonElement targetStudyYear)) { return BadRequest(); }
-            if (!json.TryGetProperty("currStudyYear", out JsonElement currStudyYear)) { return BadRequest(); }
+            if (!json.TryGetProperty("targetStudyYear", out JsonElement _targetStudyYear)) { return BadRequest(); }
+            if (!json.TryGetProperty("sourceStudyYear", out JsonElement _sourceStudyYear)) { return BadRequest(); }
             if (!json.TryGetProperty("periodId", out JsonElement periodId)) { return BadRequest(); }
+
+            int targetStudyYear = _targetStudyYear.GetInt32();
+            int sourceStudyYear = _sourceStudyYear.GetInt32();
             var (userid, _, _, schoolId) = HttpContext.GetAuthTokenInfo();
             School school =  await _azureCosmos.GetCosmosClient().GetContainer(Constant.TEAMModelOS, Constant.School).ReadItemAsync<School>(schoolId, new PartitionKey("Base"));
             var period= school.period.Find(z => z.id.Equals($"{periodId}"));
             if (period!=null) {
                 var semester = SchoolService.GetSemester(period,DateTimeOffset.UtcNow.ToUnixTimeMilliseconds());
+                int classYear = sourceStudyYear;
+                if (sourceStudyYear>=semester.studyYear)
+                {
+                 
+                    if (targetStudyYear >= semester.studyYear) {
+                        classYear =semester.studyYear;
+                    }
 
+                }
+                else {
+                    classYear=sourceStudyYear;
+                }
             }
             return Ok();
         }

+ 3 - 3
TEAMModelOS/TEAMModelOS.csproj

@@ -71,9 +71,9 @@
     <SpaRoot>ClientApp\</SpaRoot>
     <DefaultItemExcludes>$(DefaultItemExcludes);$(SpaRoot)node_modules\**</DefaultItemExcludes>
     <UserSecretsId>078b5d89-7d90-4f6a-88fc-7d96025990a8</UserSecretsId>
-    <Version>5.2308.23</Version>
-    <AssemblyVersion>5.2308.23.1</AssemblyVersion>
-    <FileVersion>5.2308.23.1</FileVersion>
+    <Version>5.2308.30</Version>
+    <AssemblyVersion>5.2308.30.1</AssemblyVersion>
+    <FileVersion>5.2308.30.1</FileVersion>
     <Description>TEAMModelOS(IES5)</Description>
     <PackageReleaseNotes>IES版本说明版本切换标记5.2308.13.1</PackageReleaseNotes>
     <PackageId>TEAMModelOS</PackageId>

+ 1 - 1
TEAMModelOS/appsettings.Development.json

@@ -18,7 +18,7 @@
     "IdTokenSalt": "8263692E2213497BB55E74792B7900B4",
     "HttpTrigger": "https://teammodelosfunction-test.chinacloudsites.cn/api/",
     //"HttpTrigger": "http://localhost:7071/api/"
-    "Version": "5.2308.23.1"
+    "Version": "5.2308.30.1"
   },
   "Azure": {
    // 测试站数据库

+ 1 - 1
TEAMModelOS/appsettings.json

@@ -18,7 +18,7 @@
     "Exp": 86400,
     "IdTokenSalt": "8263692E2213497BB55E74792B7900B4",
     "HttpTrigger": "https://teammodelosfunction.chinacloudsites.cn/api/",
-    "Version": "5.2308.23.1"
+    "Version": "5.2308.30.1"
   },
   "Azure": {
     "Storage": {