diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EvaCodeOfContuct/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EvaCodeOfContuct/Form.cshtml index f10463254..437b79c4f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EvaCodeOfContuct/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EvaCodeOfContuct/Form.cshtml @@ -3,21 +3,49 @@ Layout = "~/Views/Shared/_Form.cshtml"; }
-
-
班级
-
+
+
考核人
+
-
+
+
宿舍楼*
+
+
+
+
姓名
+ +
+ + + +
+ @*
+
院系*
+
+
+
+
专业*
+
+
+
+
班级*
+
+
*@ +
+
违纪行为地点
+ +
+
分数
- +
-
-
日期
- +
+
日期*
+
-
+
备注
- +
@Html.AppendJsFile("/Areas/EducationalAdministration/Views/EvaCodeOfContuct/Form.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EvaCodeOfContuct/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EvaCodeOfContuct/Form.js index daccbbe32..f6f540b3b 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EvaCodeOfContuct/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EvaCodeOfContuct/Form.js @@ -15,14 +15,127 @@ var bootstrap = function ($, learun) { page.initData(); }, bind: function () { - $('#Class').lrDataSourceSelect({ code: 'bjsj', value: 'classno', text: 'classname' }); + //$('#EDept').lrselect({ + // value: "deptno", + // text: "deptname", + // url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdDeptInfo', + // select: function (item) { + // if (item) { + // $('#EMajor').lrselectRefresh({ + // url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable', + // param: { code: "CdMajorInfo", strWhere: "DeptNo='" + item.deptno + "'" } + // }); + // } + // else { + // $('#EMajor').lrselectRefresh({ + // url: "", + // data: [] + // }); + // } + // $('#EClass').lrselectRefresh({ + // url: "", + // data: [] + // }); + // } + //}); + //$('#EMajor').lrselect({ + // value: "majorno", + // text: "majorname", + // select: function (item) { + // if (item) { + // $('#EClass').lrselectRefresh({ + // url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable', + // param: { code: "bjsj", strWhere: "DeptNo='" + item.deptno + "' and majorno='" + item.majorno + "'" } + // }); + // } + + // } + //}); + //$('#EMajor').on("click", + // function () { + // var data = $('#EDept').lrselectGet(); + // if (!data) { + // learun.alert.error('请先选择系'); + // } + // }); + //$('#EClass').on("click", + // function () { + // var data1 = $('#EDept').lrselectGet(); + // var data2 = $('#EMajor').lrselectGet(); + // if (!data1 || !data2) { + // learun.alert.error('请先选择系和专业'); + // } + // }); + //$('#EClass').lrselect({ + // value: "classno", + // text: "classname" + //}); + $('#FloorId').lrDataSourceSelect({ code: 'Acc_DormitoryData', value: 'id', text: 'name' }); + $('#StuName').lrGirdSelect({ + // 字段 + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=StuInfoBasic', + selectWord: 'stuname', + value: 'stuname', + text: 'stuname', + headData: [ + { label: "学号", name: "stuno", width: 100, align: "left" }, + { label: "姓名", name: "stuname", width: 100, align: "left" }, + { + 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: "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: "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']); + } + }); + } + } + + ], + select: function (item) { + $("#StuName").val(item.stuname); + $("#StuNo").val(item.stuno); + $("#EDept").val(item.deptno); + $("#EMajor").val(item.majorno); + $("#EClass").val(item.classno); + } + }); }, initData: function () { if (!!keyValue) { $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/EvaCodeOfContuct/GetFormData?keyValue=' + keyValue, function (data) { for (var id in data) { if (!!data[id].length && data[id].length > 0) { - $('#' + id ).jfGridSet('refreshdata', data[id]); + $('#' + id).jfGridSet('refreshdata', data[id]); } else { $('[data-table="' + id + '"]').lrSetFormData(data[id]); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EvaCodeOfContuct/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EvaCodeOfContuct/Index.cshtml index 320bb6719..f2d4f3344 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EvaCodeOfContuct/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EvaCodeOfContuct/Index.cshtml @@ -10,9 +10,29 @@
-
+
+
系部
+
+
+
+
学号
+ +
+
+
专业
+
+
+
+
姓名
+ +
+
班级
- +
+
+
+
考核人
+
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EvaCodeOfContuct/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EvaCodeOfContuct/Index.js index 5ffd94c47..1c9bc1c19 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EvaCodeOfContuct/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EvaCodeOfContuct/Index.js @@ -20,6 +20,63 @@ var bootstrap = function ($, learun) { $('#lr_refresh').on('click', function () { location.reload(); }); + $('#EDept').lrselect({ + value: "deptno", + text: "deptname", + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdDeptInfo', + select: function (item) { + if (item) { + $('#EMajor').lrselectRefresh({ + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable', + param: { code: "CdMajorInfo", strWhere: "DeptNo='" + item.deptno + "'" } + }); + } + else { + $('#EMajor').lrselectRefresh({ + url: "", + data: [] + }); + } + $('#EClass').lrselectRefresh({ + url: "", + data: [] + }); + } + }); + $('#EMajor').lrselect({ + value: "majorno", + text: "majorname", + select: function (item) { + if (item) { + $('#EClass').lrselectRefresh({ + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable', + param: { code: "bjsj", strWhere: "DeptNo='" + item.deptno + "' and majorno='" + item.majorno + "'" } + }); + } + + } + }); + + + $('#EMajor').on("click", + function () { + var data = $('#EDept').lrselectGet(); + if (!data) { + learun.alert.error('请先选择系'); + } + }); + $('#EClass').on("click", + function () { + var data1 = $('#EDept').lrselectGet(); + var data2 = $('#EMajor').lrselectGet(); + if (!data1 || !data2) { + learun.alert.error('请先选择系和专业'); + } + }); + $('#EClass').lrselect({ + value: "classno", + text: "classname" + }); // 新增 $('#lr_add').on('click', function () { learun.layerForm({ @@ -27,7 +84,7 @@ var bootstrap = function ($, learun) { title: '新增', url: top.$.rootUrl + '/EducationalAdministration/EvaCodeOfContuct/Form', width: 600, - height: 400, + height: 500, callBack: function (id) { return top[id].acceptClick(refreshGirdData); } @@ -42,7 +99,7 @@ var bootstrap = function ($, learun) { title: '编辑', url: top.$.rootUrl + '/EducationalAdministration/EvaCodeOfContuct/Form?keyValue=' + keyValue, width: 600, - height: 400, + height: 500, callBack: function (id) { return top[id].acceptClick(refreshGirdData); } @@ -65,11 +122,37 @@ var bootstrap = function ($, learun) { }, // 初始化列表 initGird: function () { - $('#gridtable').lrAuthorizeJfGrid({ + $('#gridtable').jfGrid({ url: top.$.rootUrl + '/EducationalAdministration/EvaCodeOfContuct/GetPageList', headData: [ { - label: "班级", name: "Class", width: 100, align: "left", + label: "院系", name: "EDept", 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: "EMajor", 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: "EClass", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { learun.clientdata.getAsync('custmerData', { url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'bjsj', @@ -81,6 +164,36 @@ var bootstrap = function ($, learun) { }); } }, + { + label: "班主任", name: "ClassTeach", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'teacheruserdata', + key: value, + keyId: 'f_encode', + callback: function (_data) { + callback(_data['f_realname']); + } + }); + } + }, + { + label: "辅导员", name: "CoachTeach", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'teacheruserdata', + key: value, + keyId: 'f_encode', + callback: function (_data) { + callback(_data['f_realname']); + } + }); + } + }, + { label: "学号", name: "StuNo", width: 100, align: "left" }, + { label: "姓名", name: "StuName", width: 100, align: "left" }, + { label: "电话", name: "Mobile", width: 100, align: "left" }, + { label: "违纪行为地点", name: "EAddress", width: 200, align: "left" }, { label: "分数", name: "Fraction", width: 100, align: "left" }, { label: "日期", name: "Data", width: 130, align: "left" }, { label: "备注", name: "Remark", width: 100, align: "left" }, diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EvaCodeOfContuct/EvaCodeOfContuctEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EvaCodeOfContuct/EvaCodeOfContuctEntity.cs index a25cfef61..c6916c898 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EvaCodeOfContuct/EvaCodeOfContuctEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EvaCodeOfContuct/EvaCodeOfContuctEntity.cs @@ -11,7 +11,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// 日 期：2019-11-20 11:37 /// 描 述：行为规范日考核 /// - public class EvaCodeOfContuctEntity + public class EvaCodeOfContuctEntity { #region 实体成员 /// @@ -22,8 +22,8 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// /// 班级 /// - [Column("CLASS")] - public string Class { get; set; } + [Column("ECLASS")] + public string EClass { get; set; } /// /// 分数 /// @@ -35,6 +35,66 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration [Column("DATA")] public DateTime? Data { get; set; } /// + /// 创建时间 + /// + [Column("FLOORID")] + public string FloorId { get; set; } + /// + /// 创建时间 + /// + [Column("StuNo")] + public string StuNo { get; set; } + /// + /// 创建时间 + /// + [Column("StuName")] + public string StuName { get; set; } + /// + /// 创建时间 + /// + [Column("EAddress")] + public string EAddress { get; set; } + /// + /// 创建时间 + /// + [Column("Mobile")] + public string Mobile { get; set; } + /// + /// 创建时间 + /// + [Column("EDept")] + public string EDept { get; set; } + /// + /// 创建时间 + /// + [Column("EMajor")] + public string EMajor { get; set; } + /// + /// 创建时间 + /// + [Column("CheckPeople")] + public string CheckPeople { get; set; } + /// + /// 创建时间 + /// + [Column("CoachTeach")] + public string CoachTeach { get; set; } + /// + /// 创建时间 + /// + [Column("ClassTeach")] + public string ClassTeach { get; set; } + /// + /// 创建时间 + /// + [Column("CreateUser")] + public string CreateUser { get; set; } + /// + /// 创建时间 + /// + [Column("CREATETIME")] + public DateTime? CreateTime { get; set; } + /// /// 备注 /// [Column("REMARK")] diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EvaCodeOfContuct/EvaCodeOfContuctService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EvaCodeOfContuct/EvaCodeOfContuctService.cs index f4e1fb119..80cadf396 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EvaCodeOfContuct/EvaCodeOfContuctService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EvaCodeOfContuct/EvaCodeOfContuctService.cs @@ -4,6 +4,7 @@ using Learun.Util; using System; using System.Collections.Generic; using System.Data; +using System.Linq; using System.Text; namespace Learun.Application.TwoDevelopment.EducationalAdministration @@ -30,24 +31,44 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration { var strSql = new StringBuilder(); strSql.Append("SELECT "); - strSql.Append(@" - t.ID, - t.Class, - t.Fraction, - t.Data, - t.Remark - "); + strSql.Append(@"* "); strSql.Append(" FROM EvaCodeOfContuct t "); strSql.Append(" WHERE 1=1 "); var queryParam = queryJson.ToJObject(); // 虚拟参数 var dp = new DynamicParameters(new { }); + if (!queryParam["EDept"].IsEmpty()) + { + dp.Add("EDept", queryParam["EDept"].ToString(), DbType.String); + strSql.Append(" AND t.EDept = @EDept "); + } + if (!queryParam["EMajor"].IsEmpty()) + { + dp.Add("EMajor", queryParam["EMajor"].ToString(), DbType.String); + strSql.Append(" AND t.EMajor = @EMajor "); + } if (!queryParam["Class"].IsEmpty()) { - dp.Add("Class", "%" + queryParam["Class"].ToString() + "%", DbType.String); - strSql.Append(" AND t.Class Like @Class "); + dp.Add("Class", queryParam["Class"].ToString(), DbType.String); + strSql.Append(" AND t.Class = @Class "); + } + if (!queryParam["StuNo"].IsEmpty()) + { + dp.Add("StuNo", "%" + queryParam["StuNo"].ToString() + "%", DbType.String); + strSql.Append(" AND t.StuNo like @StuNo "); } - return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(),dp, pagination); + if (!queryParam["StuName"].IsEmpty()) + { + dp.Add("StuName", "%" + queryParam["StuName"].ToString() + "%", DbType.String); + strSql.Append(" AND t.StuName like @StuName "); + } + if (!queryParam["CheckPeople"].IsEmpty()) + { + dp.Add("CheckPeople", "%" + queryParam["CheckPeople"].ToString() + "%", DbType.String); + strSql.Append(" AND t.CheckPeople like @CheckPeople "); + } + + return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), dp, pagination); } catch (Exception ex) { @@ -99,7 +120,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) { @@ -123,6 +144,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration { try { + var userList = LoginUserInfo.Get(); if (!string.IsNullOrEmpty(keyValue)) { entity.Modify(keyValue); @@ -131,6 +153,15 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration else { entity.Create(); + entity.Mobile = userList.mobile; + entity.CreateTime = DateTime.Now; + var TeachList = this.BaseRepository("CollegeMIS") + .FindList(x => x.ClassNo == entity.EClass).FirstOrDefault(); + if (TeachList != null) + { + entity.ClassTeach = TeachList.ClassDiredctorNo; + entity.CoachTeach = TeachList.ClassTutorNo; + } this.BaseRepository("CollegeMIS").Insert(entity); } }