家庭成员

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

@@ -472,15 +472,7 @@
     <Compile Include="Areas\LR_WorkFlowModule\Controllers\WfSystemDemoController.cs" />
     <Compile Include="Areas\LR_WorkFlowModule\LR_WorkFlowModuleAreaRegistration.cs" />
     <Compile Include="Areas\Permission\PermissionAreaRegistration.cs" />
-    <Compile Include="Areas\PersonnelManagement\Controllers\EpidemicReportController.cs" />
-    <Compile Include="Areas\PersonnelManagement\Controllers\EpidemicSituationCopyController.cs" />
     <Compile Include="Areas\PersonnelManagement\Controllers\MeetingNoticeController.cs" />
-    <Compile Include="Areas\PersonnelManagement\Controllers\MP_PerformanceTrackingController.cs" />
-    <Compile Include="Areas\PersonnelManagement\Controllers\MP_QualityObjectivesController.cs" />
-    <Compile Include="Areas\PersonnelManagement\Controllers\MP_ManagementPlanController.cs" />
-    <Compile Include="Areas\PersonnelManagement\Controllers\OvertimeApplicationController.cs" />
-    <Compile Include="Areas\PersonnelManagement\Controllers\StuSaverecordController.cs" />
-    <Compile Include="Areas\PersonnelManagement\Controllers\TimeTableController.cs" />
     <Compile Include="Areas\PersonnelManagement\PersonnelManagementAreaRegistration.cs" />
     <Compile Include="Areas\ReceiveSendFeeManagement\ReceiveSendFeeManagementAreaRegistration.cs" />
     <Compile Include="Areas\StudentWork\Controllers\SW_Ask_MainController.cs" />
@@ -681,8 +673,6 @@
     <Compile Include="Areas\EducationalAdministration\Controllers\StuLeaveManagementController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\EATalentTrainController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\Sys_DefaultPwdConfigController.cs" />
-    <Compile Include="Areas\PersonnelManagement\Controllers\MeetingSignInRecordController.cs" />
-    <Compile Include="Areas\PersonnelManagement\Controllers\MeetingMinutesController.cs" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Areas\AdmissionsPlatform\Views\AP_OnlineUserInfo\DropOutIndex.js" />

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ClassInfo/ClassInfoBLL.cs

@@ -132,6 +132,30 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             }
         }
 
+        /// <summary>
+        /// 获取学校Id
+        /// <param name="classNo">班级编号</param>
+        /// <summary>
+        /// <returns></returns>
+        public string GetSchoolIdByClassNo(string classNo)
+        {
+            try
+            {
+                return classInfoService.GetSchoolIdByClassNo(classNo);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
         #endregion
 
         #region  提交数据

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ClassInfo/ClassInfoIBLL.cs

@@ -40,6 +40,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// <summary>
         /// <returns></returns>
         ClassInfoEntity GetClassInfoEntityByClassName(string className);
+        
         #endregion
 
         #region  提交数据
@@ -62,5 +63,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
 
         IEnumerable<ClassInfoEntity> GetAllClass();
         IEnumerable<ClassInfoEntity> GetClassByMajorNo(string majorNo);
+        /// <summary>
+        /// 根据班级编号获取学校Id
+        /// </summary>
+        /// <param name="classNo"></param>
+        /// <returns></returns>
+        string GetSchoolIdByClassNo(string classNo);
     }
 }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ClassInfo/ClassInfoService.cs

@@ -175,6 +175,35 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             }
         }
 
+        /// <summary>
+        /// 获取ClassInfo表实体数据
+        /// <param name="className">班级名称</param>
+        /// <summary>
+        /// <returns></returns>
+        public string GetSchoolIdByClassNo(string classNo)
+        {
+            try
+            {
+                string sql = $@"select F_SchoolId from [dbo].[CdDept] where deptno=(
+                select deptno from[dbo].[ClassInfo] where classno = '{classNo}')";
+                var obj = this.BaseRepository("CollegeMIS").FindObject(sql);
+                if (obj == null)
+                    return "";
+                else
+                    return obj.ToString();
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
         #endregion
 
         #region  提交数据

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshService.cs

@@ -915,10 +915,16 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             }
         }
 
+        /// <summary>
+        /// 家长生成账号
+        /// </summary>
+        /// <param name="entity"></param>
+        /// <param name="stuInfoFreshFamilyList"></param>
         private void GenerateAccoutForStuFamily(StuInfoFreshEntity entity, List<StuInfoFreshFamilyEntity> stuInfoFreshFamilyList)
         {
             UserRelationIBLL userRelationIBLL = new UserRelationBLL();
             UserIBLL userIBLL = new UserBLL();
+            ClassInfoIBLL classInfoIBLL = new ClassInfoBLL();
             try
             {
                 var stuInfoBasicEntities = BaseRepository("CollegeMIS").FindList<StuInfoBasicEntity>(m => m.CheckMark != "0");
@@ -939,30 +945,26 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                         continue;
                     }
                     //获取schoolid   ClassNo
-                    //var annexesFileEntity = this.BaseRepository().FindEntity<AnnexesFileEntity>(a => a.F_FolderId == fEntity.Photo);
-                    //var url = "";
-                    //if (annexesFileEntity != null)
-                    //{
-                    //    url = annexesFileEntity.F_FilePath;
-                    //    url = "/" + url.Substring(url.IndexOf("Resource"));
-                    //}
-
-                    //UserEntity userbase = new UserEntity();
-                    //userbase.F_Account = fEntity.Mobile;
-                    //userbase.F_RealName = fEntity.Name;
-                    //userbase.F_EnCode = fEntity.Mobile;
-                    //userbase.F_Password = Md5Helper.Encrypt(defaultpwd, 32).ToLower();
-                    //userbase.F_HeadIcon = string.IsNullOrEmpty(url) ? Config.GetValue("defaultheadimg") : url;
-                    //userbase.F_Gender = !string.IsNullOrEmpty(fEntity.Sex) ? Convert.ToInt32(fEntity.Sex) : 1;
-                    //userbase.F_DeleteMark = 0;
-                    //userbase.F_EnabledMark = 1;
-                    //userbase.F_Mobile = fEntity.Mobile;
-                    //userbase.F_Description = "家长";
-                    //userbase.F_CompanyId = entity.com;
-                    //userbase.F_DepartmentId = entity.DeptNo;
-                    //userbase.F_IdentityCardNo = fEntity.IdentityCardNo;
-                    //userIBLL.SaveEntity(null, userbase);
-                    //studentList.Add(userbase);
+                    var schoolid= classInfoIBLL.GetSchoolIdByClassNo(entity.ClassNo);
+                    if(string.IsNullOrEmpty((schoolid)))
+                        continue;
+
+                    UserEntity userbase = new UserEntity();
+                    userbase.F_Account = fEntity.Mobile;
+                    userbase.F_RealName = fEntity.Name;
+                    userbase.F_EnCode = fEntity.Mobile;
+                    userbase.F_Password = Md5Helper.Encrypt(defaultpwd, 32).ToLower();
+                    userbase.F_HeadIcon = Config.GetValue("defaultheadimg");
+                    userbase.F_Gender = !string.IsNullOrEmpty(fEntity.Sex) ? Convert.ToInt32(fEntity.Sex) : 1;
+                    userbase.F_DeleteMark = 0;
+                    userbase.F_EnabledMark = 1;
+                    userbase.F_Mobile = fEntity.Mobile;
+                    userbase.F_Description = "家长";
+                    userbase.F_CompanyId = schoolid;
+                    userbase.F_DepartmentId = entity.DeptNo;
+                    userbase.F_IdentityCardNo = fEntity.IdCard;
+                    userIBLL.SaveEntity(null, userbase);
+                    studentList.Add(userbase);
                 }
                 if (studentList.Any())
                 {