diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/DtStayInSchoolController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/DtStayInSchoolController.cs new file mode 100644 index 000000000..a1134f0cc --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/DtStayInSchoolController.cs @@ -0,0 +1,164 @@ +using Learun.Util; +using System.Data; +using Learun.Application.TwoDevelopment.EducationalAdministration; +using System.Web.Mvc; +using System.Collections.Generic; +using System; + +namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2021-07-21 12:08 + /// 描 述：学生留校 + /// + public class DtStayInSchoolController : MvcControllerBase + { + private DtStayInSchoolIBLL dtStayInSchoolIBLL = new DtStayInSchoolBLL(); + + #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 = dtStayInSchoolIBLL.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 DtStayInSchoolData = dtStayInSchoolIBLL.GetDtStayInSchoolEntity(keyValue); + var jsonData = new + { + DtStayInSchool = DtStayInSchoolData, + }; + return Success(jsonData); + } + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// + /// 主键 + /// + [HttpPost] + [AjaxOnly] + public ActionResult DeleteForm(string keyValue) + { + dtStayInSchoolIBLL.DeleteEntity(keyValue); + return Success("删除成功！"); + } + /// + /// 保存实体数据（新增、修改） + /// + /// 主键 + /// 实体 + /// + [HttpPost] + [ValidateAntiForgeryToken] + [AjaxOnly] + public ActionResult SaveForm(string keyValue, string strEntity) + { + DtStayInSchoolEntity entity = strEntity.ToObject(); + if (string.IsNullOrEmpty(keyValue)) + { + entity.State = "0"; + entity.CreateTime = DateTime.Now; + } + dtStayInSchoolIBLL.SaveEntity(keyValue, entity); + return Success("保存成功！"); + } + #endregion + + #region 扩展数据 + /// + /// 提交数据 + /// + /// 主键 + /// + [HttpPost] + [AjaxOnly] + public ActionResult SubmitList(string keyValue) + { + var Model = dtStayInSchoolIBLL.GetDtStayInSchoolEntity(keyValue); + if (Model != null) + { + Model.State = "1"; + Model.CreateTime = DateTime.Now; + dtStayInSchoolIBLL.SaveEntity(keyValue, Model); + } + return Success("提交成功！"); + } + + #region 教师审核 + /// + /// 提交数据 + /// + /// 主键 + /// + [HttpPost] + [AjaxOnly] + public ActionResult TeacherAudit(string keyValue) + { + var Model = dtStayInSchoolIBLL.GetDtStayInSchoolEntity(keyValue); + if (Model != null) + { + Model.State = "2"; + Model.CreateTime = DateTime.Now; + dtStayInSchoolIBLL.SaveEntity(keyValue, Model); + } + return Success("审核成功！"); + } + #endregion + + #endregion + + } +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/DtStuLeaveController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/DtStuLeaveController.cs index d6a352431..c3618148a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/DtStuLeaveController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/DtStuLeaveController.cs @@ -121,13 +121,11 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers /// 实体 /// [HttpPost] - [ValidateAntiForgeryToken] [AjaxOnly] public ActionResult SaveForm(string keyValue, string strEntity) { DtStuLeaveEntity entity = strEntity.ToObject(); entity.FlowNo = "0"; - entity.LastUpTime = DateTime.Now; if (string.IsNullOrEmpty(keyValue)) { entity.LeaveAddTime = DateTime.Now; @@ -152,7 +150,6 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers if (Model != null) { Model.FlowNo = "1"; - Model.LastUpTime = DateTime.Now; dtStuLeaveIBLL.SaveEntity(keyValue, Model); } return Success("提交成功！"); @@ -160,6 +157,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers #endregion #region 教师审核 + /// /// 提交数据 /// @@ -173,7 +171,6 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers if (Model != null) { Model.FlowNo = "2"; - Model.LastUpTime = DateTime.Now; dtStuLeaveIBLL.SaveEntity(keyValue, Model); } return Success("审核成功！"); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/DtStayInSchool/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/DtStayInSchool/Form.cshtml new file mode 100644 index 000000000..ed1639096 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/DtStayInSchool/Form.cshtml @@ -0,0 +1,47 @@ +@{ + ViewBag.Title = "假期留校"; + Layout = "~/Views/Shared/_Form.cshtml"; +} +
+
+
专业*
+
+
+
+
班级*
+
+
+
+
性别*
+
+
+
+
联系电话*
+ +
+
+
班主任*
+
+
+
+
留校假期*
+
+
+
+
开始时间*
+ +
+
+
结束时间*
+ +
+ + +
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/DtStayInSchool/Form.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/DtStayInSchool/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/DtStayInSchool/Form.js new file mode 100644 index 000000000..dcdd7223d --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/DtStayInSchool/Form.js @@ -0,0 +1,59 @@ +/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn) + * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + * 创建人：超级管理员 + * 日 期：2021-07-20 17:19 + * 描 述：假期留校 + */ +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 () { + $('#MajorNo').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'majorno', text: 'majorname' }); + $('#Grade').lrDataSourceSelect({ code: 'bjsj', value: 'classno', text: 'classname' }); + $('#Sex').lrDataItemSelect({ code: 'usersex' }); + $('#ClassTeacher').lrDataSourceSelect({ code: 'TeacherInfo', value: 'f_userid', text: 'f_realname' }); + $('#HoildayType').lrDataItemSelect({ code: 'StayInSchoolNo' }); + $('#CreateUserId')[0].lrvalue = learun.clientdata.get(['userinfo']).userId; + $('#CreateUserId').val(learun.clientdata.get(['userinfo']).realName); + //$('#CreateTime')[0].lrvalue = learun.clientdata.get(['userinfo']).userId; + //$('#CreateTime').val(learun.clientdata.get(['userinfo']).realName); + }, + initData: function () { + if (!!keyValue) { + $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/DtStayInSchool/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/DtStayInSchool/SaveForm?keyValue=' + keyValue, postData, function (res) { + // 保存成功后才回调 + if (!!callBack) { + callBack(); + } + }); + }; + page.init(); +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/DtStayInSchool/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/DtStayInSchool/Index.cshtml new file mode 100644 index 000000000..93871b678 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/DtStayInSchool/Index.cshtml @@ -0,0 +1,54 @@ +@{ + ViewBag.Title = "假期留校"; + Layout = "~/Views/Shared/_Index.cshtml"; +} +
+
+
+
+
+
+
+
+
+
专业
+
+
+
+
性别
+
+
+
+
班主任
+
+
+
+
留校假期
+
+
+
+
创建时间
+
+
+
+
+
+
+
+
+ +
+
+  新增 +  编辑 +  删除 +   提交 + 审核 +
+
+
+
+
+
+
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/DtStayInSchool/Index.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/DtStayInSchool/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/DtStayInSchool/Index.js new file mode 100644 index 000000000..86a7760ac --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/DtStayInSchool/Index.js @@ -0,0 +1,230 @@ +/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn) + * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + * 创建人：超级管理员 + * 日 期：2021-07-20 17:19 + * 描 述：假期留校 + */ +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); + $('#MajorNo').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'majorno', text: 'majorname' }); + $('#Sex').lrDataItemSelect({ code: 'usersex' }); + $('#ClassTeacher').lrDataSourceSelect({ code: 'TeacherInfo', value: 'f_userid', text: 'f_realname' }); + $('#HoildayType').lrDataItemSelect({ code: 'StayInSchoolNo' }); + //$('#CreateTime').lrUserSelect(0); + // 刷新 + $('#lr_refresh').on('click', function () { + location.reload(); + }); + // 新增 + $('#lr_add').on('click', function () { + learun.layerForm({ + id: 'form', + title: '新增', + url: top.$.rootUrl + '/EducationalAdministration/DtStayInSchool/Form', + width: 600, + height: 400, + callBack: function (id) { + return top[id].acceptClick(refreshGirdData); + } + }); + }); + // 编辑 + $('#lr_edit').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('Id'); + if (learun.checkrow(keyValue)) { + var State = $('#gridtable').jfGridValue('State'); + if (State != 0) { + learun.alert.warning("当前项目已提交不能编辑！"); + return; + } + learun.layerForm({ + id: 'form', + title: '编辑', + url: top.$.rootUrl + '/EducationalAdministration/DtStayInSchool/Form?keyValue=' + keyValue, + width: 600, + height: 400, + callBack: function (id) { + return top[id].acceptClick(refreshGirdData); + } + }); + } + }); + // 删除 + $('#lr_delete').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('Id'); + if (learun.checkrow(keyValue)) { + var State = $('#gridtable').jfGridValue('State'); + if (State != 0) { + learun.alert.warning("当前项目已提交不能删除！"); + return; + } + learun.layerConfirm('是否确认删除该项！', function (res) { + if (res) { + learun.deleteForm(top.$.rootUrl + '/EducationalAdministration/DtStayInSchool/DeleteForm', { keyValue: keyValue }, function () { + refreshGirdData(); + }); + } + }); + } + }); + //提交 + $('#lr_submit').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('Id'); + if (learun.checkrow(keyValue)) { + var State = $('#gridtable').jfGridValue('State'); + if (State != 0) { + learun.alert.warning("当前项目已提交,请勿重复提交!"); + return; + } + learun.layerConfirm('是否确认提交该项！', function (res) { + if (res) { + learun.postForm(top.$.rootUrl + '/EducationalAdministration/DtStayInSchool/SubmitList', { keyValue: keyValue }, function () { + refreshGirdData(); + }); + } + }); + } + }); + //审核 + $('#lr_lock').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('Id'); + if (learun.checkrow(keyValue)) { + var State = $('#gridtable').jfGridValue('State'); + if (State != 1) { + learun.alert.warning("当前项目未提交,不能审核!"); + return; + } + learun.layerConfirm('是否确认审核该项！', function (res) { + if (res) { + learun.postForm(top.$.rootUrl + '/EducationalAdministration/DtStayInSchool/TeacherAudit', { keyValue: keyValue }, function () { + refreshGirdData(); + }); + } + }); + } + }); + }, + // 初始化列表 + initGird: function () { + $('#gridtable').lrAuthorizeJfGrid({ + url: top.$.rootUrl + '/EducationalAdministration/DtStayInSchool/GetPageList', + headData: [ + { + 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: "Grade", 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: "Sex", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'usersex', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, + { label: "联系电话", name: "Phone", width: 100, align: "left" }, + { + label: "班主任", name: "ClassTeacher", 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: "HoildayType", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'StayInSchoolNo', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, + { label: "开始时间", name: "BeginTime", width: 150, align: "left" }, + { label: "结束时间", name: "EndTime", width: 150, align: "left" }, + { + label: "创建用户", name: "CreateUserId", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('user', { + key: value, + callback: function (_data) { + callback(_data.name); + } + }); + } + }, + { + label: "创建时间", name: "CreateTime", width: 200, align: "left" + }, + { + label: "当前状态", name: "State", width: 100, align: "left", + formatter: function (cellvalue, row) { + if (cellvalue == 0) { + return '草稿'; + } + if (cellvalue == 1) { + return '已提交'; + } else if (cellvalue == 2) { + return '审核完成'; + } + } + } + ], + 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/Areas/EducationalAdministration/Views/DtStuLeave/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/DtStuLeave/Form.js index 6dabd7614..0fca6f2b5 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/DtStuLeave/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/DtStuLeave/Form.js @@ -49,7 +49,6 @@ var bootstrap = function ($, learun) { $('#CreateUserClassNo').lrDataSourceSelect({ code: 'bjsj',value: 'classno',text: 'classname' }); $('#LeaveType').lrDataItemSelect({ code: 'LeaveType' }); $('#LeaveAddTime').val(learun.formatDate(new Date(), 'yyyy-MM-dd hh:mm:ss')); - $('#LastUpTime').val(learun.formatDate(new Date(), 'yyyy-MM-dd hh:mm:ss')); }, initData: function () { if (!!keyValue) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/DtStuLeave/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/DtStuLeave/Index.js index dd579da86..8a0b58bf2 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/DtStuLeave/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/DtStuLeave/Index.js @@ -120,7 +120,7 @@ var bootstrap = function ($, learun) { if (learun.checkrow(keyValue)) { var FlowNo = $('#gridtable').jfGridValue('FlowNo'); if (FlowNo != 0) { - learun.alert.warning("当前项目已提交不能编辑！"); + learun.alert.warning("当前项目已提交不能删除！"); return; } learun.layerConfirm('是否确认删除该项！', function (res) { @@ -204,8 +204,7 @@ var bootstrap = function ($, learun) { return '审核完成'; } } - }, - { label: "修改时间", name: "LastUpTime", width: 150, align: "left" } + } ], mainId: 'Id', isPage: true 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 d7687c730..eaf76fc5e 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 @@ -826,6 +826,7 @@ + @@ -6461,6 +6462,10 @@ + + + + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/EducationalAdministration/DtStayInSchoolMap.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/EducationalAdministration/DtStayInSchoolMap.cs new file mode 100644 index 000000000..d6683a339 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/EducationalAdministration/DtStayInSchoolMap.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 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2021-07-21 12:08 + /// 描 述：学生留校 + /// + public class DtStayInSchoolMap : EntityTypeConfiguration + { + public DtStayInSchoolMap() + { + #region 表、主键 + //表 + this.ToTable("DTSTAYINSCHOOL"); + //主键 + 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 3dfee3fde..e3ae22389 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 @@ -575,6 +575,7 @@ + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/DtStayInSchool/DtStayInSchoolBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/DtStayInSchool/DtStayInSchoolBLL.cs new file mode 100644 index 000000000..88085f5a5 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/DtStayInSchool/DtStayInSchoolBLL.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 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2021-07-21 12:08 + /// 描 述：学生留校 + /// + public class DtStayInSchoolBLL : DtStayInSchoolIBLL + { + private DtStayInSchoolService dtStayInSchoolService = new DtStayInSchoolService(); + + #region 获取数据 + + /// + /// 获取页面显示列表数据 + /// + /// 分页参数 + /// 查询参数 + /// + public IEnumerable GetPageList(Pagination pagination, string queryJson) + { + try + { + return dtStayInSchoolService.GetPageList(pagination, queryJson); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + /// + /// 获取DtStayInSchool表实体数据 + /// + /// 主键 + /// + public DtStayInSchoolEntity GetDtStayInSchoolEntity(string keyValue) + { + try + { + return dtStayInSchoolService.GetDtStayInSchoolEntity(keyValue); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// + /// 主键 + public void DeleteEntity(string keyValue) + { + try + { + dtStayInSchoolService.DeleteEntity(keyValue); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + /// + /// 保存实体数据（新增、修改） + /// + /// 主键 + /// 实体 + /// + public void SaveEntity(string keyValue, DtStayInSchoolEntity entity) + { + try + { + dtStayInSchoolService.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/DtStayInSchool/DtStayInSchoolEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/DtStayInSchool/DtStayInSchoolEntity.cs new file mode 100644 index 000000000..a8407361e --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/DtStayInSchool/DtStayInSchoolEntity.cs @@ -0,0 +1,105 @@ +using Learun.Util; +using System; +using System.ComponentModel.DataAnnotations.Schema; + +namespace Learun.Application.TwoDevelopment.EducationalAdministration +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2021-07-21 12:08 + /// 描 述：学生留校 + /// + public class DtStayInSchoolEntity + { + #region 实体成员 + /// + /// 主键 + /// + [Column("ID")] + public string Id { get; set; } + /// + /// 专业 + /// + [Column("MAJORNO")] + public string MajorNo { get; set; } + /// + /// 年级 + /// + [Column("GRADE")] + public string Grade { get; set; } + /// + /// 性别 + /// + [Column("SEX")] + public string Sex { get; set; } + /// + /// 联系电话 + /// + [Column("PHONE")] + public string Phone { get; set; } + /// + /// 假期类型 + /// + [Column("HOILDAYTYPE")] + public string HoildayType { get; set; } + /// + /// 开始时间 + /// + [Column("BEGINTIME")] + public DateTime? BeginTime { get; set; } + /// + /// 结束时间 + /// + [Column("ENDTIME")] + public DateTime? EndTime { get; set; } + /// + /// 班主任 + /// + [Column("CLASSTEACHER")] + public string ClassTeacher { get; set; } + /// + /// 申请人 + /// + [Column("CREATEUSERID")] + public string CreateUserId { get; set; } + /// + /// 申请时间 + /// + [Column("CREATETIME")] + public DateTime? CreateTime { get; set; } + /// + /// 备注 + /// + [Column("DEMO")] + public string Demo { get; set; } + /// + /// 状态 0 草稿 1 老师 + /// + [Column("STATE")] + public string State { 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/DtStayInSchool/DtStayInSchoolIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/DtStayInSchool/DtStayInSchoolIBLL.cs new file mode 100644 index 000000000..cca739fed --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/DtStayInSchool/DtStayInSchoolIBLL.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 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2021-07-21 12:08 + /// 描 述：学生留校 + /// + public interface DtStayInSchoolIBLL + { + #region 获取数据 + + /// + /// 获取页面显示列表数据 + /// + /// 查询参数 + /// + IEnumerable GetPageList(Pagination pagination, string queryJson); + /// + /// 获取DtStayInSchool表实体数据 + /// + /// 主键 + /// + DtStayInSchoolEntity GetDtStayInSchoolEntity(string keyValue); + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// + /// 主键 + void DeleteEntity(string keyValue); + /// + /// 保存实体数据（新增、修改） + /// + /// 主键 + /// 实体 + void SaveEntity(string keyValue, DtStayInSchoolEntity entity); + #endregion + + } +} diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/DtStayInSchool/DtStayInSchoolService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/DtStayInSchool/DtStayInSchoolService.cs new file mode 100644 index 000000000..3520b70c4 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/DtStayInSchool/DtStayInSchoolService.cs @@ -0,0 +1,180 @@ +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 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2021-07-21 12:08 + /// 描 述：学生留校 + /// + public class DtStayInSchoolService : RepositoryFactory + { + #region 获取数据 + + /// + /// 获取页面显示列表数据 + /// + /// 查询参数 + /// 查询参数 + /// + public IEnumerable GetPageList(Pagination pagination, string queryJson) + { + try + { + var strSql = new StringBuilder(); + strSql.Append("SELECT "); + strSql.Append(@" + t.Id, + t.MajorNo, + t.Grade, + t.Sex, + t.Phone, + t.ClassTeacher, + t.HoildayType, + t.BeginTime, + t.EndTime, + t.CreateUserId, + t.CreateTime, + t.State + "); + strSql.Append(" FROM DtStayInSchool t "); + strSql.Append(" WHERE 1=1 "); + var queryParam = queryJson.ToJObject(); + // 虚拟参数 + var dp = new DynamicParameters(new { }); + if (!queryParam["MajorNo"].IsEmpty()) + { + dp.Add("MajorNo", queryParam["MajorNo"].ToString(), DbType.String); + strSql.Append(" AND t.MajorNo = @MajorNo "); + } + if (!queryParam["Sex"].IsEmpty()) + { + dp.Add("Sex", queryParam["Sex"].ToString(), DbType.String); + strSql.Append(" AND t.Sex = @Sex "); + } + if (!queryParam["ClassTeacher"].IsEmpty()) + { + dp.Add("ClassTeacher", queryParam["ClassTeacher"].ToString(), DbType.String); + strSql.Append(" AND t.ClassTeacher = @ClassTeacher "); + } + if (!queryParam["HoildayType"].IsEmpty()) + { + dp.Add("HoildayType", queryParam["HoildayType"].ToString(), DbType.String); + strSql.Append(" AND t.HoildayType = @HoildayType "); + } + if (!queryParam["CreateTime"].IsEmpty()) + { + dp.Add("CreateTime", queryParam["CreateTime"].ToString(), DbType.String); + strSql.Append(" AND t.CreateTime = @CreateTime "); + } + return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), dp, pagination); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + /// + /// 获取DtStayInSchool表实体数据 + /// + /// 主键 + /// + public DtStayInSchoolEntity GetDtStayInSchoolEntity(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, DtStayInSchoolEntity 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/DtStuLeave/DtStuLeaveEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/DtStuLeave/DtStuLeaveEntity.cs index 2a14427e4..0f555ad9a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/DtStuLeave/DtStuLeaveEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/DtStuLeave/DtStuLeaveEntity.cs @@ -60,11 +60,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration [Column("CREATEUSERID")] public string CreateUserId { get; set; } /// - /// 申请人编号 - /// - [Column("CREATEUSERNO")] - public string CreateUserNo { get; set; } - /// /// 申请人 /// [Column("CREATEUSERNAME")] @@ -80,31 +75,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration [Column("CREATEUSERCLASSNO")] public string CreateUserClassNo { get; set; } /// - /// 审核人ID - /// - [Column("AUDITUSERID")] - public string AuditUserId { get; set; } - /// - /// 审核人编号 - /// - [Column("AUDITUSERNO")] - public string AuditUserNo { get; set; } - /// - /// 审核时间 - /// - [Column("AUDITTIME")] - public DateTime? AuditTime { get; set; } - /// - /// 审核备注 - /// - [Column("CHECKREMARK")] - public string CheckRemark { get; set; } - /// - /// 申请时间 - /// - [Column("LASTUPTIME")] - public DateTime? LastUpTime { get; set; } - /// /// 审核状态 /// [Column("FLOWNO")] diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/DtStuLeave/DtStuLeaveService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/DtStuLeave/DtStuLeaveService.cs index 443b131c3..69faac8ba 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/DtStuLeave/DtStuLeaveService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/DtStuLeave/DtStuLeaveService.cs @@ -31,20 +31,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration { var strSql = new StringBuilder(); strSql.Append("SELECT "); - strSql.Append(@" - t.Id, - t.CreateUserName, - t.CreateUserDeptNo, - t.CreateUserClassNo, - t.LeaveType, - t.BeginDate, - t.EndDate, - t.LeaveDay, - t.LeaveReason, - t.LeaveAddTime, - t.FlowNo, - t.LastUpTime - "); + strSql.Append(@" t.* "); strSql.Append(" FROM DtStuLeave t "); strSql.Append(" WHERE 1=1 "); var queryParam = queryJson.ToJObject(); diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj index 344c4a36e..f38dbe996 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 @@ -1718,6 +1718,10 @@ + + + +