From 17907e5d9d55000a96f9ef18b858a34a7db3feeb Mon Sep 17 00:00:00 2001 From: dyy <807692433@qq.com> Date: Thu, 25 Aug 2022 11:59:31 +0800 Subject: [PATCH 01/13] =?UTF-8?q?=E3=80=90=E5=A2=9E=E5=8A=A0=E3=80=91?= =?UTF-8?q?=E6=95=99=E5=8A=A1=EF=BC=9A=E5=A2=9E=E5=8A=A0=E8=AF=BE=E5=A0=82?= =?UTF-8?q?=E5=B7=A1=E6=9F=A5=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/ClassPatrolController.cs | 127 ++++++++++++++ .../Views/ClassPatrol/Form.cshtml | 31 ++++ .../Views/ClassPatrol/Form.js | 52 ++++++ .../Views/ClassPatrol/Index.cshtml | 44 +++++ .../Views/ClassPatrol/Index.js | 114 +++++++++++++ .../Learun.Application.Web.csproj | 5 + .../Learun.Application.Mapping.csproj | 1 + .../PersonnelManagement/ClassPatrolMap.cs | 29 ++++ .../Learun.Application.TwoDevelopment.csproj | 4 + .../ClassPatrol/ClassPatrolBLL.cs | 125 ++++++++++++++ .../ClassPatrol/ClassPatrolEntity.cs | 95 +++++++++++ .../ClassPatrol/ClassPatrolIBLL.cs | 48 ++++++ .../ClassPatrol/ClassPatrolService.cs | 156 ++++++++++++++++++ 13 files changed, 831 insertions(+) create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/ClassPatrolController.cs create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ClassPatrol/Form.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ClassPatrol/Form.js create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ClassPatrol/Index.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ClassPatrol/Index.js create mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/PersonnelManagement/ClassPatrolMap.cs create mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/ClassPatrol/ClassPatrolBLL.cs create mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/ClassPatrol/ClassPatrolEntity.cs create mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/ClassPatrol/ClassPatrolIBLL.cs create mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/ClassPatrol/ClassPatrolService.cs diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/ClassPatrolController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/ClassPatrolController.cs new file mode 100644 index 000000000..c36aa4d20 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/ClassPatrolController.cs @@ -0,0 +1,127 @@ +using Learun.Util; +using System.Data; +using Learun.Application.TwoDevelopment.PersonnelManagement; +using System.Web.Mvc; +using System.Collections.Generic; +using System; + +namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2022-08-25 11:16 + /// 描 述：课堂巡查 + /// + public class ClassPatrolController : MvcControllerBase + { + private ClassPatrolIBLL classPatrolIBLL = new ClassPatrolBLL(); + + #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 = classPatrolIBLL.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 ClassPatrolData = classPatrolIBLL.GetClassPatrolEntity( keyValue ); + var jsonData = new { + ClassPatrol = ClassPatrolData, + }; + return Success(jsonData); + } + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// + /// 主键 + /// + [HttpPost] + [AjaxOnly] + public ActionResult DeleteForm(string keyValue) + { + classPatrolIBLL.DeleteEntity(keyValue); + return Success("删除成功！"); + } + /// + /// 保存实体数据（新增、修改） + /// + /// 主键 + /// 实体 + /// + [HttpPost] + [ValidateAntiForgeryToken] + [AjaxOnly] + public ActionResult SaveForm(string keyValue, string strEntity) + { + ClassPatrolEntity entity = strEntity.ToObject(); + var loginUserInfo = LoginUserInfo.Get(); + if (string.IsNullOrEmpty(keyValue)) + { + entity.CreateUserId = loginUserInfo.userId; + entity.CreateTime = DateTime.Now; + } + else + { + entity.ModifyUserId = loginUserInfo.userId; + entity.ModifyTime = DateTime.Now; + } + classPatrolIBLL.SaveEntity(keyValue,entity); + + return Success("保存成功！"); + } + #endregion + + } +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ClassPatrol/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ClassPatrol/Form.cshtml new file mode 100644 index 000000000..7f9494209 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ClassPatrol/Form.cshtml @@ -0,0 +1,31 @@ +@{ + ViewBag.Title = "课堂巡查"; + Layout = "~/Views/Shared/_Form.cshtml"; +} +
+
+
时间*
+ +
+
+
课节*
+ +
+
+
教师*
+
+
+
+
科目*
+
+
+
+
情况记载
+ +
+
+
备注
+ +
+
+@Html.AppendJsFile("/Areas/PersonnelManagement/Views/ClassPatrol/Form.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ClassPatrol/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ClassPatrol/Form.js new file mode 100644 index 000000000..cb3587702 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ClassPatrol/Form.js @@ -0,0 +1,52 @@ +/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn) + * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + * 创建人：超级管理员 + * 日 期：2022-08-25 11:16 + * 描 述：课堂巡查 + */ +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 () { + $('#EmpNo').lrDataSourceSelect({ code: 'EmpInfo',value: 'empno',text: 'empname' }); + $('#LessonNo').lrDataSourceSelect({ code: 'LessonInfo',value: 'lessonno',text: 'lessonname' }); + }, + initData: function () { + if (!!keyValue) { + $.lrSetForm(top.$.rootUrl + '/PersonnelManagement/ClassPatrol/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 + '/PersonnelManagement/ClassPatrol/SaveForm?keyValue=' + keyValue, postData, function (res) { + // 保存成功后才回调 + if (!!callBack) { + callBack(); + } + }); + }; + page.init(); +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ClassPatrol/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ClassPatrol/Index.cshtml new file mode 100644 index 000000000..cdcbc5736 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ClassPatrol/Index.cshtml @@ -0,0 +1,44 @@ +@{ + ViewBag.Title = "课堂巡查"; + Layout = "~/Views/Shared/_Index.cshtml"; +} +
+
+
+
+
+
+
+
+
+
课节
+ +
+
+
教师
+
+
+
+
科目
+
+
+
+
+
+
+
+
+ +
+
+  新增 +  编辑 +  删除 +
+
+
+
+
+
+
+@Html.AppendJsFile("/Areas/PersonnelManagement/Views/ClassPatrol/Index.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ClassPatrol/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ClassPatrol/Index.js new file mode 100644 index 000000000..c14bfe9c6 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ClassPatrol/Index.js @@ -0,0 +1,114 @@ +/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn) + * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + * 创建人：超级管理员 + * 日 期：2022-08-25 11:16 + * 描 述：课堂巡查 + */ +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); + $('#EmpNo').lrDataSourceSelect({ code: 'EmpInfo',value: 'empno',text: 'empname' }); + $('#LessonNo').lrDataSourceSelect({ code: 'LessonInfo',value: 'lessonno',text: 'lessonname' }); + // 刷新 + $('#lr_refresh').on('click', function () { + location.reload(); + }); + // 新增 + $('#lr_add').on('click', function () { + learun.layerForm({ + id: 'form', + title: '新增', + url: top.$.rootUrl + '/PersonnelManagement/ClassPatrol/Form', + width: 600, + height: 400, + callBack: function (id) { + return top[id].acceptClick(refreshGirdData); + } + }); + }); + // 编辑 + $('#lr_edit').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('Id'); + if (learun.checkrow(keyValue)) { + learun.layerForm({ + id: 'form', + title: '编辑', + url: top.$.rootUrl + '/PersonnelManagement/ClassPatrol/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)) { + learun.layerConfirm('是否确认删除该项！', function (res) { + if (res) { + learun.deleteForm(top.$.rootUrl + '/PersonnelManagement/ClassPatrol/DeleteForm', { keyValue: keyValue}, function () { + refreshGirdData(); + }); + } + }); + } + }); + }, + // 初始化列表 + initGird: function () { + $('#gridtable').lrAuthorizeJfGrid({ + url: top.$.rootUrl + '/PersonnelManagement/ClassPatrol/GetPageList', + headData: [ + { label: "时间", name: "Time", width: 100, align: "left"}, + { label: "课节", name: "Section", width: 100, align: "left"}, + { label: "教师", name: "EmpNo", width: 100, align: "left", + formatterAsync: function (callback, value, row, op,$cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'EmpInfo', + key: value, + keyId: 'empno', + callback: function (_data) { + callback(_data['empname']); + } + }); + }}, + { label: "科目", name: "LessonNo", width: 100, align: "left", + formatterAsync: function (callback, value, row, op,$cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'LessonInfo', + key: value, + keyId: 'lessonno', + callback: function (_data) { + callback(_data['lessonname']); + } + }); + }}, + { label: "情况记载", name: "Records", width: 100, align: "left"}, + { label: "备注", name: "Remark", 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 98b6ca768..1983cf9b0 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 @@ -862,6 +862,7 @@ + @@ -6850,6 +6851,10 @@ + + + + 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 d7a867732..df0c8d071 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 @@ -619,6 +619,7 @@ + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/PersonnelManagement/ClassPatrolMap.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/PersonnelManagement/ClassPatrolMap.cs new file mode 100644 index 000000000..619a5860d --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/PersonnelManagement/ClassPatrolMap.cs @@ -0,0 +1,29 @@ +using Learun.Application.TwoDevelopment.PersonnelManagement; +using System.Data.Entity.ModelConfiguration; + +namespace Learun.Application.Mapping +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2022-08-25 11:16 + /// 描 述：课堂巡查 + /// + public class ClassPatrolMap : EntityTypeConfiguration + { + public ClassPatrolMap() + { + #region 表、主键 + //表 + this.ToTable("CLASSPATROL"); + //主键 + this.HasKey(t => t.Id); + #endregion + + #region 配置关系 + #endregion + } + } +} + 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 c05639fbf..71832bee7 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 @@ -1902,6 +1902,10 @@ + + + + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/ClassPatrol/ClassPatrolBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/ClassPatrol/ClassPatrolBLL.cs new file mode 100644 index 000000000..4e7670a51 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/ClassPatrol/ClassPatrolBLL.cs @@ -0,0 +1,125 @@ +using Learun.Util; +using System; +using System.Data; +using System.Collections.Generic; + +namespace Learun.Application.TwoDevelopment.PersonnelManagement +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2022-08-25 11:16 + /// 描 述：课堂巡查 + /// + public class ClassPatrolBLL : ClassPatrolIBLL + { + private ClassPatrolService classPatrolService = new ClassPatrolService(); + + #region 获取数据 + + /// + /// 获取页面显示列表数据 + /// + /// 分页参数 + /// 查询参数 + /// + public IEnumerable GetPageList(Pagination pagination, string queryJson) + { + try + { + return classPatrolService.GetPageList(pagination, queryJson); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + /// + /// 获取ClassPatrol表实体数据 + /// + /// 主键 + /// + public ClassPatrolEntity GetClassPatrolEntity(string keyValue) + { + try + { + return classPatrolService.GetClassPatrolEntity(keyValue); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// + /// 主键 + public void DeleteEntity(string keyValue) + { + try + { + classPatrolService.DeleteEntity(keyValue); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + /// + /// 保存实体数据（新增、修改） + /// + /// 主键 + /// 实体 + /// + public void SaveEntity(string keyValue, ClassPatrolEntity entity) + { + try + { + classPatrolService.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/PersonnelManagement/ClassPatrol/ClassPatrolEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/ClassPatrol/ClassPatrolEntity.cs new file mode 100644 index 000000000..db57cf084 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/ClassPatrol/ClassPatrolEntity.cs @@ -0,0 +1,95 @@ +using Learun.Util; +using System; +using System.ComponentModel.DataAnnotations.Schema; + +namespace Learun.Application.TwoDevelopment.PersonnelManagement +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2022-08-25 11:16 + /// 描 述：课堂巡查 + /// + public class ClassPatrolEntity + { + #region 实体成员 + /// + /// Id + /// + [Column("ID")] + public string Id { get; set; } + /// + /// 时间 + /// + [Column("TIME")] + public DateTime? Time { get; set; } + /// + /// 课节 + /// + [Column("SECTION")] + public string Section { get; set; } + /// + /// 教师 + /// + [Column("EMPNO")] + public string EmpNo { get; set; } + /// + /// 科目 + /// + [Column("LESSONNO")] + public string LessonNo { get; set; } + /// + /// 情况记载 + /// + [Column("RECORDS")] + public string Records { get; set; } + /// + /// 备注 + /// + [Column("REMARK")] + public string Remark { get; set; } + /// + /// CreateUserId + /// + [Column("CREATEUSERID")] + public string CreateUserId { get; set; } + /// + /// CreateTime + /// + [Column("CREATETIME")] + public DateTime? CreateTime { get; set; } + /// + /// ModifyUserId + /// + [Column("MODIFYUSERID")] + public string ModifyUserId { get; set; } + /// + /// ModifyTime + /// + [Column("MODIFYTIME")] + public DateTime? ModifyTime { 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/PersonnelManagement/ClassPatrol/ClassPatrolIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/ClassPatrol/ClassPatrolIBLL.cs new file mode 100644 index 000000000..71b222941 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/ClassPatrol/ClassPatrolIBLL.cs @@ -0,0 +1,48 @@ +using Learun.Util; +using System.Data; +using System.Collections.Generic; + +namespace Learun.Application.TwoDevelopment.PersonnelManagement +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2022-08-25 11:16 + /// 描 述：课堂巡查 + /// + public interface ClassPatrolIBLL + { + #region 获取数据 + + /// + /// 获取页面显示列表数据 + /// + /// 查询参数 + /// + IEnumerable GetPageList(Pagination pagination, string queryJson); + /// + /// 获取ClassPatrol表实体数据 + /// + /// 主键 + /// + ClassPatrolEntity GetClassPatrolEntity(string keyValue); + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// + /// 主键 + void DeleteEntity(string keyValue); + /// + /// 保存实体数据（新增、修改） + /// + /// 主键 + /// 实体 + void SaveEntity(string keyValue, ClassPatrolEntity entity); + #endregion + + } +} diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/ClassPatrol/ClassPatrolService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/ClassPatrol/ClassPatrolService.cs new file mode 100644 index 000000000..e68f45e00 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/ClassPatrol/ClassPatrolService.cs @@ -0,0 +1,156 @@ +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.PersonnelManagement +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2022-08-25 11:16 + /// 描 述：课堂巡查 + /// + public class ClassPatrolService : RepositoryFactory + { + #region 获取数据 + + /// + /// 获取页面显示列表数据 + /// + /// 查询参数 + /// 查询参数 + /// + public IEnumerable GetPageList(Pagination pagination, string queryJson) + { + try + { + var strSql = new StringBuilder(); + strSql.Append("SELECT t.* "); + strSql.Append(" FROM ClassPatrol t "); + strSql.Append(" WHERE 1=1 "); + var queryParam = queryJson.ToJObject(); + // 虚拟参数 + var dp = new DynamicParameters(new { }); + if (!queryParam["Section"].IsEmpty()) + { + dp.Add("Section", "%" + queryParam["Section"].ToString() + "%", DbType.String); + strSql.Append(" AND t.Section Like @Section "); + } + if (!queryParam["EmpNo"].IsEmpty()) + { + dp.Add("EmpNo",queryParam["EmpNo"].ToString(), DbType.String); + strSql.Append(" AND t.EmpNo = @EmpNo "); + } + if (!queryParam["LessonNo"].IsEmpty()) + { + dp.Add("LessonNo",queryParam["LessonNo"].ToString(), DbType.String); + strSql.Append(" AND t.LessonNo = @LessonNo "); + } + return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(),dp, pagination); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + /// + /// 获取ClassPatrol表实体数据 + /// + /// 主键 + /// + public ClassPatrolEntity GetClassPatrolEntity(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, ClassPatrolEntity 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 + + } +} From 7bd4bb1e53c538ff9978fde2f785b4210f519d9c Mon Sep 17 00:00:00 2001 From: dyy <807692433@qq.com> Date: Thu, 25 Aug 2022 17:32:18 +0800 Subject: [PATCH 02/13] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91?= =?UTF-8?q?=E5=AD=A6=E7=B1=8D=E4=BF=A1=E6=81=AF=E7=AE=A1=E7=90=86=EF=BC=9A?= =?UTF-8?q?=E5=A4=9A=E6=9D=A1=E4=BB=B6=E6=9F=A5=E8=AF=A2=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/StuInfoBasic/Index.cshtml | 35 ++++++++++++- .../Views/StuInfoBasic/Index.js | 9 +++- .../StuInfoBasic/StuInfoBasicService.cs | 51 +++++++++++++++++++ 3 files changed, 93 insertions(+), 2 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.cshtml index a0018022b..a9455599d 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.cshtml @@ -38,10 +38,43 @@
民族
-
+
身份证号
+
+
审核状态
+
+
+
+
学生编号
+ +
+
+
学籍号
+ +
+
+
政治面貌
+
+
+
+
学制
+
+
+
+
身体状态
+
+
+
+
学习形式
+
+
+
+
上传照片
+
+
+
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js index 2575064cb..957ab2b27 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js @@ -10,7 +10,7 @@ var bootstrap = function ($, learun) { bind: function () { $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { page.search(queryJson); - }, 300, 400); + }, 450, 400); $('#DeptNo').lrselect({ allowSearch: true, value: "deptno", @@ -70,6 +70,13 @@ var bootstrap = function ($, learun) { $('#GenderNo').lrDataItemSelect({ code: 'usersexbit' }); $('#NationalityNo').lrDataSourceSelect({ code: 'BCdNationality', value: 'nationalityno', text: 'nationality' }); $('#FiveYear').lrDataItemSelect({ code: 'PieceCultivateWay' }); + $('#CheckMark').lrselect({ data: [{ id: '1', text: '已审核' }, { id: '0', text: '未审核' }] }); + $('#PartyFaceNo').lrDataItemSelect({ code: 'PolityStatus' }); + $('#EduSystem').lrDataItemSelect({ code: 'EduSystem' }); + $('#HealthStatus').lrDataItemSelect({ code: 'QRCodeHealthStatus' }); + $('#StudyModality').lrDataItemSelect({ code: 'StudyModality' }); + $('#Photo').lrselect({ data: [{ id: '1', text: '是' }, { id: '0', text: '否' }] }); + // 刷新 $('#lr_refresh').on('click', function () { location.reload(); diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicService.cs index d71341038..e2b8631b6 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicService.cs @@ -103,6 +103,57 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration dp.Add("Remark", "%" + queryParam["Remark"].ToString() + "%", DbType.String); strSql.Append(" AND t.Remark Like @Remark "); } + + if (!queryParam["CheckMark"].IsEmpty()) + { + dp.Add("CheckMark", "" + queryParam["CheckMark"].ToString() + "", DbType.String); + if (queryParam["CheckMark"].ToString() == "1") + { + strSql.Append(" AND t.CheckMark=@CheckMark "); + } + else + { + strSql.Append(" AND (t.CheckMark is null or t.CheckMark='0') "); + } + } + if (!queryParam["StuCode"].IsEmpty()) + { + dp.Add("StuCode", "%" + queryParam["StuCode"].ToString() + "%", DbType.String); + strSql.Append(" AND t.StuCode Like @StuCode "); + } + if (!queryParam["PartyFaceNo"].IsEmpty()) + { + dp.Add("PartyFaceNo", "" + queryParam["PartyFaceNo"].ToString() + "", DbType.String); + strSql.Append(" AND t.PartyFaceNo = @PartyFaceNo "); + } + if (!queryParam["EduSystem"].IsEmpty()) + { + dp.Add("EduSystem", "" + queryParam["EduSystem"].ToString() + "", DbType.String); + strSql.Append(" AND t.EduSystem = @EduSystem "); + } + if (!queryParam["HealthStatus"].IsEmpty()) + { + dp.Add("HealthStatus", "" + queryParam["HealthStatus"].ToString() + "", DbType.String); + strSql.Append(" AND t.HealthStatus = @HealthStatus "); + } + if (!queryParam["StudyModality"].IsEmpty()) + { + dp.Add("StudyModality", "" + queryParam["StudyModality"].ToString() + "", DbType.String); + strSql.Append(" AND t.StudyModality = @StudyModality "); + } + + if (!queryParam["Photo"].IsEmpty()) + { + dp.Add("Photo", "" + queryParam["Photo"].ToString() + "", DbType.String); + if (queryParam["Photo"].ToString() == "1") + { + strSql.Append(" AND t.Photo is not null "); + } + else + { + strSql.Append(" AND t.Photo is null "); + } + } return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), dp, pagination); } catch (Exception ex) From e4c6bc529a8d8b8ff535f762b47f2f01ec345ddb Mon Sep 17 00:00:00 2001 From: dyy <807692433@qq.com> Date: Thu, 25 Aug 2022 18:02:44 +0800 Subject: [PATCH 03/13] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91?= =?UTF-8?q?=E5=AD=A6=E7=B1=8D=EF=BC=9A=E5=90=8C=E6=AD=A5=E7=85=A7=E7=89=87?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/StuInfoBasic/Index.cshtml | 4 +- .../StuInfoBasic/StuInfoBasicService.cs | 61 ++++++++++--------- 2 files changed, 35 insertions(+), 30 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.cshtml index a9455599d..ee33a818c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.cshtml @@ -71,7 +71,7 @@
-
上传照片
+
是否有照片
@@ -95,7 +95,7 @@  审核全部  生成帐号  更新帐号 - @* 同步照片*@ +  同步照片  查看异动  拍照  学生简历表 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicService.cs index e2b8631b6..8eb9af102 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicService.cs @@ -498,13 +498,38 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration var url = AppDomain.CurrentDomain.BaseDirectory; foreach (var stuInfo in stuList) { - //照片不为空 - if (!string.IsNullOrEmpty(stuInfo.Photo)) + //判断要上传的照片在本地服务器中是否存在 + var photoPath = $"{url}/Resource/UserPhoto/{stuInfo.IdentityCardNo}.jpg"; + if (System.IO.File.Exists(photoPath)) { - var annex = this.BaseRepository() - .FindEntity(a => a.F_FolderId == stuInfo.Photo); - if (annex == null) + //学籍表中照片字段不为空 + if (!string.IsNullOrEmpty(stuInfo.Photo)) { + var annex = this.BaseRepository() + .FindEntity(a => a.F_FolderId == stuInfo.Photo); + if (annex == null) + { + var annexEntity = new AnnexesFileEntity() + { + F_Id = Guid.NewGuid().ToString(), + F_FileName = stuInfo.IdentityCardNo + ".jpg", + F_FilePath = $"{url}/Resource/UserPhoto/{stuInfo.IdentityCardNo}.jpg", + F_FolderId = stuInfo.Photo + }; + this.BaseRepository().Insert(annexEntity); + + } + else + { + annex.F_FileName = stuInfo.IdentityCardNo + ".jpg"; + annex.F_FilePath = $"{url}/Resource/UserPhoto/{stuInfo.IdentityCardNo}.jpg"; + this.BaseRepository().Update(annex); + } + } + else + { + stuInfo.Photo = Guid.NewGuid().ToString(); + var annexEntity = new AnnexesFileEntity() { F_Id = Guid.NewGuid().ToString(), @@ -512,32 +537,12 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration F_FilePath = $"{url}/Resource/UserPhoto/{stuInfo.IdentityCardNo}.jpg", F_FolderId = stuInfo.Photo }; + annexEntity.Create(); + this.BaseRepository("CollegeMIS").Update(stuInfo); this.BaseRepository().Insert(annexEntity); - - } - else - { - annex.F_FileName = stuInfo.IdentityCardNo + ".jpg"; - annex.F_FilePath = $"{url}/Resource/UserPhoto/{stuInfo.IdentityCardNo}.jpg"; - this.BaseRepository().Update(annex); } } - else - { - stuInfo.Photo = Guid.NewGuid().ToString(); - - var annexEntity = new AnnexesFileEntity() - { - F_Id = Guid.NewGuid().ToString(), - F_FileName = stuInfo.IdentityCardNo + ".jpg", - F_FilePath = $"{url}/Resource/UserPhoto/{stuInfo.IdentityCardNo}.jpg", - F_FolderId = stuInfo.Photo - }; - annexEntity.Create(); - this.BaseRepository("CollegeMIS").Update(stuInfo); - this.BaseRepository().Insert(annexEntity); - } - + } } catch (Exception ex) From 75f645785c732e10bb0610304065d67c4e6a54bb Mon Sep 17 00:00:00 2001 From: ndbs Date: Fri, 26 Aug 2022 10:33:02 +0800 Subject: [PATCH 04/13] =?UTF-8?q?app2.0=20=E6=89=8B=E6=9C=BA=E7=AB=AF?= =?UTF-8?q?=E9=98=85=E8=AF=BB=E9=80=9A=E7=9F=A5=E5=85=AC=E5=91=8A=E9=98=85?= =?UTF-8?q?=E8=AF=BB=E8=AE=B0=E5=BD=95=E4=B8=8D=E7=B4=AF=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Modules/NewsApi.cs | 36 ++++++++++++++++++- .../LearunApp-2.2.0/pages/home/notice.vue | 6 ++-- 2 files changed, 39 insertions(+), 3 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/NewsApi.cs b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/NewsApi.cs index d932ff6aa..5027aaa9e 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/NewsApi.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/NewsApi.cs @@ -9,6 +9,7 @@ using System.Text; using System.Data; using Learun.Application.OA; using Learun.Application.Organization; +using System; namespace Learun.Application.WebApi.Modules { @@ -18,12 +19,15 @@ namespace Learun.Application.WebApi.Modules private NoticeIBLL noticeIBLL = new NoticeBLL(); private DepartmentIBLL departmentIBLL = new DepartmentBLL(); private PostIBLL postIBLL = new PostBLL(); + private LR_OA_NewsReadIBLL lR_OA_NewsReadIBLL = new LR_OA_NewsReadBLL(); public NewsApi() : base("/learun/news") { Get["/list"] = GetList; Get["/shList"] = GetshList; + + Post["/newsRead"] = NewsRead; } @@ -137,11 +141,41 @@ namespace Learun.Application.WebApi.Modules } return Success(shlist); } - #region 私有类 + /// + /// 阅读通知公告 + /// 主键 + /// + /// + public Response NewsRead(dynamic _) + { + var loginUserInfo = LoginUserInfo.Get(); + NoticeEntity parameter = this.GetReqData(); + + //判断当前用户是否阅读当前通知公告 + var entity = lR_OA_NewsReadIBLL.GetLR_OA_NewsReadEntityByNewsIdAndUserId(parameter.newsId, loginUserInfo.userId); + if (entity == null) + { + var lR_OA_NewsRead = new LR_OA_NewsReadEntity() + { + NewsId = parameter.newsId, + RUserId = loginUserInfo.userId, + RUserName = loginUserInfo.realName, + RTime = DateTime.Now + }; + lR_OA_NewsReadIBLL.SaveEntity("", lR_OA_NewsRead); + + //修改当前通知公告的浏览量 + lR_OA_NewsReadIBLL.UpdateNewsPV(parameter.newsId); + } + + return Success("阅读成功！"); + } + #region 私有类 private class NoticeEntity { public string ProgressId { get; set; } + public string newsId { get; set; } } #endregion diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/home/notice.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/home/notice.vue index 00d89e6e7..7bd17e8f3 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/home/notice.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/home/notice.vue @@ -31,15 +31,17 @@ export default { async init() { this.LOADING('加载中…') const noticeItem = this.GET_PARAM() - this.content = this.CONVERT_HTML(noticeItem.f_content) - this.time = moment(noticeItem.f_time).format('HH : mm') this.date = moment(noticeItem.f_time).format('YYYY年 M月 D日') this.SET_TITLE(noticeItem.f_title) this.ready = true this.HIDE_LOADING() + let _postData = { + newsId: noticeItem.f_id, + } + this.HTTP_POST('learun/news/newsRead',_postData, '加载数据时出错'); } } } From 55731502ac262fd2c54fd3b244c788dd0437a63c Mon Sep 17 00:00:00 2001 From: ndbs Date: Fri, 26 Aug 2022 10:34:41 +0800 Subject: [PATCH 05/13] --- .../Learun.Application.WebApi/Modules/NewsApi.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/NewsApi.cs b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/NewsApi.cs index 5027aaa9e..30966dbde 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/NewsApi.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/NewsApi.cs @@ -144,7 +144,6 @@ namespace Learun.Application.WebApi.Modules /// /// 阅读通知公告 - /// 主键 /// /// public Response NewsRead(dynamic _) From 6d87a72c41082fb323ab9b8b2d5f4fab3d638951 Mon Sep 17 00:00:00 2001 From: ndbs Date: Fri, 26 Aug 2022 14:46:58 +0800 Subject: [PATCH 06/13] =?UTF-8?q?app2.0=20=E6=89=8B=E6=9C=BA=E7=AB=AF?= =?UTF-8?q?=E5=80=BC=E7=8F=AD=E5=AE=89=E6=8E=92=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PersonnelManagement/DutyScheduleApi.cs | 77 ++++++++++++++++++- .../DutySchedule/DutyScheduleBLL.cs | 22 ++++++ .../DutySchedule/DutyScheduleIBLL.cs | 6 ++ .../DutySchedule/DutyScheduleService.cs | 39 +++++++--- 4 files changed, 132 insertions(+), 12 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/PersonnelManagement/DutyScheduleApi.cs b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/PersonnelManagement/DutyScheduleApi.cs index 54b0d5975..a18aaaf04 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/PersonnelManagement/DutyScheduleApi.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/PersonnelManagement/DutyScheduleApi.cs @@ -1,4 +1,5 @@ -using Nancy; +using System; +using Nancy; using Learun.Util; using System.Collections.Generic; using Learun.Application.TwoDevelopment.EducationalAdministration; @@ -21,9 +22,13 @@ namespace Learun.Application.WebApi.Modules /// 注册接口 /// public DutyScheduleApi() - : base("/Learun/adms/PersonnelManagement/DutySchedule") + : base("/learun/adms/PersonnelManagement/DutySchedule") { Get["/pagelist"] = GetPageList; + Get["/list"] = GetList; + Get["/form"] = GetForm; + Post["/save"] = SaveForm; + Post["/delete"] = DeleteForm; } #region 获取数据 @@ -45,6 +50,74 @@ namespace Learun.Application.WebApi.Modules }; return Success(jsonData); } + + /// + /// 获取页面显示列表数据 + /// + /// + /// + public Response GetList(dynamic _) + { + string queryJson = this.GetReqData(); + var data = dutyScheduleIBLL.GetList(); + return Success(data); + } + /// + /// 获取表单数据 + /// + /// + /// + public Response GetForm(dynamic _) + { + string keyValue = this.GetReqData(); + var ScheduleData = dutyScheduleIBLL.GetDutyScheduleEntity(keyValue); + //ScheduleData.StartTime = Convert.ToDateTime((ScheduleData.StartTime.ToDate().ToString("yyyy-MM-dd") + " " + ScheduleData.StartTime.Substring(0, 2) + ":" + ScheduleData.StartTime.Substring(2, 2)).ToDate().ToString("yyyy-MM-dd HH:mm")); + //ScheduleData.EndTime = Convert.ToDateTime((ScheduleData.EndTime.ToDate().ToString("yyyy-MM-dd") + " " + ScheduleData.EndTime.Substring(0, 2) + ":" + ScheduleData.F_EndTime.Substring(2, 2)).ToDate().ToString("yyyy-MM-dd HH:mm")); + var jsonData = new + { + Schedule = ScheduleData, + }; + return Success(jsonData); + } + #endregion + + #region 提交数据 + /// + /// 保存实体数据（新增、修改） + /// + /// + /// + public Response SaveForm(dynamic _) + { + ReqFormEntity parameter = this.GetReqData(); + DutyScheduleEntity entity = parameter.strEntity.ToObject(); + dutyScheduleIBLL.SaveEntity(parameter.keyValue, entity); + return Success("保存成功！"); + } + + + /// + /// 删除实体数据 + /// + /// + /// + public Response DeleteForm(dynamic _) + { + string keyValue = this.GetReqData(); + dutyScheduleIBLL.DeleteEntity(keyValue); + return Success("删除成功！"); + } + #endregion + + #region 私有类 + /// + /// 表单实体类 + /// + private class ReqFormEntity + { + public string keyValue { get; set; } + public string strEntity { get; set; } + } #endregion } } \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/DutySchedule/DutyScheduleBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/DutySchedule/DutyScheduleBLL.cs index 45ae9380c..736a0b307 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/DutySchedule/DutyScheduleBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/DutySchedule/DutyScheduleBLL.cs @@ -66,6 +66,28 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement } } + /// + /// 获取列表 + /// + /// 返回列表 + public IEnumerable GetList() + { + try + { + return dutyScheduleService.GetList(); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } #endregion #region 提交数据 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/DutySchedule/DutyScheduleIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/DutySchedule/DutyScheduleIBLL.cs index a3120c615..4b456ae07 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/DutySchedule/DutyScheduleIBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/DutySchedule/DutyScheduleIBLL.cs @@ -27,6 +27,12 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement /// /// DutyScheduleEntity GetDutyScheduleEntity(string keyValue); + /// + /// 获取所有数据 + /// + /// + IEnumerable GetList(); + #endregion #region 提交数据 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/DutySchedule/DutyScheduleService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/DutySchedule/DutyScheduleService.cs index c660b036e..a295a2b01 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/DutySchedule/DutyScheduleService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/DutySchedule/DutyScheduleService.cs @@ -28,21 +28,16 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement { try { + var adms = this.BaseRepository().getDbConnection().Database; var strSql = new StringBuilder(); strSql.Append("SELECT "); - strSql.Append(@" - t.ID, - t.StartTime, - t.EndTime, - t.Person, - t.Remark,u.F_Account,F_RealName - "); - strSql.Append(" FROM DutySchedule t left join adms7ultimate2.dbo.LR_Base_User u on t.Person=u.F_UserId "); + strSql.Append(@" t.* ,u.F_Account,F_RealName "); + strSql.Append($" FROM DutySchedule t left join {adms}.dbo.LR_Base_User u on t.Person=u.F_UserId "); strSql.Append(" WHERE 1=1 "); var queryParam = queryJson.ToJObject(); // 虚拟参数 var dp = new DynamicParameters(new { }); - return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(),dp, pagination); + return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), dp, pagination); } catch (Exception ex) { @@ -81,6 +76,29 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement } } + /// + /// 获取列表 + /// + /// 返回列表 + public IEnumerable GetList() + { + try + { + var adms = this.BaseRepository().getDbConnection().Database; + var strSql = new StringBuilder(); + strSql.Append("SELECT "); + strSql.Append(@" t.*, u.F_Account,F_RealName "); + strSql.Append($" FROM DutySchedule t left join {adms}.dbo.LR_Base_User u on t.Person=u.F_UserId "); + return this.BaseRepository("CollegeMIS").FindList(strSql.ToString()); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + throw; + else + throw ExceptionEx.ThrowServiceException(ex); + } + } #endregion #region 提交数据 @@ -94,7 +112,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement { try { - this.BaseRepository("CollegeMIS").Delete(t=>t.ID == keyValue); + this.BaseRepository("CollegeMIS").Delete(t => t.ID == keyValue); } catch (Exception ex) { @@ -126,6 +144,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement else { entity.Create(); + entity.CreateTime = DateTime.Now; this.BaseRepository("CollegeMIS").Insert(entity); } } From ec20028f92d68fadfe95ca18f7d49e39adffc9be Mon Sep 17 00:00:00 2001 From: ndbs Date: Fri, 26 Aug 2022 15:15:20 +0800 Subject: [PATCH 07/13] =?UTF-8?q?pc=20=E5=80=BC=E7=8F=AD=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/DutySchedule/Index.cshtml | 9 +++++ .../Views/DutySchedule/Index.js | 38 +++++++++++++++++++ .../DutySchedule/DutyScheduleService.cs | 13 ++++++- 3 files changed, 59 insertions(+), 1 deletion(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/DutySchedule/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/DutySchedule/Index.cshtml index 23b616085..9409e00a9 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/DutySchedule/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/DutySchedule/Index.cshtml @@ -7,6 +7,15 @@
+
+
+
+
+ +
+
+  查询 +
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/DutySchedule/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/DutySchedule/Index.js index 39b3f0932..876fd47e1 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/DutySchedule/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/DutySchedule/Index.js @@ -7,12 +7,46 @@ 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(); + } + }); + // 查询 + $('#btn_Search').on('click', function () { + var keyword = $('#txt_Keyword').val(); + page.search({ keyword: keyword }); + }); // 刷新 $('#lr_refresh').on('click', function () { location.reload(); @@ -82,11 +116,15 @@ var bootstrap = function ($, learun) { ], mainId: 'ID', isPage: true, + sidx: 'createtime', + sord: 'desc' }); page.search(); }, search: function (param) { param = param || {}; + param.StartTime = startTime; + param.EndTime = endTime; $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); } }; diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/DutySchedule/DutyScheduleService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/DutySchedule/DutyScheduleService.cs index a295a2b01..e9db34110 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/DutySchedule/DutyScheduleService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/DutySchedule/DutyScheduleService.cs @@ -31,12 +31,23 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement var adms = this.BaseRepository().getDbConnection().Database; var strSql = new StringBuilder(); strSql.Append("SELECT "); - strSql.Append(@" t.* ,u.F_Account,F_RealName "); + strSql.Append(@" t.* ,u.F_Account,u.F_RealName "); strSql.Append($" FROM DutySchedule t left join {adms}.dbo.LR_Base_User u on t.Person=u.F_UserId "); strSql.Append(" WHERE 1=1 "); var queryParam = queryJson.ToJObject(); // 虚拟参数 var dp = new DynamicParameters(new { }); + if (!queryParam["keyword"].IsEmpty()) + { + dp.Add("keyword", "%" + queryParam["keyword"].ToString() + "%", DbType.String); + strSql.Append(" AND u.F_RealName Like @keyword "); + } + if (!queryParam["StartTime"].IsEmpty() && !queryParam["EndTime"].IsEmpty()) + { + dp.Add("startTime", queryParam["StartTime"].ToDate(), DbType.DateTime); + dp.Add("endTime", queryParam["EndTime"].ToDate(), DbType.DateTime); + strSql.Append(" AND ( t.StartTime >= @startTime AND t.EndTime <= @endTime ) "); + } return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), dp, pagination); } catch (Exception ex) From eb2e8db462a74f895284b6416943c97225564ba9 Mon Sep 17 00:00:00 2001 From: dyy <807692433@qq.com> Date: Fri, 26 Aug 2022 16:39:27 +0800 Subject: [PATCH 08/13] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91?= =?UTF-8?q?=E5=AD=A6=E7=B1=8D=E5=BC=82=E5=8A=A8=E7=AE=A1=E7=90=86=EF=BC=9A?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=87=A0=E7=A7=8D=E5=BC=82=E5=8A=A8=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=EF=BC=9B=E5=BC=82=E5=8A=A8=E6=93=8D=E4=BD=9C=E5=90=8E?= =?UTF-8?q?=E8=AE=A1=E5=85=A5=E5=BC=82=E5=8A=A8=E6=97=A5=E5=BF=97=E8=A1=A8?= =?UTF-8?q?=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../StuInfoBasicChangeController.cs | 2 +- .../Views/StuInfoBasicChange/Form.cshtml | 8 +- .../Views/StuInfoBasicChange/Form.js | 75 +++--- .../Views/StuInfoBasic_ChangeLog/Index.cshtml | 15 +- .../Views/StuInfoBasic_ChangeLog/Index.js | 48 +++- .../StuInfoBasic/StuInfoBasicEntity.cs | 2 +- .../StuInfoBasic/StuInfoBasicService.cs | 67 +++-- .../StuInfoBasicChangeEntity.cs | 6 +- .../StuInfoBasicChangeService.cs | 237 ++++++++++++++++-- .../StuInfoBasic_ChangeLogEntity.cs | 15 ++ .../StuInfoBasic_ChangeLogService.cs | 17 +- 11 files changed, 383 insertions(+), 109 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuInfoBasicChangeController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuInfoBasicChangeController.cs index 952067fec..70567beae 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuInfoBasicChangeController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuInfoBasicChangeController.cs @@ -116,7 +116,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers var loginUserInfo = LoginUserInfo.Get(); entity.CreateTime = DateTime.Now; - entity.CreateUserId = loginUserInfo.account; + entity.CreateUserId = loginUserInfo.userId; entity.CheckStatus = 0; stuInfoBasicChangeIBLL.SaveEntity(keyValue, entity); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasicChange/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasicChange/Form.cshtml index d0b4c7d6e..79f5acba6 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasicChange/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasicChange/Form.cshtml @@ -29,11 +29,11 @@
学籍异动前信息
系部*
-
+
专业*
-
+
班级*
@@ -47,20 +47,20 @@
新专业
-
+
新班级
-
异动说明
+
异动说明
备注
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasicChange/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasicChange/Form.js index ac6ce31c1..114114e35 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasicChange/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasicChange/Form.js @@ -32,37 +32,37 @@ var bootstrap = function ($, learun) { $("#NewMajorNo").siblings('div').html($("#NewMajorNo").siblings('div').attr('data-title') + '*'); $("#NewClassNo").siblings('div').html($("#NewClassNo").siblings('div').attr('data-title') + '*'); $(".NewContainer").show(); + $('#OutSchool').removeAttr("isvalid"); + $('#OutSchool').removeAttr("checkexpession"); + $("#OutSchool").siblings('div').html($("#OutSchool").siblings('div').attr('data-title')); + $('#OutSchool').val(''); $(".NewSchool").hide(); - if (item.id === "01" ) { //留级 - $(".NewSchool").hide(); + if (item.id === "01" || item.id === "07") { //留级、转班 $(".NewContainer").find('.contentDiv.zhuanban').removeAttr('readonly'); $("#NewDeptNo").lrselectSet($("#DeptNo").lrselectGet()); $("#NewMajorNo").lrselectSet($("#MajorNo").lrselectGet()); - $('#OutSchool').val(''); } else if (item.id === "02") {//转校 - $(".NewSchool").show(); $(".NewContainer").find('.contentDiv').removeAttr("isvalid"); $(".NewContainer").find('.contentDiv').removeAttr("checkexpession"); $(".NewContainer").find('.contentDiv').removeAttr('readonly'); - $(".NewSchool").find('.OutSchool').attr("isvalid", 'yes'); - $(".NewSchool").find('.OutSchool').attr("checkexpession"); - $(".NewSchool").find('.OutSchool').attr('readonly'); $("#NewDeptNo").siblings('div').html($("#NewDeptNo").siblings('div').attr('data-title')); $("#NewMajorNo").siblings('div').html($("#NewMajorNo").siblings('div').attr('data-title')); $("#NewClassNo").siblings('div').html($("#NewClassNo").siblings('div').attr('data-title')); $(".NewContainer").hide(); + $('#OutSchool').attr("isvalid", 'yes'); + $('#OutSchool').attr("checkexpession", "NotNull"); + $("#OutSchool").siblings('div').html($("#OutSchool").siblings('div').attr('data-title') + '*'); + $(".NewSchool").show(); } else if (item.id === "03") { //复学 - $(".NewSchool").hide(); - $(".NewContainer").find('.contentDiv').removeAttr('readonly'); - $(".NewSchool").find('.OutSchool').attr("isvalid", "Null"); - $('#OutSchool').val(''); - } else if (item.id === "04") { //转入 - $(".NewSchool").hide(); - $(".NewContainer").find('.contentDiv').removeAttr('readonly'); - $(".NewSchool").find('.OutSchool').attr("isvalid", "Null"); - $('#OutSchool').val(''); + $("#NewDeptNo").lrselectSet($("#DeptNo").lrselectGet()); + $("#NewMajorNo").lrselectSet($("#MajorNo").lrselectGet()); + $("#NewClassNo").lrselectSet($("#ClassNo").lrselectGet()); + } else if (item.id === "04") { //转入/进 + learun.alert.warning("异动转进请点击学籍信息管理-异动转入按钮！"); + $("#StuNo").val(""); + $("#StuName").val(""); } - else { //退学、休学、 + else if (item.id === "05" || item.id === "06") { //退学、休学、 $(".NewContainer").find('.contentDiv').removeAttr("isvalid"); $(".NewContainer").find('.contentDiv').removeAttr("checkexpession"); $(".NewContainer").find('.contentDiv').removeAttr('readonly'); @@ -70,8 +70,11 @@ var bootstrap = function ($, learun) { $("#NewMajorNo").siblings('div').html($("#NewMajorNo").siblings('div').attr('data-title')); $("#NewClassNo").siblings('div').html($("#NewClassNo").siblings('div').attr('data-title')); $(".NewContainer").hide(); - $(".NewSchool").hide(); - $('#OutSchool').val(''); + } + else if (item.id === "08") { //转专业、 + $(".NewContainer").find('.contentDiv.zhuanzhuanye').removeAttr('readonly'); + $(".NewContainer").find('.contentDiv.zhuanban').removeAttr('readonly'); + $("#NewDeptNo").lrselectSet($("#DeptNo").lrselectGet()); } } @@ -171,29 +174,33 @@ var bootstrap = function ($, learun) { $("#NewMajorNo").siblings('div').html($("#NewMajorNo").siblings('div').attr('data-title') + '*'); $("#NewClassNo").siblings('div').html($("#NewClassNo").siblings('div').attr('data-title') + '*'); $(".NewContainer").show(); - if (data[id].StuChangeType == "01") { //降级、转班 + $('#OutSchool').removeAttr("isvalid"); + $('#OutSchool').removeAttr("checkexpession"); + $("#OutSchool").siblings('div').html($("#OutSchool").siblings('div').attr('data-title')); + $('#OutSchool').val(''); + $(".NewSchool").hide(); + if (data[id].StuChangeType == "01" || data[id].StuChangeType == "07") { //留级、转班 $(".NewContainer").find('.contentDiv.zhuanban').removeAttr('readonly'); - $(".NewSchool").hide(); - $('#OutSchool').val(''); } else if (data[id].StuChangeType == "02") {//转校 - $(".NewSchool").show(); $(".NewContainer").find('.contentDiv').removeAttr("isvalid"); $(".NewContainer").find('.contentDiv').removeAttr("checkexpession"); $(".NewContainer").find('.contentDiv').removeAttr('readonly'); - $(".NewSchool").find('.OutSchool').attr("isvalid"); - $(".NewSchool").find('.OutSchool').attr("checkexpession"); - $(".NewSchool").find('.OutSchool').attr('readonly'); $("#NewDeptNo").siblings('div').html($("#NewDeptNo").siblings('div').attr('data-title')); $("#NewMajorNo").siblings('div').html($("#NewMajorNo").siblings('div').attr('data-title')); $("#NewClassNo").siblings('div').html($("#NewClassNo").siblings('div').attr('data-title')); $(".NewContainer").hide(); - } else if (data[id].StuChangeType == "03") { //转专业 + $('#OutSchool').attr("isvalid", 'yes'); + $('#OutSchool').attr("checkexpession", "NotNull"); + $("#OutSchool").siblings('div').html($("#OutSchool").siblings('div').attr('data-title') + '*'); + $(".NewSchool").show(); + } else if (data[id].StuChangeType == "03") { //复学 $(".NewContainer").find('.contentDiv').removeAttr('readonly'); - $(".NewSchool").hide(); - $('#OutSchool').val(''); - } - else { //退学、休学、转校 + } else if (data[id].StuChangeType == "04") { //转入/进 + learun.alert.warning("异动转进请点击学籍信息管理-异动转入按钮！"); + $("#StuNo").val(""); + $("#StuName").val(""); + } else if (data[id].StuChangeType == "05" || data[id].StuChangeType == "06") { //退学、休学、 $(".NewContainer").find('.contentDiv').removeAttr("isvalid"); $(".NewContainer").find('.contentDiv').removeAttr("checkexpession"); $(".NewContainer").find('.contentDiv').removeAttr('readonly'); @@ -201,8 +208,10 @@ var bootstrap = function ($, learun) { $("#NewMajorNo").siblings('div').html($("#NewMajorNo").siblings('div').attr('data-title')); $("#NewClassNo").siblings('div').html($("#NewClassNo").siblings('div').attr('data-title')); $(".NewContainer").hide(); - $(".NewSchool").hide(); - $('#OutSchool').val(''); + } + else if (data[id].StuChangeType == "08") { //转专业、 + $(".NewContainer").find('.contentDiv.zhuanzhuanye').removeAttr('readonly'); + $(".NewContainer").find('.contentDiv.zhuanban').removeAttr('readonly'); } } } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic_ChangeLog/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic_ChangeLog/Index.cshtml index 53741d3a1..84f632f14 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic_ChangeLog/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic_ChangeLog/Index.cshtml @@ -2,6 +2,9 @@ ViewBag.Title = "学籍信息异动"; Layout = "~/Views/Shared/_Index.cshtml"; } +
@@ -14,16 +17,20 @@
-
字段
+
异动类型
+
+
+
+
修改属性
-
学生主键
- +
学生姓名
+
修改人
- +
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic_ChangeLog/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic_ChangeLog/Index.js index 7ff4fcd7a..a3cffab8a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic_ChangeLog/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic_ChangeLog/Index.js @@ -45,6 +45,10 @@ var bootstrap = function ($, learun) { $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { page.search(queryJson); }, 220, 400); + $('#StuChangeType').lrDataItemSelect({ code: 'StuChangeType' }); + $('#StuID').lrDataSourceSelect({ code: 'StuInfoBasic', value: 'stuid', text: 'stuname' }); + $('#UpdateBy').lrDataSourceSelect({ code: 'BaseUser', value: 'f_account', text: 'f_realname' }); + // 刷新 $('#lr_refresh').on('click', function () { location.reload(); @@ -98,9 +102,35 @@ var bootstrap = function ($, learun) { }, // 初始化列表 initGird: function () { - $('#gridtable').lrAuthorizeJfGrid({ + $('#gridtable').jfGrid({ url: top.$.rootUrl + '/EducationalAdministration/StuInfoBasic_ChangeLog/GetPageList', headData: [ + { + label: "异动类型", name: "StuChangeType", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'StuChangeType', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, + { label: "异动备注", name: "StuChangeRemark", width: 250, align: "left" }, + { + label: "学生姓名", name: "StuID", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'StuInfoBasic', + key: value, + keyId: 'stuid', + callback: function (_data) { + callback(_data['stuname']); + } + }); + } + }, { label: "修改属性", name: "FieldName", width: 200, align: "left" }, { label: "修改前", name: "BeforeChange", width: 200, align: "left" }, { label: "修改后", name: "AfterChange", width: 200, align: "left" }, @@ -110,7 +140,7 @@ var bootstrap = function ($, learun) { learun.clientdata.getAsync('custmerData', { url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BaseUser', key: value, - keyId: 'f_account', + keyId: 'f_userid', callback: function (_data) { callback(_data['f_realname']); } @@ -119,7 +149,6 @@ var bootstrap = function ($, learun) { }, { label: "修改时间", name: "UpdateTime", width: 200, align: "left" }, - { label: "数据主键", name: "StuID", width: 250, align: "left" }, ], mainId: 'ID', isPage: true, @@ -130,9 +159,18 @@ var bootstrap = function ($, learun) { search: function (param) { param = param || {}; - if ($("#StuID").val() != "" && $("#StuID").length > 0) { - param.StuID = $("#StuID").val(); + + //赋值 + if (stuId != "" && stuId != undefined && stuId != null) { + $('#StuID').lrselectSet(stuId); + $('#StuID').attr('readonly', 'readonly'); + $('#StuID').parent().attr('display','none'); + param.StuID = stuId; + } else { + $('#StuID').removeAttr('readonly'); + $('#StuID').parent().attr('display', 'block'); } + param.StartTime = startTime; param.EndTime = endTime; $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicEntity.cs index fa19beea7..a91cc5a86 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicEntity.cs @@ -464,7 +464,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration [Column("STUDYMODALITY")] public string StudyModality { get; set; } /// - /// 学籍异动状态 + /// 学籍异动状态（1表示不显示成绩） /// /// [Column("CHANGESTATUS")] diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicService.cs index 8eb9af102..63c57af88 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicService.cs @@ -1064,17 +1064,18 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// public void SaveEntity(string keyValue, StuInfoBasicEntity entity) { + var db = this.BaseRepository("CollegeMIS").BeginTrans(); try { UserIBLL userIBLL = new UserBLL(); + var loginUser = LoginUserInfo.Get(); if (!string.IsNullOrEmpty(keyValue)) { entity.Modify(keyValue); - var oldEntity = this.BaseRepository("CollegeMIS").FindEntity(keyValue); + var oldEntity = db.FindEntity(keyValue); List list = new List(); - var loginUser = LoginUserInfo.Get(); - var tableInfos = this.BaseRepository("CollegeMIS").FindTable(@"SELECT t.[name] AS 表名,c.[name] AS 字段名,cast(ep.[value] + var tableInfos = db.FindTable(@"SELECT t.[name] AS 表名,c.[name] AS 字段名,cast(ep.[value] as varchar(100)) AS [字段说明] FROM sys.tables AS t INNER JOIN sys.columns @@ -1111,7 +1112,9 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration AfterChange = newValue.ToString(), FieldName = columnName, UpdateBy = loginUser.userId, - UpdateTime = DateTime.Now + UpdateTime = DateTime.Now, + StuChangeType="09", + StuChangeRemark="点击学籍信息管理-修改按钮进行操作" }; changeEntity.Create(); list.Add(changeEntity); @@ -1121,7 +1124,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration if (list.Count > 0) { - this.BaseRepository("CollegeMIS").Insert(list); + db.Insert(list); } @@ -1142,37 +1145,55 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration userIBLL.SaveEntity(baseUser.F_UserId, baseUser); } - this.BaseRepository("CollegeMIS").Update(entity); + db.Update(entity); } else { entity.Create(); - if (entity.IsTran == "0") + if (entity.IsTran == "0")//转入/进 { - StuInfoBasicChangeEntity stuinfoChange = new StuInfoBasicChangeEntity + //学籍异动表 + //StuInfoBasicChangeEntity stuinfoChange = new StuInfoBasicChangeEntity + //{ + // Id = Guid.NewGuid().ToString(), + // StuNo = entity.StuNo, + // StuName = entity.StuName, + // DeptNo = entity.DeptNo, + // MajorNo = entity.MajorNo, + // ClassNo = entity.ClassNo, + // StuChangeRemark = entity.Remark, + // NewDeptNo = entity.DeptNo, + // NewMajorNo = entity.MajorNo, + // NewClassNo = entity.ClassNo, + // CreateUserId = entity.StuNo, + // StuChangeType = "04", + // StuChangeReason = "10", + // CreateTime = DateTime.Now, + //}; + //db.Insert(stuinfoChange); + //学籍异动日志表 + var changeEntity = new StuInfoBasic_ChangeLogEntity { - Id = Guid.NewGuid().ToString(), - StuNo = entity.StuNo, - StuName = entity.StuName, - DeptNo = entity.DeptNo, - MajorNo = entity.MajorNo, - ClassNo = entity.ClassNo, - StuChangeRemark = entity.Remark, - NewDeptNo = entity.DeptNo, - NewMajorNo = entity.MajorNo, - NewClassNo = entity.ClassNo, - CreateUserId = entity.StuNo, + StuID = entity.StuId, + BeforeChange = "", + AfterChange = "", + FieldName = "", + UpdateBy = loginUser.userId, + UpdateTime = DateTime.Now, StuChangeType = "04", - StuChangeReason = "10", - CreateTime = DateTime.Now, + StuChangeRemark = "点击学籍信息管理-异动转入按钮进行操作" }; - this.BaseRepository("CollegeMIS").Insert(stuinfoChange); + changeEntity.Create(); + db.Insert(changeEntity); } - this.BaseRepository("CollegeMIS").Insert(entity); + db.Insert(entity); } + + db.Commit(); } catch (Exception ex) { + db.Rollback(); if (ex is ExceptionEx) { throw; diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasicChange/StuInfoBasicChangeEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasicChange/StuInfoBasicChangeEntity.cs index b58c8c2b2..298b37876 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasicChange/StuInfoBasicChangeEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasicChange/StuInfoBasicChangeEntity.cs @@ -45,17 +45,17 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration [Column("CLASSNO")] public string ClassNo { get; set; } /// - /// StuChangeType + /// 异动类型（留级01，转出/校02，复学03，转入/进04，退学05，休学06，转班07，转专业08，学籍关键信息更改09） /// [Column("STUCHANGETYPE")] public string StuChangeType { get; set; } /// - /// StuChangeReason + /// 异动原因 /// [Column("STUCHANGEREASON")] public string StuChangeReason { get; set; } /// - /// StuChangeRemark + /// 异动备注 /// [Column("STUCHANGEREMARK")] public string StuChangeRemark { get; set; } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasicChange/StuInfoBasicChangeService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasicChange/StuInfoBasicChangeService.cs index 17f8e9173..b0b62d8ac 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasicChange/StuInfoBasicChangeService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasicChange/StuInfoBasicChangeService.cs @@ -149,30 +149,215 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration var db = this.BaseRepository("CollegeMIS").BeginTrans(); try { + var loginUserInfo = LoginUserInfo.Get(); + var now = DateTime.Now; + var logList = new List(); var entity = db.FindEntity(x => x.Id == keyValue); if (entity != null) { - //处理数据 - if (entity.StuChangeType == "01" || entity.StuChangeType == "03") //降级、转班、转专业 + var stuInfoBasicEntity = db.FindEntity(x => x.StuNo == entity.StuNo); + if (stuInfoBasicEntity != null) { - //改信息； - var classInfoEntity = db.FindEntity(x => x.ClassNo == entity.NewClassNo); - if (classInfoEntity != null) + //处理数据 + if (entity.StuChangeType == "01" || entity.StuChangeType == "07") //降级、转班、 { - db.ExecuteBySql($"update StuInfoBasic set DeptNo='{entity.NewDeptNo}',MajorNo='{entity.NewMajorNo}',ClassNo='{entity.NewClassNo}',Grade='{classInfoEntity.Grade}' where StuNo='{entity.StuNo}' "); + if (stuInfoBasicEntity.ClassNo != entity.NewClassNo) + { + var classInfoEntity = db.FindEntity(x => x.ClassNo == entity.NewClassNo); + if (classInfoEntity != null) + { + if (stuInfoBasicEntity.Grade != classInfoEntity.Grade) + { + //增加异动日志表：年级 + var logentity2 = new StuInfoBasic_ChangeLogEntity() + { + FieldName = "年级", + BeforeChange = stuInfoBasicEntity.Grade, + AfterChange = classInfoEntity.Grade, + UpdateBy = loginUserInfo.userId, + UpdateTime = now, + StuID = stuInfoBasicEntity.StuId, + StuChangeType = entity.StuChangeType, + StuChangeRemark = entity.StuChangeRemark, + StuChangeId = entity.Id + }; + logentity2.Create(); + logList.Add(logentity2); + } + //改学籍信息表； + db.ExecuteBySql($"update StuInfoBasic set ClassNo='{entity.NewClassNo}',Grade='{classInfoEntity.Grade}' where StuNo='{entity.StuNo}' "); + //增加异动日志表：班级 + var logentity = new StuInfoBasic_ChangeLogEntity() + { + FieldName = "班级", + BeforeChange = entity.ClassNo, + AfterChange = entity.NewClassNo, + UpdateBy = loginUserInfo.userId, + UpdateTime = now, + StuID = stuInfoBasicEntity.StuId, + StuChangeType = entity.StuChangeType, + StuChangeRemark = entity.StuChangeRemark, + StuChangeId = entity.Id + }; + logentity.Create(); + logList.Add(logentity); + } + } + } - } - else if (entity.StuChangeType == "02" || entity.StuChangeType == "04") //退学、休学 - { - //改信息；不显示成绩； - db.ExecuteBySql($"update StuInfoBasic set ChangeStatus=1 where StuNo='{entity.StuNo}' "); - } + else if (entity.StuChangeType == "02" || entity.StuChangeType == "05" || entity.StuChangeType == "06") //转校、退学、休学、 + { + //增加异动日志表：学籍异动状态 + var logentity = new StuInfoBasic_ChangeLogEntity() + { + FieldName = "学籍异动状态", + BeforeChange = stuInfoBasicEntity.ChangeStatus?.ToString(), + AfterChange = "1", + UpdateBy = loginUserInfo.userId, + UpdateTime = now, + StuID = stuInfoBasicEntity.StuId, + StuChangeType = entity.StuChangeType, + StuChangeRemark = entity.StuChangeRemark, + StuChangeId = entity.Id + }; + logentity.Create(); + logList.Add(logentity); + //改学籍信息（异动状态为1表示不显示成绩）； + db.ExecuteBySql($"update StuInfoBasic set ChangeStatus=1 where StuNo='{entity.StuNo}' "); + } + else if (entity.StuChangeType == "03") //复学 + { + //增加异动日志表：学籍异动状态 + var logentity = new StuInfoBasic_ChangeLogEntity() + { + FieldName = "学籍异动状态", + BeforeChange = stuInfoBasicEntity.ChangeStatus?.ToString(), + AfterChange = "0", + UpdateBy = loginUserInfo.userId, + UpdateTime = now, + StuID = stuInfoBasicEntity.StuId, + StuChangeType = entity.StuChangeType, + StuChangeRemark = entity.StuChangeRemark, + StuChangeId = entity.Id + }; + logentity.Create(); + logList.Add(logentity); + //改学籍信息（异动状态为0表示显示成绩）； + db.ExecuteBySql($"update StuInfoBasic set ChangeStatus=null where StuNo='{entity.StuNo}' "); + } + else if (entity.StuChangeType == "08") //转专业、 + { + if (stuInfoBasicEntity.MajorNo != entity.NewMajorNo) + { + var classInfoEntity2 = db.FindEntity(x => x.ClassNo == entity.NewClassNo); + if (classInfoEntity2 != null) + { + if (stuInfoBasicEntity.Grade != classInfoEntity2.Grade) + { + //增加异动日志表：年级 + var logentity3 = new StuInfoBasic_ChangeLogEntity() + { + FieldName = "年级", + BeforeChange = stuInfoBasicEntity.Grade, + AfterChange = classInfoEntity2.Grade, + UpdateBy = loginUserInfo.userId, + UpdateTime = now, + StuID = stuInfoBasicEntity.StuId, + StuChangeType = entity.StuChangeType, + StuChangeRemark = entity.StuChangeRemark, + StuChangeId = entity.Id + }; + logentity3.Create(); + logList.Add(logentity3); + } + //改学籍信息； + db.ExecuteBySql($"update StuInfoBasic set MajorNo='{entity.NewMajorNo}',ClassNo='{entity.NewClassNo}',Grade='{classInfoEntity2.Grade}' where StuNo='{entity.StuNo}' "); + //增加异动日志表：专业 + var logentity = new StuInfoBasic_ChangeLogEntity() + { + FieldName = "专业", + BeforeChange = entity.MajorNo, + AfterChange = entity.NewMajorNo, + UpdateBy = loginUserInfo.userId, + UpdateTime = now, + StuID = stuInfoBasicEntity.StuId, + StuChangeType = entity.StuChangeType, + StuChangeRemark = entity.StuChangeRemark, + StuChangeId = entity.Id + }; + logentity.Create(); + logList.Add(logentity); + //增加异动日志表：班级 + var logentity2 = new StuInfoBasic_ChangeLogEntity() + { + FieldName = "班级", + BeforeChange = entity.ClassNo, + AfterChange = entity.NewClassNo, + UpdateBy = loginUserInfo.userId, + UpdateTime = now, + StuID = stuInfoBasicEntity.StuId, + StuChangeType = entity.StuChangeType, + StuChangeRemark = entity.StuChangeRemark, + StuChangeId = entity.Id + }; + logentity2.Create(); + logList.Add(logentity2); + } + } + else + { + if (stuInfoBasicEntity.ClassNo != entity.NewClassNo) + { + var classInfoEntity2 = db.FindEntity(x => x.ClassNo == entity.NewClassNo); + if (classInfoEntity2 != null) + { + if (stuInfoBasicEntity.Grade != classInfoEntity2.Grade) + { + //增加异动日志表：年级 + var logentity2 = new StuInfoBasic_ChangeLogEntity() + { + FieldName = "年级", + BeforeChange = stuInfoBasicEntity.Grade, + AfterChange = classInfoEntity2.Grade, + UpdateBy = loginUserInfo.userId, + UpdateTime = now, + StuID = stuInfoBasicEntity.StuId, + StuChangeType = entity.StuChangeType, + StuChangeRemark = entity.StuChangeRemark, + StuChangeId = entity.Id + }; + logentity2.Create(); + logList.Add(logentity2); + } + //改学籍信息表； + db.ExecuteBySql($"update StuInfoBasic set MajorNo='{entity.NewMajorNo}',ClassNo='{entity.NewClassNo}',Grade='{classInfoEntity2.Grade}' where StuNo='{entity.StuNo}' "); + //增加异动日志表：班级 + var logentity = new StuInfoBasic_ChangeLogEntity() + { + FieldName = "班级", + BeforeChange = entity.ClassNo, + AfterChange = entity.NewClassNo, + UpdateBy = loginUserInfo.userId, + UpdateTime = now, + StuID = stuInfoBasicEntity.StuId, + StuChangeType = entity.StuChangeType, + StuChangeRemark = entity.StuChangeRemark, + StuChangeId = entity.Id + }; + logentity.Create(); + logList.Add(logentity); + } + } + } + } + db.Insert(logList); - //修改状态 - entity.CheckTime = DateTime.Now; - entity.CheckUserId = LoginUserInfo.Get().account; - entity.CheckStatus = 1; - db.Update(entity); + //修改异动表：审批状态、审批人、 + entity.CheckTime = now; + entity.CheckUserId = loginUserInfo.userId; + entity.CheckStatus = 1; + db.Update(entity); + } } db.Commit(); } @@ -204,23 +389,31 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration if (entity != null) { //处理数据 - if (entity.StuChangeType == "01" || entity.StuChangeType == "02" || entity.StuChangeType == "03") //降级、转班、转专业 + if (entity.StuChangeType == "01" || entity.StuChangeType == "07" || entity.StuChangeType == "08") //降级、转班、转专业、 { - //改信息； + //改学籍信息； var classInfoEntity = db.FindEntity(x => x.ClassNo == entity.ClassNo); if (classInfoEntity != null) { db.ExecuteBySql($"update StuInfoBasic set DeptNo='{entity.DeptNo}',MajorNo='{entity.MajorNo}',ClassNo='{entity.ClassNo}',Grade='{classInfoEntity.Grade}' where StuNo='{entity.StuNo}' "); } } - else if (entity.StuChangeType == "04" || entity.StuChangeType == "05") //退学、休学 + else if (entity.StuChangeType == "02" || entity.StuChangeType == "05" || entity.StuChangeType == "06") //转校、退学、休学 { - //改信息；显示成绩； + //改学籍信息（异动状态为null表示显示成绩）； db.ExecuteBySql($"update StuInfoBasic set ChangeStatus=null where StuNo='{entity.StuNo}' "); } + else if (entity.StuChangeType == "03") //复学 + { + //改学籍信息（异动状态为1表示不显示成绩）； + db.ExecuteBySql($"update StuInfoBasic set ChangeStatus=1 where StuNo='{entity.StuNo}' "); + } - //修改状态 + //修改异动表：审批状态、审批人、 db.ExecuteBySql("update StuInfoBasicChange set CheckTime=null,CheckUserId=null,CheckStatus=0 where Id='" + keyValue + "' "); + //删除异动日志表：学籍异动主键id + db.ExecuteBySql("delete from StuInfoBasic_ChangeLog where StuChangeId='" + keyValue + "' "); + } db.Commit(); } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic_ChangeLog/StuInfoBasic_ChangeLogEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic_ChangeLog/StuInfoBasic_ChangeLogEntity.cs index 38d1e0a44..474ad6ed7 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic_ChangeLog/StuInfoBasic_ChangeLogEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic_ChangeLog/StuInfoBasic_ChangeLogEntity.cs @@ -51,6 +51,21 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration ///
[Column("STUID")] public string StuID { get; set; } + /// + /// 学籍异动类型（留级01，转出/校02，复学03，转入/进04，退学05，休学06，转班07，转专业08，学籍关键信息更改09） + /// + [Column("STUCHANGETYPE")] + public string StuChangeType { get; set; } + /// + /// 学籍异动备注 + /// + [Column("STUCHANGEREMARK")] + public string StuChangeRemark { get; set; } + /// + /// StuInfoBasicChange主键 + /// + [Column("STUCHANGEID")] + public string StuChangeId { get; set; } #endregion #region 扩展操作 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic_ChangeLog/StuInfoBasic_ChangeLogService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic_ChangeLog/StuInfoBasic_ChangeLogService.cs index 335ab28f7..e5bfd65be 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic_ChangeLog/StuInfoBasic_ChangeLogService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic_ChangeLog/StuInfoBasic_ChangeLogService.cs @@ -29,16 +29,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration try { var strSql = new StringBuilder(); - strSql.Append("SELECT "); - strSql.Append(@" - t.ID, - t.FieldName, - t.BeforeChange, - t.AfterChange, - t.UpdateBy, - t.UpdateTime, - t.StuID - "); + strSql.Append("SELECT t.*"); strSql.Append(" FROM StuInfoBasic_ChangeLog t "); strSql.Append(" WHERE 1=1 "); var queryParam = queryJson.ToJObject(); @@ -57,7 +48,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } if (!queryParam["StuID"].IsEmpty()) { - dp.Add("StuID", "" + queryParam["StuID"].ToString() + "", DbType.String); + dp.Add("StuID", queryParam["StuID"].ToString(), DbType.String); strSql.Append(" AND t.StuID = @StuID "); } if (!queryParam["UpdateTime"].IsEmpty()) @@ -67,8 +58,8 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } if (!queryParam["UpdateBy"].IsEmpty()) { - dp.Add("UpdateBy", "%" + queryParam["UpdateBy"].ToString() + "%", DbType.String); - strSql.Append(" AND t.UpdateBy Like @UpdateBy "); + dp.Add("UpdateBy", queryParam["UpdateBy"].ToString(), DbType.String); + strSql.Append(" AND t.UpdateBy = @UpdateBy "); } return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(),dp, pagination); } From 2bf275965cd6559607723eaa444e9e061c03892a Mon Sep 17 00:00:00 2001 From: ndbs Date: Mon, 29 Aug 2022 11:30:20 +0800 Subject: [PATCH 09/13] =?UTF-8?q?app2.0=20=E5=85=AC=E6=96=87=E6=9F=A5?= =?UTF-8?q?=E9=98=85=E6=89=8B=E6=9C=BA=E7=AB=AF=E8=A7=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Learun.Application.WebApi/Modules/Sys_ReceiveFileApi.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/Sys_ReceiveFileApi.cs b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/Sys_ReceiveFileApi.cs index 81017ca77..ecafe4c35 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/Sys_ReceiveFileApi.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/Sys_ReceiveFileApi.cs @@ -77,7 +77,7 @@ namespace Learun.Application.WebApi result = "/" + result.Substring(result.IndexOf("Resource")); } Sys_ReceiveFileData.Url = result; - + Sys_ReceiveFileData.Contents = WebHelper.HtmlDecode(Sys_ReceiveFileData.Contents); } var jsonData = new { From 9c903c97685cbad103e69af70814d822457f371b Mon Sep 17 00:00:00 2001 From: ndbs Date: Mon, 29 Aug 2022 11:34:56 +0800 Subject: [PATCH 10/13] =?UTF-8?q?app2.0=20=E6=94=B6=E4=BB=B6=E7=AE=B1?= =?UTF-8?q?=E6=AD=A3=E6=96=87=E8=A7=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Modules/SYS_ReceiveMessageApi.cs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/SYS_ReceiveMessageApi.cs b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/SYS_ReceiveMessageApi.cs index 56f712ebb..53ac50bb5 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/SYS_ReceiveMessageApi.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/SYS_ReceiveMessageApi.cs @@ -70,6 +70,10 @@ namespace Learun.Application.WebApi { string keyValue = this.GetReqData(); var SYS_ReceiveMessageData = sYS_ReceiveMessageIBLL.GetUrlSYS_ReceiveMessageEntity(keyValue); + if (SYS_ReceiveMessageData != null) + { + SYS_ReceiveMessageData.CONTENTS = WebHelper.HtmlDecode(SYS_ReceiveMessageData.CONTENTS); + } var jsonData = new { SYS_ReceiveMessage = SYS_ReceiveMessageData, From 3279a225bed6d355e64afb4faab9e936ff31ec21 Mon Sep 17 00:00:00 2001 From: ndbs Date: Mon, 29 Aug 2022 11:55:58 +0800 Subject: [PATCH 11/13] =?UTF-8?q?app2.0=20=E6=A0=A1=E5=86=85=E9=80=9A?= =?UTF-8?q?=E7=9F=A5=E5=85=AC=E5=91=8A=E5=AE=A1=E6=A0=B8=E6=AD=A3=E6=96=87?= =?UTF-8?q?=E8=A7=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Learun.Application.WebApi/Modules/NewsApi.cs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/NewsApi.cs b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/NewsApi.cs index 30966dbde..d06470df0 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/NewsApi.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/NewsApi.cs @@ -139,6 +139,10 @@ namespace Learun.Application.WebApi.Modules F_SendPostId.Trim(','); shlist.F_SendPostId = F_SendPostId; } + if (!shlist.F_NewsContent.IsEmpty()) + { + shlist.F_NewsContent = WebHelper.HtmlDecode(shlist.F_NewsContent); + } return Success(shlist); } From 8c87926ccf9e19970db8903e92b3b02ab768fbaf Mon Sep 17 00:00:00 2001 From: dyy <807692433@qq.com> Date: Mon, 29 Aug 2022 14:08:13 +0800 Subject: [PATCH 12/13] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91?= =?UTF-8?q?=E5=AD=A6=E7=B1=8D=E5=BC=82=E5=8A=A8=E7=AE=A1=E7=90=86=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/StuInfoBasicChange/Form.js | 26 ++++++++++++++++--- .../Views/StuInfoBasicChange/Index.js | 2 +- .../Views/StuInfoBasic_ChangeLog/Index.js | 2 +- .../StuInfoBasic/StuInfoBasicService.cs | 4 +-- 4 files changed, 27 insertions(+), 7 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasicChange/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasicChange/Form.js index 114114e35..6dfe0411e 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasicChange/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasicChange/Form.js @@ -40,7 +40,13 @@ var bootstrap = function ($, learun) { if (item.id === "01" || item.id === "07") { //留级、转班 $(".NewContainer").find('.contentDiv.zhuanban').removeAttr('readonly'); $("#NewDeptNo").lrselectSet($("#DeptNo").lrselectGet()); - $("#NewMajorNo").lrselectSet($("#MajorNo").lrselectGet()); + var timer1 = setInterval(function () { + if ($("#NewDeptNo").lrselectGet()) { + $("#NewMajorNo").lrselectSet($("#MajorNo").lrselectGet()); + console.log("系部赋值后，在赋值专业：" + $("#NewMajorNo").lrselectGet()); + clearInterval(timer1); + } + }, 1000); } else if (item.id === "02") {//转校 $(".NewContainer").find('.contentDiv').removeAttr("isvalid"); $(".NewContainer").find('.contentDiv').removeAttr("checkexpession"); @@ -55,8 +61,19 @@ var bootstrap = function ($, learun) { $(".NewSchool").show(); } else if (item.id === "03") { //复学 $("#NewDeptNo").lrselectSet($("#DeptNo").lrselectGet()); - $("#NewMajorNo").lrselectSet($("#MajorNo").lrselectGet()); - $("#NewClassNo").lrselectSet($("#ClassNo").lrselectGet()); + var timer2 = setInterval(function () { + if ($("#NewDeptNo").lrselectGet()) { + $("#NewMajorNo").lrselectSet($("#MajorNo").lrselectGet()); + console.log("系部赋值后，在赋值专业：" + $("#NewMajorNo").lrselectGet()); + clearInterval(timer2); + } + }, 1000); + var timer3 = setInterval(function () { + if ($("#NewMajorNo").lrselectGet()) { + $("#NewClassNo").lrselectSet($("#ClassNo").lrselectGet()); + clearInterval(timer3); + } + }, 1000); } else if (item.id === "04") { //转入/进 learun.alert.warning("异动转进请点击学籍信息管理-异动转入按钮！"); $("#StuNo").val(""); @@ -86,6 +103,7 @@ var bootstrap = function ($, learun) { $('#ClassNo').lrDataSourceSelect({ code: 'bjsj', value: 'classno', text: 'classname' }); $('#NewDeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname', select: function (item) { + //console.log("选择的系部为：" + JSON.stringify(item)); if (item != null && item != undefined) { $('#NewMajorNo').lrselectRefresh({ url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo', @@ -101,6 +119,7 @@ var bootstrap = function ($, learun) { }); $('#NewMajorNo').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'majorno', text: 'majorname', select: function (item) { + //console.log("选择的专业为：" + JSON.stringify(item)); if (item != null && item != undefined) { $('#NewClassNo').lrselectRefresh({ url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', @@ -221,6 +240,7 @@ var bootstrap = function ($, learun) { }; // 保存数据 acceptClick = function (callBack) { + //console.log($('body').lrGetFormData()); if (!$('body').lrValidform()) { return false; } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasicChange/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasicChange/Index.js index bca4b9019..76ceab8f3 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasicChange/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasicChange/Index.js @@ -218,11 +218,11 @@ var bootstrap = function ($, learun) { }); } }, + { label: "转出学校", name: "OutSchool", width: 200, align: "left" }, { label: "创建时间", name: "CreateTime", width: 130, align: "left" }, { label: "创建用户", name: "CreateUserId", width: 100, align: "left" }, { label: "审核时间", name: "CheckTime", width: 130, align: "left" }, { label: "审核用户", name: "CheckUserId", width: 100, align: "left" }, - { label: "转出学校", name: "OutSchool", width: 200, align: "left" }, { label: "备注", name: "StuChangeRemark", width: 200, align: "left" }, { label: "审核状态", name: "CheckStatus", width: 100, align: "left", diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic_ChangeLog/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic_ChangeLog/Index.js index a3cffab8a..68171d647 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic_ChangeLog/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic_ChangeLog/Index.js @@ -106,7 +106,7 @@ var bootstrap = function ($, learun) { url: top.$.rootUrl + '/EducationalAdministration/StuInfoBasic_ChangeLog/GetPageList', headData: [ { - label: "异动类型", name: "StuChangeType", width: 100, align: "left", + label: "异动类型", name: "StuChangeType", width: 150, align: "left", formatterAsync: function (callback, value, row, op, $cell) { learun.clientdata.getAsync('dataItem', { key: value, diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicService.cs index 63c57af88..be484e3aa 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicService.cs @@ -1073,9 +1073,9 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration { entity.Modify(keyValue); - var oldEntity = db.FindEntity(keyValue); + var oldEntity = this.BaseRepository("CollegeMIS").FindEntity(keyValue); List list = new List(); - var tableInfos = db.FindTable(@"SELECT t.[name] AS 表名,c.[name] AS 字段名,cast(ep.[value] + var tableInfos = this.BaseRepository("CollegeMIS").FindTable(@"SELECT t.[name] AS 表名,c.[name] AS 字段名,cast(ep.[value] as varchar(100)) AS [字段说明] FROM sys.tables AS t INNER JOIN sys.columns From c4aa7eff3d6e2c1df94f6e9b845e45b39ea20412 Mon Sep 17 00:00:00 2001 From: ndbs Date: Mon, 29 Aug 2022 14:41:03 +0800 Subject: [PATCH 13/13] =?UTF-8?q?=E5=8F=96=E6=B6=88=20=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E6=89=8B=E6=9C=BA=E5=8F=B7=E9=AA=8C=E8=AF=81=E4=B8=BA=E5=AF=86?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Learun.Application.Organization/User/UserBLL.cs | 10 +++++----- .../Learun.Application.Web/Views/Login/Default.cshtml | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Organization/User/UserBLL.cs b/Learun.Framework.Ultimate V7/Learun.Application.Organization/User/UserBLL.cs index e2293df0e..69cc88833 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Organization/User/UserBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Organization/User/UserBLL.cs @@ -1111,15 +1111,15 @@ namespace Learun.Application.Organization else { string dbPassword = Md5Helper.Encrypt(DESEncrypt.Encrypt(password.ToLower(), userEntity.F_Secretkey).ToLower(), 32).ToLower(); - string phone = Md5Helper.Encrypt(userEntity.F_Mobile, 32).ToLower(); + //string phone = Md5Helper.Encrypt(userEntity.F_Mobile, 32).ToLower(); if (dbPassword == userEntity.F_Password) { userEntity.LoginOk = true; } - else if (phone == password) - { - userEntity.LoginOk = true; - } + //else if (phone == password) + //{ + // userEntity.LoginOk = true; + //} else { userEntity.LoginMsg = "密码和账户名不匹配!"; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/Default.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/Default.cshtml index 6afa2d93b..754ba1912 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/Default.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/Default.cshtml @@ -89,7 +89,7 @@