Merge branch '塔里木分支' of 123.57.209.16:bjquanjiang/DigitalScholl into 塔里木分支

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/CdMajorController.cs

@@ -200,16 +200,16 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
                 return Fail("不能修改关联学科");
             }
             cdMajorIBLL.SaveEntity(keyValue, entity);
-            #region 给关联表添加科目
-            MajorAndSubjectEntity majorAndSubjectEntity = new MajorAndSubjectEntity();
-            string[] SubNo = entity.SubjectNo.Split(',');
-            for (int i = 0; i < SubNo.Length; i++)
-            {
-                majorAndSubjectEntity.MajorId = entity.ID;//关联专业主键
-                majorAndSubjectEntity.SubId = SubNo[i];//考试科目的主键
-                majorAndSubjectIBLL.SaveEntity("", majorAndSubjectEntity);
-            }
-            #endregion
+            //#region 给关联表添加科目
+            //MajorAndSubjectEntity majorAndSubjectEntity = new MajorAndSubjectEntity();
+            //string[] SubNo = entity.SubjectNo.Split(',');
+            //for (int i = 0; i < SubNo.Length; i++)
+            //{
+            //    majorAndSubjectEntity.MajorId = entity.ID;//关联专业主键
+            //    majorAndSubjectEntity.SubId = SubNo[i];//考试科目的主键
+            //    majorAndSubjectIBLL.SaveEntity("", majorAndSubjectEntity);
+            //}
+            //#endregion
             return Success("保存成功！");
         }
 

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuEnrollController.cs

@@ -385,10 +385,10 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
             var StuEnrollData = stuEnrollIBLL.GetStuEnrollEntity(keyValue);
             //获取中考成绩
             var MidExamScoreData = stuEnrollIBLL.GetMidExamScoreData(keyValue).OrderBy(x => x.sort);
+
             if (string.IsNullOrEmpty(StuEnrollData.CheckInUrl))
             {
                 StuEnrollData.CheckInUrl = Guid.NewGuid().ToString();
-
             }
             if (string.IsNullOrEmpty(StuEnrollData.SubsidizeUrl))
             {
@@ -948,6 +948,12 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         /// <returns></returns>
         public ActionResult UpdateEnrollStatus(string keyValue, string strEntity)
         {
+            var StuEnrollData = stuEnrollIBLL.GetStuEnrollEntity(keyValue);
+            if (string.IsNullOrEmpty(StuEnrollData.SubjectNo) )
+            {
+                return Fail("考试科目不能为空！");
+            }
+
             stuEnrollIBLL.UpdateEnrollStatus(keyValue, 2);
             return Success("保存成功");
         }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuEnrollPhoneController.cs

@@ -15,14 +15,17 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
     {
         private StuEnrollIBLL stuEnrollIBLL = new StuEnrollBLL();
 
+        #region 视图
         public ActionResult Link()
         {
             return View();
         }
+
         public ActionResult Form()
         {
             return View();
         }
+
         public ActionResult Search(int type)
         {
             if (type == 1)
@@ -37,11 +40,24 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
             }
             return View();
         }
+
         public ActionResult SearchResult()
         {
             return View();
         }
 
+        /// <summary>
+        /// 招生简章
+        /// </summary>
+        /// <returns></returns>
+        public ActionResult StuRecruitmentBrochure()
+        {
+            return View();
+        }
+
+        #endregion
+
+
         /// <summary>
         /// 报名
         /// </summary>
@@ -57,7 +73,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
             List<StuEnrollMidExamScoreEntity> scoreData = scoreList.ToObject<List<StuEnrollMidExamScoreEntity>>();
             if (string.IsNullOrEmpty(keyValue))
             {
-                var model = stuEnrollIBLL.GetEntityByPersonalData(entity.IDCard, entity.StuMobile);
+                var model = stuEnrollIBLL.GetEntityByPersonalData(entity.IDCard, entity.StuName);
                 if (model != null)
                 {
                     return Fail("您已报名，请耐心等待结果！");
@@ -99,20 +115,20 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
             return Success(jsonData);
         }
         /// <summary>
-        /// 下载入学须知
+        /// 下载
         /// </summary>
+        /// <param name="name">文件名称</param>
+        /// <param name="pathName">原文件名称</param>
         /// <returns></returns>
-        [HttpPost]
-        [AjaxOnly]
-        public ActionResult FileDownLoad()
+        public ActionResult FileDownLoad(string name, string pathName)
         {
             FileStreamResult result = null;
             try
             {
                 var path = Server.MapPath("~/Content/otherFile/");
-                var pathoffull = path + "入学须知.pdf";
-                FileStream fsread = fsread = new FileStream(pathoffull, FileMode.OpenOrCreate, FileAccess.ReadWrite);
-                result = File(fsread, "application/pdf", "入学须知.pdf");
+                var pathoffull = path + pathName;
+                FileStream fsread = new FileStream(pathoffull, FileMode.OpenOrCreate, FileAccess.ReadWrite);
+                result = File(fsread, "application/pdf", name + ".pdf");
 
                 return result;
             }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuLeaveManagementController.cs

@@ -119,6 +119,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         public ActionResult GetFormData(string keyValue)
         {
             var StuLeaveManagementData = stuLeaveManagementIBLL.GetStuLeaveManagementEntity(keyValue);
+            StuLeaveManagementData.num = stuLeaveManagementIBLL.Num(StuLeaveManagementData.CreateUserNo);
             var jsonData = new
             {
                 StuLeaveManagement = StuLeaveManagementData,
@@ -136,6 +137,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         public ActionResult GetFormDataByProcessId(string processId)
         {
             var StuLeaveManagementData = stuLeaveManagementIBLL.GetEntityByProcessId(processId);
+            StuLeaveManagementData.num = stuLeaveManagementIBLL.Num(StuLeaveManagementData.CreateUserNo);
             var jsonData = new
             {
                 StuLeaveManagement = StuLeaveManagementData,

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/VaccinationInfoController.cs

@@ -0,0 +1,142 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.EducationalAdministration;
+using System.Web.Mvc;
+using System.Collections.Generic;
+
+namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2022-07-18 17:52
+    /// 描 述：疫情
+    /// </summary>
+    public class VaccinationInfoController : MvcControllerBase
+    {
+        private VaccinationInfoIBLL vaccinationInfoIBLL = new VaccinationInfoBLL();
+
+        #region 视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+            return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+            return View();
+        }
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult TeachIndex()
+        {
+            return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult TeachForm()
+        {
+            return View();
+        }
+        #endregion
+
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = vaccinationInfoIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var VaccinationInfoData = vaccinationInfoIBLL.GetVaccinationInfoEntity(keyValue);
+            var jsonData = new
+            {
+                VaccinationInfo = VaccinationInfoData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            vaccinationInfoIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <param name="strEntity">实体</param>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            VaccinationInfoEntity entity = strEntity.ToObject<VaccinationInfoEntity>();
+            vaccinationInfoIBLL.SaveEntity(keyValue, entity);
+            return Success("保存成功！");
+        }
+        #endregion
+
+        #region 扩展代码
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult CreateFrom(string userId,string Description)
+        {
+            vaccinationInfoIBLL.CreateEntity(userId, Description);
+            return Success("生成成功！");
+        }
+        #endregion
+    }
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CdMajor/Form.cshtml

@@ -23,11 +23,12 @@
         <div class="lr-form-item-title">校区<font face="宋体">*</font></div>
         <div id="F_SchoolId" isvalid="yes" checkexpession="NotNull"></div>
     </div>
-    <div class="col-xs-6 lr-form-item" data-table="CdMajor">
-        <div class="lr-form-item-title">考试科目<font face="宋体">*</font></div>
-        <div id="SubjectNo" isvalid="yes" checkexpession="NotNull"></div>
-        <input id="SubjectName" type="hidden" />
-    </div>
+    @*考试科目在报名管理下维护
+            <div class="col-xs-6 lr-form-item" data-table="CdMajor">
+            <div class="lr-form-item-title">考试科目<font face="宋体">*</font></div>
+            <div id="SubjectNo" isvalid="yes" checkexpession="NotNull"></div>
+            <input id="SubjectName" type="hidden" />
+        </div>*@
     <div class="col-xs-6 lr-form-item" data-table="CdMajor">
         <div class="lr-form-item-title">年度<font face="宋体">*</font></div>
         <div id="Year" isvalid="yes" checkexpession="Num"></div>
@@ -45,13 +46,13 @@
         <div id="DeptNo"></div>
     </div>
     @*<div class="col-xs-6 lr-form-item" data-table="CdMajor">
-        <div class="lr-form-item-title">名称缩写</div>
-        <input id="MajorNameBrief" type="text" class="form-control" />
-    </div>
-    <div class="col-xs-6 lr-form-item" data-table="CdMajor">
-        <div class="lr-form-item-title">英文名称</div>
-        <input id="MajorNameEn" type="text" class="form-control" />
-    </div>*@
+            <div class="lr-form-item-title">名称缩写</div>
+            <input id="MajorNameBrief" type="text" class="form-control" />
+        </div>
+        <div class="col-xs-6 lr-form-item" data-table="CdMajor">
+            <div class="lr-form-item-title">英文名称</div>
+            <input id="MajorNameEn" type="text" class="form-control" />
+        </div>*@
     <div class="col-xs-6 lr-form-item" data-table="CdMajor">
         <div class="lr-form-item-title">教委专业代码</div>
         <input id="GovMajorNo" type="text" class="form-control" />

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/EnrollForm.cshtml

@@ -47,22 +47,25 @@
     <div class="col-xs-6 lr-form-item" data-table="StuEnroll">
         <div class="lr-form-item-title">县区<font face="宋体">*</font></div>
         <div id="County" isvalid="yes" checkexpession="NotNull"></div>
-       @* <input id="County" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />*@
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="StuEnroll">
+    <div class="col-xs-6 lr-form-item"  data-table="StuEnroll">
         <div class="lr-form-item-title">专业<font face="宋体">*</font></div>
         <div id="MajorNo"  isvalid="yes" checkexpession="NotNull"></div>
     </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuEnroll">
+        <div class="lr-form-item-title">考试科目<font face="宋体">*</font></div>
+        <div id="SubjectNo" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
     <div class="col-xs-12 lr-form-item"  data-table="StuEnroll">
-        <div class="lr-form-item-title">身份证正面照片<font face="宋体">*</font></div>
+        <div class="lr-form-item-title">身份证正面照<font face="宋体">*</font></div>
         <div id="IdCardPto1"  isvalid="yes" checkexpession="NotNull"></div>
     </div>
     <div class="col-xs-12 lr-form-item"  data-table="StuEnroll">
-        <div class="lr-form-item-title">身份证反面照片<font face="宋体">*</font></div>
+        <div class="lr-form-item-title">身份证反面照<font face="宋体">*</font></div>
         <div id="IdCardPto2"  isvalid="yes" checkexpession="NotNull"></div>
     </div>
     <div class="col-xs-12 lr-form-item"  data-table="StuEnroll">
-        <div class="lr-form-item-title">初中毕业证照片<font face="宋体">*</font></div>
+        <div class="lr-form-item-title">初中毕业证照<font face="宋体">*</font></div>
         <div id="MidDiplomaPto"  isvalid="yes" checkexpession="NotNull"></div>
     </div>
     <div class="col-xs-12 lr-form-item"  data-table="StuEnroll">

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/EnrollForm.js

@@ -23,7 +23,13 @@ var bootstrap = function ($, learun) {
             $('#MidAchievementPto').lrUploader();
             $('#Gender').lrDataItemSelect({ code: 'usersexbit' });
             $('#Nationals').lrDataItemSelect({ code: 'National' });
-
+            $('#SubjectNo').lrselect({
+                type: 'multiple',
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=' + 'ExamSubject',
+                value: 'subjectno',
+                text: 'subjectname',
+                maxHeight: 200
+            });
             //地市
             $('#City').lrselect({
                 allowSearch: true,
@@ -58,42 +64,33 @@ var bootstrap = function ($, learun) {
                 value: "acode",
                 text: "aname",
                 maxHeight: 200,
-                select: function (item) {
-                    if (item) {
-                        var countyCode = $("#County").lrselectGet();
+                //select: function (item) {
+                //    if (item) {
+                //        var countyCode = $("#County").lrselectGet();
 
-                        //专业
-                        $('#MajorNo').lrselectRefresh({
-                            url: top.$.rootUrl +
-                                '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
-                            param: {
-                                //strWhere: "1=1 and Area='" + countyCode + "'"
-                                strWhere: "1=1"
-                            },
-                            value: "id",
-                            text: "majorname",
-                            maxHeight: 200,
-                        });
-                        if (MajorNo) {
-                            $('#MajorNo').lrselectSet(MajorNo);
-                            MajorNo = '';
-                        }
-                    }
+                //        //专业
+                //        $('#MajorNo').lrselectRefresh({
+                //            url: top.$.rootUrl +
+                //                '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
+                //            param: {
+                //                //strWhere: "1=1 and Area='" + countyCode + "'"
+                //                strWhere: "1=1"
+                //            },
+                //            value: "id",
+                //            text: "majorname",
+                //            maxHeight: 200,
+                //        });
+                //        if (MajorNo) {
+                //            $('#MajorNo').lrselectSet(MajorNo);
+                //            MajorNo = '';
+                //        }
+                //    }
 
-                }
+                //}
             });
             //专业
             $('#MajorNo').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'id', text: 'majorname' });
-            //$('#MajorNo').lrselectRefresh({
-            //    url: top.$.rootUrl +
-            //        '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
-            //    param: {
-            //        strWhere: "1=1"
-            //    },
-            //    value: "id",
-            //    text: "majorname",
-            //    maxHeight: 200,
-            //});
+
 
             $('#EmpNo').lrDataSourceSelect({ code: 'EmpInfo', value: 'empno', text: 'empname' });
 
@@ -131,9 +128,10 @@ var bootstrap = function ($, learun) {
                     if (!!data.StuEnrollMidExamScore) {
                         $.each(data.StuEnrollMidExamScore,
                             function (i, item) {
+                                var score = item.score > 0 ? item.score : '';
                                 str += '<div class="col-xs-6 lr-form-item" data-table="StuEnrollMidExamScore">';
                                 str += '<div class="lr-form-item-title">' + item.subjectName + '</div>';
-                                str += '<input id="' + item.Id + '" type="text" class="form-control SEMidExamScore" value="' + item.score + '" />';
+                                str += '<input id="' + item.Id + '" type="text" class="form-control SEMidExamScore" value="' + score + '" />';
                                 str += '</div>';
                             });
                         $('#scoreDiv').html(str);
@@ -146,7 +144,8 @@ var bootstrap = function ($, learun) {
     acceptClick = function (callBack) {
         if (!$('body').lrValidform()) {
             return false;
-        } var scoreList = [];
+        }
+        var scoreList = [];
 
         $.each($("#scoreDiv .SEMidExamScore"),
             function (i, item) {
@@ -156,8 +155,10 @@ var bootstrap = function ($, learun) {
                 };
                 scoreList.push(entity);
             });
+        var entity = $('body').lrGetFormData();
+        entity.MajorName = $('#MajorNo').lrselectGetText();
         var postData = {
-            strEntity: JSON.stringify($('body').lrGetFormData()),
+            strEntity: JSON.stringify(entity),
             scoreList: JSON.stringify(scoreList)
         };
         $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/StuEnrollPhone/SaveForm?keyValue=' + keyValue, postData, function (res) {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/EnrollFormView.cshtml

@@ -57,20 +57,24 @@
         <div class="lr-form-item-title">县区<font face="宋体">*</font></div>
         <div id="County" isvalid="yes" checkexpession="NotNull"></div>
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="StuEnroll">
+    <div class="col-xs-6 lr-form-item"  data-table="StuEnroll">
         <div class="lr-form-item-title">专业<font face="宋体">*</font></div>
-        <div id="MajorNo"></div>
+        <div id="MajorNo" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuEnroll">
+        <div class="lr-form-item-title">考试科目<font face="宋体">*</font></div>
+        <div id="SubjectNo" isvalid="yes" checkexpession="NotNull"></div>
     </div>
     <div class="col-xs-12 lr-form-item"  data-table="StuEnroll">
-        <div class="lr-form-item-title">身份证正面照片<font face="宋体">*</font></div>
+        <div class="lr-form-item-title">身份证正面照<font face="宋体">*</font></div>
         <div id="IdCardPto1"  isvalid="yes" checkexpession="NotNull"></div>
     </div>
     <div class="col-xs-12 lr-form-item"  data-table="StuEnroll">
-        <div class="lr-form-item-title">身份证反面照片<font face="宋体">*</font></div>
+        <div class="lr-form-item-title">身份证反面照<font face="宋体">*</font></div>
         <div id="IdCardPto2"  isvalid="yes" checkexpession="NotNull"></div>
     </div>
     <div class="col-xs-12 lr-form-item"  data-table="StuEnroll">
-        <div class="lr-form-item-title">初中毕业证照片<font face="宋体">*</font></div>
+        <div class="lr-form-item-title">初中毕业证照<font face="宋体">*</font></div>
         <div id="MidDiplomaPto"  isvalid="yes" checkexpession="NotNull"></div>
     </div>
     <div class="col-xs-12 lr-form-item"  data-table="StuEnroll">

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/EnrollFormView.js

@@ -32,6 +32,13 @@ var bootstrap = function ($, learun) {
             $('#Nationals').lrDataItemSelect({ code: 'National' });
             $('#MajorNo').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'id', text: 'majorname' });
             $('#EmpNo').lrDataSourceSelect({ code: 'EmpInfo', value: 'empno', text: 'empname' });
+            $('#SubjectNo').lrselect({
+                type: 'multiple',
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=' + 'ExamSubject',
+                value: 'subjectno',
+                text: 'subjectname',
+                maxHeight: 200
+            });
             //地市
             $('#City').lrselect({
                 allowSearch: true,
@@ -102,9 +109,10 @@ var bootstrap = function ($, learun) {
                     if (data.StuEnrollMidExamScore) {
                         $.each(data.StuEnrollMidExamScore,
                             function (i, item) {
+                                var score = item.score > 0 ? item.score : '';
                                 str += '<div class="col-xs-6 lr-form-item" data-table="StuEnrollMidExamScore">';
                                 str += '<div class="lr-form-item-title">' + item.subjectName + '</div>';
-                                str += '<input id="' + item.Id + '" type="text" class="form-control SEMidExamScore" value="' + item.score + '" />';
+                                str += '<input id="' + item.Id + '" type="text" class="form-control SEMidExamScore" value="' + score + '" />';
                                 str += '</div>';
                             });
                         $('#scoreDiv').html(str);

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/EnrollIndex.js

@@ -89,7 +89,7 @@ var bootstrap = function ($, learun) {
                         id: 'form',
                         title: '查看',
                         url: top.$.rootUrl + '/EducationalAdministration/StuEnroll/EnrollFormView?keyValue=' + keyValue,
-                        width: 800,
+                        width: 900,
                         height: 700,
                         btn: null
                     });
@@ -108,7 +108,7 @@ var bootstrap = function ($, learun) {
                         id: 'form',
                         title: '审核',
                         url: top.$.rootUrl + '/EducationalAdministration/StuEnroll/EnrollSH?keyValue=' + keyValue,
-                        width: 700,
+                        width: 900,
                         height: 700,
                         btn: ['确认审核', '取消'],
                         callBack: function (id) {
@@ -263,8 +263,10 @@ var bootstrap = function ($, learun) {
                         formatter: function (value) {
                             if (value == 1) {
                                 return "<span class=\"label label-success\">是</span>";
-                            } else {
+                            } else if (value == 0) {
                                 return "<span class=\"label label-danger\">否</span>";
+                            } else {
+                                return "";
                             }
                         }
                     },

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/EnrollSH.cshtml

@@ -40,6 +40,7 @@
         <div class="lr-form-item-title">中考总分<font face="宋体">*</font></div>
         <input id="MidTermExam" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
+    <div id="scoreDiv"></div>
     <div class="col-xs-6 lr-form-item" data-table="StuEnroll">
         <div class="lr-form-item-title">毕业学校<font face="宋体">*</font></div>
         <input id="FromSchool" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
@@ -56,9 +57,13 @@
         <div class="lr-form-item-title">县区<font face="宋体">*</font></div>
         <div id="County" isvalid="yes" checkexpession="NotNull"></div>
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="StuEnroll">
+    <div class="col-xs-6 lr-form-item"  data-table="StuEnroll">
         <div class="lr-form-item-title">专业<font face="宋体">*</font></div>
-        <div id="MajorNo"></div>
+        <div id="MajorNo" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuEnroll">
+        <div class="lr-form-item-title">考试科目<font face="宋体">*</font></div>
+        <div id="SubjectNo" isvalid="yes" checkexpession="NotNull"></div>
     </div>
     <div class="col-xs-12 lr-form-item"  data-table="StuEnroll">
         <div class="lr-form-item-title">身份证正面照片<font face="宋体">*</font></div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/EnrollSH.js

@@ -22,6 +22,13 @@ var bootstrap = function ($, learun) {
                 type: 'radio',
                 code: 'YesOrNoBit',
             });
+            $('#SubjectNo').lrselect({
+                type: 'multiple',
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=' + 'ExamSubject',
+                value: 'subjectno',
+                text: 'subjectname',
+                maxHeight: 200
+            });
             $('#IdCardPto1').lrUploader();
             $('#IdCardPto2').lrUploader();
             $('#MidDiplomaPto').lrUploader();
@@ -96,6 +103,17 @@ var bootstrap = function ($, learun) {
                         }
                     }
                     MajorNo = data.StuEnroll.MajorNo;
+                    var str = '';
+                    if (!!data.StuEnrollMidExamScore) {
+                        $.each(data.StuEnrollMidExamScore,
+                            function (i, item) {
+                                str += '<div class="col-xs-6 lr-form-item" data-table="StuEnrollMidExamScore">';
+                                str += '<div class="lr-form-item-title">' + item.subjectName + '</div>';
+                                str += '<input id="' + item.Id + '" type="text" class="form-control SEMidExamScore" value="' + item.score + '" />';
+                                str += '</div>';
+                            });
+                        $('#scoreDiv').html(str);
+                    }
                 });
                 learun.httpAsyncGet(top.$.rootUrl + '/EducationalAdministration/StuEnroll/GetExamDataByStuId?keyValue=' + keyValue, function (res) {
                     var html = '';

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollPhone/Form.cshtml

@@ -522,21 +522,21 @@
                     $("#MajorNo").html(str);
                 },
             });
-
             //民族
             $.ajax({
-                url: "/EducationalAdministration/EmpInfoEnternal/GetMap?code=" + "BCdNationality",
+                url: "/EducationalAdministration/EmpInfoEnternal/GetDataItemMap?code=" + "National",
                 async: false,
                 success: function (msg) {
-                    var companys = $.parseJSON(msg).data.data;
+                    var companys = $.parseJSON(msg).data;
                     var str = '<option value="">请选择</option>';
                     $.each(companys,
                         function (i, item) {
-                            str += '<option value="' + item.nationalityno + '">' + item.nationality + '</option>'
+                            str += '<option value="' + item.F_ItemValue + '">' + item.F_ItemName + '</option>'
                         })
                     $("#Nationals").html(str);
                 },
             });
+            
             //地市
             $.ajax({
                 url: "/EducationalAdministration/EmpInfoEnternal/GetMap?code=" + "DIC_CITY" + "&where=" + "cparent='650000'",

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollPhone/Link.cshtml

@@ -32,6 +32,8 @@
     </div>
     <div class="box"><a href="" id="loc">查询考试地点及时间</a></div>
     <div class="box"><a href="" id="res">查询录取结果</a></div>
+    <div class="box"><a href="" id="stuRecruitmentBrochure">招生简章</a></div>
+    <div class="box major"><a id="majorIntroduce">专业介绍</a></div>
 </div>
     <script src="/Content/jquery/jquery-1.10.2.min.js"></script>
 <script src="~/PhonePage/server.js"></script>
@@ -45,7 +47,14 @@
         $('#loc').attr('href', '/EducationalAdministration/StuEnrollPhone/Search?type=1');
         //查询录取结果
         $('#res').attr('href', '/EducationalAdministration/StuEnrollPhone/Search?type=2');
-    })
+        //招生简章
+        $('#stuRecruitmentBrochure').attr('href', '/EducationalAdministration/StuEnrollPhone/StuRecruitmentBrochure');
+
+        $('.major').find('a').on('click',
+            function () {
+                location.href = "/EducationalAdministration/StuEnrollPhone/FileDownLoad?name=" + '2022年各专业介绍'+'&pathName='+'各专业介绍.pdf';
+            });
+    });
 
 </script>
 </body>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollPhone/Search.cshtml

@@ -61,42 +61,9 @@
             var form = layui.form;
             //按钮点击
             form.on('submit(*)', function (data) {
-                //var strEntity = JSON.stringify(data.field);
-                
                 location.href = '/EducationalAdministration/StuEnrollPhone/SearchResult?type=' + type + '&StuName=' + encodeURI(encodeURI($('#StuName').val())) + '&IDCard=' + $('#IDCard').val();
-                //$.ajax({
-                //    url: '/EducationalAdministration/StuEnrollPhone/SearchForm?type=' + type,
-                //    data: { strEntity: strEntity },
-                //    type: "GET",
-                //    dataType: "json",
-                //    async: true,
-                //    cache: false,
-                //    success: function (data) {
-                //        if (data.code == 200) {
-                //            alert("报名成功，请等待考试通知！");
-                //        } else {
-                //            alert(data.info);
-                //        }
-                //    },
-                //    error: function (XMLHttpRequest, textStatus, errorThrown) {
-                //    },
-                //    beforeSend: function () {
-                //    },
-                //    complete: function () {
-                //    }
-                //});
-                //return false; //阻止表单跳转。如果需要表单跳转，去掉这段即可。
-
+                
             });
-
-            //var laydate = layui.laydate;
-
-            //时间选择
-            //laydate.render({
-            //    elem: '#Birthday',
-            //    min: today.y + '-' + today.m + '-' + today.d
-            //});
-
         });
         $(window).load(function () {
 

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollPhone/SearchResult.cshtml

@@ -17,7 +17,22 @@
     <link href="~/Content/css/common.css" rel="stylesheet" />
     <link href="~/Content/layui/css/layui.css" rel="stylesheet" media="all" />
     <link href="~/Content/css/fromAdd.css" rel="stylesheet" />
+    <style>
+        .box {
+            width: 70%;
+            height: 36px;
+            text-align: center;
+            line-height: 36px;
+            background-color: #3298DC;
+            border-radius: 4px;
+            margin: 20px auto;
+        }
 
+            .box a {
+                color: #fff;
+                font-size: 14px;
+            }
+    </style>
 </head>
 <body>
     <div class="warpper" id="app">
@@ -37,9 +52,9 @@
                             <input type="text" id="IDCard" name="IDCard" class="layui-input" readonly="readonly">
                         </div>
                         @*<div class="chickInput">
-                            <span class="chickInputLable"><span>*</span> 手机号</span>
-                            <input type="text" id="StuMobile" name="StuMobile" class="layui-input" readonly="readonly">
-                        </div>*@
+                                <span class="chickInputLable"><span>*</span> 手机号</span>
+                                <input type="text" id="StuMobile" name="StuMobile" class="layui-input" readonly="readonly">
+                            </div>*@
                         <div class="chickInput" id="locdiv">
                             <span class="chickInputLable"><span>*</span> 考试信息</span>
                             <div id="examDiv" readonly="readonly" style="font-size: 12px;">
@@ -47,15 +62,16 @@
                             </div>
                         </div>
                         <div class="chickInput" id="admdiv">
-                            <span class="chickInputLable"><span>*</span> 是否录取</span>
+                            <span class="chickInputLable"><span>*</span> 录取结果信息</span>
                             <input type="text" id="IsAdmission" name="IsAdmission" readonly="readonly">
                         </div>
                         <div id="admmsg">
-                            <span style="font-size: 12px; color: red;" id="msg">录取成功，请手机截屏，保存结果图片，报名时出示此图片！</span>
-                            <div id="fileDownLoad"><a alt="点击下载">入学须知</a></div>
+                            <span style="font-size: 12px; color: red;" id="msg">&nbsp;&nbsp;&nbsp;&nbsp;备注：请手机截屏此录取界面，保存图片。报名时出示此图片换取录取通知书！</span>
+                            <br />
+                            <div class="box" id="fileDownLoad"><a alt="点击下载" style="color: blue;text-decoration: underline;">请点击入学须知并仔细阅读</a></div>
                         </div>
                     </div>
-                    
+
                 </form>
             </div>
         </div>
@@ -76,8 +92,6 @@
         //var StuMobile = request('StuMobile');
         layui.use(['form', 'laydate', 'upload'], function () {
             var form = layui.form;
-
-
         });
         $(window).load(function () {
             $('#admmsg').hide();
@@ -103,23 +117,37 @@
                         if (data.StuEnroll) {
                             $('#StuName').val(decodeURI(StuName));
                             $('#IDCard').val(IDCard);
-                           // $('#StuMobile').val(StuMobile);
-                            //$('#ExamLocation').val(data.StuEnroll.ExamLocation);
-                            //if (data.StuEnroll.ExamStartTime) {
-                            //    $('#ExamStartTime').val(data.StuEnroll.ExamStartTime + '~' + data.StuEnroll.ExamEndTime);
-                            //}
-                            if (data.StuEnroll.IsAdmission && data.StuEnroll.IsAdmission == 1) {
-                                $('#IsAdmission').val('是');
-                                if (type == '2') {
-                                    //查询录取结果
-                                    $('#admmsg').show();
-                                }
-                            } else {
-                                $('#IsAdmission').val('否');
+                            // $('#StuMobile').val(StuMobile);
+                            var IsAdmission = data.StuEnroll.IsAdmission;
+
+                            var majorName = '';
+                            //专业
+                            $.ajax({
+                                url: "/EducationalAdministration/EmpInfoEnternal/GetMap?code=" + "CdMajorInfo" + '&where=' + "id='" + data.StuEnroll.MajorNo + "'",
+                                async: false,
+                                success: function (msg) {
+                                    var majorData = $.parseJSON(msg).data.data;
+                                    majorName = majorData[0].MajorName;
+                                },
+                            });
+                            if (!majorName) {
+                                majorName = data.StuEnroll.MajorName;
+                            }
+                            if (IsAdmission == 1 || IsAdmission == true) {
+                                var major = data.StuEnroll.MajorName;
+                                $('#IsAdmission').val('恭喜您，已被我校录取' + majorName + '专业');
+                                //查询录取结果
+                                $('#admmsg').show();
+                            } else if (IsAdmission === false) {
+                                $('#IsAdmission').val('很抱歉，您未被录取');
+                            }
+                            else  {
+                                $('#IsAdmission').val('很抱歉，请您等待录取结果');
                             }
 
                         } else {
-                            $('#app').html('<img src="/Content/images/jfgrid/nodata.jpg" style="width: 100%;height: 40%;" />');
+                            $('#app').html(
+                                '<img src="/Content/images/jfgrid/nodata.jpg" style="width: 100%;height: 40%;" />');
                         }
                         if (data.examData) {
                             var examData = data.examData;
@@ -129,11 +157,15 @@
                                     var etime = examData[i].BeginTime + '~' + examData[i].EndTime;
                                     html += '<div class="chickInput">';
                                     html += '<span class="chickInputLable" style="font-size: 12px;"> 科目</span>';
-                                    html += '<input type="text" class="layui-input" readonly="readonly" value="' + examData[i].SubjectName + '" style="margin: -39px 0 0 40px; width: 85%;font-size: 12px;">';
+                                    html += '<input type="text" class="layui-input" readonly="readonly" value="' +
+                                        examData[i].SubjectName +
+                                        '" style="margin: -39px 0 0 40px; width: 85%;font-size: 12px;">';
                                     html += '</div>';
                                     html += '<div class="chickInput">';
                                     html += '<span class="chickInputLable" style="font-size: 12px;"> 时间</span>';
-                                    html += '<input type="text" class="layui-input" readonly="readonly" value="' + etime + '" style="margin: -39px 0 0 40px; width: 85%;font-size: 12px;">';
+                                    html += '<input type="text" class="layui-input" readonly="readonly" value="' +
+                                        etime +
+                                        '" style="margin: -39px 0 0 40px; width: 85%;font-size: 12px;">';
                                     html += '</div>';
                                     html += '<br/>';
 
@@ -155,42 +187,12 @@
             });
 
             $('#fileDownLoad').find('a').on('click',
-                function() {
+                function () {
                     //下载入学须知
-                    //var url = "";
-                    //var a = document.createElement('a');
-                    //a.download = 'text.zip';
-                    //a.href = url;
-                    //a.target = '_bank';
-                    //document.appendChild(a);
-                    //a.click();
-                    //document.removeChild();
-                    $.ajax({
-                        url: '/EducationalAdministration/StuEnrollPhone/FileDownLoad',
-                        type: "Post",
-                        dataType: "json",
-                        async: true,
-                        cache: false,
-                        success: function (data) {
-                            if (data.code == 200) {
-
-
-                            } else {
-                                alert(data.info);
-                            }
-                        },
-                        error: function (XMLHttpRequest, textStatus, errorThrown) {
-                        },
-                        beforeSend: function () {
-                        },
-                        complete: function () {
-                        }
-                    });
+                    location.href = "/EducationalAdministration/StuEnrollPhone/FileDownLoad?name=" + '2022年新生入学须知' + '&pathName=' + '新生入学须知.pdf';;
                 });
-
             renderForm();
-            
-        })
+        });
 
 
         //重新渲染表单

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollPhone/StuRecruitmentBrochure.cshtml

@@ -0,0 +1,67 @@
+@{
+
+    Layout = null;
+}
+
+<html>
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
+    <meta name="renderer" content="webkit">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
+    <meta name="format-detection" content="telephone=no" />
+    <link rel="shortcut icon" href="" />
+    <title>招生简章</title>
+    <meta name="keywords" content="" />
+    <meta name="description" content="数字化校园-新生报名" />
+    <link href="~/Content/css/font-awesome.css" rel="stylesheet" />
+    <link href="~/Content/css/common.css" rel="stylesheet" />
+    <link href="~/Content/layui/css/layui.css" rel="stylesheet" media="all" />
+    <link href="~/Content/css/fromAdd.css" rel="stylesheet" />
+    
+    <style type="text/css">
+       
+    </style>
+</head>
+<body>
+    <div class="warpper" id="app">
+        <!--  / index_sec5  -->
+        <div class="chickForm_sec">
+            <div class="fromSec bodyDiv" style="">
+                @*<div class="chickT">招生简章</div>*@
+                <img src="~/Content/images/StuRecruitmentBrochure.jpg" style="height: 100%; width: 100%;padding-left: 20px;padding-right: 20px;" />
+            </div>
+        </div>
+    </div>
+    <img id="fromBg" src="~/Content/images/from1.png" />
+    <div class="footer"> Copyright  ©  2019       数字化智慧校园        版权所有</div>
+    <script src="~/Content/js/jquery.min.js"></script>
+    <script src="~/Content/layui/layui.all.js"></script>
+    <script src="~/Content/vue/vue.js"></script>
+    <script src="~/PhonePage/server.js"></script>
+    <script>
+
+        layui.use(['form', 'laydate', 'upload'], function () {
+            var form = layui.form;
+            //按钮点击
+            form.on('submit(*)', function (data) {
+            });
+
+        });
+        $(window).load(function () {
+
+            renderForm();
+
+        })
+
+
+        //重新渲染表单
+        function renderForm() {
+            layui.use('form', function () {
+                var form = layui.form//高版本建议把括号去掉，有的低版本，需要加()
+                form.render();
+            });
+        }
+    </script>
+</body>
+</html>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollScore/AdmissionForm.js

@@ -28,7 +28,7 @@ var bootstrap = function ($, learun) {
                         for (var i = 0; i < data.length; i++) {
                             html += '<div class="col-xs-6 lr-form-item" data-table="StuEnroll">';
                             html += '<div class="lr-form-item-title">' + data[i].SubjectName + '：</div>';
-                            html += '<label class="lr-form-item-lable">' + data[i].Score + '</label>';
+                            html += '<label class="lr-form-item-lable">' + data[i].Grade + '</label>';
                             html += '</div>';
                         }
                         $('#form').html(html);

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollScore/AdmissionIndex.cshtml

@@ -41,7 +41,7 @@
                     <div class=" btn-group btn-group-sm" learun-authorize="yes">
                         <a id="lr_view" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;查看成绩</a>
                         <a id="lr_lq" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;录取</a>
-                        <a id="lr_nolq" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;取消录取</a>
+                        <a id="lr_nolq" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;不录取</a>
                     </div>
                 </div>
             </div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollScore/AdmissionIndex.js

@@ -79,11 +79,11 @@ var bootstrap = function ($, learun) {
             $('#lr_nolq').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('StuId');
                 if (learun.checkrow(keyValue)) {
-                    var IsAdmission = $('#gridtable').jfGridValue('IsAdmission');
-                    if (IsAdmission == 0) {
-                        return learun.alert.warning('该学生未被录取！');
-                    }
-                    learun.layerConfirm('是否确认取消录取当前学生！', function (res) {
+                    //var IsAdmission = $('#gridtable').jfGridValue('IsAdmission');
+                    //if (IsAdmission == 0) {
+                    //    return learun.alert.warning('该学生未被录取！');
+                    //}
+                    learun.layerConfirm('是否确认不录取当前学生！', function (res) {
                         if (res) {
                             learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuEnroll/Admission?keyValue=' + keyValue, { IsAdmission: 0 }, function () {
                                 refreshGirdData();
@@ -165,14 +165,16 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
-                    { label: "总分", name: "ExamScore", width: 100, align: "left" },
+                    //{ label: "总分", name: "ExamScore", width: 100, align: "left" },
                     {
                         label: "是否录取", name: "IsAdmission", width: 100, align: "left",
                         formatter: function (value) {
                             if (value == 1) {
                                 return "<span class=\"label label-success\">是</span>";
-                            } else {
+                            } else if (value == 0) {
                                 return "<span class=\"label label-danger\">否</span>";
+                            } else {
+                                return "";
                             }
                         }
                     },

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

@@ -54,7 +54,7 @@ var bootstrap = function ($, learun) {
                         learun.clientdata.getAsync('custmerData', {
                             url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'ExamSubject',
                             key: value,
-                            keyId: 'id',
+                            keyId: 'subjectno',
                             callback: function (_data) {
                                 callback(_data['subjectname']);
                             }
@@ -65,16 +65,27 @@ var bootstrap = function ($, learun) {
             ];
             headDataEdit = [
                 {
-                    label: '成绩', name: 'Score', width: 100, align: "left",
-                    edit: {
-                        type: 'input',
-                        inputType: 'number',
-                        change: function (row, rownum) {
-                            //row.Score = (parseFloat(row.OrdinaryScore || '0') * (Number($('#OrdinaryScoreScale').html()) / 100) + parseFloat(row.TermInScore || '0') * (Number($('#TermInScoreScale').html()) / 100) + parseFloat(row.TermEndScore || '0') * (Number($('#TermEndScoreScale').html()) / 100) + parseFloat(row.OtherScore || '0') * (Number($('#OtherScoreScale').html()) / 100)).toFixed(0);
-                            $('#gridtable').jfGridSet('updateRow', rownum);
+                    label: '成绩', name: 'Grade', width: 100, align: 'left'
+                    , edit: {
+                        type: 'select',
+                        init: function (data, $edit) {
+
                         },
+                        datatype: 'dataItem',
+                        code: 'StuScoreGrade'
                     }
                 },
+                //{
+                //    label: '成绩', name: 'Score', width: 100, align: "left",
+                //    edit: {
+                //        type: 'input',
+                //        inputType: 'number',
+                //        change: function (row, rownum) {
+                //            //row.Score = (parseFloat(row.OrdinaryScore || '0') * (Number($('#OrdinaryScoreScale').html()) / 100) + parseFloat(row.TermInScore || '0') * (Number($('#TermInScoreScale').html()) / 100) + parseFloat(row.TermEndScore || '0') * (Number($('#TermEndScoreScale').html()) / 100) + parseFloat(row.OtherScore || '0') * (Number($('#OtherScoreScale').html()) / 100)).toFixed(0);
+                //            $('#gridtable').jfGridSet('updateRow', rownum);
+                //        },
+                //    }
+                //},
                 {
                     label: '备注', name: 'Remark', width: 100, align: "left",
                     edit: {
@@ -83,7 +94,7 @@ var bootstrap = function ($, learun) {
                 },
             ];
             headDataNoEdit = [
-                { label: '成绩', name: 'Score', width: 80, align: "left" },
+                { label: '成绩', name: 'Grade', width: 80, align: "left" },
                 {
                     label: '备注', name: 'Remark', width: 100, align: "left"
                 },
@@ -132,7 +143,6 @@ var bootstrap = function ($, learun) {
                     if (res) {
                         var query = judgeSelect();
                         if (query) {
-
                             //判断是否已审核；判断是否被其他教师占用
                             $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/StuEnrollScore/GetEntityByJson?queryJson=' + JSON.stringify(query), function (data) {
                                 if (data != null) {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/Form.cshtml

@@ -94,7 +94,7 @@
     </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoFresh">
         <div class="lr-form-item-title">高考总分 <font face="宋体">*</font> </div>
-        <input id="HighAmountScore" type="text" class="form-control" isvalid="yes" checkexpession="PositiveFloatintZero" />
+        <input id="HighAmountScore" type="text" class="form-control" readonly="readonly" checkexpession="PositiveFloatintZero" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoFresh">
         <div class="lr-form-item-title">语文成绩 </div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/Form.js

@@ -147,7 +147,6 @@ var bootstrap = function ($, learun) {
             $("#photoBtn").on('click', function () {
                 takeImg();
             });
-
         },
         initData: function () {
             if (!!keyValue) {
@@ -176,6 +175,11 @@ var bootstrap = function ($, learun) {
             return false;
         }
 
+        var Score1 = $('#ChineseScore').val();
+        var Score2 = $('#MathScore').val();
+        var Score3 = $('#ForeignLangScore').val();
+        var Score4 = $('#ComprehensiveScore').val();
+        $('#HighAmountScore').val(Number(Score1) + Number(Score2) + Number(Score3) + Number(Score4));
         var postData = {};
         postData.strEntity = JSON.stringify($('[data-table="StuInfoFresh"]').lrGetFormData());
         postData.strstuInfoFreshEmergePeopleList = JSON.stringify($('#StuInfoFreshEmergePeople').jfGridGet('rowdatas'));

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/FormView.cshtml

@@ -62,7 +62,7 @@
 
     <div class="col-xs-6 lr-form-item" data-table="StuInfoFresh">
         <div class="lr-form-item-title">出生日期 </div>
-        <input id="Birthday" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt: 'yyyy-MM-dd', onpicked: function() { $('#Birthday').trigger('change'); } })" />
+        <input id="Birthday" type="text" class="form-control lr-input-wdatepicker" readonly="readonly" onfocus="WdatePicker({ dateFmt: 'yyyy-MM-dd', onpicked: function() { $('#Birthday').trigger('change'); } })" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoFresh">
         <div class="lr-form-item-title">政治面貌 <font face="宋体">*</font></div>
@@ -147,7 +147,7 @@
     </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoFresh">
         <div class="lr-form-item-title">精准贫困户</div>
-        <div id="IsPoor"></div>
+        <div id="IsPoor" readonly="readonly"></div>
     </div>
 
 

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/FormView.js

@@ -31,44 +31,44 @@ var bootstrap = function ($, learun) {
                 headData: [
                     {
                         label: '姓名', name: 'Name', width: 100, align: 'left'
-                        , edit: {
-                            type: 'input'
-                        }
                     },
                     {
                         label: '与本人关系', name: 'Relation', width: 100, align: 'left'
-                        , edit: {
-                            type: 'select',
-                            datatype: 'dataItem',
-                            code: 'FamilyRelation'
+                        , formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'FamilyRelation',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
                         }
                     },
                     {
-                        label: '性别', name: 'Sex', width: 100, align: 'left'
-                        , edit: {
-                            type: 'select',
-                            datatype: 'dataItem',
-                            code: 'usersex'
+                        label: '性别', name: 'Sex', width: 100, align: 'left',
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'usersex',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
                         }
                     },
                     {
                         label: '年龄', name: 'Age', width: 100, align: 'left'
-                        , edit: {
-                            type: 'input'
-                        }
                     },
                     {
                         label: '政治面貌', name: 'Politicy', width: 100, align: 'left'
-                        , edit: {
-                            type: 'select',
-                            datatype: 'dataItem',
-                            code: 'PolityStatus'
-                        }
-                    },
-                    {
-                        label: '身份证号', name: 'IdCard', width: 100, align: 'left'
-                        , edit: {
-                            type: 'input'
+                        , formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'BCdPartyFace',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
                         }
                     },
                 ],
@@ -78,36 +78,11 @@ var bootstrap = function ($, learun) {
 
             $('#StuInfoFreshEmergePeople').jfGrid({
                 headData: [
-                    {
-                        label: '姓名', name: 'Name', width: 100, align: 'left'
-                        , edit: {
-                            type: 'input'
-                        }
-                    },
-                    {
-                        label: '与本人关系', name: 'Relation', width: 100, align: 'left'
-                        , edit: {
-                            type: 'input'
-                        }
-                    },
-                    {
-                        label: '手机号码', name: 'Mobile', width: 100, align: 'left'
-                        , edit: {
-                            type: 'input'
-                        }
-                    },
-                    {
-                        label: '座机电话', name: 'Telephone', width: 100, align: 'left'
-                        , edit: {
-                            type: 'input'
-                        }
-                    },
-                    {
-                        label: '联系地址', name: 'Address', width: 100, align: 'left'
-                        , edit: {
-                            type: 'input'
-                        }
-                    },
+                    { label: '姓名', name: 'Name', width: 100, align: 'left' },
+                    { label: '与本人关系', name: 'Relation', width: 100, align: 'left' },
+                    { label: '手机号码', name: 'Mobile', width: 100, align: 'left' },
+                    { label: '座机电话', name: 'Telephone', width: 100, align: 'left' },
+                    { label: '联系地址', name: 'Address', width: 100, align: 'left' },
                 ],
                 isEdit: false,
                 height: 200

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuLeaveManagement/Form.cshtml

@@ -15,9 +15,13 @@
         <div class="lr-form-item-title">返校时间<font face="宋体">*</font></div>
         <input id="EndTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ minDate:'#F{$dp.$D(\'StartTime\')}',dateFmt:'yyyy-MM-dd HH:mm:ss',onpicked: function () { $('#EndTime').trigger('change'); } })" isvalid="yes" checkexpession="NotNull" />
     </div>
-    <div class="col-xs-12 lr-form-item" data-table="StuLeaveManagement">
+    <div class="col-xs-6 lr-form-item" data-table="StuLeaveManagement">
         <div class="lr-form-item-title">请假天数<font face="宋体">*</font></div>
-        <input id="LeaveDay" type="text" class="form-control" isvalid="yes" checkexpession="PositiveFloatint" />
+        <input id="LeaveDay" type="number" class="form-control" isvalid="yes" checkexpession="PositiveFloatint" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuLeaveManagement">
+        <div class="lr-form-item-title">未销假次数</div>
+        <input id="num" readonly type="text" class="form-control" />
     </div>
     <div class="col-xs-12 lr-form-item" data-table="StuLeaveManagement">
         <div class="lr-form-item-title">附件上传</div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuLeaveManagement/FormView.cshtml

@@ -15,10 +15,14 @@
         <div class="lr-form-item-title">返校时间<font face="宋体">*</font></div>
         <input id="EndTime" readonly type="text" class="form-control lr-input-wdatepicker" isvalid="yes" checkexpession="NotNull" />
     </div>
-    <div class="col-xs-12 lr-form-item" data-table="StuLeaveManagement">
+    <div class="col-xs-6 lr-form-item" data-table="StuLeaveManagement">
         <div class="lr-form-item-title">请假天数<font face="宋体">*</font></div>
         <input id="LeaveDay" readonly type="text" class="form-control" isvalid="yes" checkexpession="PositiveFloatint" />
     </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuLeaveManagement">
+        <div class="lr-form-item-title">未销假次数</div>
+        <input id="num" readonly type="text" class="form-control" />
+    </div>
     <div class="col-xs-12 lr-form-item" data-table="StuLeaveManagement">
         <div class="lr-form-item-title">附件上传</div>
         <div id="Files" readonly></div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/VaccinationInfo/Form.cshtml

@@ -0,0 +1,44 @@
+@{
+    ViewBag.Title = "疫情";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<div class="lr-form-wrap" id="form">
+    <div class="col-xs-6 lr-form-item" data-table="VaccinationInfo">
+        <div class="lr-form-item-title">学号</div>
+        <input id="StuNo" type="text" class="form-control" readonly="readonly" />
+        <input id="StuOrTeach" type="text" hidden="hidden" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="VaccinationInfo">
+        <div class="lr-form-item-title">姓名</div>
+        <input id="StuName" type="text" class="form-control" readonly="readonly" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="VaccinationInfo">
+        <div class="lr-form-item-title">接种地</div>
+        <input id="VaccineAddress" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="VaccinationInfo">
+        <div class="lr-form-item-title">疫苗类型</div>
+        <div id="VaccineType"></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="VaccinationInfo">
+        <div class="lr-form-item-title">第一针时间</div>
+        <input id="FirstNeedle" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#FirstNeedle').trigger('change'); } })" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="VaccinationInfo">
+        <div class="lr-form-item-title">第二针时间</div>
+        <input id="SecondNeedle" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#SecondNeedle').trigger('change'); } })" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="VaccinationInfo">
+        <div class="lr-form-item-title">第三针时间</div>
+        <input id="ThirdNeedle" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#ThirdNeedle').trigger('change'); } })" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="VaccinationInfo">
+        <div class="lr-form-item-title">未接种原因</div>
+        <textarea id="NotReason" class="form-control" style="height:60px;"></textarea>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="VaccinationInfo">
+        <div class="lr-form-item-title">备注</div>
+        <textarea id="Remark" class="form-control" style="height:100px;"></textarea>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/VaccinationInfo/Form.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/VaccinationInfo/Form.js

@@ -0,0 +1,51 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2022-07-18 17:52
+ * 描  述：疫情
+ */
+var acceptClick;
+var keyValue = request('keyValue');
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            $('.lr-form-wrap').lrscroll();
+            page.bind();
+            page.initData();
+        },
+        bind: function () {
+            $('#VaccineType').lrDataItemSelect({ code: 'VaccineType' });
+        },
+        initData: function () {
+            if (!!keyValue) {
+                $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/VaccinationInfo/GetFormData?keyValue=' + keyValue, function (data) {
+                    for (var id in data) {
+                        if (!!data[id].length && data[id].length > 0) {
+                            $('#' + id).jfGridSet('refreshdata', data[id]);
+                        }
+                        else {
+                            $('[data-table="' + id + '"]').lrSetFormData(data[id]);
+                        }
+                    }
+                });
+            }
+        }
+    };
+    // 保存数据
+    acceptClick = function (callBack) {
+        if (!$('body').lrValidform()) {
+            return false;
+        }
+        var postData = {
+            strEntity: JSON.stringify($('body').lrGetFormData())
+        };
+        $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/VaccinationInfo/SaveForm?keyValue=' + keyValue, postData, function (res) {
+            // 保存成功后才回调
+            if (!!callBack) {
+                callBack();
+            }
+        });
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/VaccinationInfo/Index.cshtml

@@ -0,0 +1,56 @@
+@{
+    ViewBag.Title = "疫情";
+    Layout = "~/Views/Shared/_Index.cshtml";
+}
+<div class="lr-layout ">
+    <div class="lr-layout-center">
+        <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">
+                        <div id="multiple_condition_query">
+                            <div class="lr-query-formcontent">
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">学号</div>
+                                    <input id="StuNo" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">姓名</div>
+                                    <input id="StuName" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">系部</div>
+                                    <div id="DeptNo"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">专业</div>
+                                    <div id="MajorNo"></div>
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">班级</div>
+                                    <div id="ClassNo"></div>
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">接种类型</div>
+                                    <div id="VaccineType"></div>
+                                </div>
+                            </div>
+                        </div>
+                    </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" learun-authorize="yes">
+                        <a id="lr_create" 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>
+                    </div>
+                </div>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/VaccinationInfo/Index.js")

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

@@ -0,0 +1,232 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2022-07-18 17:52
+ * 描  述：疫情
+ */
+var refreshGirdData;
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            page.initGird();
+            page.bind();
+        },
+        bind: function () {
+            $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
+                page.search(queryJson);
+            }, 220, 400);
+            $('#VaccineType').lrDataItemSelect({ code: 'VaccineType' });
+            $('#DeptNo').lrselect({
+                value: "deptno",
+                text: "deptname",
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdDeptInfo',
+                select: function (item) {
+                    if (item) {
+                        $('#MajorNo').lrselectRefresh({
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable',
+                            param: { code: "CdMajorInfo", strWhere: "DeptNo='" + item.deptno + "'" }
+                        });
+                    }
+                    else {
+                        $('#MajorNo').lrselectRefresh({
+                            url: "",
+                            data: []
+                        });
+                    }
+                    $('#ClassNo').lrselectRefresh({
+                        url: "",
+                        data: []
+                    });
+                }
+            });
+            $('#MajorNo').lrselect({
+                value: "majorno",
+                text: "majorname",
+                select: function (item) {
+                    if (item) {
+                        $('#ClassNo').lrselectRefresh({
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable',
+                            param: { code: "bjsj", strWhere: "DeptNo='" + item.deptno + "' and majorno='" + item.majorno + "'" }
+                        });
+                    }
+
+                }
+            });
+            $('#MajorNo').on("click",
+                function () {
+                    var data = $('#DeptNo').lrselectGet();
+                    if (!data) {
+                        learun.alert.error('请先选择系');
+                    }
+                });
+            $('#ClassNo').on("click",
+                function () {
+                    var data1 = $('#DeptNo').lrselectGet();
+                    var data2 = $('#MajorNo').lrselectGet();
+                    if (!data1 || !data2) {
+                        learun.alert.error('请先选择系和专业');
+                    }
+                });
+            $('#ClassNo').lrselect({
+                value: "classno",
+                text: "classname"
+            });
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            //// 新增
+            //$('#lr_add').on('click', function () {
+            //    learun.layerForm({
+            //        id: 'form',
+            //        title: '新增',
+            //        url: top.$.rootUrl + '/EducationalAdministration/VaccinationInfo/Form',
+            //        width: 600,
+            //        height: 400,
+            //        callBack: function (id) {
+            //            return top[id].acceptClick(refreshGirdData);
+            //        }
+            //    });
+            //});
+            // 编辑
+            $('#lr_edit').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerForm({
+                        id: 'form',
+                        title: '编辑',
+                        url: top.$.rootUrl + '/EducationalAdministration/VaccinationInfo/Form?keyValue=' + keyValue,
+                        width: 600,
+                        height: 430,
+                        callBack: function (id) {
+                            return top[id].acceptClick(refreshGirdData);
+                        }
+                    });
+                }
+            });
+            // 删除
+            $('#lr_delete').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerConfirm('是否确认删除该项！', function (res) {
+                        if (res) {
+                            learun.deleteForm(top.$.rootUrl + '/EducationalAdministration/VaccinationInfo/DeleteForm', { keyValue: keyValue }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+            // 一键生成
+            $('#lr_create').on('click', function () {
+                var userId = learun.clientdata.get(['userinfo']).userId;
+                learun.layerConfirm('是否确认一键生成！', function (res) {
+                    if (res) {
+                        learun.postForm(top.$.rootUrl + '/EducationalAdministration/VaccinationInfo/CreateFrom', { userId: userId, Description: 0 }, function () {
+                            refreshGirdData();
+                        });
+                    }
+                });
+            });
+        },
+        // 初始化列表
+        initGird: function () {
+            $('#gridtable').lrAuthorizeJfGrid({
+                url: top.$.rootUrl + '/EducationalAdministration/VaccinationInfo/GetPageList',
+                headData: [
+                    { label: "学号", name: "StuNo", width: 100, align: "left" },
+                    { label: "姓名", name: "StuName", width: 160, align: "left" },
+                    { label: "年龄", name: "Age", width: 80, align: "left" },
+                    { label: "身份证", name: "CardId", width: 150, align: "left" },
+                    {
+                        label: "院系", name: "DeptNo", width: 160, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdDeptInfo',
+                                key: value,
+                                keyId: 'deptno',
+                                callback: function (_data) {
+                                    callback(_data['deptname']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "专业", name: "MajorNo", width: 160, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdMajorInfo',
+                                key: value,
+                                keyId: 'majorno',
+                                callback: function (_data) {
+                                    callback(_data['majorname']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "班级", name: "ClassNo", width: 160, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'bjsj',
+                                key: value,
+                                keyId: 'classno',
+                                callback: function (_data) {
+                                    callback(_data['classname']);
+                                }
+                            });
+                        }
+                    },
+                    { label: "电话号码", name: "Mobile", width: 120, align: "left" },
+                    {
+                        label: "疫苗类型", name: "VaccineType", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'VaccineType',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    { label: "接种地", name: "VaccineAddress", width: 100, align: "left" },
+                    {
+                        label: "第一针时间", name: "FirstNeedle", width: 80, align: "left",
+                        formatter: function (cellvalue) {
+                            return learun.formatDate(cellvalue, 'yyyy-MM-dd');
+                        }
+                    },
+                    {
+                        label: "第二针时间", name: "SecondNeedle", width: 80, align: "left",
+                        formatter: function (cellvalue) {
+                            return learun.formatDate(cellvalue, 'yyyy-MM-dd');
+                        }
+                    },
+                    {
+                        label: "第三针时间", name: "ThirdNeedle", width: 80, align: "left",
+                        formatter: function (cellvalue) {
+                            return learun.formatDate(cellvalue, 'yyyy-MM-dd');
+                        }
+                    },
+                    { label: "未接种原因", name: "NotReason", width: 150, align: "left" },
+                    { label: "备注", name: "Remark", width: 200, align: "left" },
+                ],
+                mainId: 'Id',
+                sidx: 'CreateTime desc',
+                isPage: true
+            });
+            page.search();
+        },
+        search: function (param) {
+            param = param || {};
+            param.StuOrTeach = 0;
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+        }
+    };
+    refreshGirdData = function () {
+        $('#gridtable').jfGridSet('reload');
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/VaccinationInfo/TeachForm.cshtml

@@ -0,0 +1,44 @@
+@{
+    ViewBag.Title = "疫情";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<div class="lr-form-wrap" id="form">
+    <div class="col-xs-6 lr-form-item" data-table="VaccinationInfo">
+        <div class="lr-form-item-title">职工号</div>
+        <input id="EmpNo" type="text" class="form-control" readonly="readonly" />
+        <input id="StuOrTeach" type="text" hidden="hidden" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="VaccinationInfo">
+        <div class="lr-form-item-title">姓名</div>
+        <input id="EmpName" type="text" class="form-control" readonly="readonly" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="VaccinationInfo">
+        <div class="lr-form-item-title">接种地</div>
+        <input id="VaccineAddress" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="VaccinationInfo">
+        <div class="lr-form-item-title">疫苗类型</div>
+        <div id="VaccineType"></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="VaccinationInfo">
+        <div class="lr-form-item-title">第一针时间</div>
+        <input id="FirstNeedle" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#FirstNeedle').trigger('change'); } })" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="VaccinationInfo">
+        <div class="lr-form-item-title">第二针时间</div>
+        <input id="SecondNeedle" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#SecondNeedle').trigger('change'); } })" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="VaccinationInfo">
+        <div class="lr-form-item-title">第三针时间</div>
+        <input id="ThirdNeedle" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#ThirdNeedle').trigger('change'); } })" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="VaccinationInfo">
+        <div class="lr-form-item-title">未接种原因</div>
+        <textarea id="NotReason" class="form-control" style="height:60px;"></textarea>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="VaccinationInfo">
+        <div class="lr-form-item-title">备注</div>
+        <textarea id="Remark" class="form-control" style="height:100px;"></textarea>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/VaccinationInfo/TeachForm.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/VaccinationInfo/TeachForm.js

@@ -0,0 +1,51 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2022-07-18 17:52
+ * 描  述：疫情
+ */
+var acceptClick;
+var keyValue = request('keyValue');
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            $('.lr-form-wrap').lrscroll();
+            page.bind();
+            page.initData();
+        },
+        bind: function () {
+            $('#VaccineType').lrDataItemSelect({ code: 'VaccineType' });
+        },
+        initData: function () {
+            if (!!keyValue) {
+                $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/VaccinationInfo/GetFormData?keyValue=' + keyValue, function (data) {
+                    for (var id in data) {
+                        if (!!data[id].length && data[id].length > 0) {
+                            $('#' + id).jfGridSet('refreshdata', data[id]);
+                        }
+                        else {
+                            $('[data-table="' + id + '"]').lrSetFormData(data[id]);
+                        }
+                    }
+                });
+            }
+        }
+    };
+    // 保存数据
+    acceptClick = function (callBack) {
+        if (!$('body').lrValidform()) {
+            return false;
+        }
+        var postData = {
+            strEntity: JSON.stringify($('body').lrGetFormData())
+        };
+        $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/VaccinationInfo/SaveForm?keyValue=' + keyValue, postData, function (res) {
+            // 保存成功后才回调
+            if (!!callBack) {
+                callBack();
+            }
+        });
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/VaccinationInfo/TeachIndex.cshtml

@@ -0,0 +1,53 @@
+@using Learun.Application.Web
+@{
+    ViewBag.Title = "疫情";
+    Layout = "~/Views/Shared/_Index.cshtml";
+}
+<div class="lr-layout ">
+    <div class="lr-layout-center">
+        <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">
+                        <div id="multiple_condition_query">
+                            <div class="lr-query-formcontent">
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">部门</div>
+                                    <div id="DepartmentId"></div>
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">职工号</div>
+                                    <input id="EmpNo" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">姓名</div>
+                                    <input id="EmpName" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">接种类型</div>
+                                    <div id="VaccineType"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">身份证号</div>
+                                    <input id="CardId" type="text" class="form-control" />
+                                </div>
+                            </div>
+                        </div>
+                    </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" learun-authorize="yes">
+                        <a id="lr_create" 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>
+                    </div>
+                </div>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/VaccinationInfo/TeachIndex.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/VaccinationInfo/TeachIndex.js

@@ -0,0 +1,211 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2022-07-18 17:52
+ * 描  述：疫情
+ */
+var refreshGirdData;
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            page.initGird();
+            page.bind();
+        },
+        bind: function () {
+            $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
+                page.search(queryJson);
+            }, 220, 400);
+            $('#VaccineType').lrDataItemSelect({ code: 'VaccineType' });
+            $('#DepartmentId').lrselect({
+                type: 'tree',
+                allowSearch: true,
+                url: top.$.rootUrl + '/LR_OrganizationModule/Department/GetTree',
+                param: {}
+            });
+            $('#DeptNo').lrselect({
+                value: "deptno",
+                text: "deptname",
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdDeptInfo',
+                select: function (item) {
+                    if (item) {
+                        $('#MajorNo').lrselectRefresh({
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable',
+                            param: { code: "CdMajorInfo", strWhere: "DeptNo='" + item.deptno + "'" }
+                        });
+                    }
+                    else {
+                        $('#MajorNo').lrselectRefresh({
+                            url: "",
+                            data: []
+                        });
+                    }
+                    $('#ClassNo').lrselectRefresh({
+                        url: "",
+                        data: []
+                    });
+                }
+            });
+            $('#MajorNo').lrselect({
+                value: "majorno",
+                text: "majorname",
+                select: function (item) {
+                    if (item) {
+                        $('#ClassNo').lrselectRefresh({
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable',
+                            param: { code: "bjsj", strWhere: "DeptNo='" + item.deptno + "' and majorno='" + item.majorno + "'" }
+                        });
+                    }
+
+                }
+            });
+            $('#MajorNo').on("click",
+                function () {
+                    var data = $('#DeptNo').lrselectGet();
+                    if (!data) {
+                        learun.alert.error('请先选择系');
+                    }
+                });
+            $('#ClassNo').on("click",
+                function () {
+                    var data1 = $('#DeptNo').lrselectGet();
+                    var data2 = $('#MajorNo').lrselectGet();
+                    if (!data1 || !data2) {
+                        learun.alert.error('请先选择系和专业');
+                    }
+                });
+            $('#ClassNo').lrselect({
+                value: "classno",
+                text: "classname"
+            });
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            //// 新增
+            //$('#lr_add').on('click', function () {
+            //    learun.layerForm({
+            //        id: 'form',
+            //        title: '新增',
+            //        url: top.$.rootUrl + '/EducationalAdministration/VaccinationInfo/Form',
+            //        width: 600,
+            //        height: 400,
+            //        callBack: function (id) {
+            //            return top[id].acceptClick(refreshGirdData);
+            //        }
+            //    });
+            //});
+            // 编辑
+            $('#lr_edit').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerForm({
+                        id: 'form',
+                        title: '编辑',
+                        url: top.$.rootUrl + '/EducationalAdministration/VaccinationInfo/TeachForm?keyValue=' + keyValue,
+                        width: 600,
+                        height: 430,
+                        callBack: function (id) {
+                            return top[id].acceptClick(refreshGirdData);
+                        }
+                    });
+                }
+            });
+            // 删除
+            $('#lr_delete').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerConfirm('是否确认删除该项！', function (res) {
+                        if (res) {
+                            learun.deleteForm(top.$.rootUrl + '/EducationalAdministration/VaccinationInfo/DeleteForm', { keyValue: keyValue }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+            // 一键生成
+            $('#lr_create').on('click', function () {
+                var userId = learun.clientdata.get(['userinfo']).userId;
+                learun.layerConfirm('是否确认一键生成！', function (res) {
+                    if (res) {
+                        learun.postForm(top.$.rootUrl + '/EducationalAdministration/VaccinationInfo/CreateFrom', { userId: userId, Description: 1 }, function () {
+                            refreshGirdData();
+                        });
+                    }
+                });
+            });
+        },
+        // 初始化列表
+        initGird: function () {
+            $('#gridtable').jfGrid({
+                url: top.$.rootUrl + '/EducationalAdministration/VaccinationInfo/GetPageList',
+                headData: [
+                    { label: "职工编号", name: "EmpNo", width: 100, align: "left" },
+                    { label: "姓名", name: "EmpName", width: 150, align: "left" },
+                    { label: "身份证", name: "CardId", width: 160, align: "left" },
+                    {
+                        label: "部门", name: "DepartmentId", width: 200, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'classdata',
+                                key: value,
+                                keyId: 'id',
+                                callback: function (_data) {
+                                    callback(_data['name']);
+                                }
+                            });
+                        }
+                    },
+                    { label: "电话号码", name: "Mobile", width: 120, align: "left" },
+                    {
+                        label: "疫苗类型", name: "VaccineType", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'VaccineType',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    { label: "接种地", name: "VaccineAddress", width: 100, align: "left" },
+                    {
+                        label: "第一针时间", name: "FirstNeedle", width: 100, align: "left",
+                        formatter: function (cellvalue) {
+                            return learun.formatDate(cellvalue, 'yyyy-MM-dd');
+                        }
+                    },
+                    {
+                        label: "第二针时间", name: "SecondNeedle", width: 100, align: "left",
+                        formatter: function (cellvalue) {
+                            return learun.formatDate(cellvalue, 'yyyy-MM-dd');
+                        }
+                    },
+                    {
+                        label: "第三针时间", name: "ThirdNeedle", width: 100, align: "left",
+                        formatter: function (cellvalue) {
+                            return learun.formatDate(cellvalue, 'yyyy-MM-dd');
+                        }
+                    },
+                    { label: "未接种原因", name: "NotReason", width: 200, align: "left" },
+                    { label: "备注", name: "Remark", width: 300, align: "left" },
+                ],
+                mainId: 'Id',
+                sidx: 'CreateTime desc',
+                isPage: true
+            });
+            page.search();
+        },
+        search: function (param) {
+            param = param || {};
+            param.StuOrTeach = 1;
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+        }
+    };
+    refreshGirdData = function () {
+        $('#gridtable').jfGridSet('reload');
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Controllers/CompanyController.cs

@@ -51,6 +51,11 @@ namespace Learun.Application.Web.Areas.LR_OrganizationModule.Controllers
         public ActionResult GetList(string keyword)
         {
             var data = companyIBLL.GetList(keyword);
+            foreach (var item in data)
+            {
+                item.F_BriefIntroduction = WebHelper.HtmlDecode(item.F_BriefIntroduction);
+                item.F_EnrollmentInformation = WebHelper.HtmlDecode(item.F_EnrollmentInformation);
+            }
             return JsonResult(data);
         }
         /// <summary>
@@ -101,9 +106,13 @@ namespace Learun.Application.Web.Areas.LR_OrganizationModule.Controllers
         [HttpPost]
         [ValidateAntiForgeryToken]
         [AjaxOnly]
-        public ActionResult SaveForm(string keyValue, CompanyEntity entity)
+        [ValidateInput(false)]
+        public ActionResult SaveForm(string keyValue, string strEntity)
         {
+            CompanyEntity entity = strEntity.ToObject<CompanyEntity>();
             entity.SyncFlag = false;
+            entity.F_BriefIntroduction = WebHelper.HtmlEncode(entity.F_BriefIntroduction);
+            entity.F_EnrollmentInformation = WebHelper.HtmlEncode(entity.F_EnrollmentInformation);
             var list = companyIBLL.GetList();
             if (!string.IsNullOrEmpty(keyValue))
             {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Views/Company/Form.cshtml

@@ -2,78 +2,85 @@
     ViewBag.Title = "学校添加";
     Layout = "~/Views/Shared/_Form.cshtml";
 }
-    <div class="lr-form-wrap" id="form">
-        <div class="col-xs-12 lr-form-item">
-            <div class="lr-form-item-title">学校名称<font face="宋体">*</font></div>
-            <input id="F_FullName" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
-        </div>
-        <div class="col-xs-6 lr-form-item">
-            <div class="lr-form-item-title">学校编码<font face="宋体">*</font></div>
-            <input id="F_EnCode" type="text" class="form-control" isvalid="yes" checkexpession="Num" />
-        </div>
-        <div class="col-xs-6 lr-form-item">
-            <div class="lr-form-item-title">学校简称<font face="宋体">*</font></div>
-            <input id="F_ShortName" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
-        </div>
-        <div class="col-xs-6 lr-form-item">
-            <div class="lr-form-item-title">上级学校</div>
-            <div id="F_ParentId"></div>
-        </div>
-        <div class="col-xs-6 lr-form-item">
-            <div class="lr-form-item-title">成立时间</div>
-            <input id="F_FoundedTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker()" />
-        </div>
-        <div class="col-xs-6 lr-form-item">
-            <div class="lr-form-item-title">负责人</div>
-            <input id="F_Manager" type="text" class="form-control" />
-        </div>
-        <div class="col-xs-6 lr-form-item">
-            <div class="lr-form-item-title">电话</div>
-            <input id="F_OuterPhone" type="text" class="form-control" />
-        </div>
+<div class="lr-form-wrap" id="form">
+    <div class="col-xs-12 lr-form-item">
+        <div class="lr-form-item-title">学校名称<font face="宋体">*</font></div>
+        <input id="F_FullName" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">学校编码<font face="宋体">*</font></div>
+        <input id="F_EnCode" type="text" class="form-control" isvalid="yes" checkexpession="Num" />
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">学校简称<font face="宋体">*</font></div>
+        <input id="F_ShortName" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">上级学校</div>
+        <div id="F_ParentId"></div>
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">成立时间<font face="宋体">*</font></div>
+        <input id="F_FoundedTime" type="text" isvalid="yes" checkexpession="NotNull" class="form-control lr-input-wdatepicker" onfocus="WdatePicker()" />
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">负责人</div>
+        <input id="F_Manager" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">电话</div>
+        <input id="F_OuterPhone" type="text" class="form-control" />
+    </div>
 
-        <div class="col-xs-6 lr-form-item">
-            <div class="lr-form-item-title">电子邮箱</div>
-            <input id="F_Email" type="text" class="form-control" />
-        </div>
-        <div class="col-xs-6 lr-form-item">
-            <div class="lr-form-item-title">照片</div>
-            <div id="F_Photo"></div>
-        </div>
-        <div class="col-xs-12 lr-form-item">
-            <div class="lr-form-item-title">校区简介</div>
-            <div id="F_BriefIntroduction" style="height:200px;"></div>
-        </div>
-        <div class="col-xs-12 lr-form-item">
-            <div class="lr-form-item-title">招生简介</div>
-            <div id="F_EnrollmentInformation" style="height:200px;"></div>
-        </div>
-        <div class="col-xs-6 lr-form-item">
-            <div class="lr-form-item-title">传真</div>
-            <input id="F_Fax" type="text" class="form-control" />
-        </div>
-        <div class="col-xs-12 lr-form-item">
-            <div class="lr-form-item-title">学校地点</div>
-            <div id="area" class="col-xs-6 lr-form-area">
-                <div id="F_ProvinceId" placeholder="省" class="col-xs-4"></div>
-                <div id="F_CityId" placeholder="市" class="col-xs-4"></div>
-                <div id="F_CountyId" placeholder="县/区" class="col-xs-4"></div>
-            </div>
-            <div class="col-xs-6">
-                <input id="F_Address" type="text" placeholder="请输入详细地址" class="form-control" />
-            </div>
-        </div>
-        <div class="col-xs-6 lr-form-item">
-            <div class="lr-form-item-title">邮编</div>
-            <input id="F_Postalcode" type="text" class="form-control" />
-        </div>
-        <div class="col-xs-6 lr-form-item">
-            <div class="lr-form-item-title">学校官网</div>
-            <input id="F_WebAddress" type="text" class="form-control" />
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">电子邮箱</div>
+        <input id="F_Email" type="text" class="form-control" isvalid="yes" checkexpession="EmailOrNull" />
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">照片</div>
+        <div id="F_Photo"></div>
+    </div>
+    <div class="col-xs-12 lr-form-item">
+        <div class="lr-form-item-title">校区简介</div>
+        @*<div id="F_BriefIntroduction" style="height:200px;"></div>*@
+        <script id="F_BriefIntroduction" type="text/plain" style="height:270px;">
+        </script>
+    </div>
+    <div class="col-xs-12 lr-form-item">
+        <div class="lr-form-item-title">招生简介</div>
+        @*<div id="F_EnrollmentInformation" style="height:200px;"></div>*@
+        <script id="F_EnrollmentInformation" type="text/plain" style="height:270px;">
+        </script>
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">传真</div>
+        <input id="F_Fax" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-12 lr-form-item">
+        <div class="lr-form-item-title">学校地点</div>
+        <div id="area" class="col-xs-6 lr-form-area">
+            <div id="F_ProvinceId" placeholder="省" class="col-xs-4"></div>
+            <div id="F_CityId" placeholder="市" class="col-xs-4"></div>
+            <div id="F_CountyId" placeholder="县/区" class="col-xs-4"></div>
         </div>
-        <div class="col-xs-12 lr-form-item">
-            <div class="lr-form-item-title">备注</div>
-            <textarea id="F_Description" type="text" class="form-control" style="height:80px;"></textarea>
+        <div class="col-xs-6">
+            <input id="F_Address" type="text" placeholder="请输入详细地址" class="form-control" />
         </div>
     </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">邮编</div>
+        <input id="F_Postalcode" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">学校官网</div>
+        <input id="F_WebAddress" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-12 lr-form-item">
+        <div class="lr-form-item-title">备注</div>
+        <textarea id="F_Description" type="text" class="form-control" style="height:80px;"></textarea>
+    </div>
+</div>
+<script src="~/Content/ueditor/ueditor.config.js"></script>
+<script src="~/Content/ueditor/ueditor.all.js"></script>
+<script src="~/Content/ueditor/lang/zh-cn/zh-cn.js"></script>
 @Html.AppendJsFile("/Areas/LR_OrganizationModule/Views/Company/Form.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Views/Company/Form.js

@@ -10,6 +10,8 @@ var acceptClick;
 var keyValue = '';
 var bootstrap = function ($, learun) {
     "use strict";
+    var F_BriefIntroductionUE;
+    var F_EnrollmentInformationUE;
     var selectedRow = learun.frameTab.currentIframe().selectedRow;
     var page = {
         init: function () {
@@ -24,15 +26,25 @@ var bootstrap = function ($, learun) {
             // 省市区
             $('#area').lrAreaSelect();
             $('#F_Photo').lrUploader();
-            var F_BriefIntroductionUE = UE.getEditor('F_BriefIntroduction');
-            $('#F_BriefIntroduction')[0].ue = F_BriefIntroductionUE;
-            var F_EnrollmentInformationUE = UE.getEditor('F_EnrollmentInformation');
-            $('#F_EnrollmentInformation')[0].ue = F_EnrollmentInformationUE;
+            F_BriefIntroductionUE = UE.getEditor('F_BriefIntroduction');
+            F_EnrollmentInformationUE = UE.getEditor('F_EnrollmentInformation');
         },
         initData: function () {
             if (!!selectedRow) {
                 keyValue = selectedRow.F_CompanyId;
                 $('#form').lrSetFormData(selectedRow);
+                if (selectedRow.F_BriefIntroduction) {
+                    setTimeout(function () {
+                        F_BriefIntroductionUE.setContent(selectedRow.F_BriefIntroduction);
+                    }, 100);
+
+                };
+                if (selectedRow.F_EnrollmentInformation) {
+                    setTimeout(function () {
+                        F_EnrollmentInformationUE.setContent(selectedRow.F_EnrollmentInformation);
+                    }, 100);
+
+                };
             }
         }
     };
@@ -45,7 +57,12 @@ var bootstrap = function ($, learun) {
         if (postData["F_ParentId"] == '' || postData["F_ParentId"] == ' ') {
             postData["F_ParentId"] = '0';
         }
-        $.lrSaveForm(top.$.rootUrl + '/LR_OrganizationModule/Company/SaveForm?keyValue=' + keyValue, postData, function (res) {
+        postData["F_BriefIntroduction"] = F_BriefIntroductionUE.getContent(null, null, true);
+        postData["F_EnrollmentInformation"] = F_EnrollmentInformationUE.getContent(null, null, true);
+        var postDatas = {
+            strEntity: JSON.stringify(postData)
+        };
+        $.lrSaveForm(top.$.rootUrl + '/LR_OrganizationModule/Company/SaveForm?keyValue=' + keyValue, postDatas, function (res) {
             // 保存成功后才回调
             if (!!callBack) {
                 callBack();

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Views/Company/Index.js

@@ -28,7 +28,7 @@ var bootstrap = function ($, learun) {
                     title: '添加学校',
                     url: top.$.rootUrl + '/LR_OrganizationModule/Company/Form',
                     width: 750,
-                    height: 500,
+                    height: 800,
                     callBack: function (id) {
                         return top[id].acceptClick(refreshGirdData);
                     }
@@ -44,7 +44,7 @@ var bootstrap = function ($, learun) {
                         title: '编辑学校',
                         url: top.$.rootUrl + '/LR_OrganizationModule/Company/Form',
                         width: 750,
-                        height: 500,
+                        height: 800,
                         callBack: function (id) {
                             return top[id].acceptClick(refreshGirdData);
                         }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/TimeTableController.cs

@@ -121,7 +121,24 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
         {
             return View();
         }
-
+        /// <summary>
+        /// 表单--修改教师所带的课程【教务】
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult SchoolLesson()
+        {
+            return View();
+        }
+        /// <summary>
+        /// 表单--修改教师所带的课程【教务】
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult PrintSchedule()
+        {
+            return View();
+        }
         /// <summary>
         /// 获取表单数据
         /// <summary>
@@ -337,7 +354,7 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
             //最大节次
             int maxlessontime = timeTables.Max(m =>Convert.ToInt32(m.LessonTime.Substring(1)));
             //班级列表
-            var classinfolist = timeTables.Select(m => new {m.TeachClassNo, m.ClassName}).OrderBy(m => m.TeachClassNo).GroupBy(m=>new {m.TeachClassNo,m.ClassName});
+            var classinfolist = timeTables.Select(m => new { m.TeachClassNo, m.ClassName}).OrderBy(m => m.TeachClassNo).GroupBy(m=>new {m.TeachClassNo,m.ClassName});
             var formatData = from d in timeTables
                              let tt = d.LessonTime.Substring(1)
                              group d by tt into g

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherCancelEmploy/Index.js

@@ -38,6 +38,11 @@ var bootstrap = function ($, learun) {
             $('#lr_edit').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('Id');
                 if (learun.checkrow(keyValue)) {
+                    var checkMark = $('#gridtable').jfGridValue('CheckMark');
+                    if (checkMark == true) {
+                        learun.alert.warning("已审核项不可编辑！");
+                        return false;
+                    }
                     learun.layerForm({
                         id: 'form',
                         title: '编辑',
@@ -54,6 +59,11 @@ var bootstrap = function ($, learun) {
             $('#lr_delete').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('Id');
                 if (learun.checkrow(keyValue)) {
+                    var checkMark = $('#gridtable').jfGridValue('CheckMark');
+                    if (checkMark == true) {
+                        learun.alert.warning("已审核项不可删除！");
+                        return false;
+                    }
                     learun.layerConfirm('是否确认删除该项！', function (res) {
                         if (res) {
                             learun.deleteForm(top.$.rootUrl + '/PersonnelManagement/TeacherCancelEmploy/DeleteForm', { keyValue: keyValue }, function () {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherEncourgement/Form.cshtml

@@ -3,25 +3,25 @@
     Layout = "~/Views/Shared/_Form.cshtml";
 }
 <div class="lr-form-wrap">
-    <div class="col-xs-12 lr-form-item"  data-table="TeacherEncourgement" >
+    <div class="col-xs-12 lr-form-item" data-table="TeacherEncourgement">
         <div class="lr-form-item-title">教师<font face="宋体">*</font></div>
-        <div id="EmpId" isvalid="yes" checkexpession="NotNull" ></div>
+        <div id="EmpId" isvalid="yes" checkexpession="NotNull"></div>
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="TeacherEncourgement" >
+    <div class="col-xs-12 lr-form-item" data-table="TeacherEncourgement">
         <div class="lr-form-item-title">奖励名称<font face="宋体">*</font></div>
         <input id="EncourgeName" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="TeacherEncourgement" >
+    <div class="col-xs-12 lr-form-item" data-table="TeacherEncourgement">
         <div class="lr-form-item-title">奖励原因</div>
-        <input id="Reason" type="text" class="form-control"  />
+        <input id="Reason" type="text" class="form-control" />
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="TeacherEncourgement" >
-        <div class="lr-form-item-title">奖励金额</div>
-        <input id="Fee" type="text" class="form-control"  />
+    <div class="col-xs-12 lr-form-item" data-table="TeacherEncourgement">
+        <div class="lr-form-item-title">奖励金额<font face="宋体">*</font></div>
+        <input id="Fee" type="text" class="form-control" isvalid="yes" checkexpession="PositiveInteger" />
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="TeacherEncourgement" >
+    <div class="col-xs-12 lr-form-item" data-table="TeacherEncourgement">
         <div class="lr-form-item-title">奖励日期<font face="宋体">*</font></div>
-        <input id="EncourgeDate" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd HH:mm',onpicked: function () { $('#EncourgeDate').trigger('change'); } })"  isvalid="yes" checkexpession="NotNull" />
+        <input id="EncourgeDate" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd HH:mm',onpicked: function () { $('#EncourgeDate').trigger('change'); } })" isvalid="yes" checkexpession="NotNull" />
     </div>
 </div>
 @Html.AppendJsFile("/Areas/PersonnelManagement/Views/TeacherEncourgement/Form.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherLeaveManagement/FormView.js

@@ -47,7 +47,7 @@ var bootstrap = function ($, learun) {
             $('#CreateTime').val(learun.formatDate(new Date(), 'yyyy-MM-dd hh:mm:ss'));
             $('#LeaveType').lrDataItemSelect({ code: 'LeaveType' });
             $('#LeaveDay').lrDataItemSelect({ code: 'LeaveDay' });
-            $('#Files').lrUploader();
+            $('#Files').lrUploader({ isUpload: false });
         },
         initData: function () {
             if (!!keyValue) {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TimeTable/PrintSchedule.cshtml

@@ -0,0 +1,204 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8">
+    <title>课程表打印</title>
+</head>
+<body>
+    <style>
+        #table td {
+            text-align: center;
+            width: 100px;
+        }
+
+        #pdfDom {
+            /* width: 100%; */
+            /* overflow-x: auto;		 */
+        }
+
+        #table {
+            width: 100%;
+            /* overflow-x: auto; */
+            border-spacing: 0;
+        }
+
+            #table tr {
+            }
+
+        #exportReport {
+            background-color: #409eff;
+            border-radius: 4px;
+            width: 100px;
+            height: 40px;
+            color: white;
+            text-align: center;
+            line-height: 40px;
+            margin: 50px auto 0;
+        }
+
+            #exportReport:hover {
+                cursor: pointer;
+                background-color: #66b1ff;
+            }
+    </style>
+    <div id="pdfDom">
+        <table id="table" border="1"></table>
+    </div>
+    <div id="exportReport">导出</div>
+    <script src="http://libs.baidu.com/jquery/2.0.0/jquery.min.js"></script>
+    <script src="~/Content/js/PrintLesson/debug.js"></script>
+    <script src="~/Content/js/PrintLesson/html2canvas.js"></script>
+    <script>
+        var url = '/PersonnelManagement/TimeTable/GetDataInEducation?'
+        var search = window.location.href.split('?')[1].split('&')
+        for (var i = 0; i < search.length; i++) {
+            var data = search[i].split('=')
+            url += data[0] + '=' + data[1] + '&'
+        }
+        url = url.slice(0, url.length - 1)
+        $.get(window.origin + url, function (result) {
+            var data = JSON.parse(result).data
+            var classList = data.classinfolist;
+            var classListNow = [];
+
+            for (var i = 0; i < classList.length; i++) {
+                classListNow.push(classList[i][0]);
+            }
+
+            data.classinfolist = classListNow;
+            var dom = '<tr><td></td>'
+            var week = 7
+            var weekObj = {
+                0: '一',
+                1: '二',
+                2: '三',
+                3: '四',
+                4: '五',
+                5: '六',
+                6: '日',
+            }
+            // 生成一周七天表头
+            for (var i = 0; i < week; i++) {
+                dom += '<td colspan=' + data.maxlessontime + '>星期' + weekObj[i] + '</td>'
+            }
+            dom += '</tr><tr><td>班级|节次</td>'
+            // 生成课程节次表头
+            for (var j = 0; j < week; j++) {
+                var index = 0
+                for (var i = 0; i < data.maxlessontime; i++) {
+                    index++
+                    dom += '<td>' + (index) + '</td>'
+                }
+            }
+            dom += '</tr>'
+            // 生成每个班级的课程
+            for (var i = 0; i < data.classinfolist.length; i++) {
+                var classMsg = data.classinfolist[i]
+                dom += '<tr classId=' + classMsg.TeachClassNo + '><td>' + classMsg.ClassName + '</td>'
+                for (var j = 0; j < week; j++) {
+                    var index = 0
+                    for (var k = 0; k < data.maxlessontime; k++) {
+                        index++
+                        dom += '<td classId=' + classMsg.TeachClassNo + ' week=' + (j + 1) + ' time=' + index + '></td>'
+                    }
+                }
+                dom += '</td>'
+            }
+            table.innerHTML = dom
+
+            var tableWidth = data.maxlessontime * 7 * 100
+            table.style.width = tableWidth + 'px'
+            // 开始渲染数据
+            var domObj = {}
+            var trsObj = {}
+            var trs = document.getElementsByTagName('tr')
+            for (var j = 0; j < trs.length; j++) {
+                var id = trs[j].getAttribute('classId')
+                if (id) {
+                    trsObj[id] = trs[j]
+                }
+
+            }
+            //console.log(trsObj,'trsObj')
+            for (var i = 0; i < data.weekList.length; i++) {
+                var weekObj = data.weekList[i]
+                for (var j = 0; j < weekObj.list.length; j++) {
+                    var weekList = weekObj.list[j]
+                    weekList['time'] = weekObj.time
+
+                    var tds = trsObj[weekList.teachClassNo].getElementsByTagName('td')
+                    for (var k = 0; k < tds.length; k++) {
+                        var time = tds[k].getAttribute('time')
+                        var classId = tds[k].getAttribute('classId')
+                        var week = tds[k].getAttribute('week')
+                        if (week == weekList.day && classId == weekList.teachClassNo && time == weekList.time) {
+                            tds[k].innerHTML = '<div>课程:' + weekList.curriculum + '</div><div>教师:' + weekList.teacher + '</div><div>教室:' + weekList.classRoom + '</div>'
+                        }
+                    }
+                }
+            }
+
+
+
+            var downPdf = document.getElementById("exportReport"); //点击导出事件
+            //console.log(downPdf, 'downPdf')
+            function htmlToPdf() {
+
+                html2canvas(document.body, {
+                    onrendered: function (canvas) {
+
+                        var contentWidth = canvas.width;
+                        var contentHeight = canvas.height;
+                        // 竖版打印
+                        // var a4Width = 592.28
+                        // var a4Height = 841.89
+                        // 横板打印
+                        var a4Height = 592.28
+                        var a4Width = 841.89
+
+                        //一页pdf显示html页面生成的canvas高度;
+                        var pageHeight = contentWidth / a4Width * a4Height;
+                        //未生成pdf的html页面高度
+                        var leftHeight = contentHeight;
+                        //pdf页面偏移
+                        var position = 0;
+                        //a4纸的尺寸[595.28,841.89]，html页面生成的canvas在pdf中图片的宽高
+                        var imgWidth = a4Width;
+                        var imgHeight = a4Width / contentWidth * contentHeight;
+
+                        var pageData = canvas.toDataURL('image/jpeg', 1.0);
+
+                        var pdf = new jsPDF('l', 'pt', 'a4');
+                        //console.log(imgWidth, imgHeight, '===')
+                        //有两个高度需要区分，一个是html页面的实际高度，和生成pdf的页面高度(841.89)
+                        //当内容未超过pdf一页显示的范围，无需分页
+                        if (leftHeight < pageHeight) {
+                            pdf.addImage(pageData, 'JPEG', 0, 0, imgWidth, imgHeight);
+                        } else {
+                            while (leftHeight > 0) {
+                                pdf.addImage(pageData, 'JPEG', 0, position, imgWidth, imgHeight)
+                                leftHeight -= pageHeight;
+                                position -= a4Height;
+                                //避免添加空白页
+                                if (leftHeight > 0) {
+                                    pdf.addPage();
+                                }
+                            }
+                        }
+                        pdf.save('课程表.pdf');
+                        var index = parent.layer.getFrameIndex(window.name); //先得到当前iframe层的索引
+                        parent.layer.close(index); //再执行关闭
+                        parent.layer.msg('导出成功', {
+                            icon: 1
+                        });
+                    }
+                })
+            }
+            downPdf.onclick = htmlToPdf
+        });
+
+
+
+    </script>
+</body>
+</html>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TimeTable/SchoolLesson.cshtml

@@ -0,0 +1,88 @@
+@{
+    ViewBag.Title = "课程表";
+    Layout = "~/Views/Shared/_Index.cshtml";
+}
+<link href="~/Content/static/css/TimeTable.css" rel="stylesheet" />
+<script src="~/Content/static/js/LodopFuncs.js"></script>
+
+<style>
+    #table td {
+        text-align: center !important;
+        width: 150px !important;
+        padding: 10px 0;
+    }
+
+    #pdfDom {
+        /* width: 100%; */
+        /* overflow-x: auto;		 */
+    }
+
+    #table {
+        width: 100%;
+        /* overflow-x: auto; */
+        border-spacing: 0;
+    }
+
+        #table tr {
+        }
+
+    #exportReport {
+        background-color: #409eff;
+        border-radius: 4px;
+        width: 100px;
+        height: 40px;
+        color: white;
+        text-align: center;
+        line-height: 40px;
+        margin: 50px auto 0;
+    }
+
+        #exportReport:hover {
+            cursor: pointer;
+            background-color: #66b1ff;
+        }
+</style>
+<style>
+    .lr-select {
+        width: 150px;
+    }
+</style>
+<div class="lr-layout ">
+    <div class="lr-layout-center">
+        <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">
+                        <div id="datesearch" class="lr-search-date"></div>
+                    </div>
+                    <div class="lr-layout-tool-item">
+                        <div id="F_SchoolId" type="lrselect" class="lr-select"></div>
+                    </div>
+                    <div class="lr-layout-tool-item">
+                        <div id="ClassNo" type="lrselect" class="lr-select"></div>
+                    </div>
+                    <div class="lr-layout-tool-item">
+                        <div id="EmpNo" type="lrselect" class="lr-select"></div>
+                    </div>
+                    <div class="lr-layout-tool-item">
+                        <a id="lr_search" class="btn btn-primary">查询</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>
+                        <a id="lr_export" class="btn btn-default"><i class="fa fa-sign-out">&nbsp;导出</i></a>
+                    </div>
+                </div>
+            </div>
+            <div class="lr-layout-body" style="overflow: auto;">
+                <div id="pdfDom">
+                    <table id="table" border="1" style="background: #fff"></table>
+                </div>
+                @*<div id="exportReport">导出</div>*@
+            </div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/PersonnelManagement/Views/TimeTable/SchoolLesson.js")
+

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TimeTable/SchoolLesson.js

@@ -0,0 +1,276 @@
+var refreshGirdData;
+var bootstrap = function ($, learun) {
+    var startTime;
+    var endTime;
+    var Printdata;
+    var page = {
+        init: function () {
+            page.bind();
+            page.bindSelect();
+        },
+        loadData: function (param) {
+            $.lrSetFormWithParam(top.$.rootUrl + '/PersonnelManagement/TimeTable/GetDataInEducation', param,
+                function (data) {
+                    Printdata = '';
+                    for (var key in param) {
+                        Printdata += key + '=' + param[key]+'&'
+                    }
+                    //console.log(data, "data")
+                    var classList = data.classinfolist;
+                    var classListNow = [];
+                    if (classList == '' || classList == undefined) {
+                        learun.alert.warning('未查询到数据,请更换搜索条件');
+                        return
+                    }
+                    for (var i = 0; i < classList.length; i++) {
+                        classListNow.push(classList[i][0]);
+                    }
+
+                    data.classinfolist = classListNow;
+                    var dom = '<tr><td></td>'
+                    var week = 7
+                    var weekObj = {
+                        0: '一',
+                        1: '二',
+                        2: '三',
+                        3: '四',
+                        4: '五',
+                        5: '六',
+                        6: '日',
+                    }
+                    // 生成一周七天表头
+                    for (var i = 0; i < week; i++) {
+                        dom += '<td colspan=' + data.maxlessontime + '>星期' + weekObj[i] + '</td>'
+                    }
+                    dom += '</tr><tr><td>班级|节次</td>'
+                    // 生成课程节次表头
+                    for (var j = 0; j < week; j++) {
+                        var index = 0
+                        for (var i = 0; i < data.maxlessontime; i++) {
+                            index++
+                            dom += '<td>' + (index) + '</td>'
+                        }
+                    }
+                    dom += '</tr>'
+                    // 生成每个班级的课程
+                    for (var i = 0; i < data.classinfolist.length; i++) {
+                        var classMsg = data.classinfolist[i]
+                        dom += '<tr classId=' + classMsg.TeachClassNo + '><td>' + classMsg.ClassName + '</td>'
+                        for (var j = 0; j < week; j++) {
+                            var index = 0
+                            for (var k = 0; k < data.maxlessontime; k++) {
+                                index++
+                                dom += '<td classId=' + classMsg.TeachClassNo + ' week=' + (j + 1) + ' time=' + index + '></td>'
+                            }
+                        }
+                        dom += '</td>'
+                    }
+                    table.innerHTML = dom
+
+                    var tableWidth = data.maxlessontime * 7 * 100
+                    table.style.width = tableWidth + 'px'
+                    // 开始渲染数据
+                    var domObj = {}
+                    var trsObj = {}
+                    var trs = document.getElementsByTagName('tr')
+                    for (var j = 0; j < trs.length; j++) {
+                        var id = trs[j].getAttribute('classId')
+                        if (id) {
+                            trsObj[id] = trs[j]
+                        }
+
+                    }
+                    //console.log(trsObj,'trsObj')
+                    for (var i = 0; i < data.weekList.length; i++) {
+                        var weekObj = data.weekList[i]
+                        for (var j = 0; j < weekObj.list.length; j++) {
+                            var weekList = weekObj.list[j]
+                            weekList['time'] = weekObj.time
+
+                            var tds = trsObj[weekList.teachClassNo].getElementsByTagName('td')
+                            for (var k = 0; k < tds.length; k++) {
+                                var time = tds[k].getAttribute('time')
+                                var classId = tds[k].getAttribute('classId')
+                                var week = tds[k].getAttribute('week')
+                                if (week == weekList.day && classId == weekList.teachClassNo && time == weekList.time) {
+                                    tds[k].innerHTML = '<div>课程:' + weekList.curriculum + '</div><div>教师:' + weekList.teacher + '</div><div>教室:' + weekList.classRoom + '</div>'
+                                }
+                            }
+                        }
+                    }
+                }
+
+            );
+        },
+        bind: function () {
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            $('#datesearch').lrdate({
+                dfdata: [
+                    {
+                        name: '上周',
+                        begin: function () { return learun.getTime(7); },
+                        end: function () {
+                            return learun.getTime(1);
+                        }
+                    },
+                    {
+                        name: '本周',
+                        begin: function () { return learun.getTime(0); },
+                        end: function () {
+                            return learun.getTime(-6);
+                        }
+                    },
+                    {
+                        name: '下周',
+                        begin: function () { return learun.getTime(-7); },
+                        end: function () {
+                            return learun.getTime(-13);
+                        }
+                    }],
+                // 月
+                mShow: false,
+                premShow: false,
+                // 季度
+                jShow: false,
+                prejShow: false,
+                // 年
+                ysShow: false,
+                yxShow: false,
+                preyShow: false,
+                yShow: false,
+                // 默认
+                dfvalue: 'currentWeek',
+                selectfn: function (begin, end) {
+                    startTime = begin;
+                    endTime = end;
+                    page.search();
+                }
+            });
+            //查询
+            $('#lr_search').on('click', function () {
+                var p = {};
+                p.schoolId = $('#F_SchoolId').lrselectGet();
+                p.ClassNo = $('#ClassNo').lrselectGet();
+                p.EmpNo = $('#EmpNo').lrselectGet();
+                page.search(p);
+            });
+            // 按条件清空排课数据
+            $('#emptyByCondition').on('click', function () {
+                learun.layerForm({
+                    id: 'EmptyByConditionForm',
+                    title: '按条件清空排课数据',
+                    url: top.$.rootUrl + '/EducationalAdministration/ArrangeLessonTerm/EmptyByConditionForm',
+                    width: 600,
+                    height: 400,
+                    callBack: function (id) {
+                        return top[id].acceptClick(refreshGirdData);
+                    }
+                });
+            });
+            // 按条件同步排课数据
+            $('#syncByCondition').on('click', function () {
+                learun.layerForm({
+                    id: 'SyncByConditionForm',
+                    title: '按条件同步排课数据',
+                    url: top.$.rootUrl + '/EducationalAdministration/ArrangeLessonTerm/SyncByConditionForm',
+                    width: 600,
+                    height: 400,
+                    callBack: function (id) {
+                        return top[id].acceptClick(refreshGirdData);
+                    }
+                });
+            });
+
+            //按条件重置基础数据同步状态
+            $('#initByCondition').on('click', function () {
+                learun.layerForm({
+                    id: 'SyncByConditionForm',
+                    title: '按条件重置基础数据同步状态',
+                    url: top.$.rootUrl + '/EducationalAdministration/ArrangeLessonTerm/ClearByConditionForm',
+                    width: 600,
+                    height: 400,
+                    callBack: function (id) {
+                        return top[id].acceptClick();
+                    }
+                });
+            });
+            $('#lr_export').on('click',
+                function () {
+                    window.open(window.origin+"/PersonnelManagement/TimeTable/PrintSchedule?" + Printdata.slice(0, Printdata.length-1));
+                    //console.log(Printdata, "data");
+                });
+        },
+        bindSelect: function () {
+            //校区
+            $('#F_SchoolId').lrDataSourceSelect({
+                code: 'company', value: 'f_companyid', text: 'f_fullname', select: function (item) {
+                    if (!!item) {
+                        // 班级
+                        $('#ClassNo').lrselectRefresh({
+                            placeholder: "请选择班级",
+                            allowSearch: true,
+                            url: top.$.rootUrl + '/PersonnelManagement/TimeTable/GetClassData',
+                            param: { schoolId: item.f_companyid },
+                            value: 'value',
+                            text: 'text'
+                        });
+                        // 教师
+                        $('#EmpNo').lrselectRefresh({
+                            placeholder: "请选择教师",
+                            allowSearch: true,
+                            url: top.$.rootUrl + '/PersonnelManagement/TimeTable/GetTeacherData',
+                            param: { schoolId: item.f_companyid },
+                            value: 'value',
+                            text: 'text'
+                        });
+                    } else {
+                        //班级
+                        $('#ClassNo').lrselectRefresh({
+                            placeholder: "请选择班级",
+                            allowSearch: true,
+                            url: top.$.rootUrl + '/PersonnelManagement/TimeTable/GetClassData',
+                            param: { schoolId: "" },
+                            value: 'value',
+                            text: 'text'
+                        });
+                        //教师
+                        $('#EmpNo').lrselectRefresh({
+                            placeholder: "请选择教师",
+                            allowSearch: true,
+                            url: top.$.rootUrl + '/PersonnelManagement/TimeTable/GetTeacherData',
+                            param: { schoolId: "" },
+                            value: 'value',
+                            text: 'text'
+                        });
+                    }
+                }
+            });
+            //班级
+            $('#ClassNo').lrselect({
+                placeholder: "请选择班级",
+                allowSearch: true,
+                url: top.$.rootUrl + '/PersonnelManagement/TimeTable/GetClassData',
+                value: 'value',
+                text: 'text'
+            });
+            //教师
+            $('#EmpNo').lrselect({
+                placeholder: "请选择教师",
+                allowSearch: true,
+                url: top.$.rootUrl + '/PersonnelManagement/TimeTable/GetTeacherData',
+                value: 'value',
+                text: 'text'
+            });
+        },
+        search: function (param) {
+            param = param || {};
+            param.StartTime = startTime;
+            param.EndTime = endTime;
+            page.loadData(param);
+        }
+    };
+    page.init();
+};

Learun.Framework.Ultimate V7/Learun.Application.Web/Content/otherFile/入学须知.pdf

@@ -1,55 +0,0 @@
-    数字化智慧校园
-统一身份认证补充接口
-
-            V1.0
-概述
-
-      根据特定需求开发补充接口
-
-登录接口
-
-      采用标准 Http GET 请求发送用户名、密码到认证接口，接口实现用户名密码判定后返
-回标准 json；
-
-请求地址：http://10.30.0.10:8000/Login/CheckLoginForSSOBC
-请求方式：发送标准 Http GET 请求到认证地址
-
-接口请求参数                         说明
-       参数
-           用户名
-u          密码
-p
-
-认证接口返回参数
-
-      参数                       说明
-
-code       状态码 返回 200 成功、其他失败
-
-info       状态消息 返回 login success 表示登录成功、其他失败
-
-data       保留 暂时无用
-
-登录成功后，认证服务器将在用户浏览器 cookies 中写入数字化智慧校园系统数据，第三方
-系统可直接跳转到 http://10.30.0.10:8000/Home/Index 进入数字化智慧校园系统。
-
-退出登录接口
-
-      第三方系统退出时，需要主动调用退出登录接口以同步数字化智慧校园系统退出状态。
-      采用标准 Http POST 请求，返回标准 json；
-
-请求地址：http://10.30.0.10:8000/Login/OutLoginForSSOBC
-请求方式：发送标准 Http POST 请求到认证地址
-
-接口请求参数：无
-
-认证接口返回参数
-
-      参数                       说明
-
-code       状态码 返回 200 成功、其他失败
-
-info       状态消息 返回 logout success 表示退出成功、其他失败
-
-data       保留 暂时无用
-

Learun.Framework.Ultimate V7/Learun.Application.Web/Content/otherFile/各专业介绍.pdf

@@ -0,0 +1,175 @@
+新疆广播电视学校2022年招生
+专业代码：760202
+                            培养目标
+
+       培养具有工匠精神和信息素养、掌握扎实的科
+学文化基础和摄影摄像、音视频编辑、短视频制作
+等知识、德智体美劳全面发展的社会主义建设者和
+接班人。面向影视制作公司、广告公司、音像制作
+公司、网络公司、婚庆礼仪公司、企事业单位等行
+业企业,培养从事影视节目摄影、摄像人员、后期制
+作人员、策划人员以及基层广播电视台从事新闻工
+作的德智体美全面发展的技能型应用人才。
+就业单位          就业面向
+      就业岗位
+专业课程介绍
+
+                   电视选题与策划
+                   影视作品赏析
+                   影视摄像
+                   电视音乐音响
+                   视听语言
+                   影视剪辑
+                   非线性编辑
+                   影视后期合成
+                   电视专题节目制作
+                   数字特技制作（AE）
+                   音频编辑
+                   摄影构图
+                   电视照明
+                   电视文案写作
+                               升学专业
+
+高职：电视节目制作专业 影
+视多媒体、摄影与摄像技术
+
+本科：广播电视编导专业 数
+字媒体艺术 广播电视新闻专
+业
+职业资格证
+专业代码：760201
+      培养目标
+
+      培养具有工匠精神和信息素养、掌握
+扎实的科学文化基础和播音主持基本知识
+及传媒行业相关法律法规、德智体美劳全
+面发展的社会主义建设者和接班人。面向
+广播电台、电视台、影视制作公司、广告
+公司、婚庆礼仪公司、企事业单位等行业
+企业,培养从事播音主持、现场报道、少
+数民族语言影视配音、公关礼仪工作的德
+智体美全面发展的技能型应用人才。
+就业单位         就业面向
+      就业岗位
+专业课程介绍
+
+播音发声      影视化妆
+普通话语音     口语述评与模拟主持
+播音作品欣赏    客户呼叫服务
+播音主持语言表达  新闻播音
+播音主持训练    专题播音
+广播播音主持    新闻直播
+电视播音主持    庆典类节目主持
+升学专业
+职业资格证书
+
+            呼叫中心客户服务与管理
+            电商直播
+            新媒体技术
+            播音员与节目主持
+专业代码：710204
+                    培养目标
+
+   培养具有工匠精神和信息素养、掌握扎实的
+科学文化基础和视听语言基本规律、图形与动
+画技术、数字媒体技术等知识德智体美劳全面
+发展的社会主义建设者和接班人。面向数字媒
+体技术应用领域，培养从事数字影像处理、新
+媒体技术、无人机拍摄、融媒体内容制作、数
+字音像设备使用与维护等工作，德智体美劳全
+面发展的高素质劳动者和技能型人才。
+专业面向
+
+          面向数字媒  数字图像处理人员
+体技术应用领域，培        新媒体技术人员
+养从事数字影像处理、       融媒体技术人员
+新媒体技术、无人机        摄影摄像人员
+拍摄、融媒体内容制        数字视影视后期处理
+作、数字音像设备使        人员
+用与维护等工作的专        录音师、音响调音员
+业技术人员
+专业课程介绍
+升学专业与职业资格证书
+
+升学专业:        职业资格证书
+
+影视多媒体技术      数字影像处理
+音像技术         新媒体技术
+摄影摄像技术       融媒体内容制作
+融媒体技术与运营     无人机驾驶
+网络直播与运营
+数字媒体设备应用与管理
+专业代码：710202
+                     培养目标
+
+      培养具有工匠精神和信息素养、掌握扎实
+的科学文化基础和网络规划、网络技术、程序
+设计等知识，德智体美劳全面发展的社会主义
+建设者和接班人。面向计算机网络技术的集成
+与应用领域，培养从事网络组建、网络设备安
+装与调试、网络系统维护与管理、网络产品营
+销以及相关产品销售等工作，德智体美全面发
+展的高素质劳动者和技能型人才。
+专业面向
+
+       就业面向         就业岗位
+
+      面向计算机网络技术的集  网络设备调试员
+成与应用领域，培养从事网络      算机网络管理员
+组建、网络设备安装与调试、      网络编辑员
+网络系统维护与管理、网络产      电子商务师
+品营销以及相关产品销售等工
+作
+专业课程介绍
+
+常用工具软件             网页设计与制作
+电工电子技能与技术          网络安全技术
+计算机网络技术基础          计算机网络设备应用
+计算机组装与维护           电子商务应用
+网络设计方案
+综合布线设计与设工
+计算机图像处理/photoshop
+计算机图形处理/CAD
+升学专业与职业资格
+
+   升学专业     职业资格证书
+
+计算机应用技术     网络设备安装与调试
+计算机网络技术     5G网络运营与维护
+计算机网络与安全管理  电子商务
+网络系统管理
+网络工程
+专业代码：710103
+                   培养目标
+
+    掌握电工技术、电子技术、电子装配工艺、电子线路设计
+等知识，具备电子产品装配与调试、仪器仪表装配与维修等
+能力，主要面向电子产品生产和各类广播电视发射台、网络
+公司等行业企业，培养从事电子整机生产、安装、服务和管
+理以及电子设备装配、调试、维修与售后等工作；数字广播
+电视技术设备的维护和机房值班等工作，具有一定可持续发
+展和创新能力，理论知识和实践技能相结合，德智体美劳全
+面发展的高素质劳动者和技能型人才。
+                    专业面向
+就业面向：
+
+       面向电子产品生产和  就业岗位：
+各类广播电视发射台、网
+络公司等行业企业，培养       电子产品装配工
+从事电子整机生产、安装、      电子产品检验员
+服务和管理以及电子设备       数字广播电视机线员
+装配、调试、维修与售后
+等工作及数字广播电视技
+术设备的维护和机房值班
+等工作的专业人员。
+专业课程介绍
+
+电工技术基础与技能    数字卫星技术
+电子测量仪器       数字广播电视发送与接收技术
+数字电视技术       数字视听设备使用与维修
+光纤通信技术       电子产品检验技术
+有线电视系统设计与施工
+升学专业与职业资格证书
+
+                     职业资格证书:
+

Learun.Framework.Ultimate V7/Learun.Application.Web/Content/otherFile/新生入学须知.pdf

@@ -0,0 +1,66 @@
+                 新疆广播电视学校 2022 年普通中专
+                       新生入学须知
+
+      祝贺你已被我校录取、欢迎你来我校学习！现将入学有关事宜通知如下：
+      一、请你持录取通知书于 9 月 5 日至 7 日来我校报到。
+      温馨提示：
+      新生来学校报到时请提前准备好“7 日通信大数据行程码”、“新疆政务服务
+码”或“乌鲁木齐畅行码”（绿码）及 48 小时有效的核酸检测报告（阴性），学
+校要进行身份核验和体温检测。
+      疫情期间，请予理解和配合。
+      二、新生报到时，需携带以下物品：
+      １、录取通知书。
+      ２、初中毕业证书的原件和复印件（要求复印到同一张 A4 纸面上）一份以
+及初中纸质档案。
+      ３、户口复印件（要求将户口首页、户主页和本人页复印到同一张 A4 纸面
+上）四份、身份证复印件（要求将身份证正反面复印到同一张 A4 纸面上）四份。
+      ４、近期一寸免冠证件照片四张，团员证或团组织关系。
+      ５、学校实行准军事化管理，被褥在学校统一购买（被褥预计 365 元，含
+被子、褥子、枕头各一个，被套、床单、枕巾各两个，盆子两个等），其余生活、
+学习用品以及伙食费自备。
+      三、凡被我校录取有正式学籍的在校生可按现行国家规定享受以下政策。
+      １、所有学生全部享受免学费政策。
+免学费标准:
+      播音与主持：3300 元/学年； 广播影视节目制作：3300 元/学年；
+      电子技术应用：2200 元/学年； 数字媒体技术应用：2200 元/学年；
+      计算机网络技术：2200 元/学年。
+      2、南疆四地州以及 23 个边境县户籍的学生全部享受免教材费、免住宿费
+政策。
+23 个边境县：
+      伊 犁 州：昭苏县、察布查尔锡伯自治县、霍城县、尼勒克县
+      博 州：温泉县、博乐市
+      塔城地区：托里县、裕民县、塔城市、额敏县、和布克赛尔县
+      阿 勒 泰：吉木乃县、哈巴河县、布尔津县、阿勒泰市、福海县、富蕴县、青河县
+      昌 吉 州：奇台县、木垒县、
+      哈密地区：巴里坤县、伊吾县、哈密市
+免教材、住宿费标准：教材费—300 元/每生/学年；住宿费—600 元/每生/学年。
+      ３、南疆四地州户籍、脱贫家庭、脱贫不稳定家庭、边缘易致贫家庭、城
+乡低保家庭、特困供养家庭、孤儿和残疾等学生全部享受国家助学金，其他地
+区家庭经济困难的学生凭困难证明材料按在校其他地区户籍学生的 20%比例享
+受助学金（家庭经济困难的学生要在开学报到时提供父母所在单位或家庭住址
+所在街道办事处出具的家庭困难证明和县以上民政局的证明）。
+      助学金标准——2000 元/每生/学年（初中中专学生享受两年）
+      ４、德、智、体、美、劳全面发展且优秀的学生有机会获得国家奖学金、
+学校奖学金的奖励。
+      国 家 奖 学 金：6000 元/每生/学年；
+      学校一等奖学金：2000 元/每生/学年；
+      学校二等奖学金：1200 元/每生/学年；
+      学校三等奖学金： 800 元/每生/学年。
+      四、除现行国家政策外，我校将免除每位新生的军训费，体检费和实习保
+险费合计 282 元。
+      五、新生报到后十日内，确因特殊原因可以根据本人实际情况向学校招生
+与就业指导办公室提出书面申请，经批准后重新调整专业学习。
+      六、学生毕业后，均有机会报考我校相应的成人大专专业继续学习，直至
+本科毕业；20%的应届优秀毕业生可以按照自治区教育厅的文件精神直升疆内普
+通高等专科院校继续学习；中专学生第三年可以报名参加普通高考和三校生考
+试。
+      七、报到地址：乌鲁木齐市天山区团结路 620 号（乘 10 路、60 路、61 路、
+70 路、301 路、920 路、4103 路公交车在陶瓷厂下车即到）
+      联系电话：0991-6552258、6530980
+      特别提示：我校招生不收取任何咨询、报名、考试等费用。
+
+                                                                  新疆广播电视学校
+                                                               招生与就业指导办公室
+
+                                                                二 0 二二年七月八日
+

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

@@ -840,6 +840,7 @@
     <Compile Include="Areas\EducationalAdministration\Controllers\HealthPunchTimeController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\HealthPunchStuController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\Acc_DormitoryChangeController.cs" />
+    <Compile Include="Areas\EducationalAdministration\Controllers\VaccinationInfoController.cs" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Areas\AdmissionsPlatform\Views\AP_OnlineUserInfo\DropOutIndex.js" />
@@ -1201,6 +1202,8 @@
     <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\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" />
@@ -1603,6 +1606,7 @@
     <Content Include="Areas\PersonnelManagement\Views\TeacherLeaveManagement\FormView.js" />
     <Content Include="Areas\PersonnelManagement\Views\TeacherOvertimeManagement\FormView.js" />
     <Content Include="Areas\PersonnelManagement\Views\TimeTable\ClassIndexInEducation.js" />
+    <Content Include="Areas\PersonnelManagement\Views\TimeTable\SchoolLesson.js" />
     <Content Include="Areas\PersonnelManagement\Views\WorkStudyPositionApply\CheckIndex.js" />
     <Content Include="Areas\PersonnelManagement\Views\WorkStudyPositionApply\Form.js" />
     <Content Include="Areas\PersonnelManagement\Views\WorkStudyPositionApply\FormView.js" />
@@ -2403,6 +2407,7 @@
     <Content Include="Content\images\SsoSystem\noLogin.png" />
     <Content Include="Content\images\SsoSystem\search.png" />
     <Content Include="Content\images\SsoSystem\user.jpg" />
+    <Content Include="Content\images\StuRecruitmentBrochure.jpg" />
     <Content Include="Content\jquery\plugin\jqprint\jqprint.css" />
     <Content Include="Content\jquery\plugin\jqprint\jQuery.print.js" />
     <Content Include="Content\jquery\plugin\jSignature.min.js" />
@@ -3295,6 +3300,8 @@
     <Content Include="Content\js\OnlineRegistrate\scripts.js" />
     <Content Include="Content\js\OnlineRegistrate\tooltips.js" />
     <Content Include="Content\js\popper.js" />
+    <Content Include="Content\js\PrintLesson\debug.js" />
+    <Content Include="Content\js\PrintLesson\html2canvas.js" />
     <Content Include="Content\js\qrcode.min.js" />
     <Content Include="Content\js\swiper.min.js" />
     <Content Include="Content\js\swiper.min1.js" />
@@ -6592,6 +6599,10 @@
     <Content Include="Areas\EducationalAdministration\Views\Acc_DormitoryChange\Index.js" />
     <Content Include="Areas\EducationalAdministration\Views\Acc_DormitoryChange\Form.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\Acc_DormitoryChange\Form.js" />
+    <Content Include="Areas\EducationalAdministration\Views\VaccinationInfo\Index.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\VaccinationInfo\Index.js" />
+    <Content Include="Areas\EducationalAdministration\Views\VaccinationInfo\Form.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\VaccinationInfo\Form.js" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Areas\EducationalAdministration\Views\HomeStatistics\" />
@@ -7088,7 +7099,6 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Areas\EducationalAdministration\Views\web.config" />
     <Content Include="Areas\LR_OrganizationModule\Views\User\StudentIndex.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\LanMail\Index.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\SYS_SendMessage\FormView.cshtml" />
@@ -7920,6 +7930,11 @@
     <Content Include="Areas\EducationalAdministration\Views\SchoolCalendar\ScheduleIndex.cshtml" />
     <Content Include="Areas\LogisticsManagement\Views\Accommodation\ClearForm.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\StuInfoFresh\StatisticsProvince.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\StuEnrollPhone\StuRecruitmentBrochure.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\VaccinationInfo\TeachForm.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\VaccinationInfo\TeachIndex.cshtml" />
+    <Content Include="Areas\PersonnelManagement\Views\TimeTable\SchoolLesson.cshtml" />
+    <Content Include="Areas\PersonnelManagement\Views\TimeTable\PrintSchedule.cshtml" />
     <None Include="Properties\PublishProfiles\CustomProfile.pubxml" />
     <None Include="Properties\PublishProfiles\FolderProfile.pubxml" />
     <Content Include="Views\Login\Default-beifen.cshtml" />
@@ -8014,6 +8029,7 @@
     <None Include="Properties\PublishProfiles\FolderProfile4.pubxml" />
     <None Include="Properties\PublishProfiles\FolderProfile5.pubxml" />
     <None Include="Properties\PublishProfiles\FolderProfile6.pubxml" />
+    <None Include="Properties\PublishProfiles\FolderProfile7.pubxml" />
     <None Include="Properties\PublishProfiles\learunadms6.1.pubxml" />
   </ItemGroup>
   <ItemGroup>

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/EducationalAdministration/VaccinationInfoMap.cs

@@ -0,0 +1,29 @@
+using Learun.Application.TwoDevelopment.EducationalAdministration;
+using System.Data.Entity.ModelConfiguration;
+
+namespace  Learun.Application.Mapping
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2022-07-18 17:52
+    /// 描 述：疫情
+    /// </summary>
+    public class VaccinationInfoMap : EntityTypeConfiguration<VaccinationInfoEntity>
+    {
+        public VaccinationInfoMap()
+        {
+            #region 表、主键
+            //表
+            this.ToTable("VACCINATIONINFO");
+            //主键
+            this.HasKey(t => t.Id);
+            #endregion
+
+            #region 配置关系
+            #endregion
+        }
+    }
+}
+

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/Learun.Application.Mapping.csproj

@@ -595,6 +595,7 @@
     <Compile Include="EducationalAdministration\HealthPunchTimeMap.cs" />
     <Compile Include="EducationalAdministration\HealthPunchStuMap.cs" />
     <Compile Include="EducationalAdministration\Acc_DormitoryChangeMap.cs" />
+    <Compile Include="EducationalAdministration\VaccinationInfoMap.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\Learun.Application.Organization\Learun.Application.Organization.csproj">

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnroll/StuEnrollBLL.cs

@@ -200,11 +200,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// <param name="keyValue">主键</param>
         /// <summary>
         /// <returns></returns>
-        public StuEnrollEntity GetEntityByPersonalData(string IDCard, string StuMobile)
+        public StuEnrollEntity GetEntityByPersonalData(string IDCard, string StuName)
         {
             try
             {
-                return stuEnrollService.GetEntityByPersonalData(IDCard, StuMobile);
+                return stuEnrollService.GetEntityByPersonalData(IDCard, StuName);
             }
             catch (Exception ex)
             {

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnroll/StuEnrollEntity.cs

@@ -495,8 +495,14 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// </summary>
         [Column("YEAR")]
         public string Year { get; set; }
+
+        /// <summary>
+        /// 考试科目
+        /// </summary>
+        [Column("SUBJECTNO")]
+        public string SubjectNo { get; set; }
         #endregion
-        
+
 
 
         #region  扩展操作

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnroll/StuEnrollIBLL.cs

@@ -35,7 +35,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// <returns></returns>
         StuEnrollEntity GetStuEnrollEntity(string keyValue);
         IEnumerable<StuEnrollMidExamScoreEntity> GetMidExamScoreData(string keyValue);
-        StuEnrollEntity GetEntityByPersonalData(string IDCard, string StuMobile);
+        StuEnrollEntity GetEntityByPersonalData(string IDCard, string StuName);
         StuEnrollEntity SearchForm(int type, StuEnrollEntity strEntity);
         IEnumerable<ExamSubjectEntity> GetExamDataByStuId(string keyValue);
         #endregion

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnroll/StuEnrollService.cs

@@ -1949,7 +1949,27 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         {
             try
             {
-                return this.BaseRepository("CollegeMIS").FindList<StuEnrollMidExamScoreEntity>(x => x.StuEnrollId == keyValue);
+                var list = this.BaseRepository("CollegeMIS").FindList<StuEnrollMidExamScoreEntity>(x => x.StuEnrollId == keyValue).ToList();
+                if (list == null || list.Count() <= 0)
+                {
+                    var db = this.BaseRepository("CollegeMIS");
+                    db.BeginTrans();
+                    var dataItem = this.BaseRepository().FindList<DataItemDetailEntity>("select b.* from [dbo].[LR_Base_DataItem] a join [dbo].[LR_Base_DataItemDetail] b on a.f_itemid=b.f_itemid where a.F_ItemCode='MidTermSubject' and b.f_deletemark=0 and b.f_enabledmark=1").OrderBy(x => x.F_SortCode);
+
+                    foreach (var data in dataItem)
+                    {
+                        StuEnrollMidExamScoreEntity entity = new StuEnrollMidExamScoreEntity();
+                        entity.Create();
+                        entity.StuEnrollId = keyValue;
+                        entity.subjectName = data.F_ItemName;
+                        entity.subjectCode = data.F_ItemCode;
+                        entity.sort = data.F_SortCode;
+                        db.Insert(entity);
+                        list.Add(entity);
+                    }
+                    db.Commit();
+                }
+                return list;
             }
             catch (Exception ex)
             {
@@ -1969,12 +1989,12 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// <param name=""></param>
         /// <summary>
         /// <returns></returns>
-        public StuEnrollEntity GetEntityByPersonalData(string IDCard, string StuMobile)
+        public StuEnrollEntity GetEntityByPersonalData(string IDCard, string StuName)
         {
             try
             {
                 var year = DateTime.Now.Year;
-                return this.BaseRepository("CollegeMIS").FindEntity<StuEnrollEntity>(x => (x.IDCard == IDCard || x.StuMobile == StuMobile) && x.AddTime.Value.Year == year);
+                return this.BaseRepository("CollegeMIS").FindEntity<StuEnrollEntity>(x => (x.IDCard == IDCard && x.StuName == StuName.Trim()) && x.AddTime.Value.Year == year);
             }
             catch (Exception ex)
             {
@@ -1997,7 +2017,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         {
             try
             {
-                return this.BaseRepository("CollegeMIS").FindEntity<StuEnrollEntity>(x => x.EnrollStatus == 2 && x.StuName == entity.StuName.Trim() && x.IDCard == entity.IDCard);
+                return this.BaseRepository("CollegeMIS").FindEntity<StuEnrollEntity>(x => x.StuName == entity.StuName.Trim() && x.IDCard == entity.IDCard);
             }
             catch (Exception ex)
             {
@@ -2021,16 +2041,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         {
             try
             {
-                string sql = $"select majorno  from stuenroll where stuid='{keyValue}'";
-                var majorId = "";
-                var majorDt = this.BaseRepository("CollegeMIS").FindTable(sql);
-                if (majorDt != null)
-                {
-                    majorId = majorDt.Rows[0]["majorno"].ToString();
-                }
-
-                string subSql =
-                    $"select s.* from [dbo].[MajorAndSubject] m join ExamSubject s on m.SubId=s.Id where m.Majorid='{majorId}' and s.IsFlag=1 ";
+                string subSql = $"select * from ExamSubject where SubjectNo in (select SubjectNo from StuEnroll where stuid='{keyValue}')";
                 return this.BaseRepository("CollegeMIS").FindList<ExamSubjectEntity>(subSql);
             }
             catch (Exception ex)
@@ -2517,17 +2528,15 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                         if (list.Where(x => x.YearNo == enrollData.Year && x.StuId == enrollData.StuId).Count() <= 0)
                         {
                             //新生成绩表不存在当前新生  添加
-                            //循环报名的专业所关联的学科
-                            //专业学科关联表
-                            var MajorAndSubjectList = db.FindList<MajorAndSubjectEntity>(x => x.MajorId == enrollData.MajorNo);
-                            foreach (var sub in MajorAndSubjectList)
+                            var subNos = enrollData.SubjectNo.Split(',').ToList();
+                            foreach (var subno in subNos)
                             {
                                 StuEnrollScoreEntity model = new StuEnrollScoreEntity();
                                 model.Create();
                                 model.YearNo = enrollData.Year;
                                 model.MajorId = enrollData.MajorNo;
                                 model.StuId = enrollData.StuId;
-                                model.SubjectId = sub.SubId;
+                                model.SubjectId = subno;
                                 model.Score = 0;
                                 db.Insert(model);
                             }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnrollScore/StuEnrollScoreEntity.cs

@@ -51,6 +51,12 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         [Column("SCORE")]
         public decimal? Score { get; set; }
         /// <summary>
+        /// 合格/不合格
+        /// </summary>
+        /// <returns></returns>
+        [Column("GRADE")]
+        public string Grade { get; set; }
+        /// <summary>
         /// 状态
         /// </summary>
         /// <returns></returns>

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnrollScore/StuEnrollScoreService.cs

@@ -47,10 +47,10 @@ join stuenroll a on t.stuid=a.stuid where 1=1 ");
 
                 var queryParam = queryJson.ToJObject();
                 var dp = new DynamicParameters(new { });
-                if (!queryParam["YearNo"].IsEmpty())
+                if (!queryParam["Year"].IsEmpty())
                 {
-                    strSql.Append(" and t.YearNo=@YearNo ");
-                    dp.Add("YearNo", queryParam["YearNo"].ToString(), DbType.String);
+                    strSql.Append(" and t.YearNo=@Year ");
+                    dp.Add("Year", queryParam["Year"].ToString(), DbType.String);
                 }
                 if (!queryParam["MajorId"].IsEmpty())
                 {
@@ -86,7 +86,7 @@ join stuenroll a on t.stuid=a.stuid where 1=1 ");
         {
             try
             {
-                string sql = $"select a.Score,b.SubjectName from StuEnrollScore a left join ExamSubject b on a.subjectId=b.Id where  a.stuid='{stuid}' ";
+                string sql = $"select a.Score,b.SubjectName,a.grade from StuEnrollScore a left join ExamSubject b on a.subjectId=b.subjectNo where  a.stuid='{stuid}' ";
 
                 return this.BaseRepository("CollegeMIS").FindList<StuEnrollScoreEntity>(sql);
             }
@@ -160,10 +160,10 @@ join stuenroll a on t.stuid=a.stuid where 1=1 ");
 
                 var queryParam = queryJson.ToJObject();
                 var dp = new DynamicParameters(new { });
-                if (!queryParam["YearNo"].IsEmpty())
+                if (!queryParam["Year"].IsEmpty())
                 {
-                    strSql.Append(" and t.YearNo=@YearNo ");
-                    dp.Add("YearNo", queryParam["YearNo"].ToString(), DbType.String);
+                    strSql.Append(" and t.YearNo=@Year ");
+                    dp.Add("Year", queryParam["Year"].ToString(), DbType.String);
                 }
                 if (!queryParam["MajorId"].IsEmpty())
                 {
@@ -284,7 +284,7 @@ join stuenroll a on t.stuid=a.stuid where 1=1 ");
         {
             try
             {
-                var data = this.BaseRepository("CollegeMIS").FindList<WebHelper.YearGrade>("select distinct s.subjectId as value,a.SubjectName as text from StuEnrollScore s left join ExamSubject a on s.subjectId=a.id");
+                var data = this.BaseRepository("CollegeMIS").FindList<WebHelper.YearGrade>("select distinct s.subjectId as value,a.SubjectName as text from StuEnrollScore s left join ExamSubject a on s.subjectId=a.SubjectNo");
                 data = data.Where(x => !string.IsNullOrEmpty(x.value)).OrderBy(x => x.value);
                 return data;
             }
@@ -497,9 +497,9 @@ join stuenroll a on t.stuid=a.stuid where 1=1 ");
 
                 foreach (var item in list)
                 {
-                    item.Score = item.Score.HasValue ? item.Score.Value : 0;
-
-                    db.ExecuteBySql($"update StuEnrollScore set Score={item.Score},Remark='{item.Remark}' where Id='{item.Id}' ");
+                    //item.Score = item.Score.HasValue ? item.Score.Value : 0;
+                    //db.ExecuteBySql($"update StuEnrollScore set Score={item.Score},Remark='{item.Remark}' where Id='{item.Id}' ");
+                    db.ExecuteBySql($"update StuEnrollScore set Grade='{item.Grade}',Remark='{item.Remark}' where Id='{item.Id}' ");
                 }
 
                 db.Commit();

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuLeaveManagement/StuLeaveManagementBLL.cs

@@ -190,6 +190,27 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         }
 
         #endregion
-
+        /// <summary>
+        /// 未销假实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        public int Num(string CreateUserNo)
+        {
+            try
+            {
+                return stuLeaveManagementService.CreateUserNo(CreateUserNo);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
     }
 }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuLeaveManagement/StuLeaveManagementEntity.cs

@@ -126,6 +126,8 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         public string ClassDiredctorNo { get; set; }
         [NotMapped]
         public string ClassTutorNo { get; set; }
+        [NotMapped]
+        public int? num { get; set; }
         #endregion
     }
 }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuLeaveManagement/StuLeaveManagementIBLL.cs

@@ -63,5 +63,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         void ChangeStatusByProcessId(string status, string processId, string userId);
         #endregion
 
+        int Num(string CreateUserNo);
     }
 }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuLeaveManagement/StuLeaveManagementService.cs

@@ -42,12 +42,12 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 var dp = new DynamicParameters(new { });
                 if (!queryParam["LeaveType"].IsEmpty())
                 {
-                    dp.Add("LeaveType",queryParam["LeaveType"].ToString(), DbType.String);
+                    dp.Add("LeaveType", queryParam["LeaveType"].ToString(), DbType.String);
                     strSql.Append(" AND t.LeaveType = @LeaveType ");
                 }
                 if (!queryParam["CheckStatus"].IsEmpty())
                 {
-                    dp.Add("CheckStatus",queryParam["CheckStatus"].ToString(), DbType.String);
+                    dp.Add("CheckStatus", queryParam["CheckStatus"].ToString(), DbType.String);
                     strSql.Append(" AND t.CheckStatus = @CheckStatus ");
                 }
                 if (!queryParam["StuNo"].IsEmpty())
@@ -93,7 +93,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 //        strSql.Append(" ) ");
                 //    }
                 //}
-                return this.BaseRepository("CollegeMIS").FindList<StuLeaveManagementEntity>(strSql.ToString(),dp, pagination);
+                return this.BaseRepository("CollegeMIS").FindList<StuLeaveManagementEntity>(strSql.ToString(), dp, pagination);
             }
             catch (Exception ex)
             {
@@ -168,7 +168,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         {
             try
             {
-                this.BaseRepository("CollegeMIS").Delete<StuLeaveManagementEntity>(t=>t.Id == keyValue);
+                this.BaseRepository("CollegeMIS").Delete<StuLeaveManagementEntity>(t => t.Id == keyValue);
             }
             catch (Exception ex)
             {
@@ -263,6 +263,35 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         }
 
         #endregion
-
+        /// <summary>
+        /// 未销假次数
+        /// </summary>
+        /// <param name="CreateUserNo"></param>
+        /// <returns></returns>
+        public int CreateUserNo(string CreateUserNo)
+        {
+            try
+            {
+                var HisTime = DateTime.Now.AddDays(-30);
+                StringBuilder sb = new StringBuilder();
+                sb.Append(@"SELECT count(*) as num FROM StuLeaveManagement t 
+                left join StuCancelLeaveManagement t2 on t.Id=t2.LeaveId WHERE 1=1 and(t2.CheckStatus !=2 or t2.CheckStatus is null)  
+                and t.checktime <='" + DateTime.Now + "' and t.checktime >='" + HisTime + "' and t.CreateUserNo='" + CreateUserNo + "' ");
+                var data = this.BaseRepository("CollegeMIS").FindList<StuLeaveManagementEntity>(sb.ToString());
+                if (data.Count() > 0)
+                {
+                    foreach (var item in data)
+                    {
+                        return Convert.ToInt32(item.num);
+                    }
+                }
+                return 0;
+            }
+            catch (Exception e)
+            {
+                Console.WriteLine(e);
+                throw;
+            }
+        }
     }
 }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/VaccinationInfo/VaccinationInfoBLL.cs

@@ -0,0 +1,146 @@
+using Learun.Util;
+using System;
+using System.Data;
+using System.Collections.Generic;
+
+namespace Learun.Application.TwoDevelopment.EducationalAdministration
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2022-07-18 17:52
+    /// 描 述：疫情
+    /// </summary>
+    public class VaccinationInfoBLL : VaccinationInfoIBLL
+    {
+        private VaccinationInfoService vaccinationInfoService = new VaccinationInfoService();
+
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<VaccinationInfoEntity> GetPageList(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                return vaccinationInfoService.GetPageList(pagination, queryJson);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取VaccinationInfo表实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        public VaccinationInfoEntity GetVaccinationInfoEntity(string keyValue)
+        {
+            try
+            {
+                return vaccinationInfoService.GetVaccinationInfoEntity(keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        public void DeleteEntity(string keyValue)
+        {
+            try
+            {
+                vaccinationInfoService.DeleteEntity(keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <param name="entity">实体</param>
+        /// <returns></returns>
+        public void SaveEntity(string keyValue, VaccinationInfoEntity entity)
+        {
+            try
+            {
+                vaccinationInfoService.SaveEntity(keyValue, entity);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        #endregion
+        /// <summary>
+        /// 生成实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        public void CreateEntity(string userId, string Description)
+        {
+            try
+            {
+                vaccinationInfoService.CreateEntity(userId, Description);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+    }
+}

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/VaccinationInfo/VaccinationInfoEntity.cs

@@ -0,0 +1,170 @@
+using Learun.Util;
+using System;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Learun.Application.TwoDevelopment.EducationalAdministration
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2022-07-18 17:52
+    /// 描 述：疫情
+    /// </summary>
+    public class VaccinationInfoEntity
+    {
+        #region 实体成员
+        /// <summary>
+        /// Id
+        /// </summary>
+        [Column("ID")]
+        public string Id { get; set; }
+        /// <summary>
+        /// 0:学生1:教师
+        /// </summary>
+        [Column("STUORTEACH")]
+        public int? StuOrTeach { get; set; }
+        /// <summary>
+        /// StuNo
+        /// </summary>
+        [Column("STUNO")]
+        public string StuNo { get; set; }
+        /// <summary>
+        /// StuName
+        /// </summary>
+        [Column("STUNAME")]
+        public string StuName { get; set; }
+        /// <summary>
+        /// CardId
+        /// </summary>
+        [Column("CARDID")]
+        public string CardId { get; set; }
+        /// <summary>
+        /// DepartmentId
+        /// </summary>
+        [Column("DEPARTMENTID")]
+        public string DepartmentId { get; set; }
+        /// <summary>
+        /// DeptNo
+        /// </summary>
+        [Column("DEPTNO")]
+        public string DeptNo { get; set; }
+        /// <summary>
+        /// MajorNo
+        /// </summary>
+        [Column("MAJORNO")]
+        public string MajorNo { get; set; }
+        /// <summary>
+        /// ClassNo
+        /// </summary>
+        [Column("CLASSNO")]
+        public string ClassNo { get; set; }
+        /// <summary>
+        /// Mobile
+        /// </summary>
+        [Column("MOBILE")]
+        public string Mobile { get; set; }
+        /// <summary>
+        /// EmpNo
+        /// </summary>
+        [Column("EMPNO")]
+        public string EmpNo { get; set; }
+        /// <summary>
+        /// EmpName
+        /// </summary>
+        [Column("EMPNAME")]
+        public string EmpName { get; set; }
+        /// <summary>
+        /// 生日
+        /// </summary>
+        [Column("BIRTHDAY")]
+        public DateTime? Birthday { get; set; }
+        /// <summary>
+        /// 接种类型
+        /// </summary>
+        [Column("VACCINETYPE")]
+        public string VaccineType { get; set; }
+        /// <summary>
+        /// NotReason
+        /// </summary>
+        [Column("NOTREASON")]
+        public string NotReason { get; set; }
+        /// <summary>
+        /// FirstNeedle
+        /// </summary>
+        [Column("FIRSTNEEDLE")]
+        public DateTime? FirstNeedle { get; set; }
+        /// <summary>
+        /// SecondNeedle
+        /// </summary>
+        [Column("SECONDNEEDLE")]
+        public DateTime? SecondNeedle { get; set; }
+        /// <summary>
+        /// ThirdNeedle
+        /// </summary>
+        [Column("THIRDNEEDLE")]
+        public DateTime? ThirdNeedle { get; set; }
+        /// <summary>
+        /// Remark
+        /// </summary>
+        [Column("REMARK")]
+        public string Remark { get; set; }
+        /// <summary>
+        /// State
+        /// </summary>
+        [Column("STATE")]
+        public int? State { get; set; }
+        /// <summary>
+        /// CreateTime
+        /// </summary>
+        [Column("CREATETIME")]
+        public DateTime? CreateTime { get; set; }
+        /// <summary>
+        /// CreateUser
+        /// </summary>
+        [Column("CREATEUSER")]
+        public string CreateUser { get; set; }
+        /// <summary>
+        /// LastTime
+        /// </summary>
+        [Column("LASTTIME")]
+        public DateTime? LastTime { get; set; }
+        /// <summary>
+        /// LastUser
+        /// </summary>
+        [Column("LASTUSER")]
+        public string LastUser { get; set; }
+        /// <summary>
+        /// 接种地
+        /// </summary>
+        [Column("VACCINEADDRESS")]
+        public string VaccineAddress { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        [NotMapped]
+        public int? Age { get; set; }
+        #endregion
+
+        #region 扩展操作
+        /// <summary>
+        /// 新增调用
+        /// </summary>
+        public void Create()
+        {
+            this.Id = Guid.NewGuid().ToString();
+        }
+        /// <summary>
+        /// 编辑调用
+        /// </summary>
+        /// <param name="keyValue"></param>
+        public void Modify(string keyValue)
+        {
+            this.Id = keyValue;
+        }
+        #endregion
+        #region 扩展字段
+        #endregion
+    }
+}
+

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/VaccinationInfo/VaccinationInfoIBLL.cs

@@ -0,0 +1,51 @@
+using Learun.Util;
+using System.Data;
+using System.Collections.Generic;
+
+namespace Learun.Application.TwoDevelopment.EducationalAdministration
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2022-07-18 17:52
+    /// 描 述：疫情
+    /// </summary>
+    public interface VaccinationInfoIBLL
+    {
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        IEnumerable<VaccinationInfoEntity> GetPageList(Pagination pagination, string queryJson);
+        /// <summary>
+        /// 获取VaccinationInfo表实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        VaccinationInfoEntity GetVaccinationInfoEntity(string keyValue);
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        void DeleteEntity(string keyValue);
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <param name="entity">实体</param>
+        void SaveEntity(string keyValue, VaccinationInfoEntity entity);
+        #endregion
+        /// <summary>
+        /// 生成
+        /// </summary>
+        void CreateEntity(string userId,string Description);
+    }
+}

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/VaccinationInfo/VaccinationInfoService.cs

@@ -0,0 +1,284 @@
+using Dapper;
+using Learun.DataBase.Repository;
+using Learun.Util;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Text;
+
+namespace Learun.Application.TwoDevelopment.EducationalAdministration
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2022-07-18 17:52
+    /// 描 述：疫情
+    /// </summary>
+    public class VaccinationInfoService : RepositoryFactory
+    {
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="pagination">查询参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<VaccinationInfoEntity> GetPageList(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                var strSql = new StringBuilder();
+                strSql.Append("SELECT ");
+                strSql.Append(@" t.* ");
+                strSql.Append("  FROM VaccinationInfo t ");
+                strSql.Append("  left join ClassInfo c on t.classno = c.classno ");
+                strSql.Append("  WHERE 1=1 ");
+                var login = LoginUserInfo.Get();
+                var queryParam = queryJson.ToJObject();
+                // 虚拟参数
+                var dp = new DynamicParameters(new { });
+                var StuOrTeach = queryParam["StuOrTeach"].ToString();
+                if (StuOrTeach == "0")
+                {
+                    if (!queryParam["StuOrTeach"].IsEmpty())
+                    {
+                        dp.Add("StuOrTeach", queryParam["StuOrTeach"].ToString(), DbType.Int32);
+                        strSql.Append(" AND t.StuOrTeach = @StuOrTeach ");
+                    }
+                    if (!queryParam["StuNo"].IsEmpty())
+                    {
+                        dp.Add("StuNo", "%" + queryParam["StuNo"].ToString() + "%", DbType.String);
+                        strSql.Append(" AND t.StuNo Like @StuNo ");
+                    }
+                    if (!queryParam["StuName"].IsEmpty())
+                    {
+                        dp.Add("StuName", "%" + queryParam["StuName"].ToString() + "%", DbType.String);
+                        strSql.Append(" AND t.StuName Like @StuName ");
+                    }
+                    if (!queryParam["DeptNo"].IsEmpty())
+                    {
+                        dp.Add("DeptNo", queryParam["DeptNo"].ToString(), DbType.String);
+                        strSql.Append(" AND t.DeptNo = @DeptNo ");
+                    }
+                    if (!queryParam["MajorNo"].IsEmpty())
+                    {
+                        dp.Add("MajorNo", queryParam["MajorNo"].ToString(), DbType.String);
+                        strSql.Append(" AND t.MajorNo = @MajorNo ");
+                    }
+                    if (!queryParam["ClassNo"].IsEmpty())
+                    {
+                        dp.Add("ClassNo", queryParam["ClassNo"].ToString(), DbType.String);
+                        strSql.Append(" AND t.ClassNo = @ClassNo ");
+                    }
+                    if (!queryParam["CardId"].IsEmpty())
+                    {
+                        dp.Add("CardId", "%" + queryParam["CardId"].ToString() + "%", DbType.String);
+                        strSql.Append(" AND t.CardId like  @CardId ");
+                    }
+                    if (!queryParam["VaccineType"].IsEmpty())
+                    {
+                        dp.Add("VaccineType", queryParam["VaccineType"].ToString(), DbType.String);
+                        strSql.Append(" AND t.VaccineType =@VaccineType ");
+                    }
+                    if (!queryParam["Mobile"].IsEmpty())
+                    {
+                        dp.Add("Mobile", "%" + queryParam["Mobile"].ToString() + "%", DbType.String);
+                        strSql.Append(" AND t.Mobile like  @Mobile ");
+                    }
+                    if (login.Description == "教师")
+                    {
+                        strSql.Append(" AND c.ClassDiredctorno = '" + login.account + "' ");
+                    }
+                }
+                else if (StuOrTeach == "1")
+                {
+                    if (!queryParam["StuOrTeach"].IsEmpty())
+                    {
+                        dp.Add("StuOrTeach", queryParam["StuOrTeach"].ToString(), DbType.Int32);
+                        strSql.Append(" AND t.StuOrTeach = @StuOrTeach ");
+                    }
+                    if (!queryParam["VaccineType"].IsEmpty())
+                    {
+                        dp.Add("VaccineType", queryParam["VaccineType"].ToString(), DbType.String);
+                        strSql.Append(" AND t.VaccineType =@VaccineType ");
+                    }
+                    if (!queryParam["DepartmentId"].IsEmpty())
+                    {
+                        dp.Add("DepartmentId", queryParam["DepartmentId"].ToString(), DbType.String);
+                        strSql.Append(" AND t.DepartmentId = @DepartmentId ");
+                    }
+                    if (!queryParam["CardId"].IsEmpty())
+                    {
+                        dp.Add("CardId", "%" + queryParam["CardId"].ToString() + "%", DbType.String);
+                        strSql.Append(" AND t.CardId like  @CardId ");
+                    }
+                    if (!queryParam["Mobile"].IsEmpty())
+                    {
+                        dp.Add("Mobile", "%" + queryParam["Mobile"].ToString() + "%", DbType.String);
+                        strSql.Append(" AND t.Mobile like  @Mobile ");
+                    }
+                    if (!queryParam["EmpNo"].IsEmpty())
+                    {
+                        dp.Add("EmpNo", "%" + queryParam["EmpNo"].ToString() + "%", DbType.String);
+                        strSql.Append(" AND t.EmpNo Like @EmpNo ");
+                    }
+                    if (!queryParam["EmpName"].IsEmpty())
+                    {
+                        dp.Add("EmpName", "%" + queryParam["EmpName"].ToString() + "%", DbType.String);
+                        strSql.Append(" AND t.EmpName Like @EmpName ");
+                    }
+                }
+
+                var data = this.BaseRepository("CollegeMIS").FindList<VaccinationInfoEntity>(strSql.ToString(), dp, pagination);
+                if (data.Count() > 0 && StuOrTeach == "0")
+                {
+                    foreach (var item in data)
+                    {
+                        item.Age = DateTime.Now.Year - Convert.ToInt32(item.CardId.ToString().Substring(6, 4));
+                    }
+                }
+                return data;
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取VaccinationInfo表实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        public VaccinationInfoEntity GetVaccinationInfoEntity(string keyValue)
+        {
+            try
+            {
+                return this.BaseRepository("CollegeMIS").FindEntity<VaccinationInfoEntity>(keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        public void DeleteEntity(string keyValue)
+        {
+            try
+            {
+                this.BaseRepository("CollegeMIS").Delete<VaccinationInfoEntity>(t => t.Id == keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <param name="entity">实体</param>
+        public void SaveEntity(string keyValue, VaccinationInfoEntity entity)
+        {
+            try
+            {
+                var logininfo = LoginUserInfo.Get();
+                if (!string.IsNullOrEmpty(keyValue))
+                {
+                    entity.LastTime = DateTime.Now;
+                    entity.LastUser = logininfo.userId;
+                    entity.Modify(keyValue);
+                    this.BaseRepository("CollegeMIS").Update(entity);
+                }
+                else
+                {
+                    entity.Create();
+                    this.BaseRepository("CollegeMIS").Insert(entity);
+                }
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        #endregion
+        /// <summary>
+        /// 生成实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        public void CreateEntity(string userId, string Description)
+        {
+            try
+            {
+                if (Description == "0")
+                {
+                    this.BaseRepository("CollegeMIS").ExecuteBySql(@"insert into VaccinationInfo(
+                    Id, StuOrTeach, stuno, stuname, CardId, deptno, majorno, classno, Mobile, birthday, CreateTime, CreateUser)
+                    select NEWID(),'" + Description + "',stuno,stuname,IdentityCardNo,DeptNo,MajorNo,ClassNo,Mobile,birthday,'"
+                                                                   + DateTime.Now + "','" + userId
+                                                                   + "' from StuInfoBasic where CheckMark = '1' and stuno not in (select stuno from VaccinationInfo where stuno is not null)");
+                }
+                else
+                {
+                    this.BaseRepository("CollegeMIS").ExecuteBySql(@"insert into VaccinationInfo(
+                    Id,StuOrTeach,CardId,empno,empname,DepartmentId,Mobile,birthday,CreateTime,CreateUser)
+                   select NEWID(),'" + Description + "',IdentityCardNo,EmpNo,empname,F_DepartmentId,Mobile,birthday,'"
+                                                                   + DateTime.Now + "','" + userId
+                                                                   + "' from empinfo where CheckMark = '1' and EmpNo not in (select EmpNo from VaccinationInfo where EmpNo is not null)");
+                }
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+    }
+}

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj

@@ -1807,6 +1807,10 @@
     <Compile Include="EducationalAdministration\Acc_DormitoryChange\Acc_DormitoryChangeService.cs" />
     <Compile Include="EducationalAdministration\Acc_DormitoryChange\Acc_DormitoryChangeBLL.cs" />
     <Compile Include="EducationalAdministration\Acc_DormitoryChange\Acc_DormitoryChangeIBLL.cs" />
+    <Compile Include="EducationalAdministration\VaccinationInfo\VaccinationInfoEntity.cs" />
+    <Compile Include="EducationalAdministration\VaccinationInfo\VaccinationInfoService.cs" />
+    <Compile Include="EducationalAdministration\VaccinationInfo\VaccinationInfoBLL.cs" />
+    <Compile Include="EducationalAdministration\VaccinationInfo\VaccinationInfoIBLL.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\Learun.Application.Organization\Learun.Application.Organization.csproj">

Learun.Framework.Ultimate V7/Quanjiang.DigitalScholl.JobService/App.config

@@ -13,6 +13,8 @@
     <add name="YKTDBString" connectionString="Data Source=xcykt;Persist Security Info=True;User ID=xcysdata;Password=xcysdata2019;Unicode=True" providerName="System.Data.OracleClient" />
     <add name="mjDBString" connectionString="Server=112.45.152.8,17049;Initial Catalog=mjxtjh;User ID=mjxtjh;Password=s1RKFzJvIG7KfcNRtntZ" providerName="System.Data.SqlClient" />
     <add name="tsDBString" connectionString="Server=112.45.152.8,17049;Initial Catalog=tsgxtjh;User ID=tsgxtjh;Password=Qs6cYOzFoQupbr12MFZm" providerName="System.Data.SqlClient" />
+    <add name="TLMZYMiddleDBString" connectionString="Data Source=TLMZYMIDDLE;Persist Security Info=True;User ID=digitalschool;Password=digitalschool;Unicode=True" providerName="System.Data.OracleClient" />
+
   </connectionStrings>
   <startup>
     <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />

Learun.Framework.Ultimate V7/Quanjiang.DigitalScholl.JobService/Quanjiang.DigitalScholl.JobService.csproj

@@ -20,9 +20,24 @@
     <SccProvider>
     </SccProvider>
     <TargetFrameworkProfile />
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
@@ -138,5 +153,17 @@
       <Name>Learun.DataBase</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include=".NETFramework,Version=v4.6.1">
+      <Visible>False</Visible>
+      <ProductName>Microsoft .NET Framework 4.6.1 %28x86 和 x64%29</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>