广警修改

EMIS.Web/Config/DataAnnotations.xml

@@ -48,8 +48,8 @@
 
 
   <!--河北工大begin-->
-  <MetadataTypes Assembly="EMIS.ExtensionLogic.HBGD">
-  </MetadataTypes>
+  <!--<MetadataTypes Assembly="EMIS.ExtensionLogic.HBGD">
+  </MetadataTypes>-->
   <!--河北工大end-->
   
   
@@ -64,6 +64,10 @@
   </MetadataTypes>-->
   <!--临沧农校end-->
   
+  <!--广东警官begin-->
+  <MetadataTypes Assembly="EMIS.ExtensionLogic.GDJY">
+  </MetadataTypes>
+  <!--广东警官end-->
   
   <!--Testbegin-->
   <!--<MetadataTypes Assembly="EMIS.ExtensionLogic.Test">

EMIS.Web/Config/IOCConfig.xml

@@ -158,29 +158,29 @@
 
   <!--河北工大begin-->
   <!--招生专业页面（专业班级生成规则）-->
-  <component name="EMIS.CommonLogic.EnrollManage.SpecialtyManage.IRecruitSpecialtyServices"
-             implement="EMIS.ExtensionLogic.ServiceLogic.EnrollManage.RecruitSpecialtyServices, EMIS.ExtensionLogic.HBGD" />
+  <!--<component name="EMIS.CommonLogic.EnrollManage.SpecialtyManage.IRecruitSpecialtyServices"
+             implement="EMIS.ExtensionLogic.ServiceLogic.EnrollManage.RecruitSpecialtyServices, EMIS.ExtensionLogic.HBGD" />-->
   <!--新生分配页面（匹配省招专业）-->
-  <component name="EMIS.CommonLogic.EnrollManage.NewStudentManage.INewStudentCollegeServices"
-             implement="EMIS.ExtensionLogic.ServiceLogic.EnrollManage.NewStudentCollegeServices, EMIS.ExtensionLogic.HBGD" />
+  <!--<component name="EMIS.CommonLogic.EnrollManage.NewStudentManage.INewStudentCollegeServices"
+             implement="EMIS.ExtensionLogic.ServiceLogic.EnrollManage.NewStudentCollegeServices, EMIS.ExtensionLogic.HBGD" />-->
   <!--录取名单页面（名单提交匹配录取照片）-->
-  <component name="EMIS.CommonLogic.EnrollManage.NewStudentManage.INewStudentEnterServices"
-             implement="EMIS.ExtensionLogic.ServiceLogic.EnrollManage.NewStudentEnterServices, EMIS.ExtensionLogic.HBGD" />
+  <!--<component name="EMIS.CommonLogic.EnrollManage.NewStudentManage.INewStudentEnterServices"
+             implement="EMIS.ExtensionLogic.ServiceLogic.EnrollManage.NewStudentEnterServices, EMIS.ExtensionLogic.HBGD" />-->
   <!--课程信息页面（业务主键为课程代码唯一）-->
-  <component name="EMIS.CommonLogic.Cultureplan.ICoursematerialServices"
-             implement="EMIS.ExtensionLogic.ServiceLogic.CultureplanManage.CoursematerialServices, EMIS.ExtensionLogic.HBGD" />
+  <!--<component name="EMIS.CommonLogic.Cultureplan.ICoursematerialServices"
+             implement="EMIS.ExtensionLogic.ServiceLogic.CultureplanManage.CoursematerialServices, EMIS.ExtensionLogic.HBGD" />-->
   <!--科目成绩页面（处理工作流程状态）-->
-  <component name="EMIS.CommonLogic.ScoreManage.LevelScoreManage.ILevelScoreServices"
-             implement="EMIS.ExtensionLogic.ServiceLogic.ScoreManage.LevelScoreServices, EMIS.ExtensionLogic.HBGD" />
+  <!--<component name="EMIS.CommonLogic.ScoreManage.LevelScoreManage.ILevelScoreServices"
+             implement="EMIS.ExtensionLogic.ServiceLogic.ScoreManage.LevelScoreServices, EMIS.ExtensionLogic.HBGD" />-->
   <!--结业证书编号生成规则-->
-  <component name="EMIS.CommonLogic.GraduationManage.GraduationManage.IGraduationApplyServices"
-             implement="EMIS.ExtensionLogic.ServiceLogic.GraduationManage.GraduationApplyServices, EMIS.ExtensionLogic.HBGD" />
+  <!--<component name="EMIS.CommonLogic.GraduationManage.GraduationManage.IGraduationApplyServices"
+             implement="EMIS.ExtensionLogic.ServiceLogic.GraduationManage.GraduationApplyServices, EMIS.ExtensionLogic.HBGD" />-->
   <!--毕业证书编号生成规则-->
-  <component name="EMIS.CommonLogic.GraduationManage.GraduationManage.IGraduationListServices"
-             implement="EMIS.ExtensionLogic.ServiceLogic.GraduationManage.GraduationListServices, EMIS.ExtensionLogic.HBGD" />
+  <!--<component name="EMIS.CommonLogic.GraduationManage.GraduationManage.IGraduationListServices"
+             implement="EMIS.ExtensionLogic.ServiceLogic.GraduationManage.GraduationListServices, EMIS.ExtensionLogic.HBGD" />-->
   <!--学位证书编号生成规则-->
-  <component name="EMIS.CommonLogic.DegreeManage.DegreeManage.IDegreeListServices"
-             implement="EMIS.ExtensionLogic.ServiceLogic.DegreeManage.DegreeListServices, EMIS.ExtensionLogic.HBGD" />
+  <!--<component name="EMIS.CommonLogic.DegreeManage.DegreeManage.IDegreeListServices"
+             implement="EMIS.ExtensionLogic.ServiceLogic.DegreeManage.DegreeListServices, EMIS.ExtensionLogic.HBGD" />-->
   <!--河北工大end-->
   
   
@@ -232,7 +232,30 @@
   <!--<component name="EMIS.CommonLogic.DegreeManage.DegreeManage.IDegreeListServices" 
              implement="EMIS.ExtensionLogic.ServiceLogic.DegreeManage.DegreeListServices, EMIS.ExtensionLogic.LCNX" />-->
   <!--临沧农校end-->
-  
+
+  <!--广东警院begin-->
+  <!--学生信息-->
+  <component name="EMIS.CommonLogic.Students.IStudentsServices"
+             implement="EMIS.ExtensionLogic.ServiceLogic.Students.StudentsServices, EMIS.ExtensionLogic.GDJY" />
+  <!--招生专业页面（专业班级生成规则）-->
+  <component name="EMIS.CommonLogic.EnrollManage.SpecialtyManage.IRecruitSpecialtyServices"
+             implement="EMIS.ExtensionLogic.ServiceLogic.EnrollManage.RecruitSpecialtyServices, EMIS.ExtensionLogic.GDJY" />
+  <!--新生分配页面（匹配省招专业）-->
+  <component name="EMIS.CommonLogic.RecruitStudentsManage.NewStudentManage.INewStudentCollegeServices"
+             implement="EMIS.ExtensionLogic.ServiceLogic.RecruitStudentsManage.NewStudentCollegeServices, EMIS.ExtensionLogic.GDJY" />
+  <!--考务管理-->
+  <component name="EMIS.DataLogic.ExaminationManage.RoomSettingDAL"
+             implement="EMIS.ExtensionLogic.DataLogic.ExaminationManage.RoomSettingDAL, EMIS.ExtensionLogic.GDJY" />
+  <!--结业证书编号生成规则-->
+  <component name="EMIS.CommonLogic.GraduationManage.GraduationManage.IGraduationApplyServices"
+             implement="EMIS.ExtensionLogic.ServiceLogic.GraduationManage.GraduationApplyServices, EMIS.ExtensionLogic.GDJY" />
+  <!--毕业证书编号生成规则-->
+  <component name="EMIS.CommonLogic.GraduationManage.GraduationManage.IGraduationListServices"
+             implement="EMIS.ExtensionLogic.ServiceLogic.GraduationManage.GraduationListServices, EMIS.ExtensionLogic.GDJY" />
+  <!--学位证书编号生成规则-->
+  <component name="EMIS.CommonLogic.DegreeManage.DegreeManage.IDegreeListServices"
+             implement="EMIS.ExtensionLogic.ServiceLogic.DegreeManage.DegreeListServices, EMIS.ExtensionLogic.GDJY" />
+  <!--广东警院end-->
   
   <!--Testbegin-->
   <!--Testend-->

EMIS.Web/Controllers/StudentManage/StudentProfile/StudentsController.cs

@@ -1222,6 +1222,11 @@ namespace EMIS.Web.Controllers.Students
             foreach (var userID in userIDList)
             {
                 studentView = StudentfileServices.Value.GetStudentfileView(userID);
+                CellItem cellTitle= new CellItem();
+                cellTitle.Col = 0;
+                cellTitle.Row = 0;
+                cellTitle.Value = EMIS.Utility.RSL.Get("UniversityName") + "学籍卡";
+                cellItems.Add(cellTitle);
                 CellItem celltiem = new CellItem();
                 celltiem.Col = 1;
                 celltiem.Row = 1;

EMIS.Web/Site.js

@@ -221,7 +221,7 @@
     <!--个性化页面配置eng-->
     
     <!--Excel模板配置begin-->
-    <!--<add key="CollegeImport" value="/Content/DGLGTemplateFile/批量导入教学点信息模板.xls"/>
+    <!--<add key="StudentsImport" value="/Content/DGLGTemplateFile/批量导入教学点信息模板.xls"/>
     <add key="DepartmentImport" value="/Content/DGLGTemplateFile/批量导入教研室信息模板.xls"/>
     <add key="StaffImport" value="/Content/DGLGTemplateFile/批量导入教师信息模板.xls"/>
     <add key="FacultymajorImport" value="/Content/DGLGTemplateFile/批量导入院系专业信息模板.xls"/>
@@ -235,6 +235,18 @@
     <!--Excel模板配置eng-->
     <!--东莞理工end-->
 
+    <!--广东警官begin-->
+    <!--个性化文件配置begin-->
+    <!--个性化文件配置eng-->
+
+    <!--个性化页面配置begin-->
+    <!--<add key="ExaminationClassroom" value="ExaminationPlan/ClassroomAdult" />-->
+    <!--个性化页面配置eng-->
+    
+    <!--Excel模板配置begin-->
+    <add key="StudentsImport" value="/Content/GDJGTemplateFile/批量导入学生信息模板.xls"/>
+    <!--Excel模板配置eng-->
+    <!--广东警官end-->
 
     <!--广东技师begin-->
     <!--个性化文件配置begin-->
@@ -326,7 +338,7 @@
     <!--个性化页面配置eng-->
     
     <!--Excel模板配置begin-->
-    <add key="CollegeImport" value="/Content/HBGDTemplateFile/批量导入函授站信息模板.xls"/>
+    <!--<add key="CollegeImport" value="/Content/HBGDTemplateFile/批量导入函授站信息模板.xls"/>
     <add key="DepartmentImport" value="/Content/HBGDTemplateFile/批量导入教研室信息模板.xls"/>
     <add key="StaffImport" value="/Content/HBGDTemplateFile/批量导入教师信息模板.xls"/>
     <add key="FacultymajorImport" value="/Content/HBGDTemplateFile/批量导入院系专业信息模板.xls"/>
@@ -336,7 +348,7 @@
     <add key="CustomStandardSettingImport" value="/Content/HBGDTemplateFile/批量导入省招专业模板.xls"/>
     <add key="AssignCollegeImport" value="/Content/HBGDTemplateFile/批量导入名单分配模板.xls"/>
 
-    <add key="EducationMissionImport" value="/Content/HBGDTemplateFile/批量导入教学任务模板.xls"/>
+    <add key="EducationMissionImport" value="/Content/HBGDTemplateFile/批量导入教学任务模板.xls"/>-->
     <!--Excel模板配置eng-->
     <!--河北工大end-->
 

ServiceLogic/EMIS.CommonLogic/Students/StudentsServices.cs

@@ -788,7 +788,7 @@ namespace EMIS.CommonLogic.Students
         public void Save(StudentsView studentfileView)
         {
             BaseStudentView tempView = StudentsDAL.Value.GetBaseStudentViewQueryable(x => x.Sys_User.UserID == studentfileView.UserID).FirstOrDefault();
-            var parameter = ParameterDAL.ParameterRepository.GetSingle(x => x.ParameterTypeID == (int)ViewModel.CF_ParameterType.StudentInitPassword);
+            var parameter = ParameterDAL.ParameterRepository.GetSingle(x => x.ParameterTypeID == (int)CF_ParameterType.StudentInitPassword);
             var roleList = RoleDAL.Value.RoleRepository.GetList(x => x.TypeID == (int)SYS_RoleType.Student && x.CF_StudentRole.StudentType == studentfileView.StudentType,(x=>x.CF_StudentRole)).ToList();
             if (EMIS.Utility.Const.LOCAL_SETTING_PlanningGraduateDateSpringMonth == null)
                 throw new Exception("请先设置配置文件的预计毕业月份（春季入学）。");
@@ -1411,7 +1411,7 @@ namespace EMIS.CommonLogic.Students
         /// 学生添加后进行数据插入
         /// </summary>
         /// <param name="studentID"></param>
-        public void AddStudentEnd(List<Guid> studentID)
+        public virtual void AddStudentEnd(List<Guid> studentID)
         {
             var inschoolStatusList = InSchoolSettingRepository.Value.GetList(x => x.IsSelected == true).Select(x => x.InSchoolStatusID).ToList();
             var schoolYear = SchoolYearServices.Value.GetCurrentSchoolYear();
@@ -1705,7 +1705,7 @@ namespace EMIS.CommonLogic.Students
         /// </summary>
         /// <param name="dataSource"></param>
         /// <returns></returns>
-        public DataTable Import(DataTable dataSource)
+        public virtual DataTable Import(DataTable dataSource)
         {
             var errorSource = dataSource.Clone();
             errorSource.Columns.Add("错误信息");