diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EvaluationTeach/EvaluationTeach.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EvaluationTeach/EvaluationTeach.js index 347ad0d1b..2c9a28807 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EvaluationTeach/EvaluationTeach.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EvaluationTeach/EvaluationTeach.js @@ -1,4 +1,4 @@ -(function () { +(function () { var multipleData = null; var page = { grid: null, @@ -36,7 +36,7 @@ if (param.multipleData) { _postParam.queryJson = JSON.stringify(multipleData); } - learun.httpget(config.webapi + '/learun/eval/studentlist', _postParam, (data) => { + learun.httpget(config.webapi + '/learun/adms/eval/studentlist', _postParam, (data) => { $page.find('.lr-badge').text('0'); if (data) { $page.find('.lr-badge').text(data.records); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EvaluationTeach/EvaluationTeahcers/EvaluationTeahcers.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EvaluationTeach/EvaluationTeahcers/EvaluationTeahcers.js index 373a8a33c..7f5aad220 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EvaluationTeach/EvaluationTeahcers/EvaluationTeahcers.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EvaluationTeach/EvaluationTeahcers/EvaluationTeahcers.js @@ -4,7 +4,7 @@ init: function($page, param) { var path = config.webapi; learun.layer.loading(true, "加载数据中..."); - learun.httpget(path + "/learun/eval/paper", { + learun.httpget(path + "/learun/adms/eval/paper", { VID: param.VID }, (res) => { learun.layer.loading(false); @@ -92,7 +92,7 @@ return } // return - learun.httppost(path + "/learun/eval/savepaper", + learun.httppost(path + "/learun/adms/eval/savepaper", { VID: param.VID, LessonNo: param.LessonNo, diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuPunishmentController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuPunishmentController.cs index 569c7f202..b7c36916e 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuPunishmentController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuPunishmentController.cs @@ -37,6 +37,16 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers { return View(); } + /// + /// 解除处分表单页 + /// + /// + [HttpGet] + public ActionResult CancelForm() + { + return View(); + } + #endregion #region 获取数据 @@ -114,9 +124,9 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers /// [HttpPost] [AjaxOnly] - public ActionResult DoCancelPunish(string keyValue, bool status) + public ActionResult DoCancelPunish(string keyValue, bool status, string File) { - stuPunishmentIBLL.DoCancelPunish(keyValue, status); + stuPunishmentIBLL.DoCancelPunish(keyValue, status, File); return Success("操作成功！"); } #endregion diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CdLessonSort/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CdLessonSort/Form.cshtml index e25ccaca0..4bfb7b364 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CdLessonSort/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CdLessonSort/Form.cshtml @@ -11,10 +11,10 @@
分类编号*
-
+ @*
英文名称
-
+
*@
英文缩写
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CdLessonSort/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CdLessonSort/Index.js index 13da6cbdb..a533da9f0 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CdLessonSort/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CdLessonSort/Index.js @@ -74,7 +74,7 @@ var bootstrap = function ($, learun) { headData: [ { label: "分类名称", name: "LessonSortName", width: 100, align: "left" }, { label: "分类编号", name: "LessonSortNo", width: 100, align: "left" }, - { label: "英文名称", name: "EnLessonSortName", width: 100, align: "left" }, + //{ label: "英文名称", name: "EnLessonSortName", width: 100, align: "left" }, { label: "英文缩写", name: "En_Abbr", width: 100, align: "left" }, { label: "选课级别", name: "ChooseLessonLevel", width: 100, align: "left" } ], diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CdMajor/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CdMajor/Form.cshtml index 2b5a13e02..f93cc8e42 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CdMajor/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CdMajor/Form.cshtml @@ -44,14 +44,14 @@
系别
-
+ @*
名称缩写
英文名称
-
+
*@
教委专业代码
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CdMajor/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CdMajor/Index.js index fc4df8b1d..451c1b0ed 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CdMajor/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CdMajor/Index.js @@ -175,8 +175,8 @@ var bootstrap = function ($, learun) { }); } }, - { label: "名称缩写", name: "MajorNameBrief", width: 100, align: "left" }, - { label: "英文名称", name: "MajorNameEn", width: 100, align: "left" }, + //{ label: "名称缩写", name: "MajorNameBrief", width: 100, align: "left" }, + //{ label: "英文名称", name: "MajorNameEn", width: 100, align: "left" }, { label: "教委专业代码", name: "GovMajorNo", width: 100, align: "left" }, { label: "教委专业名称", name: "GovMajorName", width: 200, align: "left" }, { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ClassInfo/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ClassInfo/Index.js index 3bac36860..d61360a5a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ClassInfo/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ClassInfo/Index.js @@ -237,6 +237,7 @@ var bootstrap = function ($, learun) { }); } }, + { label: "联系电话", name: "MobileOne", width: 100, align: "left" }, { label: "辅导员", name: "ClassTutorNo", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { @@ -250,6 +251,7 @@ var bootstrap = function ($, learun) { }); } }, + { label: "联系电话", name: "MobileTwo", width: 100, align: "left" }, { label: "是否启用", name: "CheckMark", width: 80, align: "center", formatter: function (cellvalue) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ClassPlan/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ClassPlan/Index.js index aca03f435..e8de585b5 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ClassPlan/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ClassPlan/Index.js @@ -267,8 +267,8 @@ var bootstrap = function ($, learun) { { label: "拟开教学班数", name: "TeachClassNum", width: 100, align: "left" }, //{ label: "人数", name: "StuNum", width: 80, align: "left" }, { label: "周课时", name: "WeekLessonHour", width: 80, align: "left" }, - { label: "教室课时", name: "WeekHourClassroom", width: 80, align: "left" }, - { label: "上机课时", name: "PracticeHour", width: 80, align: "left" }, + { label: "理论课时", name: "WeekHourClassroom", width: 80, align: "left" }, + { label: "实践课时", name: "PracticeHour", width: 80, align: "left" }, { label: "起始周次", name: "StartWeek", width: 80, align: "left" }, //{ label: "结束周次", name: "EndWeek", width: 80, align: "left" }, //{ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ClassPlan/IndexSchool.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ClassPlan/IndexSchool.js index 73ef466e3..c034d9e2d 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ClassPlan/IndexSchool.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ClassPlan/IndexSchool.js @@ -90,8 +90,8 @@ var bootstrap = function ($, learun) { { label: "拟开教学班数", name: "TeachClassNum", width: 100, align: "left" }, //{ label: "人数", name: "StuNum", width: 80, align: "left" }, { label: "周课时", name: "WeekLessonHour", width: 80, align: "left" }, - { label: "教室课时", name: "WeekHourClassroom", width: 80, align: "left" }, - { label: "上机课时", name: "PracticeHour", width: 80, align: "left" }, + { label: "理论课时", name: "WeekHourClassroom", width: 80, align: "left" }, + { label: "实践课时", name: "PracticeHour", width: 80, align: "left" }, { label: "起始周次", name: "StartWeek", width: 80, align: "left" }, //{ label: "结束周次", name: "EndWeek", width: 80, align: "left" }, //{ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.cshtml index 7643558b7..cc04a0431 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.cshtml @@ -33,7 +33,7 @@
  • 基本信息
  • 教育经历
  • 专业技术职务经历
    • -
  • 工人技术等级经历
    • + @*
  • 工人技术等级经历
    • *@
  • 工作简历
  • 家庭情况
  • 证书信息
    • @@ -380,9 +380,9 @@
    -
    + @*
    -
    +
    *@
    diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.js index 3f609ace8..665ae19da 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.js @@ -62,7 +62,7 @@ var bootstrap = function ($, learun) { //选项卡 $("#PM_EducationExperience").attr("src", "/EducationalAdministration/PM_EducationExperience/Index?empId=" + NewEmpId); $("#PM_TechnicalPost").attr("src", "/EducationalAdministration/PM_TechnicalPost/Index?empId=" + NewEmpId); - $("#PM_WorkerTechnology").attr("src", "/EducationalAdministration/PM_WorkerTechnology/Index?empId=" + NewEmpId); + //$("#PM_WorkerTechnology").attr("src", "/EducationalAdministration/PM_WorkerTechnology/Index?empId=" + NewEmpId); $("#PM_Resume").attr("src", "/EducationalAdministration/PM_Resume/Index?empId=" + NewEmpId); $("#PM_FamilySituation").attr("src", "/EducationalAdministration/PM_FamilySituation/Index?empId=" + NewEmpId); $("#TeacherCertificate").attr("src", "/PersonnelManagement/TeacherCertificate/Index?empId=" + NewEmpId); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.js index cfc27ca61..23ba5cb53 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.js @@ -70,7 +70,7 @@ var bootstrap = function ($, learun) { // 是否允许搜索 allowSearch: true, // 访问数据接口地址 - url: top.$.rootUrl + '/LR_OrganizationModule/Department/GetTreeNoCheck', + //url: top.$.rootUrl + '/LR_OrganizationModule/Department/GetTreeNoCheck', // 访问数据接口参数 }); //职工状态 diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/LessonInfo/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/LessonInfo/Form.cshtml index 007811b35..dd7d122c2 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/LessonInfo/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/LessonInfo/Form.cshtml @@ -43,11 +43,15 @@
    周实验学时*
    -
    +
    每周课时*
    -
    +
    +
    每周课时*
    + +
    +
    是否先修
    @@ -60,8 +64,8 @@
    -
    课程分类
    -
    +
    课程分类*
    +
    课程分类明细
    diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/LessonInfo/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/LessonInfo/Index.js index 4d1f4d643..9cc59a33a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/LessonInfo/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/LessonInfo/Index.js @@ -189,6 +189,7 @@ var bootstrap = function ($, learun) { { label: "周理论学时", name: "WeekStudyHour", width: 80, align: "left" }, { label: "周实验学时", name: "WeekPracticeHour", width: 80, align: "left" }, { label: "每周课时", name: "TotalStudyHour", width: 80, align: "left" }, + { label: "总课时", name: "TotalHours", width: 80, align: "left" }, { label: "是否先修", name: "HaveBeforeLesson", width: 80, align: "left", formatter: function (cellvalue) { @@ -274,6 +275,7 @@ var bootstrap = function ($, learun) { { label: "周理论学时", name: "WeekStudyHour", width: 80, align: "left" }, { label: "周实验学时", name: "WeekPracticeHour", width: 80, align: "left" }, { label: "每周课时", name: "TotalStudyHour", width: 80, align: "left" }, + { label: "总学时", name: "TotalHours", width: 80, align: "left" }, { label: "是否先修", name: "HaveBeforeLesson", width: 80, align: "left", formatter: function (cellvalue) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEncourgement/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEncourgement/Form.cshtml index 8439d9669..15c281c86 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEncourgement/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEncourgement/Form.cshtml @@ -23,6 +23,10 @@
    奖励名称*
    +
    +
    奖励类型*
    +
    +
    奖励原因*
    @@ -35,5 +39,9 @@
    奖励日期*
    +
    +
    附件
    +
    +
    @Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuEncourgement/Form.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEncourgement/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEncourgement/Form.js index 3bada9dba..04d37ae6f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEncourgement/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEncourgement/Form.js @@ -93,13 +93,15 @@ var bootstrap = function ($, learun) { } }); + $('#FilePath').lrUploader(); + $("#AwardType").lrDataItemSelect({ code: 'TLMAwardType' }); }, initData: function () { if (!!keyValue) { $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/StuEncourgement/GetFormData?keyValue=' + keyValue, function (data) { for (var id in data) { if (!!data[id].length && data[id].length > 0) { - $('#' + id ).jfGridSet('refreshdata', data[id]); + $('#' + id).jfGridSet('refreshdata', data[id]); } else { $('[data-table="' + id + '"]').lrSetFormData(data[id]); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEncourgement/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEncourgement/Index.js index 1960822bb..f7cbe69ad 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEncourgement/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEncourgement/Index.js @@ -19,12 +19,12 @@ var bootstrap = function ($, learun) { }); // 新增 $('#lr_add').on('click', function () { - learun.layerForm({ + learun.layerForm({ id: 'form', title: '新增', url: top.$.rootUrl + '/EducationalAdministration/StuEncourgement/Form', width: 600, - height: 400, + height: 500, callBack: function (id) { return top[id].acceptClick(refreshGirdData); } @@ -39,7 +39,7 @@ var bootstrap = function ($, learun) { title: '编辑', url: top.$.rootUrl + '/EducationalAdministration/StuEncourgement/Form?keyValue=' + keyValue, width: 600, - height: 400, + height: 500, callBack: function (id) { return top[id].acceptClick(refreshGirdData); } @@ -50,9 +50,9 @@ var bootstrap = function ($, learun) { $('#lr_delete').on('click', function () { var keyValue = $('#gridtable').jfGridValue('ID'); if (learun.checkrow(keyValue)) { - learun.layerConfirm('是否确认删除该项！', function (res) { + learun.layerConfirm('是否确认删除该项！', function (res) { if (res) { - learun.deleteForm(top.$.rootUrl + '/EducationalAdministration/StuEncourgement/DeleteForm', { keyValue: keyValue}, function () { + learun.deleteForm(top.$.rootUrl + '/EducationalAdministration/StuEncourgement/DeleteForm', { keyValue: keyValue }, function () { refreshGirdData(); }); } @@ -65,21 +65,33 @@ var bootstrap = function ($, learun) { $('#gridtable').lrAuthorizeJfGrid({ url: top.$.rootUrl + '/EducationalAdministration/StuEncourgement/GetPageList', headData: [ - { label: "学号", name: "StuNo", width: 100, align: "left"}, - { label: "姓名", name: "StuName", width: 100, align: "left"}, - { label: "奖励名称", name: "EncourgeName", width: 100, align: "left"}, - { label: "奖励原因", name: "Reason", width: 100, align: "left"}, - { label: "奖励金额", name: "Fee", width: 100, align: "left"}, - { label: "奖励日期", name: "EncourgeDate", width: 100, align: "left"}, + { label: "学号", name: "StuNo", width: 100, align: "left" }, + { label: "姓名", name: "StuName", width: 100, align: "left" }, + { label: "奖励名称", name: "EncourgeName", width: 200, align: "left" }, + { + label: "奖励类型", name: "AwardType", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'TLMAwardType', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, + { label: "奖励原因", name: "Reason", width: 200, align: "left" }, + { label: "奖励金额", name: "Fee", width: 100, align: "left" }, + { label: "奖励日期", name: "EncourgeDate", width: 100, align: "left" }, ], - mainId:'ID', + mainId: 'ID', isPage: true }); page.search(); }, search: function (param) { param = param || {}; - $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) }); + $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); } }; refreshGirdData = function () { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/Form.cshtml index ede79a9a1..7fc24e747 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/Form.cshtml @@ -33,7 +33,23 @@
    -
    系所号
    +
    生源地
    +
    +
    +
    +
    疆内
    +
    +
    +
    +
    毕业学校
    + +
    +
    +
    毕业生类型
    +
    +
    +
    +
    院系
    @@ -129,19 +145,22 @@
    精准贫困户
    -
    -
    开户银行*
    -
    -
    -
    -
    银行卡账号*
    - -
    -
    -
    开户银行位置
    - -
    - +
    +
    开户银行*
    +
    +
    +
    +
    银行卡账号*
    + +
    +
    +
    开户银行位置
    + +
    +
    +
    开户行号
    + +
    拍照
    diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/Form.js index cc3d59d23..c0321d48e 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/Form.js @@ -15,7 +15,7 @@ var bootstrap = function ($, learun) { page.initData(); }, bind: function () { - $('#DepositBank').lrDataItemSelect({ code: 'DepositBank' }); + $('#DepositBank').lrDataItemSelect({ code: 'DepositBank' }); $("#GenderNo").lrDataItemSelect({ code: 'usersex' }); $("#PartyFaceNo").lrDataItemSelect({ code: 'PolityStatus' }); $("#FamilyOriginNo").lrDataItemSelect({ code: 'ExamineeCategory' }); @@ -26,7 +26,37 @@ var bootstrap = function ($, learun) { $("#MatriculateSort").lrDataItemSelect({ code: 'EnrollStyle' }); $('#ResidenceNo').lrDataItemSelect({ code: 'ResidenceNo' }); $('#IsPoor').lrDataItemSelect({ code: 'YesOrNoInt' }); - + $('#GraduateType').lrDataItemSelect({ code: 'GraduateType' }); + $('#Province').lrselect({ + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=' + 'DIC_PROVINCE', + //param: { strWhere: " cparent= 650000 " }, + value: 'pcode', + text: 'pname', + maxHeight: 200, + allowSearch: true, + select: function (item) { + var Citys = $("#Province").lrselectGet(); + if (Citys != null && Citys != "" && Citys != undefined) { + $('#City').lrselectRefresh({ + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=DIC_CITY', + param: { strWhere: " 1=1 and cparent in (" + Citys + ")" }, + allowSearch: true, + value: "ccode", + text: "cname", + maxHeight: 200 + }); + } else { + $('#City').lrselectRefresh({ + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=DIC_CITY', + param: { strWhere: " 1=1 and cparent ='' " }, + value: "ccode", + text: "cname", + maxHeight: 200 + }); + } + } + }) + $("#City").lrselect(); $('#StuInfoFreshFamily').jfGrid({ headData: [ { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/Index.js index b22d61222..8ec7e682d 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/Index.js @@ -199,7 +199,7 @@ var bootstrap = function ($, learun) { } }, { - label: '系', name: 'DeptNo', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { + label: '院系', name: 'DeptNo', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { learun.clientdata.getAsync('custmerData', { url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdDeptInfo', key: value, @@ -279,6 +279,45 @@ var bootstrap = function ($, learun) { }); } }, + { + label: '生源地', name: 'Province', width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'DIC_PROVINCE', + key: value, + keyId: 'pcode', + callback: function (_data) { + callback(_data['pname']); + } + }); + } + }, + { + label: '疆内', name: 'City', width: 150, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'DIC_CITY', + key: value, + keyId: 'ccode', + callback: function (_data) { + callback(_data['cname']); + } + }); + } + }, + { label: '毕业学校', name: 'SchoolTag', width: 100, align: "left" }, + { + label: '毕业生类型', name: 'GraduateType', width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'GraduateType', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, { label: '科类', name: 'TestStuSubjectNo', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { learun.clientdata.getAsync('dataItem', { @@ -321,7 +360,7 @@ var bootstrap = function ($, learun) { { label: '英语', name: 'ForeignLangScore', width: 100, align: "left" }, { label: '综合', name: 'ComprehensiveScore', width: 100, align: "left" }, { - label: '开户银行', name: 'DepositBank', width: 100, align: "left", + label: '开户银行', name: 'DepositBank', width: 200, align: "left", formatterAsync: function (callback, value, row, op, $cell) { learun.clientdata.getAsync('dataItem', { key: value, @@ -333,7 +372,8 @@ var bootstrap = function ($, learun) { } }, { label: '银行卡账号', name: 'BankCard', width: 150, align: "left" }, - { label: '开户银行位置', name: 'BankLocation', width: 200, align: "left" }, + { label: '开户银行位置', name: 'BankLocation', width: 300, align: "left" }, + { label: '开户行号', name: 'BankNo', width: 150, align: "center" }, ], mainId: 'ID', isPage: true, diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuPunishment/CancelForm.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuPunishment/CancelForm.cshtml new file mode 100644 index 000000000..cd819caeb --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuPunishment/CancelForm.cshtml @@ -0,0 +1,15 @@ +@{ + ViewBag.Title = "开课计划"; + Layout = "~/Views/Shared/_Form.cshtml"; +} +
    +
    +
    解除文号*
    + +
    +
    +
    解除文件*
    +
    +
    +
    +@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuPunishment/CancelForm.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuPunishment/CancelForm.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuPunishment/CancelForm.js new file mode 100644 index 000000000..143f1382d --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuPunishment/CancelForm.js @@ -0,0 +1,35 @@ +/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn) + * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + * 创建人：超级管理员 + * 日 期：2021-11-29 11:43 + * 描 述：处分解除 + */ +var acceptClick; +var keyValue = request('keyValue'); +var bootstrap = function ($, learun) { + "use strict"; + var page = { + init: function () { + $('.lr-form-wrap').lrscroll(); + page.bind(); + }, + bind: function () { + $('#CancelFilePatch').lrUploader(); + } + }; + // 保存数据 + acceptClick = function (callBack) { + if (!$('body').lrValidform()) { + return false; + } + var postData = $('#form').lrGetFormData(); + var EmpNo = postData.EmpNo; + var File = postData.CancelFilePatch; + $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/StuPunishment/DoCancelPunish', { keyValue: keyValue, status: true, File: File }, function () { + }); + if (!!callBack) { + callBack(); + } + }; + page.init(); +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuPunishment/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuPunishment/Form.cshtml index 9560e249e..4c4bd4bb0 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuPunishment/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuPunishment/Form.cshtml @@ -3,31 +3,31 @@ Layout = "~/Views/Shared/_Form.cshtml"; }
    -
    +
    学号*
    -
    +
    -
    +
    姓名*
    -
    +
    学年*
    -
    +
    学期*
    处分名称*
    -
    +
    - +
    +
    签发机关
    + +
    任教学科
    diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherCertificate/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherCertificate/Index.js index 33797683a..fea61a031 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherCertificate/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherCertificate/Index.js @@ -171,6 +171,7 @@ var bootstrap = function ($, learun) { }, { label: "证书名称", name: "TCType", width: 150, align: "left" }, { label: "证书编号", name: "TCCode", width: 150, align: "left" }, + { label: "签发机关", name: "TCVisaOffice", width: 150, align: "left" }, { label: "资格种类", name: "TCTypeID", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherPunishment/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherPunishment/Form.cshtml index 63a6acaf1..495ed2fe0 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherPunishment/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherPunishment/Form.cshtml @@ -3,25 +3,29 @@ Layout = "~/Views/Shared/_Form.cshtml"; }
    -
    +
    教师*
    -
    +
    -
    +
    +
    处分文号
    + +
    +
    处分名称*
    -
    +
    处分原因
    - +
    -
    +
    处分开始时间*
    - +
    -
    +
    处分结束时间*
    - +
    @Html.AppendJsFile("/Areas/PersonnelManagement/Views/TeacherPunishment/Form.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherPunishment/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherPunishment/Index.js index 23fd491fb..720381623 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherPunishment/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherPunishment/Index.js @@ -78,10 +78,11 @@ var bootstrap = function ($, learun) { } }); }}, - { label: "处分名称", name: "PunishmentName", width: 100, align: "left"}, - { label: "处分原因", name: "Reason", width: 100, align: "left"}, - { label: "处分开始时间", name: "StartTime", width: 100, align: "left"}, - { label: "处分结束时间", name: "EndTime", width: 100, align: "left"}, + { label: "处分文号", name: "Proof", width: 200, align: "left"}, + { label: "处分名称", name: "PunishmentName", width: 200, align: "left"}, + { label: "处分原因", name: "Reason", width: 200, align: "left"}, + { label: "处分开始时间", name: "StartTime", width: 200, align: "left"}, + { label: "处分结束时间", name: "EndTime", width: 200, align: "left"}, ], mainId:'Id', isPage: true diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherTitleEvaluation/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherTitleEvaluation/Form.cshtml index fba400918..53be87893 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherTitleEvaluation/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherTitleEvaluation/Form.cshtml @@ -15,6 +15,10 @@
    教师姓名*
    +
    +
    聘任时间
    + +
    评定时间*
    diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherTitleEvaluation/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherTitleEvaluation/Index.js index 1753e738e..99ba6b66f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherTitleEvaluation/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherTitleEvaluation/Index.js @@ -167,6 +167,12 @@ var bootstrap = function ($, learun) { }); } }, + { + label: "聘任时间", name: "TTInSchoolDate", width: 120, align: "left", + formatter: function (cellvalue) { + return learun.formatDate(cellvalue, 'yyyy-MM-dd'); + } + }, { label: "性别", name: "Sex", width: 100, align: "left", formatter: function (cellvalue) { return cellvalue == 1 ? "男" : "女" diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherTrain/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherTrain/Form.cshtml index 14a26b38d..cdb8a24a1 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherTrain/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherTrain/Form.cshtml @@ -7,6 +7,10 @@
    教师姓名*
    +
    +
    发放部门
    + +
    培训开始时间*
    diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherTrain/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherTrain/Index.js index bc8e266c0..931567fe2 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherTrain/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherTrain/Index.js @@ -93,6 +93,7 @@ var bootstrap = function ($, learun) { }); } }, + { label: "发放部门", name: "TTDepartment", width: 100, align: "left" }, { label: "培训开始时间", name: "TTStartTime", width: 100, align: "left" }, { label: "培训结束时间", name: "TTEndTime", width: 100, align: "left" }, { label: "培训内容", name: "TTContent", width: 100, align: "left" }, diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj index 70d56d9a0..cfe11f274 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj @@ -1103,6 +1103,7 @@ + @@ -7895,6 +7896,7 @@ + diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/IndexInTeacher.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/IndexInTeacher.cshtml index 1d9a7069d..1af44d0a4 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/IndexInTeacher.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/IndexInTeacher.cshtml @@ -15,7 +15,7 @@ {
  • 教育经历
  • 专业技术职务经历
    • -
  • 工人技术等级经历
    • + @*
  • 工人技术等级经历
    • *@
  • 工作简历
  • 家庭情况
    • } @@ -810,9 +810,9 @@
    -
    + @*
    -
    +
    *@
    diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/IndexInTeacher.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/IndexInTeacher.js index dd739e7b1..259403df3 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/IndexInTeacher.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/IndexInTeacher.js @@ -18,7 +18,7 @@ var bootstrap = function ($, learun) { //选项卡 $("#PM_EducationExperience").attr("src", "/EducationalAdministration/PM_EducationExperience/Index?empId=" + NewEmpId); $("#PM_TechnicalPost").attr("src", "/EducationalAdministration/PM_TechnicalPost/Index?empId=" + NewEmpId); - $("#PM_WorkerTechnology").attr("src", "/EducationalAdministration/PM_WorkerTechnology/Index?empId=" + NewEmpId); + //$("#PM_WorkerTechnology").attr("src", "/EducationalAdministration/PM_WorkerTechnology/Index?empId=" + NewEmpId); $("#PM_Resume").attr("src", "/EducationalAdministration/PM_Resume/Index?empId=" + NewEmpId); $("#PM_FamilySituation").attr("src", "/EducationalAdministration/PM_FamilySituation/Index?empId=" + NewEmpId); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/system.config b/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/system.config index cdab5f3d2..26f5ee6ee 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/system.config +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/system.config @@ -65,7 +65,7 @@ - + @@ -77,11 +77,11 @@ - + - + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ClassInfo/ClassInfoEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ClassInfo/ClassInfoEntity.cs index 167e68b0d..99c2ec017 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ClassInfo/ClassInfoEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ClassInfo/ClassInfoEntity.cs @@ -122,6 +122,10 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } #endregion #region 扩展字段 + [NotMapped] + public string MobileOne { get; set; } + [NotMapped] + public string MobileTwo { get; set; } #endregion } } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ClassInfo/ClassInfoService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ClassInfo/ClassInfoService.cs index 1075e48cd..698dac58b 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ClassInfo/ClassInfoService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ClassInfo/ClassInfoService.cs @@ -30,22 +30,9 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration try { var strSql = new StringBuilder(); - strSql.Append("SELECT "); - strSql.Append(@" - t.ClassId, - t.ClassName, - t.ClassNo, - t.DeptNo, - t.MajorNo, - t.SerialNum, - t.Grade, - t.StuNum, - t.ClassDiredctorNo, - t.ClassTutorNo, - t.ClassType, - t.CheckMark,t.IsSeparate - "); - strSql.Append(" FROM ClassInfo t "); + strSql.Append(" select t.*,fb1.Mobile as MobileOne,fb2.Mobile as MobileTwo from classinfo t "); + strSql.Append(" left join empinfo fb1 on t.classdiredctorno = fb1.EmpNo"); + strSql.Append(" left join empinfo fb2 on t.ClassTutorNo = fb2.EmpNo"); strSql.Append(" WHERE 1=1 "); var queryParam = queryJson.ToJObject(); // 虚拟参数 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/LessonInfo/LessonInfoEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/LessonInfo/LessonInfoEntity.cs index 9c57f9bd0..2e8fa4042 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/LessonInfo/LessonInfoEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/LessonInfo/LessonInfoEntity.cs @@ -11,7 +11,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// 日 期：2019-01-24 17:03 /// 描 述：课程信息管理 ///
    - public class LessonInfoEntity + public class LessonInfoEntity { #region 实体成员 /// @@ -45,6 +45,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration [Column("WEEKSTUDYHOUR")] public decimal? WeekStudyHour { get; set; } /// + /// 总学时 + /// + [Column("TOTALHOURS")] + public decimal? TotalHours { get; set; } + /// /// 周实验学时 /// [Column("WEEKPRACTICEHOUR")] diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/LessonInfo/LessonInfoService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/LessonInfo/LessonInfoService.cs index 96e49ebe8..716339fb2 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/LessonInfo/LessonInfoService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/LessonInfo/LessonInfoService.cs @@ -31,25 +31,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration { var strSql = new StringBuilder(); strSql.Append("SELECT "); - strSql.Append(@" - t.LessonId, - t.LessonNo, - t.LessonName, - t.TeachDeptNo, - t.TeachMajorNo, - t.EnName, - t.StudyScore, - t.WeekStudyHour, - t.WeekPracticeHour, - t.TotalStudyHour, - t.HaveBeforeLesson, - t.BeforeLesson, - t.WhoStudy, - t.LessonSortNo, - t.LessonSortDetailNo, - t.CheckMark, - t.LessonTypeId,t.F_SchoolId - "); + strSql.Append(@" * "); strSql.Append(" FROM LessonInfo t "); strSql.Append(" WHERE 1=1 "); var queryParam = queryJson.ToJObject(); diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEncourgement/StuEncourgementEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEncourgement/StuEncourgementEntity.cs index 2a0bbabc7..609c14f85 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEncourgement/StuEncourgementEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEncourgement/StuEncourgementEntity.cs @@ -40,7 +40,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// [Column("STUNAME")] public string StuName { get; set; } - + /// /// 奖励名称 /// @@ -106,6 +106,17 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration ///     [Column("CHECKMARK")] public string CheckMark { get; set; } + /// + /// 附件路径 + /// + [Column("FILEPATH")] + public string FilePath { get; set; } + /// + /// 奖励类型 + /// + [Column("AWARDTYPE")] + public string AwardType { get; set; } + #endregion #region 扩展操作 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEncourgement/StuEncourgementService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEncourgement/StuEncourgementService.cs index 19ea322af..729330e9f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEncourgement/StuEncourgementService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEncourgement/StuEncourgementService.cs @@ -38,7 +38,9 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration t.EncourgeName, t.Reason, t.Fee, - t.EncourgeDate + t.EncourgeDate, + t.FilePath, + t.AwardType "); strSql.Append(" FROM StuEncourgement t "); strSql.Append(" WHERE 1=1 "); diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshEntity.cs index 01055cb7a..0f076d9da 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshEntity.cs @@ -619,6 +619,31 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration [Column("BANKLOCATION")] public string BankLocation { get; set; } + /// + /// 生源地 + /// + [Column("PROVINCE")] + public string Province { get; set; } + /// + /// 疆内 + /// + [Column("CITY")] + public string City { get; set; } + /// + /// 毕业学校 + /// + [Column("SCHOOLTAG")] + public string SchoolTag { get; set; } + /// + /// 毕业生类别 + /// + [Column("GRADUATETYPE")] + public string GraduateType { get; set; } + /// + /// 开户行号 + /// + [Column("BANKNO")] + public string BankNo { get; set; } #endregion #region 扩展操作 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshService.cs index d98219818..64b293b98 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshService.cs @@ -28,85 +28,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration private string fieldSql; public StuInfoFreshService() { - fieldSql = @" - t.ID, - t.NoticeNo, - t.ksh, - t.zkzh, - t.StuNo, - t.StuName, - t.DeptNo, - t.GenderNo, - t.MajorNo, - t.MajorDetailNok, - t.MajorDetailName, - t.Birthday, - t.PartyFaceNo, - t.FamilyOriginNo, - t.NationalityNo, - t.ResidenceNo, - t.TestStuSortNo, - t.HealthStatusNo, - t.WillNo, - t.TestStuSubjectNo, - t.GraduateNo, - t.PlanFormNo, - t.HighTestSortNo, - t.HighAmountScore, - t.PoliticsScore, - t.ChineseScore, - t.MathScore, - t.PhysicsScore, - t.ChemScore, - t.BiologyScore, - t.ForeignLangScore, - t.ForeignLangOralScore, - t.ComprehensiveScore, - t.ForeignLangSpecies, - t.IsThreeGood, - t.IsExcellent, - t.IsNormalCadre, - t.IsProvinceFirstThree, - t.OverseasChineseNo, - t.MatriculateSort, - t.ProvinceNo, - t.HighSchoolNo, - t.RegionNo, - t.Remark, - t.RecruitYearDate, - t.ClassNo, - t.IdentityCardNo, - t.HighSchoolName, - t.GoodAt, - t.ArriveDate, - t.ArchivesNo, - t.telephone, - t.FamilyAddress, - t.RegisterStatus, - t.MailAddress, - t.PostalCode, - t.TransMark, - t.LogIp, - t.LogNum, - t.Logtime, - t.RecruitDeptNo, - t.RecruitMajorNo, - t.RegisterEmpNo, - t.RegisterEmpName, - t.ApprovedLeader, - t.ChangeReason, - t.ChangeDate, - t.TextNo, - t.SignUpTime, - t.OriginAddress, - t.IsAccommodate, - t.HeightWeight, - t.CreateUserId, - t.UpdateUserId, - t.IsPayUniform, - t.IsGetUniform, - t.Grade - "; + fieldSql = @" * "; } #endregion diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuPunishment/StuPunishmentBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuPunishment/StuPunishmentBLL.cs index d05838389..b1010201c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuPunishment/StuPunishmentBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuPunishment/StuPunishmentBLL.cs @@ -216,11 +216,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// 主键 /// /// - public void DoCancelPunish(string keyValue, bool status) + public void DoCancelPunish(string keyValue, bool status,string File) { try { - stuPunishmentService.DoCancelPunish(keyValue, status); + stuPunishmentService.DoCancelPunish(keyValue, status, File); } catch (Exception ex) { diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuPunishment/StuPunishmentEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuPunishment/StuPunishmentEntity.cs index 72fc3ddec..cf0b3d654 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuPunishment/StuPunishmentEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuPunishment/StuPunishmentEntity.cs @@ -40,7 +40,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// [Column("STUNAME")] public string StuName { get; set; } - + /// /// 处分名称码(参见DM-CFMC《处分名称代码》) /// @@ -67,6 +67,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration [Column("FILENO")] public string FileNo { get; set; } /// + /// 取消处分文号 + /// + [Column("CANCELFILENO")] + public string CancelFileNo { get; set; } + /// /// 处分撤消日期 /// [Column("WITHDRAWDATE")] @@ -106,6 +111,23 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// [Column("CANCELPUNISHDATE")] public DateTime? CancelPunishDate { get; set; } + + /// + /// 附件路径 + /// + [Column("FilePatch")] + public string FilePatch { get; set; } + /// + /// 取消文件路径 + /// + [Column("CANCELFILEPATCH")] + public string CancelFilePatch { get; set; } + /// + /// 取消用户 + /// + [Column("CANCELUSER")] + public string CancelUser { get; set; } + #endregion #region 扩展操作 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuPunishment/StuPunishmentIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuPunishment/StuPunishmentIBLL.cs index 1c35cbc4e..8911e4e57 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuPunishment/StuPunishmentIBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuPunishment/StuPunishmentIBLL.cs @@ -73,7 +73,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// 主键 /// /// - void DoCancelPunish(string keyValue, bool status); + void DoCancelPunish(string keyValue, bool status, string File); #endregion } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuPunishment/StuPunishmentService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuPunishment/StuPunishmentService.cs index 2f08ca743..7e0db635a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuPunishment/StuPunishmentService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuPunishment/StuPunishmentService.cs @@ -244,20 +244,21 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// 主键 /// /// - public void DoCancelPunish(string keyValue, bool status) + public void DoCancelPunish(string keyValue, bool status, string File) { try { + var userList = LoginUserInfo.Get(); var keyvalue = Convert.ToInt32(keyValue); if (status) { //解除处分 - this.BaseRepository("CollegeMIS").ExecuteBySql("update StuPunishment set IsCancelPunish=1,CancelPunishDate='" + DateTime.Now + "' where Id= " + keyValue); + this.BaseRepository("CollegeMIS").ExecuteBySql("update StuPunishment set IsCancelPunish=1,CancelUser='" + userList.realName + "',CancelPunishDate='" + DateTime.Now + "',CancelFilePatch='" + File + "' where Id= " + keyValue); } else { //取消解除处分 - this.BaseRepository("CollegeMIS").ExecuteBySql("update StuPunishment set IsCancelPunish=0,CancelPunishDate=null where Id= " + keyValue); + this.BaseRepository("CollegeMIS").ExecuteBySql("update StuPunishment set IsCancelPunish=0,CancelPunishDate=null,CancelUser=null,CancelFilePatch=null where Id= " + keyValue); } } catch (Exception ex) diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EvaluationTeach/Eval_Main/Eval_MainBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EvaluationTeach/Eval_Main/Eval_MainBLL.cs index e8fbd7078..856e59034 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EvaluationTeach/Eval_Main/Eval_MainBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EvaluationTeach/Eval_Main/Eval_MainBLL.cs @@ -253,6 +253,30 @@ namespace Learun.Application.TwoDevelopment.EvaluationTeach } } } + /// + /// 评教：按教师、课程统计上课人数、评教人数、评教平均分 + /// + /// + /// + /// + public IEnumerable GetTeacherIndexPageList2(Pagination paginationobj, string queryJson) + { + try + { + return ask_MainService.GetTeacherIndexPageList2(paginationobj, queryJson); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } #endregion diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EvaluationTeach/Eval_Main/Eval_MainIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EvaluationTeach/Eval_Main/Eval_MainIBLL.cs index dffb738f1..4c155b3c2 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EvaluationTeach/Eval_Main/Eval_MainIBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EvaluationTeach/Eval_Main/Eval_MainIBLL.cs @@ -56,5 +56,14 @@ namespace Learun.Application.TwoDevelopment.EvaluationTeach IEnumerable GetAnswerPageList(Pagination paginationobj, string queryJson); IEnumerable GetTeacherIndexPageList(Pagination paginationobj, string queryJson); + /// + /// 评教：按教师、课程统计上课人数、评教人数、评教平均分 + /// + /// + /// + /// + IEnumerable GetTeacherIndexPageList2(Pagination paginationobj, string queryJson); + + } } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EvaluationTeach/Eval_Main/Eval_MainService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EvaluationTeach/Eval_Main/Eval_MainService.cs index 90d3a1151..831652470 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EvaluationTeach/Eval_Main/Eval_MainService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EvaluationTeach/Eval_Main/Eval_MainService.cs @@ -344,17 +344,43 @@ namespace Learun.Application.TwoDevelopment.EvaluationTeach var queryParam = queryJson.ToJObject(); var dp = new DynamicParameters(new { }); var strSql = new StringBuilder(); - strSql.Append("select aa.*,bb.UID,cc.EmpName,dd.LessonName,ee.StuName,ee.DeptNo,ee.MajorNo,ee.ClassNo,ff.Iscore from (select a.LessonNo,a.EmpNo,a.AcademicYearNo,a.Semester,b.VID,a.StuNo from " + misdbname + ".dbo.StuSelectLessonList a "); - strSql.Append("left join Eval_Main b on a.AcademicYearNo=b.AcademicYearNo and a.Semester=b.Semester where b.Status=1 ) aa "); - strSql.Append("left join (select distinct b.EmpNo, b.LessonNo, b.UID from Eval_Question a left join Eval_QuestionResult b on a.QID=b.QID) bb on aa.EmpNo=bb.EmpNo and aa.LessonNo=bb.LessonNo and aa.StuNo=bb.UID "); - strSql.Append("left join " + misdbname + ".dbo.EmpInfo cc on aa.EmpNo=cc.EmpNo left join " + misdbname + ".dbo.LessonInfo dd on aa.LessonNo = dd.LessonNo "); - strSql.Append("left join " + misdbname + ".dbo.StuInfoBasic ee on aa.StuNo=ee.StuNo "); - strSql.Append(@" left join ( - select sum(IScore) as IScore, EmpNo, LessonNo, UID from Eval_QuestionResult a left - join Eval_QuestionItems b on a.IID = b.IID - group by EmpNo, LessonNo, UID - ) ff on bb.UID = ff.UID and bb.EmpNo = ff.EmpNo and bb.LessonNo = ff.LessonNo "); - strSql.Append(" where aa.VID='" + queryParam["VID"] + "'"); + //strSql.Append("select aa.*,bb.UID,cc.EmpName,dd.LessonName,ee.StuName,ee.DeptNo,ee.MajorNo,ee.ClassNo,ff.Iscore from (select a.LessonNo,a.EmpNo,a.AcademicYearNo,a.Semester,b.VID,a.StuNo from " + misdbname + ".dbo.StuSelectLessonList a "); + //strSql.Append("left join Eval_Main b on a.AcademicYearNo=b.AcademicYearNo and a.Semester=b.Semester where b.Status=1 ) aa "); + //strSql.Append("left join (select distinct b.EmpNo, b.LessonNo, b.UID from Eval_Question a left join Eval_QuestionResult b on a.QID=b.QID) bb on aa.EmpNo=bb.EmpNo and aa.LessonNo=bb.LessonNo and aa.StuNo=bb.UID "); + //strSql.Append("left join " + misdbname + ".dbo.EmpInfo cc on aa.EmpNo=cc.EmpNo left join " + misdbname + ".dbo.LessonInfo dd on aa.LessonNo = dd.LessonNo "); + //strSql.Append("left join " + misdbname + ".dbo.StuInfoBasic ee on aa.StuNo=ee.StuNo "); + //strSql.Append(@" left join ( + //select sum(IScore) as IScore, EmpNo, LessonNo, UID from Eval_QuestionResult a left + // join Eval_QuestionItems b on a.IID = b.IID + //group by EmpNo, LessonNo, UID + // ) ff on bb.UID = ff.UID and bb.EmpNo = ff.EmpNo and bb.LessonNo = ff.LessonNo "); + //strSql.Append(" where aa.VID='" + queryParam["VID"] + "'"); + + strSql.Append(@" +select aa.LessonNo,aa.EmpNo,aa.AcademicYearNo,aa.Semester,aa.VID,aa.StuNo,bb.IScore,bb.UID,cc.EmpName,dd.LessonName,ee.StuName,ee.DeptNo,ee.MajorNo,ee.ClassNo +from +( +select a.LessonNo,a.EmpNo,a.AcademicYearNo,a.Semester,b.VID,a.StuNo +from " + misdbname + @".dbo.StuSelectLessonList a +left join Eval_Main b on a.AcademicYearNo=b.AcademicYearNo and a.Semester=b.Semester +where b.Status=1 and b.VID='" + queryParam["VID"] + @"' +and a.StuNo is not null and a.StuNo <> '' +) aa +left join +( +select sum(b.IScore) as IScore, a.EmpNo, a.LessonNo, a.UID +from Eval_QuestionResult a +left join Eval_QuestionItems b on a.IID = b.IID +left join Eval_Question c on a.QID=c.QID +where c.VID='" + queryParam["VID"] + @"' +and a.EmpNo is not null and a.EmpNo <> '' and a.LessonNo is not null and a.LessonNo <> '' and a.UID is not null and a.UID <> '' +group by a.EmpNo, a.LessonNo, a.UID +) bb +on aa.EmpNo=bb.EmpNo and aa.LessonNo=bb.LessonNo and aa.StuNo=bb.UID +left join " + misdbname + @".dbo.EmpInfo cc on aa.EmpNo=cc.EmpNo +left join " + misdbname + @".dbo.LessonInfo dd on aa.LessonNo = dd.LessonNo +left join " + misdbname + @".dbo.StuInfoBasic ee on aa.StuNo = ee.StuNo +where 1=1 "); if (!queryParam["StuNo"].IsEmpty()) { @@ -396,7 +422,7 @@ namespace Learun.Application.TwoDevelopment.EvaluationTeach else //多课程 { //dp.Add("LessonNo", "(" + queryParam["LessonNo"].ToString() + ")", DbType.String); - strSql.Append(" AND aa.LessonNo in (" + queryParam["LessonNo"].ToString() + ") "); + //strSql.Append(" AND aa.LessonNo in (" + queryParam["LessonNo"].ToString() + ") "); } } @@ -477,5 +503,72 @@ namespace Learun.Application.TwoDevelopment.EvaluationTeach } } } + /// + /// 评教：按教师、课程统计上课人数、评教人数、评教平均分 + /// + /// + /// + /// + public IEnumerable GetTeacherIndexPageList2(Pagination paginationobj, string queryJson) + { + try + { + //取库名 + var misdbname = BaseRepository("CollegeMIS").getDbConnection().Database; + var queryParam = queryJson.ToJObject(); + var strSql = new StringBuilder(); + strSql.Append(@" +select ee.*,ss.*,cc.EmpName,dd.LessonName from +( +select a.LessonNo,a.EmpNo,count(a.StuNo) as StudentCount +from " + misdbname + @".dbo.StuSelectLessonList a +left join Eval_Main b on a.AcademicYearNo=b.AcademicYearNo and a.Semester=b.Semester +where b.Status=1 and b.VID='" + queryParam["VID"] + @"' +and a.StuNo is not null and a.StuNo <> '' +group by a.LessonNo,a.EmpNo +) ss +left join +( +select aa.EmpNo,aa.LessonNo,sum(aa.IScore) as EvalTotalScore,count(aa.UID) as EvalCount,Convert(decimal(18,2),sum(aa.IScore)/count(aa.UID)) as AverageScore from +( +select sum(b.IScore) as IScore, a.EmpNo, a.LessonNo, a.UID +from Eval_QuestionResult a +left join Eval_QuestionItems b on a.IID = b.IID +left join Eval_Question c on a.QID=c.QID +where c.VID='" + queryParam["VID"] + @"' +and a.EmpNo is not null and a.EmpNo <> '' and a.LessonNo is not null and a.LessonNo <> '' and a.UID is not null and a.UID <> '' +group by a.EmpNo, a.LessonNo, a.UID +) aa +group by aa.EmpNo,aa.LessonNo +) ee +on ee.EmpNo=ss.EmpNo and ee.LessonNo=ss.LessonNo +left join " + misdbname + @".dbo.EmpInfo cc on ss.EmpNo=cc.EmpNo +left join " + misdbname + @".dbo.LessonInfo dd on ss.LessonNo = dd.LessonNo +where 1=1 "); + if (!queryParam["EmpNo"].IsEmpty()) + { + strSql.Append(" and ss.EmpNo='" + queryParam["EmpNo"] + "' "); + } + if (!queryParam["keyword"].IsEmpty()) + { + strSql.Append(" and cc.EmpName like '%" + queryParam["keyword"] + "%' "); + } + strSql.Append(" order by ss.EmpNo,ss.LessonNo"); + + return this.BaseRepository().FindList(strSql.ToString()); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + } } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EvaluationTeach/Eval_QuestionResult/Eval_QuestionResultEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EvaluationTeach/Eval_QuestionResult/Eval_QuestionResultEntity.cs index b4901f5a2..bbedcc62c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EvaluationTeach/Eval_QuestionResult/Eval_QuestionResultEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EvaluationTeach/Eval_QuestionResult/Eval_QuestionResultEntity.cs @@ -79,10 +79,26 @@ namespace Learun.Application.TwoDevelopment.EvaluationTeach [NotMapped] public string MajorNo { get; set; } [NotMapped] public string ClassNo { get; set; } [NotMapped] public string StuNo { get; set; } + /// + /// 分数 + /// [NotMapped] public decimal? IScore { get; set; } + /// + /// 评教平均分（评教总分/评教人数） + /// [NotMapped] public decimal? AverageScore { get; set; } - [NotMapped] public int StudentCount { get; set; } - [NotMapped] public int EvalCount { get; set; } + /// + /// 上课人数 + /// + [NotMapped] public int? StudentCount { get; set; } + /// + /// 评教人数 + /// + [NotMapped] public int? EvalCount { get; set; } + /// + /// 评教总分 + /// + [NotMapped] public decimal? EvalTotalScore { get; set; } #endregion #region 扩展操作 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeacherCertificate/TeacherCertificateEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeacherCertificate/TeacherCertificateEntity.cs index 12fc2d02e..1bf32b1da 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeacherCertificate/TeacherCertificateEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeacherCertificate/TeacherCertificateEntity.cs @@ -30,6 +30,11 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement [Column("TCTYPE")] public string TCType { get; set; } /// + /// 证书名称 + /// + [Column("TCVISAOFFICE")] + public string TCVisaOffice { get; set; } + /// /// 资格种类 /// [Column("TCTYPEID")] diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeacherPunishment/TeacherPunishmentEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeacherPunishment/TeacherPunishmentEntity.cs index d71d5a44c..ea84dadbe 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeacherPunishment/TeacherPunishmentEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeacherPunishment/TeacherPunishmentEntity.cs @@ -25,6 +25,11 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement [Column("EMPID")] public string EmpId { get; set; } /// + /// 文号 + /// + [Column("PROOF")] + public string Proof { get; set; } + /// /// 处分名称 /// [Column("PUNISHMENTNAME")] diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeacherPunishment/TeacherPunishmentService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeacherPunishment/TeacherPunishmentService.cs index 2ed02b692..ba616061e 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeacherPunishment/TeacherPunishmentService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeacherPunishment/TeacherPunishmentService.cs @@ -32,14 +32,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement { var strSql = new StringBuilder(); strSql.Append("SELECT "); - strSql.Append(@" - t.Id, - t.EmpId, - t.PunishmentName, - t.Reason, - t.StartTime, - t.EndTime - "); + strSql.Append(@" * "); strSql.Append(" FROM TeacherPunishment t "); strSql.Append(" WHERE 1=1 "); var queryParam = queryJson.ToJObject(); diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeacherTitleEvaluation/TeacherTitleEvaluationEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeacherTitleEvaluation/TeacherTitleEvaluationEntity.cs index f6ab38f65..af8bc6e8b 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeacherTitleEvaluation/TeacherTitleEvaluationEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeacherTitleEvaluation/TeacherTitleEvaluationEntity.cs @@ -90,6 +90,12 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement /// [Column("CHECKUSER")] public string CheckUser { get; set; } + /// + /// 聘任时间 + /// + [Column("TTINSCHOOLDATE")] + public DateTime? TTInSchoolDate { get; set; } + #endregion diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeacherTrain/TeacherTrainEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeacherTrain/TeacherTrainEntity.cs index bef77f791..47a8c6624 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeacherTrain/TeacherTrainEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeacherTrain/TeacherTrainEntity.cs @@ -40,6 +40,11 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement [Column("TTENDTIME")] public DateTime? TTEndTime { get; set; } /// + /// TTEndTime + /// + [Column("TTDEPARTMENT")] + public string TTDepartment { get; set; } + /// /// TTContent /// [Column("TTCONTENT")] diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages.json b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages.json index a83644ca5..b97438479 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages.json +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages.json @@ -601,13 +601,13 @@ }, //掌上评教 { - "path": "pages/EducationalAdministration/EvaluationTeach/list", + "path": "pages/EvaluationTeach/list", "style": { "navigationBarTitleText": "课程列表" } }, { - "path": "pages/EducationalAdministration/EvaluationTeach/single", + "path": "pages/EvaluationTeach/single", "style": { "navigationBarTitleText": "评教" } diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/EvaluationTeach/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EvaluationTeach/list.vue similarity index 98% rename from Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/EvaluationTeach/list.vue rename to Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EvaluationTeach/list.vue index 805993be7..45a3aa1d3 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/EvaluationTeach/list.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EvaluationTeach/list.vue @@ -161,7 +161,6 @@ export default { }, '加载数据时出错' ) - if (!result) { return } this.total = result.total @@ -207,8 +206,10 @@ export default { }, // 点击「编辑」、「查看」、「添加」、「删除」按钮 - async action(type, item) { - this.NAV_TO(`./single?type=view&id=${item.VID}&EmpNo=${item.EmpNo}&LessonNo=${item.LessonNo}`) + async action(type, item) { + if (item.UID != undefined && item.UID !== '') { + this.TOAST('当前项已评价！'); + } }, // 显示列表中的标题项 diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/EvaluationTeach/single.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EvaluationTeach/single.vue similarity index 94% rename from Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/EvaluationTeach/single.vue rename to Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EvaluationTeach/single.vue index b0163ef76..8a7100218 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/EvaluationTeach/single.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EvaluationTeach/single.vue @@ -88,10 +88,10 @@ export default { // 表单项数据结构 scheme: { JournalSend: { - JTitle: { type: 'text', title: '日志主题' }, - JTypeId: { type: 'select', title: '日志类型', dataSource: '0' }, - JReceiveId: { type: 'organize', title: '接收人', dataType: 'user' }, - JContent: { type: 'textarea', title: '日志内容' }, + JTitle: { type: 'text' }, + JTypeId: { type: 'select' }, + JReceiveId: { type: 'organize'}, + JContent: { type: 'textarea' }, }, }, @@ -137,8 +137,8 @@ export default { this.origin = await this.getDefaultForm() } else { const result = await this.HTTP_GET('learun/adms/eval/paper', {VID:this.id}) -console.log(result); this.origin = await this.formatFormData(result) + console.log(result,"result") } this.current = this.COPY(this.origin) },