diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StudentCompetition/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StudentCompetition/Form.cshtml index ed6e9ef96..6aa5a4ec5 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StudentCompetition/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StudentCompetition/Form.cshtml @@ -3,55 +3,59 @@ Layout = "~/Views/Shared/_Form.cshtml"; }
-
+
学年*
-
+
学期*
-
+
学生学号*
-
+
学生姓名*
-
+
专业部*
-
+
专业*
-
+
班级*
-
+
赛事名称*
-
+
赛事级别*
-
+
赛事种类*
-
+
+
奖次*
+
+
+
颁发单位*
-
+
分值*
-
+
获取时间*
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StudentCompetition/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StudentCompetition/Form.js index 4b6969f65..30d7b74c9 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StudentCompetition/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StudentCompetition/Form.js @@ -64,6 +64,7 @@ var bootstrap = function ($, learun) { $('#ClassNo').lrDataSourceSelect({ code: 'bjsj', value: 'classno', text: 'classname' }); $('#Url').lrUploader(); $('#SCLevel').lrDataItemSelect({ code: 'Level' }); + $('#EncouragementDegree').lrDataItemSelect({ code: 'EncouragementDegree' }); $('#StuNo').blur(function () { learun.httpAsyncGet(top.$.rootUrl + '/EducationalAdministration/StudentCompetition/GetStuData?stuno=' + $('#StuNo').val(), function (res) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StudentCompetition/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StudentCompetition/Index.cshtml index 8681f67e4..cdcb22f42 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StudentCompetition/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StudentCompetition/Index.cshtml @@ -63,9 +63,9 @@  新增  复制  编辑 -  修改分值 + @* 修改分值*@  删除 -  提交 + @* 提交*@  打印
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StudentCompetition/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StudentCompetition/Index.js index c31e56680..bc8a1c4da 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StudentCompetition/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StudentCompetition/Index.js @@ -17,9 +17,57 @@ var bootstrap = function ($, learun) { $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { page.search(queryJson); }, 240, 400); - $('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' }); - $('#MajorNo').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'majorno', text: 'majorname' }); - $('#ClassNo').lrDataSourceSelect({ code: 'bjsj', value: 'classno', text: 'classname' }); + $('#DeptNo').lrselect({ + allowSearch: true, + value: "deptno", + text: "deptname", + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdDeptInfo', + 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: "1=1 AND CheckMark=1" } + }); + } + + } + }); + $('#MajorNo').lrselect({ + allowSearch: true, + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo', + value: "majorno", + text: "majorname", + param: { strWhere: "1=1 AND CheckMark=1" }, + select: function (item) { + if (item) { + $('#ClassNo').lrselectRefresh({ + allowSearch: true, + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', + param: { strWhere: "majorno='" + item.majorno + "' AND CheckMark=1 order by classno desc" } + }); + } else { + $('#ClassNo').lrselectRefresh({ + allowSearch: true, + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', + param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" } + }); + } + } + }); + $('#ClassNo').lrselect({ + allowSearch: true, + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', + param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" }, + value: "classno", + text: "classname" + }); $('#SCLevel').lrDataItemSelect({ code: 'Level' }); //学年 $('#AcademicYearNo').lrselect({ @@ -47,8 +95,8 @@ var bootstrap = function ($, learun) { id: 'form', title: '新增', url: top.$.rootUrl + '/EducationalAdministration/StudentCompetition/Form', - width: 1000, - height: 800, + width: 700, + height: 400, callBack: function (id) { var res = false; // 验证数据 @@ -67,21 +115,21 @@ var bootstrap = function ($, learun) { $('#lr_edit').on('click', function () { var keyValue = $('#gridtable').jfGridValue('Id'); if (learun.checkrow(keyValue)) { - var Status = $('#gridtable').jfGridValue('Status'); - if (Status == '2') { - learun.alert.warning("当前项目已审批通过！"); - return; - } - if (Status != '0') { - learun.alert.warning("当前项目已提交，请耐心等待审批！"); - return; - } + //var Status = $('#gridtable').jfGridValue('Status'); + //if (Status == '2') { + // learun.alert.warning("当前项目已审批通过！"); + // return; + //} + //if (Status != '0') { + // learun.alert.warning("当前项目已提交，请耐心等待审批！"); + // return; + //} learun.layerForm({ id: 'form', title: '编辑', url: top.$.rootUrl + '/EducationalAdministration/StudentCompetition/Form?keyValue=' + keyValue, - width: 1000, - height: 800, + width: 700, + height: 400, callBack: function (id) { var res = false; // 验证数据 @@ -139,8 +187,8 @@ var bootstrap = function ($, learun) { id: 'form', title: '新增', url: top.$.rootUrl + '/EducationalAdministration/StudentCompetition/Form?keyValue=' + keyValue + '&type=copy', - width: 1000, - height: 800, + width: 700, + height: 400, callBack: function (id) { var res = false; // 验证数据 @@ -160,15 +208,15 @@ var bootstrap = function ($, learun) { $('#lr_delete').on('click', function () { var keyValue = $('#gridtable').jfGridValue('Id'); if (learun.checkrow(keyValue)) { - var Status = $('#gridtable').jfGridValue('Status'); - if (Status == '2') { - learun.alert.warning("当前项目已审批通过！"); - return; - } - if (Status != '0') { - learun.alert.warning("当前项目已提交，请耐心等待审批！"); - return; - } + //var Status = $('#gridtable').jfGridValue('Status'); + //if (Status == '2') { + // learun.alert.warning("当前项目已审批通过！"); + // return; + //} + //if (Status != '0') { + // learun.alert.warning("当前项目已提交，请耐心等待审批！"); + // return; + //} learun.layerConfirm('是否确认删除该项！', function (res) { if (res) { learun.deleteForm(top.$.rootUrl + '/EducationalAdministration/StudentCompetition/DeleteForm', { keyValue: keyValue }, function () { @@ -269,6 +317,18 @@ var bootstrap = function ($, learun) { } }, { label: "赛事种类", name: "SCType", width: 100, align: "left" }, + { + label: "奖次", name: "EncouragementDegree", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'EncouragementDegree', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, { label: "颁发单位", name: "Unit", width: 100, align: "left" }, { label: "分值", name: "Score", width: 100, align: "left" }, { @@ -277,21 +337,22 @@ var bootstrap = function ($, learun) { return learun.formatDate(cellvalue, 'yyyy-MM-dd'); } }, - { - label: "状态", name: "Status", width: 100, align: "left", - formatter: function (cellvalue, row) { - if (cellvalue === 1) { - return '审批中'; - } else if (cellvalue === 2) { - return '审核通过'; - } else { - return '草稿'; - } - } - }, + //{ + // label: "状态", name: "Status", width: 100, align: "left", + // formatter: function (cellvalue, row) { + // if (cellvalue === 1) { + // return '审批中'; + // } else if (cellvalue === 2) { + // return '审核通过'; + // } else { + // return '草稿'; + // } + // } + //}, ], mainId: 'Id', - isPage: true + isPage: true, + sidx: "SCTime desc" }); page.search(); }, @@ -301,17 +362,18 @@ var bootstrap = function ($, learun) { } }; refreshGirdData = function (res, postData) { - if (res && res.code && res.code == 200) { - var postData = { - schemeCode: 'StudentCompetition',// 填写流程对应模板编号 - processId: processId, - level: '1', - }; - learun.httpAsync('Post', top.$.rootUrl + '/LR_NewWorkFlow/NWFProcess/CreateFlow', postData, function (data) { - learun.loading(false); - }); - } - page.search(); + $('#gridtable').jfGridSet('reload'); + //if (res && res.code && res.code == 200) { + // var postData = { + // schemeCode: 'StudentCompetition',// 填写流程对应模板编号 + // processId: processId, + // level: '1', + // }; + // learun.httpAsync('Post', top.$.rootUrl + '/LR_NewWorkFlow/NWFProcess/CreateFlow', postData, function (data) { + // learun.loading(false); + // }); + //} + //page.search(); }; page.init(); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TrainEquipmentManage/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TrainEquipmentManage/Form.cshtml index c7b9c29f9..7f35d4fd9 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TrainEquipmentManage/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TrainEquipmentManage/Form.cshtml @@ -3,37 +3,69 @@ Layout = "~/Views/Shared/_Form.cshtml"; }
-
-
专业部*
-
+
+
部门*
+
-
+
实训室名称*
-
+
设备名称*
-
-
设备型号
- +
+
类别
+
+
+
+
型号
+
@*
-
新增
- +
新增
+ +
+
+
损耗
+ +
+
+
现存
+ +
*@ +
+
品牌
+
-
-
损耗
- -
*@ -
-
现存
- +
+
参数
+ +
+
+
单位*
+
+
+
+
数量*
+ +
+
+
单价(元)*
+ +
+
+
金额(元)*
+ +
+
+
管理员*
+
+
+
+
备注
+
- @*
-
设备金额*
- -
*@
@Html.AppendJsFile("/Areas/EducationalAdministration/Views/TrainEquipmentManage/Form.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TrainEquipmentManage/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TrainEquipmentManage/Form.js index e9e222cb2..d77974a2e 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TrainEquipmentManage/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TrainEquipmentManage/Form.js @@ -15,14 +15,30 @@ var bootstrap = function ($, learun) { page.initData(); }, bind: function () { - $('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' }); + $('#DeptNo').lrDataSourceSelect({ code: 'classdata', value: 'id', text: 'name' }); + $('#Unit').lrDataItemSelect({ code: 'sldw', allowSearch: true }); + $('#EquipmentType').lrDataItemSelect({ code: 'AssType' }); + $('#Status').lrDataItemSelect({ code: 'AssState' }); + $('#UserId').lrDataSourceSelect({ code: 'TeacherInfo', value: 'f_userid', text: 'f_realname' }); + $('#Nuantity').focus(function () { }).blur(function () { + var Nuantity = $('#Nuantity').val(); + var Price = $('#Price').val(); + var EquipmentMoney = parseFloat(Price) * parseFloat(Nuantity) + $('#EquipmentMoney').val(EquipmentMoney) + }); + $('#Price').focus(function () { }).blur(function () { + var Price = $('#Price').val(); + var Nuantity = $('#Nuantity').val(); + var EquipmentMoney = parseFloat(Price) * parseFloat(Nuantity) + $('#EquipmentMoney').val(EquipmentMoney) + }); }, initData: function () { if (!!keyValue) { $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/TrainEquipmentManage/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]); @@ -32,6 +48,7 @@ var bootstrap = function ($, learun) { } } }; + // 保存数据 acceptClick = function (callBack) { if (!$('body').lrValidform()) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TrainEquipmentManage/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TrainEquipmentManage/Index.cshtml index 6381a04bd..8fb96f016 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TrainEquipmentManage/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TrainEquipmentManage/Index.cshtml @@ -2,7 +2,7 @@ ViewBag.Title = "实训设备管理"; Layout = "~/Views/Shared/_Index.cshtml"; } -
+
@@ -11,17 +11,25 @@
-
专业部
+
部门
-
+
实训室名称
-
+
设备名称
+
+
类型
+
+
+
+
管理员
+
+
@@ -31,9 +39,10 @@
-  新增 -  编辑 +  新增 +  编辑  删除 +  打印
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TrainEquipmentManage/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TrainEquipmentManage/Index.js index 5d4c0d41a..b333e584f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TrainEquipmentManage/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TrainEquipmentManage/Index.js @@ -16,7 +16,9 @@ var bootstrap = function ($, learun) { $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { page.search(queryJson); }, 220, 400); - $('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' }); + $('#DeptNo').lrDataSourceSelect({ code: 'classdata', value: 'id', text: 'name' }); + $('#EquipmentType').lrDataItemSelect({ code: 'AssType' }); + $('#UserId').lrDataSourceSelect({ code: 'TeacherInfo', value: 'f_userid', text: 'f_realname' }); // 刷新 $('#lr_refresh').on('click', function () { location.reload(); @@ -28,7 +30,7 @@ var bootstrap = function ($, learun) { title: '新增', url: top.$.rootUrl + '/EducationalAdministration/TrainEquipmentManage/Form', width: 600, - height: 400, + height: 420, callBack: function (id) { return top[id].acceptClick(refreshGirdData); } @@ -43,7 +45,7 @@ var bootstrap = function ($, learun) { title: '编辑', url: top.$.rootUrl + '/EducationalAdministration/TrainEquipmentManage/Form?keyValue=' + keyValue, width: 600, - height: 400, + height: 420, callBack: function (id) { return top[id].acceptClick(refreshGirdData); } @@ -56,47 +58,95 @@ var bootstrap = function ($, learun) { if (learun.checkrow(keyValue)) { learun.layerConfirm('是否确认删除该项！', function (res) { if (res) { - learun.deleteForm(top.$.rootUrl + '/EducationalAdministration/TrainEquipmentManage/DeleteForm', { keyValue: keyValue}, function () { + learun.deleteForm(top.$.rootUrl + '/EducationalAdministration/TrainEquipmentManage/DeleteForm', { keyValue: keyValue }, function () { refreshGirdData(); }); } }); } }); + // 打印 + $('#lr_print').on('click', function () { + $('#gridtable').jqprintTable(); + }); }, // 初始化列表 initGird: function () { - $('#gridtable').lrAuthorizeJfGrid({ + $('#gridtable').lrAuthorizeJfGridLei({ url: top.$.rootUrl + '/EducationalAdministration/TrainEquipmentManage/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: "TrainName", width: 100, align: "left"}, - { label: "设备名称", name: "EquipmentName", width: 100, align: "left"}, - { label: "设备型号", name: "EquipmentModel", width: 100, align: "left"}, - { label: "新增", name: "AddNum", width: 100, align: "left"}, - { label: "损耗", name: "LossNum", width: 100, align: "left"}, - { label: "现存", name: "ExistNum", width: 100, align: "left"}, - { label: "设备金额", name: "EquipmentMoney", width: 100, align: "left" }, - { label: "库存", name: "Inventory", 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=' + 'classdata', + key: value, + keyId: 'id', + callback: function (_data) { + callback(_data['name']); + } + }); + } + }, + { label: "实训室名称", name: "TrainName", width: 100, align: "left" }, + { label: "设备名称", name: "EquipmentName", width: 100, align: "left" }, + { + label: "类别", name: "EquipmentType", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'AssType', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, + { label: "品牌", name: "Brand", width: 120, align: "left" }, + { label: "型号", name: "EquipmentModel", width: 100, align: "left" }, + { label: "参数", name: "Argument", width: 120, align: "left" }, + { + label: "单位", name: "Unit", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'sldw', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, + //{ label: "新增", name: "AddNum", width: 100, align: "left"}, + //{ label: "损耗", name: "LossNum", width: 100, align: "left"}, + //{ label: "现存", name: "ExistNum", width: 100, align: "left"}, + { label: "数量", name: "Nuantity", width: 100, align: "left", statistics: true }, + { label: "单价(元)", name: "Price", width: 100, align: "left"}, + { label: "设备金额(元)", name: "EquipmentMoney", width: 100, align: "left", statistics: true }, + { + label: "管理员", name: "UserId", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'TeacherInfo', + key: value, + keyId: 'f_userid', + callback: function (_data) { + callback(_data['f_realname']); + } + }); + } + }, + { label: "备注", name: "Remark", width: 100, align: "left" }, ], - mainId:'Id', - isPage: true + mainId: 'Id', + isPage: true, + sidx: "CreateTime desc" }); 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.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StudentCompetition/StudentCompetitionEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StudentCompetition/StudentCompetitionEntity.cs index 69555c96b..5323e5c9f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StudentCompetition/StudentCompetitionEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StudentCompetition/StudentCompetitionEntity.cs @@ -109,6 +109,12 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// [Column("SEMESTER")] public string Semester { get; set; } + /// + /// 学期 + /// + [Column("ENCOURAGEMENTDEGREE")] + public string EncouragementDegree { get; set; } + #endregion #region 扩展操作 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TrainEquipmentManage/TrainEquipmentManageEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TrainEquipmentManage/TrainEquipmentManageEntity.cs index 15e3f718f..ecf8ebf0f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TrainEquipmentManage/TrainEquipmentManageEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TrainEquipmentManage/TrainEquipmentManageEntity.cs @@ -11,7 +11,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// 日 期：2022-08-30 10:49 /// 描 述：实训设备管理 /// - public class TrainEquipmentManageEntity + public class TrainEquipmentManageEntity { #region 实体成员 /// @@ -64,6 +64,30 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// [Column("INVENTORY")] public decimal? Inventory { get; set; } + [Column("EQUIPMENTTYPE")] + public string EquipmentType { get; set; } + [Column("BRAND")] + public string Brand { get; set; } + [Column("ARGUMENT")] + public string Argument { get; set; } + [Column("UNIT")] + public string Unit { get; set; } + [Column("NUANTITY")] + public decimal? Nuantity { get; set; } + [Column("PRICE")] + public decimal? Price { get; set; } + [Column("USERID")] + public string UserId { get; set; } + [Column("CREATETIME")] + public DateTime? CreateTime { get; set; } + [Column("CREATEUSER")] + public string CreateUser { get; set; } + [Column("UPDATETIME")] + public DateTime? UpdateTime { get; set; } + [Column("UPDATEUSER")] + public string UpdateUser { get; set; } + [Column("REMARK")] + public string Remark { get; set; } #endregion @@ -74,6 +98,8 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration public void Create() { this.Id = Guid.NewGuid().ToString(); + this.CreateTime = DateTime.Now; + this.CreateUser = LoginUserInfo.Get().userId; } /// /// 编辑调用 @@ -82,6 +108,8 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration public void Modify(string keyValue) { this.Id = keyValue; + this.UpdateTime = DateTime.Now; + this.UpdateUser = LoginUserInfo.Get().userId; } #endregion #region 扩展字段 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TrainEquipmentManage/TrainEquipmentManageService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TrainEquipmentManage/TrainEquipmentManageService.cs index 8d050b764..5c157bc4c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TrainEquipmentManage/TrainEquipmentManageService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TrainEquipmentManage/TrainEquipmentManageService.cs @@ -51,6 +51,16 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration dp.Add("EquipmentName", "%" + queryParam["EquipmentName"].ToString() + "%", DbType.String); strSql.Append(" AND t.EquipmentName Like @EquipmentName "); } + if (!queryParam["EquipmentType"].IsEmpty()) + { + dp.Add("EquipmentType", queryParam["EquipmentType"].ToString(), DbType.String); + strSql.Append(" AND t.EquipmentType = @EquipmentType "); + } + if (!queryParam["UserId"].IsEmpty()) + { + dp.Add("UserId", queryParam["UserId"].ToString(), DbType.String); + strSql.Append(" AND t.UserId = @UserId "); + } return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(),dp, pagination); } catch (Exception ex)