JAELYS 4 лет назад
Родитель
Сommit
086ec03d8d

+ 1 - 12
TEAMModelOS.SDK/Models/Cosmos/Common/Syllabus.cs

@@ -12,18 +12,7 @@ namespace TEAMModelOS.SDK.Models
     /// </summary>
     /// </summary>
     
     
     public class Syllabus : CosmosEntity
     public class Syllabus : CosmosEntity
-    {
-        [Required(ErrorMessage = "{0} 必须填写")]
-        public string code { get; set; }
-        //[PartitionKey(name = "Syllabuses")]
-        public string pk { get; set; }
-        public int? ttl { get; set; }
-        /// <summary>
-        /// 
-        /// </summary>
-        [Required(ErrorMessage = "{0} 必须填写")]
-        public string id { get; set; }
-
+    {  
         /// <summary>
         /// <summary>
         /// 册别编码
         /// 册别编码
         /// </summary>
         /// </summary>

+ 1 - 1
TEAMModelOS/Controllers/Common/SurveyController.cs

@@ -386,7 +386,7 @@ namespace TEAMModelOS.Controllers
                 }*/
                 }*/
 
 
             }
             }
-            catch (Exception e)
+            catch
             {
             {
                 return BadRequest();
                 return BadRequest();
             }
             }

+ 2 - 9
TEAMModelOS/Models/Dto/ExamInfoDto.cs

@@ -14,17 +14,10 @@ namespace TEAMModelOS.SDK.Models
     /// </summary>
     /// </summary>
    
    
     public class ExamInfoDto : CosmosEntity
     public class ExamInfoDto : CosmosEntity
-    {
-        [Required(ErrorMessage = "{0} 必须填写")]
-        public string code { get; set; }
-
-        public string pk { get; set; }
-        public int? ttl { get; set; }
+    {        
         public ExamInfoDto()
         public ExamInfoDto()
         {
         {
-        }
-        [JsonProperty(PropertyName = "id")]
-        public string id { get; set; }
+        }       
 
 
         public string name { get; set; }
         public string name { get; set; }
         public int stuCount { get; set; }
         public int stuCount { get; set; }

+ 2 - 8
TEAMModelOS/Models/Dto/ExamResultDto.cs

@@ -12,20 +12,14 @@ namespace TEAMModelOS.SDK.Models
     /// </summary>
     /// </summary>
    
    
     public class ExamResultDto : CosmosEntity
     public class ExamResultDto : CosmosEntity
-    {
-        [Required(ErrorMessage = "{0} 必须填写")]
-        public string code { get; set; }
-        // [PartitionKey(name = "ExamResult")]
-        public string pk { get; set; }
-        public int? ttl { get; set; }
+    {       
         public ExamResultDto()
         public ExamResultDto()
         {
         {
             classes = new List<Dictionary<string, int[]>>();
             classes = new List<Dictionary<string, int[]>>();
             result = new List<List<double>>();
             result = new List<List<double>>();
             ids = new List<string>();
             ids = new List<string>();
             point = new List<double>();
             point = new List<double>();
-        }
-        public string id { get; set; }
+        }        
         public string name { get; set; }
         public string name { get; set; }
         public string time { get; set; }
         public string time { get; set; }
         public string subjectCode { get; set; }
         public string subjectCode { get; set; }

+ 1 - 17
TEAMModelOS/TEAMModelOS.csproj

@@ -11,23 +11,7 @@
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.6" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.6" />
       <PackageReference Include="VueCliMiddleware" Version="5.0.0" />
       <PackageReference Include="VueCliMiddleware" Version="5.0.0" />
   </ItemGroup>  
   </ItemGroup>  
-  <ItemGroup>
-    <!-- Don't publish the SPA source files, but do show them in the project files list -->
-    <Compile Remove="JsonFile\Subject\**" />
-    <Compile Remove="logfile\**" />
-    <Compile Remove="Models\SchoolInfo\**" />     
-    <Content Remove="JsonFile\Subject\**" />    
-    <Content Remove="logfile\**" />    
-    <Content Remove="Models\SchoolInfo\**" />    
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Remove="JsonFile\Subject\**" />
-    <EmbeddedResource Remove="logfile\**" />
-    <EmbeddedResource Remove="Models\SchoolInfo\**" />
-    <None Remove="JsonFile\Subject\**" />
-    <None Remove="logfile\**" />
-    <None Remove="Models\SchoolInfo\**" />
-  </ItemGroup> 
+  
   <ItemGroup>
   <ItemGroup>
     <Folder Include="JwtRsaFile\" />
     <Folder Include="JwtRsaFile\" />
     <Folder Include="Services\Evaluation\" />
     <Folder Include="Services\Evaluation\" />