招生文件

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Controllers/EnrollDataController.cs

@@ -3,6 +3,8 @@ using System.Data;
 using Learun.Application.TwoDevelopment.LR_Desktop;
 using System.Web.Mvc;
 using System.Collections.Generic;
+using Learun.Application.OA.File.FilePreview;
+using Learun.Application.Base.SystemModule;
 
 namespace Learun.Application.Web.Areas.LR_Desktop.Controllers
 {
@@ -16,6 +18,8 @@ namespace Learun.Application.Web.Areas.LR_Desktop.Controllers
     public class EnrollDataController : MvcControllerBase
     {
         private EnrollDataIBLL enrollDataIBLL = new EnrollDataBLL();
+        private FilePreviewIBLL filePreviewIBLL = new FilePreviewBLL();
+        private AnnexesFileIBLL annexesFileIBLL = new AnnexesFileBLL();
 
         #region 视图功能
 
@@ -26,7 +30,7 @@ namespace Learun.Application.Web.Areas.LR_Desktop.Controllers
         [HttpGet]
         public ActionResult Index()
         {
-             return View();
+            return View();
         }
         /// <summary>
         /// 表单页
@@ -35,8 +39,18 @@ namespace Learun.Application.Web.Areas.LR_Desktop.Controllers
         [HttpGet]
         public ActionResult Form()
         {
-             return View();
+            return View();
         }
+        /// <summary>
+        /// 
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult IndexPersonnel()
+        {
+            return View();
+        }
+        
         #endregion
 
         #region 获取数据
@@ -71,8 +85,9 @@ namespace Learun.Application.Web.Areas.LR_Desktop.Controllers
         [AjaxOnly]
         public ActionResult GetFormData(string keyValue)
         {
-            var EnrollDataData = enrollDataIBLL.GetEnrollDataEntity( keyValue );
-            var jsonData = new {
+            var EnrollDataData = enrollDataIBLL.GetEnrollDataEntity(keyValue);
+            var jsonData = new
+            {
                 EnrollData = EnrollDataData,
             };
             return Success(jsonData);
@@ -105,7 +120,7 @@ namespace Learun.Application.Web.Areas.LR_Desktop.Controllers
         public ActionResult SaveForm(string keyValue, string strEntity)
         {
             EnrollDataEntity entity = strEntity.ToObject<EnrollDataEntity>();
-            enrollDataIBLL.SaveEntity(keyValue,entity);
+            enrollDataIBLL.SaveEntity(keyValue, entity);
             if (string.IsNullOrEmpty(keyValue))
             {
             }
@@ -113,5 +128,127 @@ namespace Learun.Application.Web.Areas.LR_Desktop.Controllers
         }
         #endregion
 
+        #region MyRegion
+
+        /// <summary>
+        /// 下载文件
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpPost]
+        public void DownloadFile(string folderid)
+        {
+            var data = annexesFileIBLL.GetEntityByFolderId(folderid);
+            string filename = Server.UrlDecode(data.F_FileName);//返回客户端文件名称
+            string filepath = data.F_FilePath;//this.Server.MapPath(data.F_FilePath);
+            if (FileDownHelper.FileExists(filepath))
+            {
+                FileDownHelper.DownLoadold(filepath, filename);
+            }
+        }
+
+        /// <summary>
+        /// 文件预览
+        /// </summary>
+        /// <param name="fileId">文件ID</param>
+        /// <returns></returns>
+        public void PreviewFile(string folderid)
+        {
+            var data = annexesFileIBLL.GetEntityByFolderId(folderid);
+            if (data == null)
+            {
+                return;
+            }
+            string filename = Server.UrlDecode(data.F_FileName);//客户端保存的文件名  
+            string filepath = data.F_FilePath;// DirFileHelper.GetAbsolutePath(data.F_FilePath);//路径 
+            if (data.F_FileType == "xlsx" || data.F_FileType == "xls")
+            {
+                filepath = filepath.Substring(0, filepath.LastIndexOf(".")) + ".pdf";//文件名
+                if (!DirFileHelper.IsExistFile(filepath))
+                {
+                    filePreviewIBLL.GetExcelData(DirFileHelper.GetAbsolutePath(data.F_FilePath));
+                }
+            }
+            if (data.F_FileType == "docx" || data.F_FileType == "doc")
+            {
+                filepath = filepath.Substring(0, filepath.LastIndexOf(".")) + ".pdf";//文件名
+                if (!DirFileHelper.IsExistFile(filepath))
+                {
+                    filePreviewIBLL.GetWordData(DirFileHelper.GetAbsolutePath(data.F_FilePath));
+                }
+            }
+            if (data.F_FileType == "ppt" || data.F_FileType == "pptx")
+            {
+                filepath = filepath.Substring(0, filepath.LastIndexOf(".")) + ".pdf";//文件名
+                if (!DirFileHelper.IsExistFile(filepath))
+                {
+                    filePreviewIBLL.GetPptData(DirFileHelper.GetAbsolutePath(data.F_FilePath));
+                }
+            }
+            //FileDownHelper.DownLoadold(filepath, filename);
+
+
+
+            //FileStream files = new FileStream(filepath, FileMode.Open);
+            //byte[] fileByte = new byte[files.Length];
+            //files.Read(fileByte, 0, fileByte.Length);
+            //files.Close();
+            //System.IO.MemoryStream ms = new MemoryStream(fileByte, 0, fileByte.Length);
+            Response.ClearContent();
+            switch (data.F_FileType)
+            {
+                case "jpg":
+                    Response.ContentType = "image/jpeg";
+                    break;
+                case "gif":
+                    Response.ContentType = "image/gif";
+                    break;
+                case "png":
+                    Response.ContentType = "image/png";
+                    break;
+                case "bmp":
+                    Response.ContentType = "application/x-bmp";
+                    break;
+                case "jpeg":
+                    Response.ContentType = "image/jpeg";
+                    break;
+                case "doc":
+                    Response.ContentType = "application/pdf";
+                    break;
+                case "docx":
+                    Response.ContentType = "application/pdf";
+                    break;
+                case "ppt":
+                    Response.ContentType = "application/x-ppt";
+                    break;
+                case "pptx":
+                    Response.ContentType = "application/x-ppt";
+                    break;
+                case "xls":
+                    Response.ContentType = "application/pdf";
+                    break;
+                case "xlsx":
+                    Response.ContentType = "application/pdf";
+                    break;
+                case "pdf":
+                    Response.ContentType = "application/pdf";
+                    break;
+                case "txt":
+                    Response.ContentType = "text/plain";
+                    break;
+                case "csv":
+                    Response.ContentType = "";
+                    break;
+                default:
+                    Response.ContentType = "application/pdf";
+                    break;
+            }
+            Response.Charset = "GB2312";
+            Response.WriteFile(filepath);
+            //Response.BinaryWrite(ms.ToArray());
+        }
+
+        #endregion
+
     }
 }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/EnrollData/Index.cshtml

@@ -7,15 +7,27 @@
         <div class="lr-layout-wrap lr-layout-wrap-notitle ">
             <div class="lr-layout-tool">
                 <div class="lr-layout-tool-left">
+                    <div class="lr-layout-tool-item">
+                        <input id="txt_Keyword" type="text" class="form-control" placeholder="请输入要查询关键字" />
+                    </div>
+                    <div class="lr-layout-tool-item">
+                        <a id="btn_Search" class="btn btn-primary btn-sm"><i class="fa fa-search"></i>&nbsp;<span class="lrlt">查询</span></a>
+                    </div>
                 </div>
+
                 <div class="lr-layout-tool-right">
                     <div class=" btn-group btn-group-sm">
                         <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
                     </div>
+                    <div class="btn-group btn-group-sm">
+                        <a id="lr-download" class="btn btn-default"><i class="fa fa-download"></i>&nbsp;<span class="lrlt">下载</span></a>
+                        <a id="lr-preview" class="btn btn-default"><i class="fa fa-eye"></i>&nbsp;<span class="lrlt">预览</span></a>
+                    </div>
+
                     <div class=" btn-group btn-group-sm" learun-authorize="yes">
-                        <a id="lr_add"   class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;新增</a>
+                        @*<a id="lr_add"   class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;新增</a>
                         <a id="lr_edit"  class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;编辑</a>
-                        <a id="lr_delete" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;删除</a>
+                        <a id="lr_delete" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;删除</a>*@
                         <a id="lr_print"   class="btn btn-default"><i class="fa fa-print"></i>&nbsp;打印</a>
                     </div>
                 </div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/EnrollData/Index.js

@@ -13,6 +13,12 @@ var bootstrap = function ($, learun) {
             page.bind();
         },
         bind: function () {
+            // 查询
+            $('#btn_Search').on('click', function () {
+                var keyword = $('#txt_Keyword').val();
+                page.search({ keyword: keyword });
+            });
+
             // 刷新
             $('#lr_refresh').on('click', function () {
                 location.reload();
@@ -63,21 +69,56 @@ var bootstrap = function ($, learun) {
             $('#lr_print').on('click', function () {
                 $('#gridtable').jqprintTable();
             });
+
+            //文件下载
+            $('#lr-download').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                var Path = $("#gridtable").jfGridValue("Path");
+                if (keyValue) {
+                    learun.download({ url: top.$.rootUrl + '/LR_Desktop/EnrollData/DownloadFile', param: { folderid: Path }, method: 'POST' });
+                } else {
+                    learun.alert.warning('请选择要下载的文件！');
+                }
+            });
+            //文件预览
+            $('#lr-preview').on('click', function () {
+                var keyValue = $("#gridtable").jfGridValue("Id");
+                var Path = $("#gridtable").jfGridValue("Path");
+                if (keyValue) {
+                    learun.layerForm({
+                        id: 'PreviewForm',
+                        title: '文件预览',
+                        url: top.$.rootUrl + '/LR_Desktop/EnrollData/PreviewFile?folderid=' + Path,
+                        width: 1080,
+                        height: 850,
+                        btn: null,
+                        callBack: function (id) {
+                            return top[id].acceptClick(refreshGirdData);
+                        }
+                    });
+                } else {
+                    learun.alert.warning('请选择要预览的文件！');
+                }
+            });
+
         },
         // 初始化列表
         initGird: function () {
-            $('#gridtable').lrAuthorizeJfGrid({
+            $('#gridtable').jfGrid({
                 url: top.$.rootUrl + '/LR_Desktop/EnrollData/GetPageList',
                 headData: [
+                    { label: "文件名", name: "F_FileName", width: 200, align: "left"},
                     { label: "上传时间", name: "UploadTime", width: 100, align: "left"},
                 ],
                 mainId:'Id',
-                isPage: true
+                isPage: true,
+                sidx: 'UploadTime desc',
             });
             page.search();
         },
         search: function (param) {
             param = param || {};
+            param.Type = 1;
             $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) });
         }
     };

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

@@ -315,7 +315,6 @@
     <Compile Include="Areas\AssetManagementSystem\Controllers\Ass_SupplierController.cs" />
     <Compile Include="Areas\AssetManagementSystem\Controllers\Ass_UserChangeInfoController.cs" />
     <Compile Include="Areas\AssetManagementSystem\Controllers\Ass_WarningController.cs" />
-    <Compile Include="Areas\EducationalAdministration\Controllers\Acc_DormitoryChangeController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\ArrangeLessonSyncController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\ArrangeLessonTermAttemperController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\CertificateManageController.cs" />
@@ -327,37 +326,19 @@
     <Compile Include="Areas\EducationalAdministration\Controllers\EvaDormitoryInteriorController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\EvaHygieveController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\EvaViolationOfDisciplineController.cs" />
-    <Compile Include="Areas\EducationalAdministration\Controllers\ExamSubjectController.cs" />
-    <Compile Include="Areas\EducationalAdministration\Controllers\Exam_ArrangeExamTermItemNewController.cs" />
-    <Compile Include="Areas\EducationalAdministration\Controllers\Exam_ArrangeExamTermNewController.cs" />
-    <Compile Include="Areas\EducationalAdministration\Controllers\Exam_ExamLessonController.cs" />
-    <Compile Include="Areas\EducationalAdministration\Controllers\Exam_ExamPlanController.cs" />
-    <Compile Include="Areas\EducationalAdministration\Controllers\Exam_ExamPlanLessonController.cs" />
-    <Compile Include="Areas\EducationalAdministration\Controllers\Exam_ExamRoomController.cs" />
-    <Compile Include="Areas\EducationalAdministration\Controllers\Exam_ExamStudentController.cs" />
-    <Compile Include="Areas\EducationalAdministration\Controllers\Exam_ExamTeacherTimeController.cs" />
-    <Compile Include="Areas\EducationalAdministration\Controllers\Exam_InvigilateTeacherController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\FillinFromController.cs" />
-    <Compile Include="Areas\EducationalAdministration\Controllers\HealthPunchStuController.cs" />
-    <Compile Include="Areas\EducationalAdministration\Controllers\HealthPunchTimeController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\HomeStatisticsController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\LeaveSchoolAController.cs" />
-    <Compile Include="Areas\EducationalAdministration\Controllers\LR_Base_LogoController.cs" />
-    <Compile Include="Areas\EducationalAdministration\Controllers\MajorAndSubjectController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\PracticeBaseController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\R_EnterBuildingController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\R_EnterSchoolController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\ScoreStatisticsController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\StuAttendanceController.cs" />
-    <Compile Include="Areas\EducationalAdministration\Controllers\StuEnrollPhoneController.cs" />
-    <Compile Include="Areas\EducationalAdministration\Controllers\StuEnrollScoreController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\StuGrantController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\StuInfoBasicChangeController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\StuScoreNotPassController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\Sys_DefaultPwdConfigController.cs" />
-    <Compile Include="Areas\EducationalAdministration\Controllers\Sys_PsychologicalCounseController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\Sys_ReceiveDocumentController.cs" />
-    <Compile Include="Areas\EducationalAdministration\Controllers\VaccinationInfoController.cs" />
     <Compile Include="Areas\EvaluationTeach\EvaluationTeachAreaRegistration.cs" />
     <Compile Include="Areas\EvaluationTeach\Controllers\Eval_MainController.cs" />
     <Compile Include="Areas\EvaluationTeach\Controllers\Eval_QuestionController.cs" />
@@ -380,10 +361,8 @@
     <Compile Include="Areas\EducationalAdministration\Controllers\TeachPlanController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\TeachSwitchController.cs" />
     <Compile Include="Areas\EducationalAdministration\EducationalAdministrationAreaRegistration.cs" />
-    <Compile Include="Areas\LogisticsManagement\Controllers\Acc_DormitoryRuleController.cs" />
     <Compile Include="Areas\LogisticsManagement\Controllers\APAppointmentPsychologistController.cs" />
     <Compile Include="Areas\LogisticsManagement\Controllers\CompanyNewsController.cs" />
-    <Compile Include="Areas\LogisticsManagement\Controllers\DormitoryReturnController.cs" />
     <Compile Include="Areas\LogisticsManagement\LogisticsManagementAreaRegistration.cs" />
     <Compile Include="Areas\LR_AuthorizeModule\Controllers\AuthorizeController.cs" />
     <Compile Include="Areas\LR_AuthorizeModule\Controllers\FilterIPController.cs" />
@@ -842,6 +821,7 @@
     <Compile Include="Areas\EducationalAdministration\Controllers\StuDisciplineManagementController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\StuCancelDisciplineManagementController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\ArrangeExamTermNewController.cs" />
+    <Compile Include="Areas\EducationalAdministration\Controllers\StuVolunteerController.cs" />
     <Compile Include="Areas\LR_Desktop\Controllers\EnrollTemplateController.cs" />
     <Compile Include="Areas\LR_Desktop\Controllers\EnrollDataController.cs" />
   </ItemGroup>
@@ -1001,51 +981,10 @@
     <Content Include="Areas\EducationalAdministration\Views\EvaHygieve\Index.js" />
     <Content Include="Areas\EducationalAdministration\Views\EvaViolationOfDiscipline\Form.js" />
     <Content Include="Areas\EducationalAdministration\Views\EvaViolationOfDiscipline\Index.js" />
-    <Content Include="Areas\EducationalAdministration\Views\ExamSubject\Form.js" />
-    <Content Include="Areas\EducationalAdministration\Views\ExamSubject\Index.js" />
-    <Content Include="Areas\EducationalAdministration\Views\Exam_ArrangeExamTermItemNew\Form.js" />
-    <Content Include="Areas\EducationalAdministration\Views\Exam_ArrangeExamTermItemNew\Index.js" />
-    <Content Include="Areas\EducationalAdministration\Views\Exam_ArrangeExamTermNew\Form.js" />
-    <Content Include="Areas\EducationalAdministration\Views\Exam_ArrangeExamTermNew\Index.js" />
-    <Content Include="Areas\EducationalAdministration\Views\Exam_ArrangeExamTermNew\IndexForClass.js" />
-    <Content Include="Areas\EducationalAdministration\Views\Exam_ArrangeExamTermNew\IndexItem.js" />
-    <Content Include="Areas\EducationalAdministration\Views\Exam_ExamLesson\Form.js" />
-    <Content Include="Areas\EducationalAdministration\Views\Exam_ExamLesson\FormExamTime.js" />
-    <Content Include="Areas\EducationalAdministration\Views\Exam_ExamLesson\FormYearSemester.js" />
-    <Content Include="Areas\EducationalAdministration\Views\Exam_ExamLesson\Index.js" />
-    <Content Include="Areas\EducationalAdministration\Views\Exam_ExamPlanLesson\Form.js" />
-    <Content Include="Areas\EducationalAdministration\Views\Exam_ExamPlanLesson\FormClass.js" />
-    <Content Include="Areas\EducationalAdministration\Views\Exam_ExamPlanLesson\FormRoom.js" />
-    <Content Include="Areas\EducationalAdministration\Views\Exam_ExamPlanLesson\FormRoomTeacher.js" />
-    <Content Include="Areas\EducationalAdministration\Views\Exam_ExamPlanLesson\FormTeacher.js" />
-    <Content Include="Areas\EducationalAdministration\Views\Exam_ExamPlanLesson\Index.js" />
-    <Content Include="Areas\EducationalAdministration\Views\Exam_ExamPlan\ClearForm.js" />
-    <Content Include="Areas\EducationalAdministration\Views\Exam_ExamPlan\Form.js" />
-    <Content Include="Areas\EducationalAdministration\Views\Exam_ExamPlan\FormTime.js" />
-    <Content Include="Areas\EducationalAdministration\Views\Exam_ExamPlan\GenerateForm.js" />
-    <Content Include="Areas\EducationalAdministration\Views\Exam_ExamPlan\Index.js" />
-    <Content Include="Areas\EducationalAdministration\Views\Exam_ExamRoom\Form.js" />
-    <Content Include="Areas\EducationalAdministration\Views\Exam_ExamRoom\FormYearSemester.js" />
-    <Content Include="Areas\EducationalAdministration\Views\Exam_ExamRoom\Index.js" />
-    <Content Include="Areas\EducationalAdministration\Views\Exam_ExamStudent\Form.js" />
-    <Content Include="Areas\EducationalAdministration\Views\Exam_ExamStudent\FormClear.js" />
-    <Content Include="Areas\EducationalAdministration\Views\Exam_ExamStudent\FormImport.js" />
-    <Content Include="Areas\EducationalAdministration\Views\Exam_ExamStudent\Index.js" />
-    <Content Include="Areas\EducationalAdministration\Views\Exam_ExamTeacherTime\Form.js" />
-    <Content Include="Areas\EducationalAdministration\Views\Exam_ExamTeacherTime\Index.js" />
-    <Content Include="Areas\EducationalAdministration\Views\Exam_InvigilateTeacher\Form.js" />
-    <Content Include="Areas\EducationalAdministration\Views\Exam_InvigilateTeacher\FormYearSemester.js" />
-    <Content Include="Areas\EducationalAdministration\Views\Exam_InvigilateTeacher\Index.js" />
     <Content Include="Areas\EducationalAdministration\Views\FillinFrom\Form.js" />
     <Content Include="Areas\EducationalAdministration\Views\FillinFrom\FormIndex.js" />
     <Content Include="Areas\EducationalAdministration\Views\FillinFrom\FormPeople.js" />
     <Content Include="Areas\EducationalAdministration\Views\FillinFrom\Index.js" />
-    <Content Include="Areas\EducationalAdministration\Views\HealthPunchStu\Form.js" />
-    <Content Include="Areas\EducationalAdministration\Views\HealthPunchStu\Index.js" />
-    <Content Include="Areas\EducationalAdministration\Views\HealthPunchStu\Statistics.js" />
-    <Content Include="Areas\EducationalAdministration\Views\HealthPunchStu\StatisticsTeach.js" />
-    <Content Include="Areas\EducationalAdministration\Views\HealthPunchTime\Form.js" />
-    <Content Include="Areas\EducationalAdministration\Views\HealthPunchTime\Index.js" />
     <Content Include="Areas\EducationalAdministration\Views\JournalSend\FormOfDC.js" />
     <Content Include="Areas\EducationalAdministration\Views\JournalSend\IndexOfDC.js" />
     <Content Include="Areas\EducationalAdministration\Views\LeaveSchoolA\Form.js" />
@@ -1054,8 +993,6 @@
     <Content Include="Areas\EducationalAdministration\Views\LessonInfo\IndexNoMajor.js" />
     <Content Include="Areas\EducationalAdministration\Views\LoginUserBind\Form.js" />
     <Content Include="Areas\EducationalAdministration\Views\LoginUserBind\BindAccountIndex.js" />
-    <Content Include="Areas\EducationalAdministration\Views\MajorAndSubject\Form.js" />
-    <Content Include="Areas\EducationalAdministration\Views\MajorAndSubject\Index.js" />
     <Content Include="Areas\EducationalAdministration\Views\PracticeBase\Form.js" />
     <Content Include="Areas\EducationalAdministration\Views\PracticeBase\Index.js" />
     <Content Include="Areas\EducationalAdministration\Views\R_EnterBuilding\ClassReport.js" />
@@ -1080,9 +1017,6 @@
     <Content Include="Areas\EducationalAdministration\Views\StuConsumption\IndexForStudent.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuConsumption\IndexForTeacher.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuDisciplineManagement\FormView.js" />
-    <Content Include="Areas\EducationalAdministration\Views\StuEnrollScore\AdmissionForm.js" />
-    <Content Include="Areas\EducationalAdministration\Views\StuEnrollScore\AdmissionIndex.js" />
-    <Content Include="Areas\EducationalAdministration\Views\StuEnrollScore\Index.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuEnroll\AmountForm.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuGrant\Form.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuGrant\Index.js" />
@@ -1122,15 +1056,11 @@
     <Content Include="Areas\EducationalAdministration\Views\StuScore\GraduateScoreQueryAllIndex.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuScore\ScoreQueryAllIndexTeacher.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuScore\ScoreQueryAllIndex.js" />
+    <Content Include="Areas\EducationalAdministration\Views\StuVolunteer\FormSchool.js" />
+    <Content Include="Areas\EducationalAdministration\Views\StuVolunteer\IndexAccount.js" />
+    <Content Include="Areas\EducationalAdministration\Views\StuVolunteer\IndexLabel.js" />
     <Content Include="Areas\EducationalAdministration\Views\Sys_DefaultPwdConfig\Form.js" />
     <Content Include="Areas\EducationalAdministration\Views\Sys_DefaultPwdConfig\Index.js" />
-    <Content Include="Areas\EducationalAdministration\Views\Sys_PsychologicalCounse\Form.js" />
-    <Content Include="Areas\EducationalAdministration\Views\Sys_PsychologicalCounse\FormReceive.js" />
-    <Content Include="Areas\EducationalAdministration\Views\Sys_PsychologicalCounse\FormView.js" />
-    <Content Include="Areas\EducationalAdministration\Views\Sys_PsychologicalCounse\FormViewReceive.js" />
-    <Content Include="Areas\EducationalAdministration\Views\Sys_PsychologicalCounse\FormViewReceiveData.js" />
-    <Content Include="Areas\EducationalAdministration\Views\Sys_PsychologicalCounse\Index.js" />
-    <Content Include="Areas\EducationalAdministration\Views\Sys_PsychologicalCounse\IndexRecive.js" />
     <Content Include="Areas\EducationalAdministration\Views\Sys_ReceiveDocument\FormView.js" />
     <Content Include="Areas\EducationalAdministration\Views\Sys_ReceiveDocument\Form.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\Sys_ReceiveDocument\Form.js" />
@@ -1163,39 +1093,9 @@
     <Content Include="Areas\EducationalAdministration\Views\Sys_SendFile\ReadListParty.js" />
     <Content Include="Areas\EducationalAdministration\Views\Sys_SendFile\ReadListDocument.js" />
     <Content Include="Areas\EducationalAdministration\Views\ClassPlanTeach\Index.js" />
-    <Content Include="Areas\EducationalAdministration\Views\TextBookIndentDetail\Index.js" />
-    <Content Include="Areas\EducationalAdministration\Views\TextBookIndent\Form.js" />
-    <Content Include="Areas\EducationalAdministration\Views\TextBookIndent\FormDetail.js" />
-    <Content Include="Areas\EducationalAdministration\Views\TextBookIndent\FormLook.js" />
-    <Content Include="Areas\EducationalAdministration\Views\TextBookIndent\FormView.js" />
-    <Content Include="Areas\EducationalAdministration\Views\TextBookIndent\Index.js" />
-    <Content Include="Areas\EducationalAdministration\Views\TextBookInfo\Form.js" />
-    <Content Include="Areas\EducationalAdministration\Views\TextBookInfo\Index.js" />
-    <Content Include="Areas\EducationalAdministration\Views\TextBookInOut\Form.js" />
-    <Content Include="Areas\EducationalAdministration\Views\TextBookInOut\FormUse.js" />
-    <Content Include="Areas\EducationalAdministration\Views\TextBookInOut\Index.js" />
-    <Content Include="Areas\EducationalAdministration\Views\TextBookInOut\IndexInOut.js" />
-    <Content Include="Areas\EducationalAdministration\Views\TextBookIn\Form.js" />
-    <Content Include="Areas\EducationalAdministration\Views\TextBookIn\FormDelete.js" />
-    <Content Include="Areas\EducationalAdministration\Views\TextBookIn\FormIn.js" />
-    <Content Include="Areas\EducationalAdministration\Views\TextBookIn\FormView.js" />
-    <Content Include="Areas\EducationalAdministration\Views\TextBookIn\Index.js" />
-    <Content Include="Areas\EducationalAdministration\Views\TextBookOut\Form.js" />
-    <Content Include="Areas\EducationalAdministration\Views\TextBookOut\FormDelete.js" />
-    <Content Include="Areas\EducationalAdministration\Views\TextBookOut\FormOut.js" />
-    <Content Include="Areas\EducationalAdministration\Views\TextBookOut\FormView.js" />
-    <Content Include="Areas\EducationalAdministration\Views\TextBookOut\Index.js" />
-    <Content Include="Areas\EducationalAdministration\Views\TextBookSolSubDetail\Form.js" />
-    <Content Include="Areas\EducationalAdministration\Views\TextBookSolSubDetail\Index.js" />
-    <Content Include="Areas\EducationalAdministration\Views\TextBookSolSub\Form.js" />
-    <Content Include="Areas\EducationalAdministration\Views\TextBookSolSub\Index.js" />
     <Content Include="Areas\EducationalAdministration\Views\Thermography\IndexResult.js" />
     <Content Include="Areas\EducationalAdministration\Views\Thermography\StatisticIndex.js" />
     <Content Include="Areas\EducationalAdministration\Views\Thermography\SubmitIndex.js" />
-    <Content Include="Areas\EducationalAdministration\Views\VaccinationInfo\Form.js" />
-    <Content Include="Areas\EducationalAdministration\Views\VaccinationInfo\Index.js" />
-    <Content Include="Areas\EducationalAdministration\Views\VaccinationInfo\TeachForm.js" />
-    <Content Include="Areas\EducationalAdministration\Views\VaccinationInfo\TeachIndex.js" />
     <Content Include="Areas\EvaluationTeach\Views\Eval_Main\AnswerIndex.js" />
     <Content Include="Areas\EvaluationTeach\Views\Eval_Main\TeacherIndex2.js" />
     <Content Include="Areas\EvaluationTeach\Views\Eval_Main\TeacherIndex.js" />
@@ -1332,8 +1232,6 @@
     <Content Include="Areas\LogisticsManagement\Views\Accommodation\IndexClassify.js" />
     <Content Include="Areas\LogisticsManagement\Views\Accommodation\IndexBed.js" />
     <Content Include="Areas\LogisticsManagement\Views\Accommodation\IndexDistribution.js" />
-    <Content Include="Areas\LogisticsManagement\Views\Acc_DormitoryRule\Form.js" />
-    <Content Include="Areas\LogisticsManagement\Views\Acc_DormitoryRule\Index.js" />
     <Content Include="Areas\LogisticsManagement\Views\ADR_Record\AttendanceReportByWeek.js" />
     <Content Include="Areas\LogisticsManagement\Views\ADR_Record\StatisticDetailIndex.js" />
     <Content Include="Areas\LogisticsManagement\Views\ADR_Record\StatisticIndex.js" />
@@ -1341,11 +1239,6 @@
     <Content Include="Areas\LogisticsManagement\Views\APAppointmentPsychologist\Index.js" />
     <Content Include="Areas\LogisticsManagement\Views\CompanyNews\Form.js" />
     <Content Include="Areas\LogisticsManagement\Views\CompanyNews\Index.js" />
-    <Content Include="Areas\LogisticsManagement\Views\DormitoryReturn\Form.js" />
-    <Content Include="Areas\LogisticsManagement\Views\DormitoryReturn\FormOut.js" />
-    <Content Include="Areas\LogisticsManagement\Views\DormitoryReturn\FormReturn.js" />
-    <Content Include="Areas\LogisticsManagement\Views\DormitoryReturn\Index.js" />
-    <Content Include="Areas\LogisticsManagement\Views\DormitoryReturn\IndexReport.js" />
     <Content Include="Areas\LR_AuthorizeModule\Views\Authorize\AppForm.js" />
     <Content Include="Areas\LR_AuthorizeModule\Views\Authorize\Form.css" />
     <Content Include="Areas\LR_AuthorizeModule\Views\Authorize\Form.js" />
@@ -1429,6 +1322,7 @@
     <Content Include="Areas\LR_Desktop\Views\DTSetting\App\AppIndex.js" />
     <Content Include="Areas\LR_Desktop\Views\DTSetting\PC\PcIndex.css" />
     <Content Include="Areas\LR_Desktop\Views\DTSetting\PC\PcIndex.js" />
+    <Content Include="Areas\LR_Desktop\Views\EnrollData\IndexPersonnel.js" />
     <Content Include="Areas\LR_Desktop\Views\EnrollTemplate\IndexPersonnel.js" />
     <Content Include="Areas\LR_Desktop\Views\FormulaChild\Form.js" />
     <Content Include="Areas\LR_Desktop\Views\FormulaChild\Index.js" />
@@ -6402,7 +6296,9 @@
     <Content Include="Areas\EducationalAdministration\Views\ArrangeExamTermNew\Form.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\ArrangeExamTermNew\Form.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuVolunteer\Index.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\StuVolunteer\Index.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuVolunteer\Form.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\StuVolunteer\Form.js" />
     <Content Include="Areas\LR_Desktop\Views\EnrollTemplate\Index.cshtml" />
     <Content Include="Areas\LR_Desktop\Views\EnrollTemplate\Index.js" />
     <Content Include="Areas\LR_Desktop\Views\EnrollTemplate\Form.cshtml" />
@@ -6413,10 +6309,7 @@
     <Content Include="Areas\LR_Desktop\Views\EnrollData\Form.js" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Areas\EducationalAdministration\Views\AwardAndPunishment\" />
-    <Folder Include="Areas\EducationalAdministration\Views\AwardPunishInfo\" />
     <Folder Include="Areas\EducationalAdministration\Views\HomeStatistics\" />
-    <Folder Include="Areas\EducationalAdministration\Views\OpenLessonPlanOfElectivePre\" />
     <Folder Include="Areas\LR_Desktop\Models\" />
     <Folder Include="Areas\LR_Desktop\Views\Shared\" />
     <Folder Include="Areas\LR_ReportTestModule\Models\" />
@@ -7634,101 +7527,7 @@
     <Content Include="Areas\LogisticsManagement\Views\Accommodation\IndexClassify.cshtml" />
     <Content Include="Areas\LogisticsManagement\Views\Accommodation\FormClassify.cshtml" />
     <Content Include="Areas\LR_Desktop\Views\EnrollTemplate\IndexPersonnel.cshtml" />
-    <Content Include="Areas\EducationalAdministration\Views\ExamSubject\Form.cshtml" />
-    <Content Include="Areas\EducationalAdministration\Views\ExamSubject\Index.cshtml" />
-    <Content Include="Areas\EducationalAdministration\Views\Exam_ArrangeExamTermItemNew\Form.cshtml" />
-    <Content Include="Areas\EducationalAdministration\Views\Exam_ArrangeExamTermItemNew\Index.cshtml" />
-    <Content Include="Areas\EducationalAdministration\Views\Exam_ArrangeExamTermNew\Form.cshtml" />
-    <Content Include="Areas\EducationalAdministration\Views\Exam_ArrangeExamTermNew\Index.cshtml" />
-    <Content Include="Areas\EducationalAdministration\Views\Exam_ArrangeExamTermNew\IndexForClass.cshtml" />
-    <Content Include="Areas\EducationalAdministration\Views\Exam_ArrangeExamTermNew\IndexItem.cshtml" />
-    <Content Include="Areas\EducationalAdministration\Views\Exam_ExamLesson\Form.cshtml" />
-    <Content Include="Areas\EducationalAdministration\Views\Exam_ExamLesson\FormExamTime.cshtml" />
-    <Content Include="Areas\EducationalAdministration\Views\Exam_ExamLesson\FormYearSemester.cshtml" />
-    <Content Include="Areas\EducationalAdministration\Views\Exam_ExamLesson\Index.cshtml" />
-    <Content Include="Areas\EducationalAdministration\Views\Exam_ExamPlanLesson\Form.cshtml" />
-    <Content Include="Areas\EducationalAdministration\Views\Exam_ExamPlanLesson\FormClass.cshtml" />
-    <Content Include="Areas\EducationalAdministration\Views\Exam_ExamPlanLesson\FormRoom.cshtml" />
-    <Content Include="Areas\EducationalAdministration\Views\Exam_ExamPlanLesson\FormRoomTeacher.cshtml" />
-    <Content Include="Areas\EducationalAdministration\Views\Exam_ExamPlanLesson\FormTeacher.cshtml" />
-    <Content Include="Areas\EducationalAdministration\Views\Exam_ExamPlanLesson\Index.cshtml" />
-    <Content Include="Areas\EducationalAdministration\Views\Exam_ExamPlan\ClearForm.cshtml" />
-    <Content Include="Areas\EducationalAdministration\Views\Exam_ExamPlan\Form.cshtml" />
-    <Content Include="Areas\EducationalAdministration\Views\Exam_ExamPlan\FormTime.cshtml" />
-    <Content Include="Areas\EducationalAdministration\Views\Exam_ExamPlan\GenerateForm.cshtml" />
-    <Content Include="Areas\EducationalAdministration\Views\Exam_ExamPlan\Index.cshtml" />
-    <Content Include="Areas\EducationalAdministration\Views\Exam_ExamRoom\Form.cshtml" />
-    <Content Include="Areas\EducationalAdministration\Views\Exam_ExamRoom\FormYearSemester.cshtml" />
-    <Content Include="Areas\EducationalAdministration\Views\Exam_ExamRoom\Index.cshtml" />
-    <Content Include="Areas\EducationalAdministration\Views\Exam_ExamStudent\Form.cshtml" />
-    <Content Include="Areas\EducationalAdministration\Views\Exam_ExamStudent\FormClear.cshtml" />
-    <Content Include="Areas\EducationalAdministration\Views\Exam_ExamStudent\FormImport.cshtml" />
-    <Content Include="Areas\EducationalAdministration\Views\Exam_ExamStudent\Index.cshtml" />
-    <Content Include="Areas\EducationalAdministration\Views\Exam_ExamTeacherTime\Form.cshtml" />
-    <Content Include="Areas\EducationalAdministration\Views\Exam_ExamTeacherTime\Index.cshtml" />
-    <Content Include="Areas\EducationalAdministration\Views\Exam_InvigilateTeacher\Form.cshtml" />
-    <Content Include="Areas\EducationalAdministration\Views\Exam_InvigilateTeacher\FormYearSemester.cshtml" />
-    <Content Include="Areas\EducationalAdministration\Views\Exam_InvigilateTeacher\Index.cshtml" />
-    <Content Include="Areas\EducationalAdministration\Views\HealthPunchStu\Form.cshtml" />
-    <Content Include="Areas\EducationalAdministration\Views\HealthPunchStu\Index.cshtml" />
-    <Content Include="Areas\EducationalAdministration\Views\HealthPunchStu\Statistics.cshtml" />
-    <Content Include="Areas\EducationalAdministration\Views\HealthPunchStu\StatisticsTeach.cshtml" />
-    <Content Include="Areas\EducationalAdministration\Views\HealthPunchTime\Form.cshtml" />
-    <Content Include="Areas\EducationalAdministration\Views\HealthPunchTime\Index.cshtml" />
-    <Content Include="Areas\EducationalAdministration\Views\MajorAndSubject\Form.cshtml" />
-    <Content Include="Areas\EducationalAdministration\Views\MajorAndSubject\Index.cshtml" />
-    <Content Include="Areas\EducationalAdministration\Views\StuEnrollPhone\Form.cshtml" />
-    <Content Include="Areas\EducationalAdministration\Views\StuEnrollPhone\Link.cshtml" />
-    <Content Include="Areas\EducationalAdministration\Views\StuEnrollPhone\Search.cshtml" />
-    <Content Include="Areas\EducationalAdministration\Views\StuEnrollPhone\SearchResult.cshtml" />
-    <Content Include="Areas\EducationalAdministration\Views\StuEnrollPhone\StuRecruitmentBrochure.cshtml" />
-    <Content Include="Areas\EducationalAdministration\Views\StuEnrollScore\AdmissionForm.cshtml" />
-    <Content Include="Areas\EducationalAdministration\Views\StuEnrollScore\AdmissionIndex.cshtml" />
-    <Content Include="Areas\EducationalAdministration\Views\StuEnrollScore\Index.cshtml" />
-    <Content Include="Areas\EducationalAdministration\Views\Sys_PsychologicalCounse\Form.cshtml" />
-    <Content Include="Areas\EducationalAdministration\Views\Sys_PsychologicalCounse\FormReceive.cshtml" />
-    <Content Include="Areas\EducationalAdministration\Views\Sys_PsychologicalCounse\FormView.cshtml" />
-    <Content Include="Areas\EducationalAdministration\Views\Sys_PsychologicalCounse\FormViewReceive.cshtml" />
-    <Content Include="Areas\EducationalAdministration\Views\Sys_PsychologicalCounse\FormViewReceiveData.cshtml" />
-    <Content Include="Areas\EducationalAdministration\Views\Sys_PsychologicalCounse\Index.cshtml" />
-    <Content Include="Areas\EducationalAdministration\Views\Sys_PsychologicalCounse\IndexRecive.cshtml" />
-    <Content Include="Areas\EducationalAdministration\Views\TextBookIndentDetail\Index.cshtml" />
-    <Content Include="Areas\EducationalAdministration\Views\TextBookIndent\Form.cshtml" />
-    <Content Include="Areas\EducationalAdministration\Views\TextBookIndent\FormDetail.cshtml" />
-    <Content Include="Areas\EducationalAdministration\Views\TextBookIndent\FormLook.cshtml" />
-    <Content Include="Areas\EducationalAdministration\Views\TextBookIndent\FormView.cshtml" />
-    <Content Include="Areas\EducationalAdministration\Views\TextBookIndent\Index.cshtml" />
-    <Content Include="Areas\EducationalAdministration\Views\TextBookInfo\Form.cshtml" />
-    <Content Include="Areas\EducationalAdministration\Views\TextBookInfo\Index.cshtml" />
-    <Content Include="Areas\EducationalAdministration\Views\TextBookInOut\Form.cshtml" />
-    <Content Include="Areas\EducationalAdministration\Views\TextBookInOut\FormUse.cshtml" />
-    <Content Include="Areas\EducationalAdministration\Views\TextBookInOut\Index.cshtml" />
-    <Content Include="Areas\EducationalAdministration\Views\TextBookInOut\IndexInOut.cshtml" />
-    <Content Include="Areas\EducationalAdministration\Views\TextBookIn\Form.cshtml" />
-    <Content Include="Areas\EducationalAdministration\Views\TextBookIn\FormDelete.cshtml" />
-    <Content Include="Areas\EducationalAdministration\Views\TextBookIn\FormIn.cshtml" />
-    <Content Include="Areas\EducationalAdministration\Views\TextBookIn\FormView.cshtml" />
-    <Content Include="Areas\EducationalAdministration\Views\TextBookIn\Index.cshtml" />
-    <Content Include="Areas\EducationalAdministration\Views\TextBookOut\Form.cshtml" />
-    <Content Include="Areas\EducationalAdministration\Views\TextBookOut\FormDelete.cshtml" />
-    <Content Include="Areas\EducationalAdministration\Views\TextBookOut\FormOut.cshtml" />
-    <Content Include="Areas\EducationalAdministration\Views\TextBookOut\FormView.cshtml" />
-    <Content Include="Areas\EducationalAdministration\Views\TextBookOut\Index.cshtml" />
-    <Content Include="Areas\EducationalAdministration\Views\TextBookSolSubDetail\Form.cshtml" />
-    <Content Include="Areas\EducationalAdministration\Views\TextBookSolSubDetail\Index.cshtml" />
-    <Content Include="Areas\EducationalAdministration\Views\TextBookSolSub\Form.cshtml" />
-    <Content Include="Areas\EducationalAdministration\Views\TextBookSolSub\Index.cshtml" />
-    <Content Include="Areas\EducationalAdministration\Views\VaccinationInfo\Form.cshtml" />
-    <Content Include="Areas\EducationalAdministration\Views\VaccinationInfo\Index.cshtml" />
-    <Content Include="Areas\EducationalAdministration\Views\VaccinationInfo\TeachForm.cshtml" />
-    <Content Include="Areas\EducationalAdministration\Views\VaccinationInfo\TeachIndex.cshtml" />
-    <Content Include="Areas\LogisticsManagement\Views\Acc_DormitoryRule\Form.cshtml" />
-    <Content Include="Areas\LogisticsManagement\Views\Acc_DormitoryRule\Index.cshtml" />
-    <Content Include="Areas\LogisticsManagement\Views\DormitoryReturn\Form.cshtml" />
-    <Content Include="Areas\LogisticsManagement\Views\DormitoryReturn\FormOut.cshtml" />
-    <Content Include="Areas\LogisticsManagement\Views\DormitoryReturn\FormReturn.cshtml" />
-    <Content Include="Areas\LogisticsManagement\Views\DormitoryReturn\Index.cshtml" />
-    <Content Include="Areas\LogisticsManagement\Views\DormitoryReturn\IndexReport.cshtml" />
+    <Content Include="Areas\LR_Desktop\Views\EnrollData\IndexPersonnel.cshtml" />
     <None Include="Properties\PublishProfiles\CustomProfile.pubxml" />
     <None Include="Properties\PublishProfiles\FolderProfile.pubxml" />
     <Content Include="Views\Login\Default-beifen.cshtml" />

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/EnrollData/EnrollDataEntity.cs

@@ -60,6 +60,9 @@ namespace Learun.Application.TwoDevelopment.LR_Desktop
         }
         #endregion
         #region 扩展字段
+        [NotMapped]
+        public string F_FileName { get; set; }
+
         #endregion
     }
 }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/EnrollData/EnrollDataService.cs

@@ -29,17 +29,28 @@ namespace Learun.Application.TwoDevelopment.LR_Desktop
         {
             try
             {
+                var basedbname = BaseRepository().getDbConnection().Database;
                 var strSql = new StringBuilder();
                 strSql.Append("SELECT ");
                 strSql.Append(@"
-                t.Id,
-                t.UploadTime
+                 t.*,f.F_FileName
                 ");
                 strSql.Append("  FROM EnrollData t ");
+                strSql.Append("  left join "+ basedbname + ".dbo.LR_Base_AnnexesFile f on t.[Path]=f.f_folderid ");
                 strSql.Append("  WHERE 1=1 ");
                 var queryParam = queryJson.ToJObject();
                 // 虚拟参数
                 var dp = new DynamicParameters(new { });
+                if (!queryParam["Type"].IsEmpty())
+                {
+                    dp.Add("Type", queryParam["Type"].ToString(), DbType.String);
+                    strSql.Append(" AND t.Type = @Type ");
+                }
+                if (!queryParam["keyword"].IsEmpty())
+                {
+                    dp.Add("keyword", queryParam["keyword"].ToString(), DbType.String);
+                    strSql.Append(" AND f.F_FileName like  @keyword ");
+                }
                 return this.BaseRepository("CollegeMIS").FindList<EnrollDataEntity>(strSql.ToString(),dp, pagination);
             }
             catch (Exception ex)