From c192347be512638ec94ddee0ed3ccfa0cbb11bfb Mon Sep 17 00:00:00 2001 From: dyy <18335927079@163.com> Date: Mon, 7 Dec 2020 18:20:47 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91?= =?UTF-8?q?=E5=AD=A6=E7=94=9F=E9=80=89=E8=AF=BE=E6=83=85=E5=86=B5=EF=BC=9A?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=E6=A1=86=E5=A2=9E=E5=8A=A0=E2=80=9C=E9=80=89?= =?UTF-8?q?=E4=BF=AE=E8=AF=BE=E7=A8=8B=E2=80=9D=EF=BC=9B=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E2=80=9C=E4=B8=8A=E8=AF=BE=E8=8A=82=E6=AC=A1=E2=80=9D=E5=88=97?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96=E6=97=B6=E5=A2=9E=E5=8A=A0=E5=88=A4?= =?UTF-8?q?=E6=96=AD=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../QueryStuSelectResult.cshtml | 4 ++++ .../QueryStuSelectResult.js | 16 ++++++++++++---- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuSelectLessonListOfElective/QueryStuSelectResult.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuSelectLessonListOfElective/QueryStuSelectResult.cshtml index 7d68759cc..621bf8e9a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuSelectLessonListOfElective/QueryStuSelectResult.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuSelectLessonListOfElective/QueryStuSelectResult.cshtml @@ -34,6 +34,10 @@
班级
+
+
选修课程
+
+
选课状态
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuSelectLessonListOfElective/QueryStuSelectResult.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuSelectLessonListOfElective/QueryStuSelectResult.js index c791970b2..c5f5bb8cb 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuSelectLessonListOfElective/QueryStuSelectResult.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuSelectLessonListOfElective/QueryStuSelectResult.js @@ -24,7 +24,7 @@ var bootstrap = function ($, learun) { return; } page.search(queryJson); - }, 250, 400); + }, 300, 400); $('#AcademicYearNo').lrselect({ placeholder: "请选择学年", allowSearch: true, @@ -46,6 +46,13 @@ var bootstrap = function ($, learun) { $('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' }); $('#MajorNo').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'majorno', text: 'majorname' }); $('#ClassNo').lrDataSourceSelect({ code: 'bjsj', value: 'classno', text: 'classname' }); + $('#LessonNo').lrselect({ + allowSearch: true, + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=LessonInfo', + param: { strWhere: "1=1 AND LessonSortNo='2' " }, + value: "lessonno", + text: "lessonname" + }); // 刷新 $('#lr_refresh').on('click', function () { location.reload(); @@ -174,11 +181,12 @@ var bootstrap = function ($, learun) { { label: "上课节次", name: "LessonSection", width: 150, align: "left", formatter: function (cellvalue, row) { - if (cellvalue != "") { - if (cellvalue.indexOf(',') == -1) + if (cellvalue != "" && cellvalue != undefined && cellvalue != null) { + if (cellvalue.indexOf(',') == -1) { return "星期" + weekChina[cellvalue.slice(0, 1) - 1] + "第" + cellvalue.slice(1) + "节"; - else + } else { return "星期" + weekChina[cellvalue.slice(0, 1) - 1] + "第" + cellvalue.slice(1, 2) + "、" + cellvalue.slice(4) + "节"; + } } } }, From ae22ae60e254e29aba895713ee55998f5025e70a Mon Sep 17 00:00:00 2001 From: liangkun Date: Tue, 8 Dec 2020 11:54:49 +0800 Subject: [PATCH 02/11] =?UTF-8?q?h5=E4=BF=AE=E6=94=B9=E4=B8=AA=E4=BA=BA?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E9=A1=B5=E8=B0=83=E6=95=B4=E3=80=81=E7=99=BB?= =?UTF-8?q?=E5=BD=95=E9=A1=B5=E6=8A=A5=E9=94=99=EF=BC=8Capi=E5=9C=B0?= =?UTF-8?q?=E5=9D=80=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../StuInfoBasic/StuInfoBasic.html | 12 +++---- .../StuInfoBasic/StuInfoBasic.js | 35 +++++++++---------- .../www/pages/login/login.js | 2 +- 3 files changed, 24 insertions(+), 25 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoBasic/StuInfoBasic.html b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoBasic/StuInfoBasic.html index 5a012080a..5a63ed573 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoBasic/StuInfoBasic.html +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoBasic/StuInfoBasic.html @@ -14,7 +14,7 @@
-
+
@@ -74,7 +74,7 @@
-
+
-
+
\ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoBasic/StuInfoBasic.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoBasic/StuInfoBasic.js index 861937092..71192b1ea 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoBasic/StuInfoBasic.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoBasic/StuInfoBasic.js @@ -19,7 +19,6 @@ data: { 'account': account }, async: false, success: function (msg) { - console.log(msg); if (msg.data) { keyValue = msg.data.StuId; } else { @@ -168,23 +167,23 @@ code: 'ResidenceNo', type: 'dataItem' }); - $page.find('#Photo').imagepicker(); - $page.find('#FamilyOriginNo').lrpickerex({ - type: 'sourceData', - code: 'BCdFamilyOrigin', - ivalue: 'familyoriginno', - itext: 'familyorigin' - }); - $page.find('#OverseasChineseNo').lrpickerex({ - type: 'sourceData', - code: 'BCdOverseasChinese', - ivalue: 'overseaschineseno', - itext: 'overseaschinesename' - }); - $page.find('#GraduateNo').lrpickerex({ - code: 'CollegeType', - type: 'dataItem' - }); + //$page.find('#Photo').imagepicker(); + //$page.find('#FamilyOriginNo').lrpickerex({ + // type: 'sourceData', + // code: 'BCdFamilyOrigin', + // ivalue: 'familyoriginno', + // itext: 'familyorigin' + //}); + //$page.find('#OverseasChineseNo').lrpickerex({ + // type: 'sourceData', + // code: 'BCdOverseasChinese', + // ivalue: 'overseaschineseno', + // itext: 'overseaschinesename' + //}); + //$page.find('#GraduateNo').lrpickerex({ + // code: 'CollegeType', + // type: 'dataItem' + //}); }, destroy: function (pageinfo) { $header = null; keyValue = ''; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/login/login.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/login/login.js index 1e2b59d9d..7608fd4f6 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/login/login.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/login/login.js @@ -3,7 +3,7 @@ headColor: '#ffffff', init: function ($page) { var path = config.webapi; - learun.http.get(path + "Learun/EducationalAdministration/EmpRegister/registerbutton", + learun.http.get(path + "Learun/adms/EducationalAdministration/EmpRegister/registerbutton", {}, (res) => { if (res.info == "True") { var button = $page.find('#RegisterBtn'); From c395bb9d043bee23b119544fef1fb4b3d8f36132 Mon Sep 17 00:00:00 2001 From: liangkun Date: Tue, 8 Dec 2020 17:18:14 +0800 Subject: [PATCH 03/11] =?UTF-8?q?=E8=B0=83=E6=95=B4h5=E4=B8=AA=E4=BA=BA?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../StuInfoBasic/StuInfoBasic.html | 4 +-- .../StuInfoBasic/StuInfoBasic.js | 26 +++++++++---------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoBasic/StuInfoBasic.html b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoBasic/StuInfoBasic.html index 5a63ed573..85355335d 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoBasic/StuInfoBasic.html +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoBasic/StuInfoBasic.html @@ -1,5 +1,5 @@ 
-
+
    +
    提交测温
    diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Thermography/measure/measure.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Thermography/measure/measure.js index 425fa2e07..56d3741ca 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Thermography/measure/measure.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Thermography/measure/measure.js @@ -52,7 +52,42 @@ $('.timeTableAlert').removeClass('active'); } - //确定 + //弹框确定按钮：单个学生提交测温 + //$page.find(".timeTableBtn").on('tap', + // function () { + // // 获取表单数据 + // if (!$page.find('.lr-form-container').lrformValid()) { + // return false; + // } + // var data = JSON.parse($(this).siblings('.timeTableAlertTop').attr('student')); + // data.Status = $page.find('#Status').lrpickerGet(); + // data.Temperature = $page.find('#Temperature').val(); + // data.ProcessingResult = $page.find('#ProcessingResult').val(); + // data.Remark = $page.find('#Remark').val(); + // data.MeasureTime = $page.find('#MeasureTime').lrpickerGet(); + // learun.layer.confirm('是否确认提交测温？', + // function (_index) { + // if (_index === '1') { + // learun.layer.loading(true, '正在提交'); + // learun.httppost( + // config.webapi + '/learun/adms/EducationalAdministration/Thermography/save', + // { + // keyValue: data.ID, + // strEntity: JSON.stringify(data) + // }, + // (data) => { + // learun.layer.loading(false); + // if (data) { + // learun.layer.toast("提交成功"); + // timeTableAlertFn(); + // loadData($page, param); + // } + // }); + // } + // }); + // }); + + //弹框确定按钮：弹框数据绑定到学生列表上 $page.find(".timeTableBtn").on('tap', function () { // 获取表单数据 @@ -65,28 +100,41 @@ data.ProcessingResult = $page.find('#ProcessingResult').val(); data.Remark = $page.find('#Remark').val(); data.MeasureTime = $page.find('#MeasureTime').lrpickerGet(); + $page.find('.timeTableList').find('li[stuNo="' + data.PersonBeingMeasured + '"]').attr('student', JSON.stringify(data)); + var classTemp = !data.Status ? 'sStatue1' : data.Status == "0" ? 'sStatue1' : data.Status == "1" ? 'sStatue2' : 'sStatue3'; + $page.find('.timeTableList').find('li[stuNo="' + data.PersonBeingMeasured + '"]').removeClass().addClass(classTemp); + timeTableAlertFn(); + }); + + //提交测温按钮：整个班级提交测温 + $page.find(".submitBtn").on('tap', + function () { + var dataArray = new Array(); + $.each($page.find('.timeTableList').find('li'), function (i, item) { + var dataItem = JSON.parse($(item).attr('student')); + dataArray.push(dataItem); + }); learun.layer.confirm('是否确认提交测温？', function (_index) { if (_index === '1') { learun.layer.loading(true, '正在提交'); learun.httppost( - config.webapi + '/learun/adms/EducationalAdministration/Thermography/save', + config.webapi + '/learun/adms/EducationalAdministration/Thermography/save2', { - keyValue: data.ID, - strEntity: JSON.stringify(data) + measureTime: $page.find('#MeasureTime').lrpickerGet(), + strEntity: JSON.stringify(dataArray) }, (data) => { learun.layer.loading(false); if (data) { learun.layer.toast("提交成功"); - timeTableAlertFn(); loadData($page, param); } }); } }); - }); + }); } }; @@ -110,11 +158,13 @@ var className = ''; if (weekData2.length == 0) { html = '
  • 暂时没有信息
    • ' + $('.submitBtn').hide(); } else { + $('.submitBtn').show(); className = weekData2[0].ClassName; $.each(weekData2, function (j, k) { var statusName = !k.Status ? 'sStatue1' : k.Status == "0" ? 'sStatue1' : k.Status == "1" ? 'sStatue2' : 'sStatue3'; - html += '
  • ' + + html += '
  • ' + k.PersonBeingMeasuredName + '' + '
    • '; }); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/ThermographyController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/ThermographyController.cs index c802bf5ba..bf96c0471 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/ThermographyController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/ThermographyController.cs @@ -58,6 +58,15 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers { return View(); } + /// + /// 班级自诊打开结果 + /// + /// + [HttpGet] + public ActionResult IndexResult() + { + return View(); + } #endregion #region 获取数据 diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Thermography/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Thermography/Index.js index 291765b6f..d9aed5d45 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Thermography/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Thermography/Index.js @@ -236,7 +236,16 @@ var bootstrap = function ($, learun) { key: value, code: 'TemperatureMeasure', callback: function (_data) { - callback(_data.text); + //callback(_data.text); + if (_data.text) { + if (_data.text == "正常") { + callback('' + _data.text + ''); + } else if (_data.text == "异常") { + callback('' + _data.text + ''); + } else { + callback('' + _data.text + ''); + } + } } }); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Thermography/IndexResult.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Thermography/IndexResult.cshtml new file mode 100644 index 000000000..7085627a6 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Thermography/IndexResult.cshtml @@ -0,0 +1,54 @@ +@{ + ViewBag.Title = "班级自诊打卡结果"; + Layout = "~/Views/Shared/_Index.cshtml"; +} +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    系部
    +
    +
    +
    +
    专业
    +
    +
    +
    +
    班级
    +
    +
    +
    +
    被测温人
    +
    +
    +
    +
    状态
    +
    +
    +
    +
    测温时间段
    +
    +
    +
    +
    +
    +
    +
    +
    + +
    +
    +
    +
    +
    +
    +
    +@Html.AppendJsFile("/Areas/EducationalAdministration/Views/Thermography/IndexResult.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Thermography/IndexResult.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Thermography/IndexResult.js new file mode 100644 index 000000000..b29544089 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Thermography/IndexResult.js @@ -0,0 +1,226 @@ +/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) + * Copyright (c) 2013-2018 北京泉江科技有限公司 + * 创建人：超级管理员 + * 日 期：2020-04-16 15:52 + * 描 述：班级自诊打卡结果 + */ +var refreshGirdData; +var bootstrap = function ($, learun) { + "use strict"; + var startTime; + var endTime; + var page = { + init: function () { + + page.initGird(); + page.bind(); + }, + bind: function () { + // 时间搜索框 + $('#datesearch').lrdate({ + dfdata: [ + { name: '今天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00') }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } }, + { name: '近7天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'd', -6) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } }, + { name: '近1个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -1) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } }, + { name: '近3个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -3) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } } + ], + // 月 + mShow: false, + premShow: false, + // 季度 + jShow: false, + prejShow: false, + // 年 + ysShow: false, + yxShow: false, + preyShow: false, + yShow: false, + // 默认 + dfvalue: '1', + selectfn: function (begin, end) { + startTime = begin; + endTime = end; + page.search(); + } + }); + $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { + page.search(queryJson); + }, 300, 400); + $('#DeptNo').lrDataSourceSelect({ + code: 'CdDeptInfo', value: 'deptno', text: 'deptname', select: function (val) { + var deptno = ""; + if (val) { + deptno = val.deptno; + } + $('#MajorNo').lrselectRefresh({ + url: top.$.rootUrl + '/EducationalAdministration/CdMajor/GetListByDeptNo?DeptNo=' + deptno, + text: "MajorName", + value: "MajorNo" + }) + } + }); + $('#MajorNo').lrDataSourceSelect({ + code: 'CdMajorInfo', value: 'majorno', text: 'majorname', select: + function (val) { + var majorNo = ''; + if (val) { + majorNo = val.MajorNo; + } + $('#ClassNo').lrselectRefresh({ + url: top.$.rootUrl + '/EducationalAdministration/ClassInfo/GetClassByMajorNo?majorNo=' + majorNo, + text: "ClassName", + value: "ClassNo" + }) + } + }); + $('#ClassNo').lrDataSourceSelect({ + code: 'bjsj', value: 'classno', text: 'classname', select: function (val) { + var classNo = ''; + if (val) { + classNo = val.ClassNo; + } + $('#PersonBeingMeasured').lrselectRefresh({ + url: top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/GetStuInfoByClassNo?classNo=' + classNo, + text: "StuName", + value: "StuNo" + }) + } + }); + $('#PersonBeingMeasured').lrDataSourceSelect({ code: 'StuInfoBasic', value: 'stuno', text: 'stuname' }); + $('#Status').lrDataItemSelect({ code: 'TemperatureMeasure' }); + $('#MeasureTime').lrDataItemSelect({ code: 'MeasureTime' }); + // 刷新 + $('#lr_refresh').on('click', function () { + location.reload(); + }); + + }, + // 初始化列表 + initGird: function () { + $('#gridtable').lrAuthorizeJfGrid({ + url: top.$.rootUrl + '/EducationalAdministration/Thermography/GetPageList', + headData: [ + { + 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, + keyId: 'deptno', + callback: function (_data) { + callback(_data['deptname']); + } + }); + } + }, + { + label: "专业", name: "MajorNo", width: 100, 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: 100, 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: "MeasurerID", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BaseUser', + key: value, + keyId: 'f_account', + callback: function (_data) { + callback(_data['f_realname']); + } + }); + } + }, + { + label: "被测温人学号", name: "PersonBeingMeasured", width: 100, align: "left" + }, + { + label: "被测温人", name: "PersonBeingMeasuredName", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BaseUser', + key: row.PersonBeingMeasured, + keyId: 'f_account', + callback: function (_data) { + callback(_data['f_realname']); + } + }); + } + }, + { + label: "状态", name: "Status", width: 80, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'TemperatureMeasure', + callback: function (_data) { + //callback(_data.text); + if (_data.text) { + if (_data.text == "正常") { + callback('' + _data.text + ''); + } else if (_data.text == "异常") { + callback('' + _data.text + ''); + } else { + callback('' + _data.text + ''); + } + } + } + }); + } + }, + { label: "温度", name: "Temperature", width: 100, align: "left" }, + { label: "处理结果", name: "ProcessingResult", width: 100, align: "left" }, + { label: "备注", name: "Remark", width: 100, align: "left" }, + { label: "测量时间", name: "MeasureDate", width: 120, align: "left" }, + { + label: "测量时间段", name: "MeasureTime", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'MeasureTime', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, + ], + mainId: 'ID', + isPage: true, + sidx: 'MeasureDate desc,PersonBeingMeasured', + sord: 'desc' + }); + }, + search: function (param) { + param = param || {}; + param.StartTime = startTime; + param.EndTime = endTime; + $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); + } + }; + refreshGirdData = function () { + page.search(); + }; + page.init(); +} 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 e127f6d05..179d3d9d9 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 @@ -1014,6 +1014,7 @@ + @@ -6883,6 +6884,7 @@ + diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/EducationalAdministration/ThermographyApi.cs b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/EducationalAdministration/ThermographyApi.cs index 657e44224..8347bc910 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/EducationalAdministration/ThermographyApi.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/EducationalAdministration/ThermographyApi.cs @@ -30,6 +30,7 @@ namespace Learun.Application.WebApi Get["/form"] = GetForm; Post["/delete"] = DeleteForm; Post["/save"] = SaveForm; + Post["/save2"] = SaveFormList; } #region 获取数据 @@ -104,7 +105,7 @@ namespace Learun.Application.WebApi return Success("删除成功！"); } /// - /// 保存实体数据（新增、修改） + /// 保存实体数据（新增、修改）：单个学生提交测温 /// /// /// @@ -117,6 +118,18 @@ namespace Learun.Application.WebApi thermographyIBLL.SaveEntity(this.userInfo, parameter.keyValue, entity); return Success("保存成功！"); } + /// + /// 保存实体数据（新增、修改）：整个班级提交测温 + /// + /// + /// + public Response SaveFormList(dynamic _) + { + ReqFormEntity parameter = this.GetReqData(); + List entities = parameter.strEntity.ToObject>(); + thermographyIBLL.SaveEntityList(parameter.measureTime, entities); + return Success("保存成功！"); + } #endregion #region 私有类 @@ -128,6 +141,8 @@ namespace Learun.Application.WebApi { public string keyValue { get; set; } public string strEntity { get; set; } + public string measureTime { get; set; } + } #endregion diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Thermography/ThermographyService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Thermography/ThermographyService.cs index 3e1da4e07..02b77e286 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Thermography/ThermographyService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Thermography/ThermographyService.cs @@ -536,6 +536,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration var now = DateTime.Now; var nowDate = DateTime.Now.Date; var nextDate = DateTime.Now.AddDays(1).Date; + var pushTitle = string.Empty;//微信推送标题 foreach (var entity in entities) { entity.MeasurerID = userInfo.account; @@ -556,28 +557,32 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration //体温异常 if (entity.Status == "2") { - try + if (string.IsNullOrEmpty(pushTitle)) { - var stuModel = db.FindEntity(x => x.StuNo == entity.PersonBeingMeasured); - if (stuModel != null) - { - var title = string.Format("{0}({1})", stuModel.StuName, stuModel.StuNo); - //读取信息推送管理-班级自诊打卡体温异常学生推送（05）的配置 - var informationPushEntity = this.BaseRepository().FindEntity(x => x.PushItem == "05"); - if (informationPushEntity != null && informationPushEntity.Status == true) - { - //微信推送 - PushWeixin(title); - } - - } + var classModel = db.FindEntity(x => x.ClassNo == entity.ClassNo); + pushTitle = string.Format("{0}班级({1})发现异常学生：{2}({3})", classModel?.ClassName, entity.ClassNo, entity.PersonBeingMeasuredName, entity.PersonBeingMeasured); } - catch (Exception e) + else { + pushTitle += string.Format("，{0}({1})", entity.PersonBeingMeasuredName, entity.PersonBeingMeasured); } } } db.Commit(); + //读取信息推送管理-班级自诊打卡体温异常学生推送（05）的配置 + var informationPushEntity = this.BaseRepository().FindEntity(x => x.PushItem == "05"); + if (informationPushEntity != null && informationPushEntity.Status == true) + { + try + { + //微信推送 + PushWeixin(pushTitle); + } + catch (Exception) + { + throw; + } + } } catch (Exception ex) { From 402321fc605c00eab8a889460b665f132e8d42d7 Mon Sep 17 00:00:00 2001 From: liangkun Date: Fri, 11 Dec 2020 10:34:58 +0800 Subject: [PATCH 06/11] =?UTF-8?q?=E8=87=AA=E8=AF=8A=E6=89=93=E5=8D=A1?= =?UTF-8?q?=E8=A1=A8=E5=8D=95=E9=A1=B5=E5=A7=93=E5=90=8D=E6=94=B9=E4=B8=BA?= =?UTF-8?q?=E5=8F=AA=E8=AF=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PersonnelManagement/EpidemicSituationCopy/form/form.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/EpidemicSituationCopy/form/form.html b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/EpidemicSituationCopy/form/form.html index ab4912983..3cef3e612 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/EpidemicSituationCopy/form/form.html +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/EpidemicSituationCopy/form/form.html @@ -2,7 +2,7 @@
    -
    +
    From 26f4b91cf7f0536e16391d7cbb5866ef01165aea Mon Sep 17 00:00:00 2001 From: zhichao lei <442149704@qq.com> Date: Fri, 11 Dec 2020 15:24:43 +0800 Subject: [PATCH 07/11] =?UTF-8?q?=E8=87=AA=E8=AF=8A=E6=89=93=E5=8D=A1=20?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=20=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/EpidemicSituationCopy/Index.cshtml | 22 ---------- .../EpidemicSituationCopy/IndexReport.cshtml | 10 ++--- .../EpidemicSituationCopy/IndexReport.js | 10 ++--- .../EpidemicSituationService.cs | 26 ++++++++++- .../Learun.DataBase.Repository/IRepository.cs | 1 + .../Learun.DataBase.Repository/Repository.cs | 44 +++++++++++++++++++ 6 files changed, 77 insertions(+), 36 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/EpidemicSituationCopy/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/EpidemicSituationCopy/Index.cshtml index c2f4b8818..10d01d354 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/EpidemicSituationCopy/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/EpidemicSituationCopy/Index.cshtml @@ -7,28 +7,6 @@
    -
    -
    -
    -
    -
    填表人员
    - -
    -
    -
    类别
    -
    -
    -
    -
    身份证号
    - -
    -
    -
    单位名称
    - -
    -
    -
    -
    diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/EpidemicSituationCopy/IndexReport.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/EpidemicSituationCopy/IndexReport.cshtml index cd5f06fdf..19d677a58 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/EpidemicSituationCopy/IndexReport.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/EpidemicSituationCopy/IndexReport.cshtml @@ -12,19 +12,15 @@
    填表人员
    - +
    类别
    -
    身份证号
    - -
    -
    -
    单位名称
    - +
    系|专业|班级
    +
    diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/EpidemicSituationCopy/IndexReport.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/EpidemicSituationCopy/IndexReport.js index 89963173f..a40972104 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/EpidemicSituationCopy/IndexReport.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/EpidemicSituationCopy/IndexReport.js @@ -5,6 +5,7 @@ * 描 述：疫情记录 */ var refreshGirdData; +var startTime, endTime; var bootstrap = function ($, learun) { "use strict"; var page = { @@ -13,10 +14,13 @@ var bootstrap = function ($, learun) { page.bind(); }, bind: function () { + + $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { page.search(queryJson); }, 220, 400); $('#Type').lrDataItemSelect({ code: 'EUserType' }); + $('#Creater').lrDataSourceSelect({ code: 'BaseUser', value: 'f_userid', text: 'f_realname' }); // 刷新 $('#lr_refresh').on('click', function () { location.reload(); @@ -55,12 +59,6 @@ var bootstrap = function ($, learun) { } }, - { - label: "填报日期", name: "CreateTime", width: 100, align: "left", - formatter: function (value, row) { - return dateFormat("YYYY-mm-dd", new Date(value)); - } - }, { label: "类别", name: "Type", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/EpidemicSituation/EpidemicSituationService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/EpidemicSituation/EpidemicSituationService.cs index fa234e70e..26e75c01f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/EpidemicSituation/EpidemicSituationService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/EpidemicSituation/EpidemicSituationService.cs @@ -144,7 +144,31 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement list.Add(entity); } - list = this.BaseRepository("CollegeMIS").FindList(list, pagination).ToList(); + + + var expression = LinqExtensions.True(); + var queryParam = queryJson.ToJObject(); + // 填表人员 + if (!queryParam["Creater"].IsEmpty()) + { + string Creater = queryParam["Creater"].ToString(); + expression = expression.And(t => t.Creater.Equals(Creater)); + } + // 类别 + if (!queryParam["Type"].IsEmpty()) + { + int Type = 0; + int.TryParse(queryParam["Type"].ToString(), out Type); + expression = expression.And(t => t.Type.Equals(Type)); + } + // 学生来源 + if (!queryParam["StudentSource"].IsEmpty()) + { + string StudentSource = queryParam["StudentSource"].ToString(); + expression = expression.And(t => t.StudentSource.Contains(StudentSource)); + } + + list = this.BaseRepository("CollegeMIS").FindList(list, expression, pagination).ToList(); return list; diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Db/Learun.DataBase.Repository/IRepository.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Db/Learun.DataBase.Repository/IRepository.cs index 17e8f6022..dc84e68e5 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Db/Learun.DataBase.Repository/IRepository.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Db/Learun.DataBase.Repository/IRepository.cs @@ -233,6 +233,7 @@ namespace Learun.DataBase.Repository IEnumerable FindList(Pagination pagination) where T : class, new(); IEnumerable FindList(List data, Pagination pagination) where T : class, new(); + IEnumerable FindList(List data, Expression> condition, Pagination pagination) where T : class, new(); /// /// 查询列表(分页) /// diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Db/Learun.DataBase.Repository/Repository.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Db/Learun.DataBase.Repository/Repository.cs index 6bd529a08..397b9516c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Db/Learun.DataBase.Repository/Repository.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Db/Learun.DataBase.Repository/Repository.cs @@ -447,11 +447,55 @@ namespace Learun.DataBase.Repository var property = typeof(T).GetProperty(_orderField); var propertyAccess = Expression.MakeMemberAccess(parameter, property); var orderByExp = Expression.Lambda(propertyAccess, parameter); + resultExp = Expression.Call(typeof(Queryable), isAsc ? "OrderBy" : "OrderByDescending", new Type[] { typeof(T), property.PropertyType }, tempData.Expression, Expression.Quote(orderByExp)); } } + if (resultExp != null) + { + tempData = tempData.Provider.CreateQuery(resultExp); + } + pagination.records = tempData.Count(); + tempData = tempData.Skip(pageSize * (pageIndex - 1)).Take(pageSize).AsQueryable(); + return tempData.ToList(); + } + + public IEnumerable FindList(List data, Expression> condition, Pagination pagination) where T : class, new() + { + var isAsc = pagination.sord.ToLower() == "asc" ? true : false; + var pageSize = pagination.rows; + var pageIndex = pagination.page; + string[] _order = pagination.sidx.Split(','); + MethodCallExpression resultExp = null; + var tempData = data.AsQueryable().Where(condition); + foreach (string item in _order) + { + if (!string.IsNullOrEmpty(item)) + { + string _orderPart = item; + _orderPart = Regex.Replace(_orderPart, @"\s+", " "); + string[] _orderArry = _orderPart.Split(' '); + string _orderField = _orderArry[0]; + bool sort = isAsc; + if (_orderArry.Length == 2) + { + isAsc = _orderArry[1].ToUpper() == "ASC" ? true : false; + } + var parameter = Expression.Parameter(typeof(T), "t"); + var property = typeof(T).GetProperty(_orderField); + var propertyAccess = Expression.MakeMemberAccess(parameter, property); + var orderByExp = Expression.Lambda(propertyAccess, parameter); + resultExp = Expression.Call(typeof(Queryable), isAsc ? "OrderBy" : "OrderByDescending", new Type[] { typeof(T), property.PropertyType }, tempData.Expression, Expression.Quote(orderByExp)); + + } + } + if (resultExp != null) + { + tempData = tempData.Provider.CreateQuery(resultExp); + } pagination.records = tempData.Count(); tempData = tempData.Skip(pageSize * (pageIndex - 1)).Take(pageSize).AsQueryable(); + return tempData.ToList(); } From 180686fc3f9538732919c2a6886fbf59566500b0 Mon Sep 17 00:00:00 2001 From: chinaXLG <444381778@qq.com> Date: Wed, 16 Dec 2020 09:29:08 +0800 Subject: [PATCH 08/11] =?UTF-8?q?=E7=99=BB=E5=BD=95=E5=AF=86=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js | 2 +- Learun.Framework.Ultimate V7/LearunApp-2.2.0/manifest.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js index c6afe4a56..25ccb3901 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js @@ -14,7 +14,7 @@ export default { // ], // 开发环境下自动填充登录账号密码，与接口地址一一对应，只在开发环境下显示 "devAccount": [ - { username: "System", password: "0000" } + { username: "system", password: "123456" } ], //是否分布式部署 指WebApi与Web不在一台服务器 "isDistributed":true, diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/manifest.json b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/manifest.json index d04f4cd98..5d59763e8 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/manifest.json +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/manifest.json @@ -1,7 +1,7 @@ { - "name" : "数字化智慧校园", + "name" : "智慧校园", "appid" : "__UNI__611EB80", - "description" : "数字化智慧校园移动端", + "description" : "智慧校园移动端", "versionName" : "2.1.0", "versionCode" : 20100, "transformPx" : false, From db8a501f6490464733bb4ec1dcf5b9b451975aa9 Mon Sep 17 00:00:00 2001 From: dyy <18335927079@163.com> Date: Thu, 17 Dec 2020 16:27:37 +0800 Subject: [PATCH 09/11] =?UTF-8?q?=E3=80=90=E5=A2=9E=E5=8A=A0=E3=80=91?= =?UTF-8?q?=E6=95=99=E5=8A=A1=E4=BF=A1=E6=81=AF=E7=AE=A1=E7=90=86=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E4=BA=BA=E6=89=8D=E5=9F=B9=E5=85=BB=E6=96=B9=E6=A1=88?= =?UTF-8?q?=EF=BC=9B=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E4=BD=93=E6=B8=A9?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=E5=AD=A6=E7=94=9F=E8=BF=9B=E8=A1=8C=E5=BE=AE?= =?UTF-8?q?=E4=BF=A1=E6=8E=A8=E9=80=81=E5=8A=9F=E8=83=BD=E8=BF=9B=E8=A1=8C?= =?UTF-8?q?=E5=AE=8C=E5=96=84=EF=BC=9B=E7=A7=BB=E5=8A=A8=E7=AB=AF=E6=B5=8B?= =?UTF-8?q?=E6=B8=A9=E8=A1=A8=E5=8D=95=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=96=87=E5=AD=97=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Thermography/measure/measure.html | 4 +- .../Controllers/EATalentTrainController.cs | 117 +++++++++++++ .../Views/EATalentTrain/Form.cshtml | 39 +++++ .../Views/EATalentTrain/Form.js | 85 +++++++++ .../Views/EATalentTrain/Index.cshtml | 48 ++++++ .../Views/EATalentTrain/Index.js | 150 ++++++++++++++++ .../Learun.Application.Web.csproj | 5 + .../EATalentTrainMap.cs | 29 ++++ .../Learun.Application.Mapping.csproj | 1 + .../EATalentTrain/EATalentTrainBLL.cs | 125 ++++++++++++++ .../EATalentTrain/EATalentTrainEntity.cs | 85 +++++++++ .../EATalentTrain/EATalentTrainIBLL.cs | 48 ++++++ .../EATalentTrain/EATalentTrainService.cs | 161 ++++++++++++++++++ .../Thermography/ThermographyService.cs | 25 +-- .../Learun.Application.TwoDevelopment.csproj | 4 + 15 files changed, 914 insertions(+), 12 deletions(-) create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/EATalentTrainController.cs create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EATalentTrain/Form.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EATalentTrain/Form.js create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EATalentTrain/Index.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EATalentTrain/Index.js create mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/EducationalAdministration/EATalentTrainMap.cs create mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EATalentTrain/EATalentTrainBLL.cs create mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EATalentTrain/EATalentTrainEntity.cs create mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EATalentTrain/EATalentTrainIBLL.cs create mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EATalentTrain/EATalentTrainService.cs diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Thermography/measure/measure.html b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Thermography/measure/measure.html index a932ff8d9..2e36f2471 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Thermography/measure/measure.html +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Thermography/measure/measure.html @@ -43,8 +43,8 @@
    * - - + +
    diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/EATalentTrainController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/EATalentTrainController.cs new file mode 100644 index 000000000..5039cdcf7 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/EATalentTrainController.cs @@ -0,0 +1,117 @@ +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 +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2020-12-17 14:29 + /// 描 述：人才培养方案 + /// + public class EATalentTrainController : MvcControllerBase + { + private EATalentTrainIBLL eATalentTrainIBLL = new EATalentTrainBLL(); + + #region 视图功能 + + /// + /// 主页面 + /// + /// + [HttpGet] + public ActionResult Index() + { + return View(); + } + /// + /// 表单页 + /// + /// + [HttpGet] + public ActionResult Form() + { + return View(); + } + #endregion + + #region 获取数据 + + /// + /// 获取页面显示列表数据 + /// + /// 分页参数 + /// 查询参数 + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetPageList(string pagination, string queryJson) + { + Pagination paginationobj = pagination.ToObject(); + var data = eATalentTrainIBLL.GetPageList(paginationobj, queryJson); + var jsonData = new + { + rows = data, + total = paginationobj.total, + page = paginationobj.page, + records = paginationobj.records + }; + return Success(jsonData); + } + /// + /// 获取表单数据 + /// + /// 主键 + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetFormData(string keyValue) + { + var EATalentTrainData = eATalentTrainIBLL.GetEATalentTrainEntity( keyValue ); + var jsonData = new { + EATalentTrain = EATalentTrainData, + }; + return Success(jsonData); + } + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// + /// 主键 + /// + [HttpPost] + [AjaxOnly] + public ActionResult DeleteForm(string keyValue) + { + eATalentTrainIBLL.DeleteEntity(keyValue); + return Success("删除成功！"); + } + /// + /// 保存实体数据（新增、修改） + /// + /// 主键 + /// 实体 + /// + [HttpPost] + [ValidateAntiForgeryToken] + [AjaxOnly] + public ActionResult SaveForm(string keyValue, string strEntity) + { + EATalentTrainEntity entity = strEntity.ToObject(); + eATalentTrainIBLL.SaveEntity(keyValue,entity); + if (string.IsNullOrEmpty(keyValue)) + { + } + return Success("保存成功！"); + } + #endregion + + } +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EATalentTrain/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EATalentTrain/Form.cshtml new file mode 100644 index 000000000..a33de37dd --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EATalentTrain/Form.cshtml @@ -0,0 +1,39 @@ +@{ + ViewBag.Title = "人才培养方案"; + Layout = "~/Views/Shared/_Form.cshtml"; +} +
    +
    +
    学年*
    +
    +
    +
    +
    学期*
    +
    +
    +
    +
    系部*
    +
    +
    +
    +
    专业*
    +
    +
    +
    +
    入学要求
    + +
    +
    +
    修业年限
    + +
    +
    +
    培训方案
    +
    +
    +
    +
    备注
    + +
    +
    +@Html.AppendJsFile("/Areas/EducationalAdministration/Views/EATalentTrain/Form.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EATalentTrain/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EATalentTrain/Form.js new file mode 100644 index 000000000..04f08fea7 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EATalentTrain/Form.js @@ -0,0 +1,85 @@ +/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn) + * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + * 创建人：超级管理员 + * 日 期：2020-12-17 14:29 + * 描 述：人才培养方案 + */ +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 () { + //学年 + $('#AcademicYearNo').lrselect({ + placeholder: "请选择学年", + allowSearch: true, + url: top.$.rootUrl + '/EducationalAdministration/EADateArrange/GetAcademicYearNo', + value: 'value', + text: 'text' + }); + //学期 + $('#Semester').lrselect({ + placeholder: "请选择学年", + allowSearch: true, + url: top.$.rootUrl + '/EducationalAdministration/EADateArrange/GetSemester', + value: 'value', + text: 'text' + }); + $('#DeptNo').lrDataSourceSelect({ + code: 'CdDeptInfo', value: 'deptno', text: 'deptname', select: function (item) { + if (item) { + $('#MajorNo').lrselectRefresh({ + allowSearch: true, + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo', + param: { strWhere: "deptno='" + item.deptno + "' AND CheckMark=1" } + }); + } else { + $('#MajorNo').lrselectRefresh({ + allowSearch: true, + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo', + param: { strWhere: "CheckMark=1" } + }); + } + } + }); + $('#MajorNo').lrDataSourceSelect({ code: 'CdMajorInfo',value: 'majorno',text: 'majorname' }); + $('#ProgramFile').lrUploader(); + }, + initData: function () { + if (!!keyValue) { + $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/EATalentTrain/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/EATalentTrain/SaveForm?keyValue=' + keyValue, postData, function (res) { + // 保存成功后才回调 + if (!!callBack) { + callBack(); + } + }); + }; + page.init(); +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EATalentTrain/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EATalentTrain/Index.cshtml new file mode 100644 index 000000000..c1fd02e6d --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EATalentTrain/Index.cshtml @@ -0,0 +1,48 @@ +@{ + ViewBag.Title = "人才培养方案"; + Layout = "~/Views/Shared/_Index.cshtml"; +} +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    学年
    +
    +
    +
    +
    学期
    +
    +
    +
    +
    系部
    +
    +
    +
    +
    专业
    +
    +
    +
    +
    +
    +
    +
    +
    + +
    +
    +  新增 +  编辑 +  删除 +
    +
    +
    +
    +
    +
    +
    +@Html.AppendJsFile("/Areas/EducationalAdministration/Views/EATalentTrain/Index.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EATalentTrain/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EATalentTrain/Index.js new file mode 100644 index 000000000..ecdee2cd8 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EATalentTrain/Index.js @@ -0,0 +1,150 @@ +/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn) + * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + * 创建人：超级管理员 + * 日 期：2020-12-17 14:29 + * 描 述：人才培养方案 + */ +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); + //学年 + $('#AcademicYearNo').lrselect({ + placeholder: "请选择学年", + allowSearch: true, + url: top.$.rootUrl + '/EducationalAdministration/EADateArrange/GetAcademicYearNo', + value: 'value', + text: 'text' + }); + //学期 + $('#Semester').lrselect({ + placeholder: "请选择学年", + allowSearch: true, + url: top.$.rootUrl + '/EducationalAdministration/EADateArrange/GetSemester', + value: 'value', + text: 'text' + }); + $('#DeptNo').lrDataSourceSelect({ + code: 'CdDeptInfo', value: 'deptno', text: 'deptname', select: function (item) { + if (item) { + $('#MajorNo').lrselectRefresh({ + allowSearch: true, + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo', + param: { strWhere: "deptno='" + item.deptno + "' AND CheckMark=1" } + }); + } else { + $('#MajorNo').lrselectRefresh({ + allowSearch: true, + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo', + param: { strWhere: "CheckMark=1" } + }); + } + } + }); + $('#MajorNo').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'majorno', text: 'majorname' }); + // 刷新 + $('#lr_refresh').on('click', function () { + location.reload(); + }); + // 新增 + $('#lr_add').on('click', function () { + learun.layerForm({ + id: 'form', + title: '新增', + url: top.$.rootUrl + '/EducationalAdministration/EATalentTrain/Form', + width: 800, + height: 600, + 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/EATalentTrain/Form?keyValue=' + keyValue, + width: 800, + height: 600, + 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/EATalentTrain/DeleteForm', { keyValue: keyValue }, function () { + refreshGirdData(); + }); + } + }); + } + }); + }, + // 初始化列表 + initGird: function () { + $('#gridtable').lrAuthorizeJfGrid({ + url: top.$.rootUrl + '/EducationalAdministration/EATalentTrain/GetPageList', + headData: [ + { label: "学年", name: "AcademicYearNo", width: 100, align: "left" }, + { label: "学期", name: "Semester", width: 100, align: "left" }, + { + 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, + keyId: 'deptno', + callback: function (_data) { + callback(_data['deptname']); + } + }); + } + }, + { + label: "专业", name: "MajorNo", width: 100, 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: "EntranceRequire", width: 150, align: "left" }, + { label: "修业年限", name: "YearLimit", width: 100, align: "left" }, + ], + mainId: 'Id', + isPage: true + }); + page.search(); + }, + search: function (param) { + param = param || {}; + $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); + } + }; + refreshGirdData = function () { + $('#gridtable').jfGridSet('reload'); + }; + page.init(); +} 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 179d3d9d9..5c0c2a9c5 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 @@ -791,6 +791,7 @@ + @@ -6119,6 +6120,10 @@ + + + + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/EducationalAdministration/EATalentTrainMap.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/EducationalAdministration/EATalentTrainMap.cs new file mode 100644 index 000000000..82055c079 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/EducationalAdministration/EATalentTrainMap.cs @@ -0,0 +1,29 @@ +using Learun.Application.TwoDevelopment.EducationalAdministration; +using System.Data.Entity.ModelConfiguration; + +namespace Learun.Application.Mapping +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2020-12-17 14:29 + /// 描 述：人才培养方案 + /// + public class EATalentTrainMap : EntityTypeConfiguration + { + public EATalentTrainMap() + { + #region 表、主键 + //表 + this.ToTable("EATALENTTRAIN"); + //主键 + this.HasKey(t => t.Id); + #endregion + + #region 配置关系 + #endregion + } + } +} + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/Learun.Application.Mapping.csproj b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/Learun.Application.Mapping.csproj index a4ec4b235..e6b2f1fa7 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/Learun.Application.Mapping.csproj +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/Learun.Application.Mapping.csproj @@ -543,6 +543,7 @@ + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EATalentTrain/EATalentTrainBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EATalentTrain/EATalentTrainBLL.cs new file mode 100644 index 000000000..19865e458 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EATalentTrain/EATalentTrainBLL.cs @@ -0,0 +1,125 @@ +using Learun.Util; +using System; +using System.Data; +using System.Collections.Generic; + +namespace Learun.Application.TwoDevelopment.EducationalAdministration +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2020-12-17 14:29 + /// 描 述：人才培养方案 + /// + public class EATalentTrainBLL : EATalentTrainIBLL + { + private EATalentTrainService eATalentTrainService = new EATalentTrainService(); + + #region 获取数据 + + /// + /// 获取页面显示列表数据 + /// + /// 分页参数 + /// 查询参数 + /// + public IEnumerable GetPageList(Pagination pagination, string queryJson) + { + try + { + return eATalentTrainService.GetPageList(pagination, queryJson); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + /// + /// 获取EATalentTrain表实体数据 + /// + /// 主键 + /// + public EATalentTrainEntity GetEATalentTrainEntity(string keyValue) + { + try + { + return eATalentTrainService.GetEATalentTrainEntity(keyValue); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// + /// 主键 + public void DeleteEntity(string keyValue) + { + try + { + eATalentTrainService.DeleteEntity(keyValue); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + /// + /// 保存实体数据（新增、修改） + /// + /// 主键 + /// 实体 + /// + public void SaveEntity(string keyValue, EATalentTrainEntity entity) + { + try + { + eATalentTrainService.SaveEntity(keyValue, entity); + } + 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/EducationalAdministration/EATalentTrain/EATalentTrainEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EATalentTrain/EATalentTrainEntity.cs new file mode 100644 index 000000000..e406c7b0e --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EATalentTrain/EATalentTrainEntity.cs @@ -0,0 +1,85 @@ +using Learun.Util; +using System; +using System.ComponentModel.DataAnnotations.Schema; + +namespace Learun.Application.TwoDevelopment.EducationalAdministration +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2020-12-17 14:29 + /// 描 述：人才培养方案 + /// + public class EATalentTrainEntity + { + #region 实体成员 + /// + /// Id + /// + [Column("ID")] + public string Id { get; set; } + /// + /// 学年 + /// + [Column("ACADEMICYEARNO")] + public string AcademicYearNo { get; set; } + /// + /// 学期 + /// + [Column("SEMESTER")] + public string Semester { get; set; } + /// + /// 系部 + /// + [Column("DEPTNO")] + public string DeptNo { get; set; } + /// + /// 专业 + /// + [Column("MAJORNO")] + public string MajorNo { get; set; } + /// + /// 入学要求 + /// + [Column("ENTRANCEREQUIRE")] + public string EntranceRequire { get; set; } + /// + /// 修业年限 + /// + [Column("YEARLIMIT")] + public string YearLimit { get; set; } + /// + /// 方案文件 + /// + [Column("PROGRAMFILE")] + public string ProgramFile { get; set; } + /// + /// 备注 + /// + [Column("REMARK")] + public string Remark { get; set; } + #endregion + + #region 扩展操作 + /// + /// 新增调用 + /// + public void Create() + { + this.Id = Guid.NewGuid().ToString(); + } + /// + /// 编辑调用 + /// + /// + public void Modify(string keyValue) + { + this.Id = keyValue; + } + #endregion + #region 扩展字段 + #endregion + } +} + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EATalentTrain/EATalentTrainIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EATalentTrain/EATalentTrainIBLL.cs new file mode 100644 index 000000000..df57227cc --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EATalentTrain/EATalentTrainIBLL.cs @@ -0,0 +1,48 @@ +using Learun.Util; +using System.Data; +using System.Collections.Generic; + +namespace Learun.Application.TwoDevelopment.EducationalAdministration +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2020-12-17 14:29 + /// 描 述：人才培养方案 + /// + public interface EATalentTrainIBLL + { + #region 获取数据 + + /// + /// 获取页面显示列表数据 + /// + /// 查询参数 + /// + IEnumerable GetPageList(Pagination pagination, string queryJson); + /// + /// 获取EATalentTrain表实体数据 + /// + /// 主键 + /// + EATalentTrainEntity GetEATalentTrainEntity(string keyValue); + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// + /// 主键 + void DeleteEntity(string keyValue); + /// + /// 保存实体数据（新增、修改） + /// + /// 主键 + /// 实体 + void SaveEntity(string keyValue, EATalentTrainEntity entity); + #endregion + + } +} diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EATalentTrain/EATalentTrainService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EATalentTrain/EATalentTrainService.cs new file mode 100644 index 000000000..c3d250659 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EATalentTrain/EATalentTrainService.cs @@ -0,0 +1,161 @@ +using Dapper; +using Learun.DataBase.Repository; +using Learun.Util; +using System; +using System.Collections.Generic; +using System.Data; +using System.Text; + +namespace Learun.Application.TwoDevelopment.EducationalAdministration +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2020-12-17 14:29 + /// 描 述：人才培养方案 + /// + public class EATalentTrainService : RepositoryFactory + { + #region 获取数据 + + /// + /// 获取页面显示列表数据 + /// + /// 查询参数 + /// 查询参数 + /// + public IEnumerable GetPageList(Pagination pagination, string queryJson) + { + try + { + var strSql = new StringBuilder(); + strSql.Append("SELECT t.* "); + strSql.Append(" FROM EATalentTrain t "); + strSql.Append(" WHERE 1=1 "); + var queryParam = queryJson.ToJObject(); + // 虚拟参数 + var dp = new DynamicParameters(new { }); + if (!queryParam["AcademicYearNo"].IsEmpty()) + { + dp.Add("AcademicYearNo",queryParam["AcademicYearNo"].ToString(), DbType.String); + strSql.Append(" AND t.AcademicYearNo = @AcademicYearNo "); + } + if (!queryParam["Semester"].IsEmpty()) + { + dp.Add("Semester",queryParam["Semester"].ToString(), DbType.String); + strSql.Append(" AND t.Semester = @Semester "); + } + 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 "); + } + return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(),dp, pagination); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + /// + /// 获取EATalentTrain表实体数据 + /// + /// 主键 + /// + public EATalentTrainEntity GetEATalentTrainEntity(string keyValue) + { + try + { + return this.BaseRepository("CollegeMIS").FindEntity(keyValue); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// + /// 主键 + public void DeleteEntity(string keyValue) + { + try + { + this.BaseRepository("CollegeMIS").Delete(t=>t.Id == keyValue); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + /// + /// 保存实体数据（新增、修改） + /// + /// 主键 + /// 实体 + public void SaveEntity(string keyValue, EATalentTrainEntity entity) + { + try + { + if (!string.IsNullOrEmpty(keyValue)) + { + 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 + + } +} diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Thermography/ThermographyService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Thermography/ThermographyService.cs index 02b77e286..8c5dc14de 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Thermography/ThermographyService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Thermography/ThermographyService.cs @@ -569,20 +569,25 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } db.Commit(); - //读取信息推送管理-班级自诊打卡体温异常学生推送（05）的配置 - var informationPushEntity = this.BaseRepository().FindEntity(x => x.PushItem == "05"); - if (informationPushEntity != null && informationPushEntity.Status == true) + + if (entities.Any(x => x.Status == "2")) { - try - { - //微信推送 - PushWeixin(pushTitle); - } - catch (Exception) + //读取信息推送管理-班级自诊打卡体温异常学生推送（05）的配置 + var informationPushEntity = this.BaseRepository().FindEntity(x => x.PushItem == "05"); + if (informationPushEntity != null && informationPushEntity.Status == true) { - throw; + try + { + //微信推送 + PushWeixin(pushTitle); + } + catch (Exception) + { + throw; + } } } + } catch (Exception ex) { diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj index 521244137..22a49063c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj @@ -1593,6 +1593,10 @@ + + + + From 8ae64a608b4648e32a79b5fb13d3e3133c733ac3 Mon Sep 17 00:00:00 2001 From: liangkun Date: Tue, 22 Dec 2020 12:30:57 +0800 Subject: [PATCH 10/11] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E7=BB=91=E5=AE=9A?= =?UTF-8?q?=E9=A1=B5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/Login/PageFourWxLogin.cshtml | 4 ---- .../Views/Login/PageSixWxLogin.cshtml | 6 +----- .../Views/Login/PageThreeWxLogin.cshtml | 4 ---- .../Views/Login/PageTwoWxLogin.cshtml | 4 ---- 4 files changed, 1 insertion(+), 17 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/PageFourWxLogin.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/PageFourWxLogin.cshtml index 4472c6df9..1ae339f7a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/PageFourWxLogin.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/PageFourWxLogin.cshtml @@ -21,10 +21,6 @@
    -
    - 版本号 : @if (ViewBag.Version) - { - @ViewBag.errornum - }       在线用户人数 : @ViewBag.OnlineUserNum 人 +
    在线用户人数 : @ViewBag.OnlineUserNum 人
    北京金隅科技学校       智慧校园 版权所有
    diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/PageThreeWxLogin.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/PageThreeWxLogin.cshtml index 9bb27a26b..6e25e93b0 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/PageThreeWxLogin.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/PageThreeWxLogin.cshtml @@ -21,10 +21,6 @@
    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 20578acca..a5487d379 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 @@ -15,7 +15,7 @@ var bootstrap = function ($, learun) { bind: function () { $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { page.search(queryJson); - }, 250, 400); + }, 280, 400); $('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' }); $('#ProvinceNo').lrDataSourceSelect({ code: 'DIC_PROVINCE', value: 'pcode', text: 'pname', @@ -49,14 +49,16 @@ var bootstrap = function ($, learun) { $('#RegionNo').lrselect(); //政治面貌 $('#PartyFaceNo').lrDataSourceSelect({ code: 'BCdPartyFace', value: 'partyfaceno', text: 'partyface' }); - //文化程度 - $('#CultureDegreeNo').lrDataSourceSelect({ code: 'BCdCultureDegree', value: 'culturedegreeno', text: 'culturedegree' }); + //最高学历 + $('#HighestRecord').lrDataSourceSelect({ code: 'BCdCultureDegree', value: 'culturedegreeno', text: 'culturedegree' }); //民族 $('#NationalityNo').lrDataSourceSelect({ code: 'BCdNationality', value: 'nationalityno', text: 'nationality' }); //性别 $('#GenderNo').lrDataItemSelect({ code: 'usersexbit' }); + //是否审核 + $('#CheckMark').lrDataItemSelect({ code: 'YesOrNoInt' }); //学位 $('#DegreeNo').lrDataSourceSelect({ code: 'BCdDegree', value: 'degreeno', text: 'degreename' }); //职称 @@ -412,7 +414,7 @@ var bootstrap = function ($, learun) { { label: "身份证号", name: "IdentityCardNo", width: 150, align: "left" }, { - label: "文化程度", name: "CultureDegreeNo", width: 100, align: "left", + label: "最高学历", name: "HighestRecord", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { learun.clientdata.getAsync('custmerData', { url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdCultureDegree', diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoService.cs index 6f1210b30..13ad106bc 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoService.cs @@ -97,6 +97,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration dp.Add("NationalityNo", queryParam["NationalityNo"].ToString(), DbType.String); strSql.Append(" AND t.NationalityNo = @NationalityNo "); } + if (!queryParam["PartyFaceNo"].IsEmpty())//政治面貌 + { + dp.Add("PartyFaceNo", queryParam["PartyFaceNo"].ToString(), DbType.String); + strSql.Append(" AND t.PartyFaceNo = @PartyFaceNo "); + } if (!queryParam["GenderNo"].IsEmpty())//性别 { dp.Add("GenderNo", queryParam["GenderNo"].ToString(), DbType.String); @@ -112,6 +117,16 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration dp.Add("ProfessionalTitle", queryParam["ProfessionalTitle"].ToString(), DbType.String); strSql.Append(" AND t.ProfessionalTitle = @ProfessionalTitle "); } + if (!queryParam["HighestRecord"].IsEmpty())//最高学历 + { + dp.Add("HighestRecord", queryParam["HighestRecord"].ToString(), DbType.String); + strSql.Append(" AND t.HighestRecord = @HighestRecord "); + } + if (!queryParam["CheckMark"].IsEmpty())//是否审核 + { + dp.Add("CheckMark", queryParam["CheckMark"].ToString(), DbType.String); + strSql.Append(" AND t.CheckMark = @CheckMark "); + } return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), dp, pagination); } catch (Exception ex)