diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuDisciplineManagement/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuDisciplineManagement/Form.cshtml index efeb1039d..1b10a43e9 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuDisciplineManagement/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuDisciplineManagement/Form.cshtml @@ -3,37 +3,45 @@ Layout = "~/Views/Shared/_Form.cshtml"; }
-
+
违纪学生*
-
+
-
-
违纪时间*
- -
-
+
处理老师*
-
+
+
+
+
处分类别*
+
-
+
+
违纪时间*
+ +
+
处理时间
- +
-
+
事情经过
- +
-
+
学生态度
- +
-
+
班主任意见
- +
-
+
家长意见
- + +
+
+
学校意见
+
@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuDisciplineManagement/Form.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuDisciplineManagement/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuDisciplineManagement/Form.js index deff3d006..8476bc2ec 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuDisciplineManagement/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuDisciplineManagement/Form.js @@ -49,7 +49,7 @@ var bootstrap = function ($, learun) { value: "StuNo", text: "StuName" }); - //$('#StuNo').lrDataSourceSelect({ code: 'StuInfoBasic', value: 'stuno', text: 'stuname' }); + $('#SType').lrDataItemSelect({ code: 'DisType' }); $('#EmpNo').lrDataSourceSelect({ code: 'EmpInfo', value: 'empno', text: 'empname' }); }, initData: function () { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuDisciplineManagement/FormView.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuDisciplineManagement/FormView.cshtml index a3c3f33c8..fde664f03 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuDisciplineManagement/FormView.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuDisciplineManagement/FormView.cshtml @@ -5,19 +5,23 @@
违纪学生*
-
-
-
-
违纪时间*
- +
处理老师*
-
+
-
+
+
违纪类型*
+
+
+
+
违纪时间*
+ +
+
处理时间
- +
事情经过
@@ -35,5 +39,9 @@
家长意见
+
+
学校意见
+ +
@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuDisciplineManagement/FormView.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuDisciplineManagement/FormView.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuDisciplineManagement/FormView.js index deff3d006..8476bc2ec 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuDisciplineManagement/FormView.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuDisciplineManagement/FormView.js @@ -49,7 +49,7 @@ var bootstrap = function ($, learun) { value: "StuNo", text: "StuName" }); - //$('#StuNo').lrDataSourceSelect({ code: 'StuInfoBasic', value: 'stuno', text: 'stuname' }); + $('#SType').lrDataItemSelect({ code: 'DisType' }); $('#EmpNo').lrDataSourceSelect({ code: 'EmpInfo', value: 'empno', text: 'empname' }); }, initData: function () { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuDisciplineManagement/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuDisciplineManagement/Index.js index 5409b447b..c492abce4 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuDisciplineManagement/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuDisciplineManagement/Index.js @@ -136,9 +136,22 @@ var bootstrap = function ($, learun) { }, // 初始化列表 initGird: function () { - $('#gridtable').lrAuthorizeJfGrid({ + $('#gridtable').jfGrid({ url: top.$.rootUrl + '/EducationalAdministration/StuDisciplineManagement/GetPageList', headData: [ + { label: "学号", name: "StuNo", width: 100, align: "left" }, + { + label: "处分类别", name: "SType", width: 80, align: "left" , + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'DisType', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, { label: "违纪学生", name: "StuNo", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { @@ -152,7 +165,52 @@ var bootstrap = function ($, learun) { }); } }, - { label: "违纪时间", name: "DisciplineTime", width: 120, align: "left" }, + { + label: "性别", name: "GenderNo", width: 50, align: "left", + formatter: function (cellvalue) { + return cellvalue == true ? "男" : "女"; + } + }, + { label: "电话", name: "Mobile", width: 100, align: "left" }, + { + label: "院系", name: "DeptNo", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdDeptInfo', + key: value, + keyId: 'deptno', + callback: function (_data) { + callback(_data['deptname']); + } + }); + } + }, + { + label: "专业", name: "majorno", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdMajorInfo', + key: value, + keyId: 'majorno', + callback: function (_data) { + callback(_data['majorname']); + } + }); + } + }, + { + label: "班级", name: "classno", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'bjsj', + key: value, + keyId: 'classno', + callback: function (_data) { + callback(_data['classname']); + } + }); + } + }, { label: "处理老师", name: "EmpNo", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { @@ -171,6 +229,7 @@ var bootstrap = function ($, learun) { { label: "学生态度", name: "StudentAttitude", width: 100, align: "left" }, { label: "班主任意见", name: "TeacherOpinion", width: 100, align: "left" }, { label: "家长意见", name: "ParentsOpinion", width: 100, align: "left" }, + { label: "学校意见", name: "SchoolOpinion", width: 100, align: "left" }, { label: "审核状态", name: "CheckStatus", width: 100, align: "left", formatter: function (cellvalue) { return cellvalue == "1" ? "审核中" : cellvalue == "2" ? "审核通过" : cellvalue == "3" ? "审核未通过" : "草稿"; diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuDisciplineManagement/StuDisciplineManagementEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuDisciplineManagement/StuDisciplineManagementEntity.cs index 1f5ef0386..fb194c213 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuDisciplineManagement/StuDisciplineManagementEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuDisciplineManagement/StuDisciplineManagementEntity.cs @@ -11,7 +11,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// 日 期：2021-03-26 15:23 /// 描 述：学生违纪管理 /// - public class StuDisciplineManagementEntity + public class StuDisciplineManagementEntity { #region 实体成员 /// @@ -94,6 +94,16 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// [Column("PROCESSID")] public string ProcessId { get; set; } + /// + /// 学校意见 + /// + [Column("SCHOOLOPINION")] + public string SchoolOpinion { get; set; } + /// + /// 类型 + /// + [Column("STYPE")] + public string SType { get; set; } #endregion #region 扩展操作 @@ -114,6 +124,19 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } #endregion #region 扩展字段 + [NotMapped] + public bool? GenderNo { get; set; } + [NotMapped] + public string StuName { get; set; } + [NotMapped] + public string DeptNo { get; set; } + [NotMapped] + public string majorno { get; set; } + [NotMapped] + public string classno { get; set; } + [NotMapped] + public string Mobile { get; set; } + #endregion } } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuDisciplineManagement/StuDisciplineManagementService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuDisciplineManagement/StuDisciplineManagementService.cs index eecfcc65b..1790d267a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuDisciplineManagement/StuDisciplineManagementService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuDisciplineManagement/StuDisciplineManagementService.cs @@ -30,23 +30,23 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration try { var strSql = new StringBuilder(); - strSql.Append("SELECT t.* "); + strSql.Append(" SELECT t.*,sib.StuName,sib.DeptNo,sib.majorno,sib.classno,sib.GenderNo,sib.Mobile "); strSql.Append(" FROM StuDisciplineManagement t "); - strSql.Append(" WHERE 1=1 "); + strSql.Append(" left join stuinfobasic sib on t.Stuno = sib.stuno WHERE 1=1 "); var queryParam = queryJson.ToJObject(); // 虚拟参数 var dp = new DynamicParameters(new { }); if (!queryParam["StuNo"].IsEmpty()) { - dp.Add("StuNo",queryParam["StuNo"].ToString(), DbType.String); + dp.Add("StuNo", queryParam["StuNo"].ToString(), DbType.String); strSql.Append(" AND t.StuNo = @StuNo "); } if (!queryParam["EmpNo"].IsEmpty()) { - dp.Add("EmpNo",queryParam["EmpNo"].ToString(), DbType.String); + dp.Add("EmpNo", queryParam["EmpNo"].ToString(), DbType.String); strSql.Append(" AND t.EmpNo = @EmpNo "); } - return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(),dp, pagination); + return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), dp, pagination); } catch (Exception ex) { @@ -94,7 +94,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration { try { - return this.BaseRepository("CollegeMIS").FindEntity(t=>t.ProcessId == processId); + return this.BaseRepository("CollegeMIS").FindEntity(t => t.ProcessId == processId); } catch (Exception ex) { @@ -121,7 +121,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration { try { - this.BaseRepository("CollegeMIS").Delete(t=>t.Id == keyValue); + this.BaseRepository("CollegeMIS").Delete(t => t.Id == keyValue); } catch (Exception ex) {