Merge branch '塔里木分支' of http://8.141.155.183:3000/bjquanjiang/DigitalScholl into 塔里木分支

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js

@@ -240,6 +240,9 @@ var bootstrap = function ($, learun) {
                     { label: "考生号", name: "ksh", width: 100, align: "left" },
                     { label: "通知书号", name: "NoticeNo", width: 100, align: "left" },
                     { label: "姓名", name: "StuName", width: 100, align: "left" },
+                    { label: "是否在校", name: "InSchoolStatus", width: 100, align: "left" },
+                    { label: "学籍状态", name: "XJZT", width: 100, align: "left" },
+                    { label: "学生当前状态", name: "XSDQZT", width: 100, align: "left" },
                     {
                         label: "性别", name: "GenderNo", width: 80, align: "left",
                         formatter: function (cellvalue) {

Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj

@@ -23,7 +23,7 @@
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
     <UseGlobalApplicationHostFile />
-    <Use64BitIISExpress />
+    <Use64BitIISExpress>false</Use64BitIISExpress>
     <SccProjectName>
     </SccProjectName>
     <SccLocalPath>
@@ -109,9 +109,6 @@
     <Reference Include="Microsoft.Practices.Unity.RegistrationByConvention">
       <HintPath>..\packages\Unity.4.0.1\lib\net45\Microsoft.Practices.Unity.RegistrationByConvention.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.QualityTools.Testing.Fakes, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-    </Reference>
     <Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
       <Private>True</Private>

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoEntity.cs

@@ -645,6 +645,10 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// </summary>
         [NotMapped] public string DepartmentName { get; set; }
         /// <summary>
+        /// 部门编号
+        /// </summary>
+        [NotMapped] public string DepartmentNo { get; set; }
+        /// <summary>
         /// 工作简历
         /// </summary>
         [NotMapped] public List<PM_ResumeEntity> PM_ResumeList { get; set; }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoService.cs

@@ -187,7 +187,14 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         {
             try
             {
-                return this.BaseRepository("CollegeMIS").FindList<EmpInfoEntity>();
+                var dept = this.BaseRepository().FindList<DepartmentEntity>();
+                var list= this.BaseRepository("CollegeMIS").FindList<EmpInfoEntity>();
+                foreach (var item in list)
+                {
+                    item.DepartmentName = dept.FirstOrDefault(x=>x.F_DepartmentId==item.F_DepartmentId)?.F_FullName;
+                    item.DepartmentNo = dept.FirstOrDefault(x => x.F_DepartmentId == item.F_DepartmentId)?.F_EnCode; ;
+                }
+                return list;
             }
             catch (Exception ex)
             {

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicEntity.cs

@@ -799,6 +799,16 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// </summary> 
         [Column("MOVESTATUS")]
         public int? MoveStatus { get; set; }
+        /// <summary>
+        /// 学籍状态
+        /// </summary>
+        [Column("XJZT")]
+        public string XJZT { get; set; }
+        /// <summary>
+        /// 学生当前状态
+        /// </summary>
+        [Column("XSDQZT")]
+        public string XSDQZT { get; set; }
 
         #endregion