.gitignore

@@ -56,3 +56,6 @@
 /EMIS.ResourcesTest/bin/Release
 /EMIS.Services/bin/Release
 /EMIS.ResourcesGDJG/obj
+/EMIS.ResourcesGDJY/obj/Debug
+/EMIS.ResourcesGDJY/obj/Release
+/EMIS.ResourcesGDJY/bin/Release

EMIS.ResourcesGDJG/DataAnnotations/Label.Designer.cs

@@ -106,7 +106,7 @@ namespace EMIS.Resources.DataAnnotations {
         }
         
         /// <summary>
-        ///   查找类似 教学点 的本地化字符串。
+        ///   查找类似 院系所 的本地化字符串。
         /// </summary>
         public static string College {
             get {
@@ -115,7 +115,7 @@ namespace EMIS.Resources.DataAnnotations {
         }
         
         /// <summary>
-        ///   查找类似 教学点代码 的本地化字符串。
+        ///   查找类似 院系所代码 的本地化字符串。
         /// </summary>
         public static string CollegeCode {
             get {
@@ -124,7 +124,7 @@ namespace EMIS.Resources.DataAnnotations {
         }
         
         /// <summary>
-        ///   查找类似 教学点数 的本地化字符串。
+        ///   查找类似 院系所数 的本地化字符串。
         /// </summary>
         public static string CollegeCount {
             get {
@@ -133,7 +133,7 @@ namespace EMIS.Resources.DataAnnotations {
         }
         
         /// <summary>
-        ///   查找类似 教学点ID 的本地化字符串。
+        ///   查找类似 院系所ID 的本地化字符串。
         /// </summary>
         public static string CollegeID {
             get {
@@ -142,7 +142,7 @@ namespace EMIS.Resources.DataAnnotations {
         }
         
         /// <summary>
-        ///   查找类似 教学点名称 的本地化字符串。
+        ///   查找类似 院系所名称 的本地化字符串。
         /// </summary>
         public static string CollegeName {
             get {
@@ -151,7 +151,7 @@ namespace EMIS.Resources.DataAnnotations {
         }
         
         /// <summary>
-        ///   查找类似 教学点排名 的本地化字符串。
+        ///   查找类似 院系所排名 的本地化字符串。
         /// </summary>
         public static string CollegeRanking {
             get {
@@ -187,7 +187,7 @@ namespace EMIS.Resources.DataAnnotations {
         }
         
         /// <summary>
-        ///   查找类似 开课教学点 的本地化字符串。
+        ///   查找类似 开课院系所 的本地化字符串。
         /// </summary>
         public static string CourseCollege {
             get {
@@ -196,7 +196,7 @@ namespace EMIS.Resources.DataAnnotations {
         }
         
         /// <summary>
-        ///   查找类似 开课教学点ID 的本地化字符串。
+        ///   查找类似 开课院系ID 的本地化字符串。
         /// </summary>
         public static string CourseCollegeID {
             get {
@@ -205,7 +205,7 @@ namespace EMIS.Resources.DataAnnotations {
         }
         
         /// <summary>
-        ///   查找类似 开课教学点代码 的本地化字符串。
+        ///   查找类似 开课院系代码 的本地化字符串。
         /// </summary>
         public static string CourseCollegeNo {
             get {
@@ -214,7 +214,7 @@ namespace EMIS.Resources.DataAnnotations {
         }
         
         /// <summary>
-        ///   查找类似 培养层次 的本地化字符串。
+        ///   查找类似 所修学历 的本地化字符串。
         /// </summary>
         public static string CultureModel {
             get {
@@ -223,7 +223,7 @@ namespace EMIS.Resources.DataAnnotations {
         }
         
         /// <summary>
-        ///   查找类似 培养层次 的本地化字符串。
+        ///   查找类似 所修学历 的本地化字符串。
         /// </summary>
         public static string CultureModelName {
             get {
@@ -232,7 +232,7 @@ namespace EMIS.Resources.DataAnnotations {
         }
         
         /// <summary>
-        ///   查找类似 培养层次 的本地化字符串。
+        ///   查找类似 所修学历 的本地化字符串。
         /// </summary>
         public static string EducationID {
             get {
@@ -241,7 +241,7 @@ namespace EMIS.Resources.DataAnnotations {
         }
         
         /// <summary>
-        ///   查找类似 培养层次 的本地化字符串。
+        ///   查找类似 所修学历 的本地化字符串。
         /// </summary>
         public static string EducationName {
             get {
@@ -268,7 +268,7 @@ namespace EMIS.Resources.DataAnnotations {
         }
         
         /// <summary>
-        ///   查找类似 是否必修课 的本地化字符串。
+        ///   查找类似 是否课证融通课 的本地化字符串。
         /// </summary>
         public static string IsRequired {
             get {
@@ -277,7 +277,7 @@ namespace EMIS.Resources.DataAnnotations {
         }
         
         /// <summary>
-        ///   查找类似 地址： 的本地化字符串。
+        ///   查找类似 地址：广州市滨江东路500号  邮编：510230  电话：(020)34067698 的本地化字符串。
         /// </summary>
         public static string LoginBottomLine1 {
             get {
@@ -286,7 +286,7 @@ namespace EMIS.Resources.DataAnnotations {
         }
         
         /// <summary>
-        ///   查找类似 Copyright  © 广东警官学院 All Rights Reserved 的本地化字符串。
+        ///   查找类似 备案号：   版权所有：©广东警官学院继续教育部 的本地化字符串。
         /// </summary>
         public static string LoginBottomLine2 {
             get {
@@ -313,7 +313,7 @@ namespace EMIS.Resources.DataAnnotations {
         }
         
         /// <summary>
-        ///   查找类似 期末成绩 的本地化字符串。
+        ///   查找类似 考试成绩 的本地化字符串。
         /// </summary>
         public static string Theoretical {
             get {
@@ -322,7 +322,7 @@ namespace EMIS.Resources.DataAnnotations {
         }
         
         /// <summary>
-        ///   查找类似 广东警官学院继续教育学院教务综合管理平台 的本地化字符串。
+        ///   查找类似 广东警官学院继续教育部教务综合管理平台 的本地化字符串。
         /// </summary>
         public static string Title {
             get {
@@ -331,7 +331,7 @@ namespace EMIS.Resources.DataAnnotations {
         }
         
         /// <summary>
-        ///   查找类似 广东警官学院继续教育学院 的本地化字符串。
+        ///   查找类似 广东警官学院继续教育部 的本地化字符串。
         /// </summary>
         public static string UniversityInscribe {
             get {
@@ -340,7 +340,7 @@ namespace EMIS.Resources.DataAnnotations {
         }
         
         /// <summary>
-        ///   查找类似 广东警官学院继续教育学院 的本地化字符串。
+        ///   查找类似 广东警官学院继续教育部 的本地化字符串。
         /// </summary>
         public static string UniversityName {
             get {
@@ -349,7 +349,7 @@ namespace EMIS.Resources.DataAnnotations {
         }
         
         /// <summary>
-        ///   查找类似 使用教学点 的本地化字符串。
+        ///   查找类似 使用院系所 的本地化字符串。
         /// </summary>
         public static string UsingCollege {
             get {

EMIS.ResourcesGDJG/DataAnnotations/Label.resx

@@ -133,22 +133,22 @@
     <value>校区简称</value>
   </data>
   <data name="College" xml:space="preserve">
-    <value>教学点</value>
+    <value>院系所</value>
   </data>
   <data name="CollegeCode" xml:space="preserve">
-    <value>教学点代码</value>
+    <value>院系所代码</value>
   </data>
   <data name="CollegeCount" xml:space="preserve">
-    <value>教学点数</value>
+    <value>院系所数</value>
   </data>
   <data name="CollegeID" xml:space="preserve">
-    <value>教学点ID</value>
+    <value>院系所ID</value>
   </data>
   <data name="CollegeName" xml:space="preserve">
-    <value>教学点名称</value>
+    <value>院系所名称</value>
   </data>
   <data name="CollegeRanking" xml:space="preserve">
-    <value>教学点排名</value>
+    <value>院系所排名</value>
   </data>
   <data name="CourseCampus" xml:space="preserve">
     <value>开课校区</value>
@@ -160,25 +160,25 @@
     <value>开课校区代码</value>
   </data>
   <data name="CourseCollege" xml:space="preserve">
-    <value>开课教学点</value>
+    <value>开课院系所</value>
   </data>
   <data name="CourseCollegeID" xml:space="preserve">
-    <value>开课教学点ID</value>
+    <value>开课院系ID</value>
   </data>
   <data name="CourseCollegeNo" xml:space="preserve">
-    <value>开课教学点代码</value>
+    <value>开课院系代码</value>
   </data>
   <data name="CultureModel" xml:space="preserve">
-    <value>培养层次</value>
+    <value>所修学历</value>
   </data>
   <data name="CultureModelName" xml:space="preserve">
-    <value>培养层次</value>
+    <value>所修学历</value>
   </data>
   <data name="EducationID" xml:space="preserve">
-    <value>培养层次</value>
+    <value>所修学历</value>
   </data>
   <data name="EducationName" xml:space="preserve">
-    <value>培养层次</value>
+    <value>所修学历</value>
   </data>
   <data name="EvaluationCollegeScore" xml:space="preserve">
     <value>院系评分</value>
@@ -187,13 +187,13 @@
     <value>学生评分</value>
   </data>
   <data name="IsRequired" xml:space="preserve">
-    <value>是否必修课</value>
+    <value>是否课证融通课</value>
   </data>
   <data name="LoginBottomLine1" xml:space="preserve">
-    <value>地址：</value>
+    <value>地址：广州市滨江东路500号  邮编：510230  电话：(020)34067698</value>
   </data>
   <data name="LoginBottomLine2" xml:space="preserve">
-    <value>Copyright  © 广东警官学院 All Rights Reserved</value>
+    <value>备案号：   版权所有：©广东警官学院继续教育部</value>
   </data>
   <data name="Peacetime" xml:space="preserve">
     <value>平时成绩</value>
@@ -202,18 +202,18 @@
     <value>实验成绩</value>
   </data>
   <data name="Theoretical" xml:space="preserve">
-    <value>期末成绩</value>
+    <value>考试成绩</value>
   </data>
   <data name="Title" xml:space="preserve">
-    <value>广东警官学院继续教育学院教务综合管理平台</value>
+    <value>广东警官学院继续教育部教务综合管理平台</value>
   </data>
   <data name="UniversityInscribe" xml:space="preserve">
-    <value>广东警官学院继续教育学院</value>
+    <value>广东警官学院继续教育部</value>
   </data>
   <data name="UniversityName" xml:space="preserve">
-    <value>广东警官学院继续教育学院</value>
+    <value>广东警官学院继续教育部</value>
   </data>
   <data name="UsingCollege" xml:space="preserve">
-    <value>使用教学点</value>
+    <value>使用院系所</value>
   </data>
 </root>

EMIS.ResourcesGDJG/EMIS.ResourcesGDJG.csproj

@@ -51,9 +51,9 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="DataAnnotations\Label.Designer.cs">
+      <DependentUpon>Label.resx</DependentUpon>
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
-      <DependentUpon>Label.resx</DependentUpon>
     </Compile>
     <Compile Include="Images\Images.Designer.cs">
       <AutoGen>True</AutoGen>
@@ -71,6 +71,7 @@
     <EmbeddedResource Include="DataAnnotations\Label.resx">
       <Generator>PublicResXFileCodeGenerator</Generator>
       <LastGenOutput>Label.Designer.cs</LastGenOutput>
+      <SubType>Designer</SubType>
     </EmbeddedResource>
     <EmbeddedResource Include="Images\Images.resx">
       <Generator>PublicResXFileCodeGenerator</Generator>

EMIS.ResourcesGDJG/Properties/AssemblyInfo.cs

@@ -5,11 +5,11 @@ using System.Runtime.InteropServices;
 // 有关程序集的常规信息通过以下
 // 特性集控制。更改这些特性值可修改
 // 与程序集关联的信息。
-[assembly: AssemblyTitle("EMIS.ResourcesGDJG")]
+[assembly: AssemblyTitle("EMIS.ResourcesGDJY")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("EMIS.ResourcesGDJG")]
+[assembly: AssemblyProduct("EMIS.ResourcesGDJY")]
 [assembly: AssemblyCopyright("Copyright ©  2018")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]

EMIS.Web/Controllers/NewReports/ExaminationClassStudentStatisticsController.cs

@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.Mvc;
+
+namespace EMIS.Web.Controllers.NewReports
+{
+    public class ExaminationClassStudentStatisticsController : Controller
+    {
+        //
+        // GET: /ExaminationClassStudentStatistics/
+
+        public ActionResult Index()
+        {
+            return View();
+        }
+
+    }
+}

EMIS.Web/EMIS.Web.csproj

@@ -3697,6 +3697,7 @@
     <None Include="Content\bootstrap\fonts\glyphicons-halflings-regular.ttf" />
     <None Include="Content\bootstrap\fonts\glyphicons-halflings-regular.woff" />
     <None Include="Content\bootstrap\fonts\glyphicons-halflings-regular.woff2" />
+    <Content Include="Content\GDJGTemplateFile\批量导入学生信息模板.xls" />
     <None Include="Content\TemplateFile\scorePDF.xlsx" />
     <None Include="Content\TemplateFile\studentCard.xlsx" />
     <None Include="Content\TemplateFile\studentKeepFileScore.xlsx" />

EMIS.Web/Views/StudentCount/Index.cshtml

@@ -33,7 +33,7 @@
                 }
             }
             if (CMS_SystemConfig.ReportType == 2) {
-                var fileUrl = CMS_SystemConfig.VirtualDirectoryPath + "/StudentStatistics/StudentCountPDF?InSchoolStatusID=" + InSchoolStatusID;
+                var fileUrl = CMS_SystemConfig.VirtualDirectoryPath + "/StudentCount/StudentCountPDF?InSchoolStatusID=" + InSchoolStatusID;
                 $("#reportContent").attr("src", CMS_SystemConfig.VirtualDirectoryPath + "/Scripts/pdf.js/web/viewer.html?file=" + encodeURIComponent(fileUrl));
             }
         }

EMIS.Web/Web.config

@@ -15,7 +15,7 @@
     <!--成教开发环境-->
     <!--<add name="EMISNewContext" providerName="System.Data.SqlClient" connectionString="Data Source=192.168.0.29\sql2008;Initial Catalog=ssEMISNewDGLG1128;Persist Security Info=True;User ID=sa;Password=1;Pooling=True;Max Pool Size=10000;" />-->
     <!--松山测试环境-->
-    <add name="EMISNewContext" providerName="System.Data.SqlClient" connectionString="Data Source=.;Initial Catalog=Gdss.Emis202204081055;Persist Security Info=True;User ID=sa;Password=1;Pooling=True;Max Pool Size=10000;" />
+    <!--<add name="EMISNewContext" providerName="System.Data.SqlClient" connectionString="Data Source=.;Initial Catalog=Gdss.Emis202204081055;Persist Security Info=True;User ID=sa;Password=1;Pooling=True;Max Pool Size=10000;" />-->
     <!--广体测试环境-->
     <!--<add name="EMISNewContext" providerName="System.Data.SqlClient" connectionString="Data Source=192.168.0.66\EmisGzty;Initial Catalog=Gzty.Emis;Persist Security Info=True;User ID=sa;Password=1;Pooling=True;Max Pool Size=10000;" />-->
     <!--广中医测试环境-->
@@ -24,6 +24,8 @@
     <!--<add name="EMISNewContext" providerName="System.Data.SqlClient" connectionString="Data Source=192.168.0.66\EMISHBGD;Initial Catalog=Hbgd.Emis;Persist Security Info=True;User ID=sa;Password=1;Pooling=True;Max Pool Size=10000;" />-->
     <!--科大测试环境-->
     <!--<add name="EMISNewContext" providerName="System.Data.SqlClient" connectionString="Data Source=192.168.0.66\EMISHBKD;Initial Catalog=Hbkd.Emis;Persist Security Info=True;User ID=sa;Password=1;Pooling=True;Max Pool Size=10000;" />-->
+    <!--广东警院测试环境-->
+    <add name="EMISNewContext" providerName="System.Data.SqlClient" connectionString="Data Source=192.168.0.66\EMISADULTDEVELOP;Initial Catalog=AdultDEVELOP;Persist Security Info=True;User ID=sa;Password=1;Pooling=True;Max Pool Size=10000;" />
     <!--临沧农校测试环境-->
     <!--<add name="EMISNewContext" providerName="System.Data.SqlClient" connectionString="Data Source=192.168.0.66\EMISLCNX;Initial Catalog=LCNX.Emis;Persist Security Info=True;User ID=sa;Password=1;Pooling=True;Max Pool Size=10000;" />-->
     <!--<add name="HRServiceContextContainer" providerName="System.Data.SqlClient" connectionString="Data Source=39.98.145.11;Initial Catalog=Emis.HRService;Persist Security Info=True;User ID=sa;Password=Bow1nSql2008;Pooling=True;Max Pool Size=10000;" />
@@ -31,8 +33,8 @@
 
     <!--本地测试环境-->
     <!--<add name="EMISNewContext" providerName="System.Data.SqlClient" connectionString="Data Source=.;Initial Catalog=Hbgd.Emis;Persist Security Info=True;User ID=sa;Password=1;Pooling=True;Max Pool Size=10000;" />-->
-    <add name="HRServiceContextContainer" providerName="System.Data.SqlClient" connectionString="Data Source=.;Initial Catalog=Emis.HRService;Persist Security Info=True;User ID=sa;Password=1;Pooling=True;Max Pool Size=10000;" />
-    <add name="EMISNewLogContext" providerName="System.Data.SqlClient" connectionString="Data Source=.;Initial Catalog=Gdss.EmisLog;Persist Security Info=True;User ID=sa;Password=1;Pooling=True;Max Pool Size=10000;" />
+    <add name="HRServiceContextContainer" providerName="System.Data.SqlClient" connectionString="Data Source=192.168.0.66\EMISADULTDEVELOP;Initial Catalog=Emis.HRService;Persist Security Info=True;User ID=sa;Password=1;Pooling=True;Max Pool Size=10000;" />
+    <add name="EMISNewLogContext" providerName="System.Data.SqlClient" connectionString="Data Source=192.168.0.66\EMISADULTDEVELOP;Initial Catalog=AdultDEVELOP.EmisLog;Persist Security Info=True;User ID=sa;Password=1;Pooling=True;Max Pool Size=10000;" />
   </connectionStrings>
   <appSettings>
     <!--MVC组件配置begin-->

NewEMIS.sln

@@ -98,10 +98,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bowin.Web.Controls.Mvc", "F
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EMIS.Entities.Log", "EMIS.Entities.Log\EMIS.Entities.Log.csproj", "{DB95178F-587B-4F96-88DA-D4FD8EF75BFF}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EMIS.ResourcesGDJG", "EMIS.ResourcesGDJG\EMIS.ResourcesGDJG.csproj", "{0CFF1257-CBE5-4865-8DA7-BE9338085DD8}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EMIS.ExtensionLogic.LCNX", "学校扩展文件\EMIS.ExtensionLogic.LCNX\EMIS.ExtensionLogic.LCNX.csproj", "{4F5005F6-BFA0-44DD-92FA-075435D01553}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EMIS.ExtensionLogic.GDJY", "学校扩展文件\EMIS.ExtensionLogic.GDJY\EMIS.ExtensionLogic.GDJY.csproj", "{A015390F-A5E4-4A27-9763-9DCDC32B5CC3}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EMIS.ResourcesGDJY", "EMIS.ResourcesGDJY\EMIS.ResourcesGDJY.csproj", "{0CFF1257-CBE5-4865-8DA7-BE9338085DD8}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -430,18 +432,6 @@ Global
 		{DB95178F-587B-4F96-88DA-D4FD8EF75BFF}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{DB95178F-587B-4F96-88DA-D4FD8EF75BFF}.Release|x86.ActiveCfg = Release|Any CPU
 		{DB95178F-587B-4F96-88DA-D4FD8EF75BFF}.Release|x86.Build.0 = Release|Any CPU
-		{0CFF1257-CBE5-4865-8DA7-BE9338085DD8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0CFF1257-CBE5-4865-8DA7-BE9338085DD8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0CFF1257-CBE5-4865-8DA7-BE9338085DD8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{0CFF1257-CBE5-4865-8DA7-BE9338085DD8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{0CFF1257-CBE5-4865-8DA7-BE9338085DD8}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{0CFF1257-CBE5-4865-8DA7-BE9338085DD8}.Debug|x86.Build.0 = Debug|Any CPU
-		{0CFF1257-CBE5-4865-8DA7-BE9338085DD8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0CFF1257-CBE5-4865-8DA7-BE9338085DD8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0CFF1257-CBE5-4865-8DA7-BE9338085DD8}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{0CFF1257-CBE5-4865-8DA7-BE9338085DD8}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{0CFF1257-CBE5-4865-8DA7-BE9338085DD8}.Release|x86.ActiveCfg = Release|Any CPU
-		{0CFF1257-CBE5-4865-8DA7-BE9338085DD8}.Release|x86.Build.0 = Release|Any CPU
 		{4F5005F6-BFA0-44DD-92FA-075435D01553}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{4F5005F6-BFA0-44DD-92FA-075435D01553}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{4F5005F6-BFA0-44DD-92FA-075435D01553}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -454,6 +444,30 @@ Global
 		{4F5005F6-BFA0-44DD-92FA-075435D01553}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{4F5005F6-BFA0-44DD-92FA-075435D01553}.Release|x86.ActiveCfg = Release|Any CPU
 		{4F5005F6-BFA0-44DD-92FA-075435D01553}.Release|x86.Build.0 = Release|Any CPU
+		{A015390F-A5E4-4A27-9763-9DCDC32B5CC3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A015390F-A5E4-4A27-9763-9DCDC32B5CC3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A015390F-A5E4-4A27-9763-9DCDC32B5CC3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{A015390F-A5E4-4A27-9763-9DCDC32B5CC3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{A015390F-A5E4-4A27-9763-9DCDC32B5CC3}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A015390F-A5E4-4A27-9763-9DCDC32B5CC3}.Debug|x86.Build.0 = Debug|Any CPU
+		{A015390F-A5E4-4A27-9763-9DCDC32B5CC3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A015390F-A5E4-4A27-9763-9DCDC32B5CC3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A015390F-A5E4-4A27-9763-9DCDC32B5CC3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{A015390F-A5E4-4A27-9763-9DCDC32B5CC3}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{A015390F-A5E4-4A27-9763-9DCDC32B5CC3}.Release|x86.ActiveCfg = Release|Any CPU
+		{A015390F-A5E4-4A27-9763-9DCDC32B5CC3}.Release|x86.Build.0 = Release|Any CPU
+		{0CFF1257-CBE5-4865-8DA7-BE9338085DD8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0CFF1257-CBE5-4865-8DA7-BE9338085DD8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0CFF1257-CBE5-4865-8DA7-BE9338085DD8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{0CFF1257-CBE5-4865-8DA7-BE9338085DD8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{0CFF1257-CBE5-4865-8DA7-BE9338085DD8}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{0CFF1257-CBE5-4865-8DA7-BE9338085DD8}.Debug|x86.Build.0 = Debug|Any CPU
+		{0CFF1257-CBE5-4865-8DA7-BE9338085DD8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0CFF1257-CBE5-4865-8DA7-BE9338085DD8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0CFF1257-CBE5-4865-8DA7-BE9338085DD8}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{0CFF1257-CBE5-4865-8DA7-BE9338085DD8}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{0CFF1257-CBE5-4865-8DA7-BE9338085DD8}.Release|x86.ActiveCfg = Release|Any CPU
+		{0CFF1257-CBE5-4865-8DA7-BE9338085DD8}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -489,8 +503,9 @@ Global
 		{CE305378-83CB-41CF-9CDB-3536F84E3447} = {A77466DE-2CEE-4204-ACE7-D4711BD556E3}
 		{45FCE04F-75CF-4B22-AF0A-BD0EBE109617} = {A77466DE-2CEE-4204-ACE7-D4711BD556E3}
 		{DB95178F-587B-4F96-88DA-D4FD8EF75BFF} = {D5377F2D-8644-4428-8A18-54D28A7856E0}
-		{0CFF1257-CBE5-4865-8DA7-BE9338085DD8} = {57EAD09D-3B94-408F-AAC3-C58AD125741B}
 		{4F5005F6-BFA0-44DD-92FA-075435D01553} = {346F415C-C1E6-4589-B9BD-05918A1C96D9}
+		{A015390F-A5E4-4A27-9763-9DCDC32B5CC3} = {346F415C-C1E6-4589-B9BD-05918A1C96D9}
+		{0CFF1257-CBE5-4865-8DA7-BE9338085DD8} = {57EAD09D-3B94-408F-AAC3-C58AD125741B}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {278E45C4-9C89-4EEA-A0B9-3E79CE973684}

学校扩展文件/EMIS.ExtensionLogic.GDJG/Properties/AssemblyInfo.cs

@@ -1,36 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// 有关程序集的常规信息通过以下
-// 特性集控制。更改这些特性值可修改
-// 与程序集关联的信息。
-[assembly: AssemblyTitle("EMIS.ExtensionLogic.GDJG")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("EMIS.ExtensionLogic.GDJG")]
-[assembly: AssemblyCopyright("Copyright ©  2017")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// 将 ComVisible 设置为 false 使此程序集中的类型
-// 对 COM 组件不可见。如果需要从 COM 访问此程序集中的类型，
-// 则将该类型上的 ComVisible 特性设置为 true。
-[assembly: ComVisible(false)]
-
-// 如果此项目向 COM 公开，则下列 GUID 用于类型库的 ID
-[assembly: Guid("974E32CC-5F8E-4A38-82A5-0E0CF48D34B9")]
-
-// 程序集的版本信息由下面四个值组成:
-//
-//      主版本
-//      次版本 
-//      内部版本号
-//      修订号
-//
-// 可以指定所有这些值，也可以使用“内部版本号”和“修订号”的默认值，
-// 方法是按如下所示使用“*”:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]

学校扩展文件/EMIS.ExtensionLogic.GDJG/EMIS.ExtensionLogic.GDJG.csproj

@@ -1,31 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{D3AD308D-E1FF-418B-9CE5-6658493FC7FF}</ProjectGuid>
+    <ProjectGuid>{A015390F-A5E4-4A27-9763-9DCDC32B5CC3}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>EMIS.ExtensionLogic</RootNamespace>
-    <AssemblyName>EMIS.ExtensionLogic.DGLG</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <RootNamespace>EMIS.ExtensionLogic.GDJY</RootNamespace>
+    <AssemblyName>EMIS.ExtensionLogic.GDJY</AssemblyName>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <SccProjectName>
-    </SccProjectName>
-    <SccLocalPath>
-    </SccLocalPath>
-    <SccAuxPath>
-    </SccAuxPath>
-    <SccProvider>
-    </SccProvider>
+    <Deterministic>true</Deterministic>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>..\..\EMIS.Web\bin\</OutputPath>
+    <OutputPath>bin\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -43,14 +35,17 @@
       <HintPath>..\..\Lib\Bowin.Common.dll</HintPath>
     </Reference>
     <Reference Include="EntityFramework">
-      <HintPath>..\..\packages\EntityFramework.6.1.3\lib\net40\EntityFramework.dll</HintPath>
+      <HintPath>..\..\Lib\EntityFramework.dll</HintPath>
+    </Reference>
+    <Reference Include="EntityFramework.Extended">
+      <HintPath>..\..\Lib\EntityFramework.Extended.dll</HintPath>
     </Reference>
     <Reference Include="EntityFramework.SqlServer">
-      <HintPath>..\..\packages\EntityFramework.6.1.3\lib\net40\EntityFramework.SqlServer.dll</HintPath>
+      <HintPath>..\..\Lib\EntityFramework.SqlServer.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
-    <Reference Include="System.configuration" />
+    <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
     <Reference Include="System.Transactions" />
     <Reference Include="System.Web" />
@@ -58,6 +53,7 @@
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data" />
+    <Reference Include="System.Net.Http" />
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
@@ -68,21 +64,25 @@
     <Compile Include="ServiceLogic\EnrollManage\RecruitSpecialtyServices.cs" />
     <Compile Include="ServiceLogic\GraduationManage\GraduationApplyServices.cs" />
     <Compile Include="ServiceLogic\GraduationManage\GraduationListServices.cs" />
+    <Compile Include="ServiceLogic\Students\StudentsServices.cs" />
     <Compile Include="ServiceLogic\SystemManage\UserServices.cs" />
     <Compile Include="ViewModel\EducationManage\EducationMissionClassViewMetadataType.cs" />
     <Compile Include="ViewModel\StaffViewMetadataType.cs" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="app.config" />
+  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\EMiS.DataLogic\EMIS.DataLogic.csproj">
-      <Project>{D9B77877-BBB9-4E90-96B6-32AA6C43C3A1}</Project>
+      <Project>{d9b77877-bbb9-4e90-96b6-32aa6c43c3a1}</Project>
       <Name>EMIS.DataLogic</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\EMIS.Entities\EMIS.Entities.csproj">
-      <Project>{37E0EAA8-4A6E-46C4-86EF-0745373B1080}</Project>
+      <Project>{37e0eaa8-4a6e-46c4-86ef-0745373b1080}</Project>
       <Name>EMIS.Entities</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\EMIS.Utility\EMIS.Utility.csproj">
-      <Project>{E23364FA-480A-4A5D-95A4-ECBEDFDE03B4}</Project>
+      <Project>{e23364fa-480a-4a5d-95a4-ecbedfde03b4}</Project>
       <Name>EMIS.Utility</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\EMIS.ViewModel\EMIS.ViewModel.csproj">
@@ -90,23 +90,13 @@
       <Name>EMIS.ViewModel</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\ServiceLogic\EMIS.CommonLogic\EMIS.CommonLogic.csproj">
-      <Project>{3F1264D0-C66F-4F85-A0C6-F4E43FEE616A}</Project>
+      <Project>{3f1264d0-c66f-4f85-a0c6-f4e43fee616a}</Project>
       <Name>EMIS.CommonLogic</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\ServiceLogic\EMIS.ICommonLogic\EMIS.ICommonLogic.csproj">
-      <Project>{5CE392A4-CCF8-437F-AC8D-C7BDD4F1731A}</Project>
+      <Project>{5ce392a4-ccf8-437f-ac8d-c7bdd4f1731a}</Project>
       <Name>EMIS.ICommonLogic</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <None Include="app.config" />
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
 </Project>

学校扩展文件/EMIS.ExtensionLogic.GDJY/Properties/AssemblyInfo.cs

@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// 有关程序集的一般信息由以下
+// 控制。更改这些特性值可修改
+// 与程序集关联的信息。
+[assembly: AssemblyTitle("EMIS.ExtensionLogic.GDJY")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("EMIS.ExtensionLogic.GDJY")]
+[assembly: AssemblyCopyright("Copyright ©  2022")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// 将 ComVisible 设置为 false 会使此程序集中的类型
+//对 COM 组件不可见。如果需要从 COM 访问此程序集中的类型
+//请将此类型的 ComVisible 特性设置为 true。
+[assembly: ComVisible(false)]
+
+// 如果此项目向 COM 公开，则下列 GUID 用于类型库的 ID
+[assembly: Guid("a015390f-a5e4-4a27-9763-9dcdc32b5cc3")]
+
+// 程序集的版本信息由下列四个值组成: 
+//
+//      主版本
+//      次版本
+//      生成号
+//      修订号
+//
+//可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
+//通过使用 "*"，如下所示:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]