From e20d716bbf34ca827d25dcaad3e468d2e99a1a99 Mon Sep 17 00:00:00 2001 From: ndbs Date: Mon, 4 Jul 2022 11:18:45 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=8A=95=E8=AF=89=E4=B8=AD=E5=BF=83--?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=99=84=E4=BB=B6=E4=B8=8A=E4=BC=A0=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/Sys_ReceiveComplaint/Form.cshtml | 4 ++++ .../Views/Sys_ReceiveComplaint/Form.js | 3 ++- .../Views/Sys_ReceiveComplaint/FormView.cshtml | 4 ++++ .../Views/Sys_ReceiveComplaint/FormView.js | 1 + .../Views/Sys_SendComplaint/Form.cshtml | 4 ++++ .../Views/Sys_SendComplaint/Form.js | 1 + .../Views/Sys_SendComplaint/FormList.cshtml | 4 ++++ .../Views/Sys_SendComplaint/FormList.js | 1 + .../Sys_SendComplaint/FormListView.cshtml | 6 +++++- .../Views/Sys_SendComplaint/FormListView.js | 1 + .../Views/Sys_SendComplaint/FormView.cshtml | 6 +++++- .../Views/Sys_SendComplaint/FormView.js | 1 + .../Sys_ReceiveComplaintEntity.cs | 7 ++++++- .../Sys_SendComplaintEntity.cs | 9 +++++++-- .../Sys_SendComplaintService.cs | 18 ++---------------- 15 files changed, 48 insertions(+), 22 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveComplaint/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveComplaint/Form.cshtml index 3ec21da8c..894c758b6 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveComplaint/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveComplaint/Form.cshtml @@ -15,5 +15,9 @@
回复内容*
+
+
附件
+
+
@Html.AppendJsFile("/Areas/EducationalAdministration/Views/Sys_ReceiveComplaint/Form.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveComplaint/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveComplaint/Form.js index 81a4558df..b5a02b3a4 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveComplaint/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveComplaint/Form.js @@ -15,13 +15,14 @@ var bootstrap = function ($, learun) { page.initData(); }, bind: function () { + $('#FilePath').lrUploader(); }, initData: function () { if (!!keyValue) { $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/Sys_ReceiveComplaint/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/Sys_ReceiveComplaint/FormView.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveComplaint/FormView.cshtml index 2dfc6211a..033ce3753 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveComplaint/FormView.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveComplaint/FormView.cshtml @@ -15,5 +15,9 @@
回复内容*
+
+
附件
+
+
@Html.AppendJsFile("/Areas/EducationalAdministration/Views/Sys_ReceiveComplaint/FormView.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveComplaint/FormView.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveComplaint/FormView.js index 81a4558df..635fd47b4 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveComplaint/FormView.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveComplaint/FormView.js @@ -15,6 +15,7 @@ var bootstrap = function ($, learun) { page.initData(); }, bind: function () { + $('#FilePath').lrUploader(); }, initData: function () { if (!!keyValue) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendComplaint/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendComplaint/Form.cshtml index fe5dd1914..1eb6a351d 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendComplaint/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendComplaint/Form.cshtml @@ -18,5 +18,9 @@
投诉意见*
+
+
附件
+
+
@Html.AppendJsFile("/Areas/EducationalAdministration/Views/Sys_SendComplaint/Form.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendComplaint/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendComplaint/Form.js index f1d03956b..0a48c58bd 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendComplaint/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendComplaint/Form.js @@ -15,6 +15,7 @@ var bootstrap = function ($, learun) { page.initData(); }, bind: function () { + $('#FilePath').lrUploader(); }, initData: function () { if (!!keyValue) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendComplaint/FormList.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendComplaint/FormList.cshtml index 735e23a6a..a1c0fd952 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendComplaint/FormList.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendComplaint/FormList.cshtml @@ -19,5 +19,9 @@
接收人*
+
+
附件
+
+
@Html.AppendJsFile("/Areas/EducationalAdministration/Views/Sys_SendComplaint/FormList.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendComplaint/FormList.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendComplaint/FormList.js index 50c3dc3ce..f4f97e927 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendComplaint/FormList.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendComplaint/FormList.js @@ -15,6 +15,7 @@ var bootstrap = function ($, learun) { page.initData(); }, bind: function () { + $('#FilePath').lrUploader(); $('#ReceiverUserId').lrUserSelect({ type: '1' }); }, initData: function () { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendComplaint/FormListView.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendComplaint/FormListView.cshtml index ebd40bc19..a52f98cf0 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendComplaint/FormListView.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendComplaint/FormListView.cshtml @@ -17,7 +17,11 @@
接收人*
- + +
+
+
附件
+
@Html.AppendJsFile("/Areas/EducationalAdministration/Views/Sys_SendComplaint/FormListView.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendComplaint/FormListView.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendComplaint/FormListView.js index 50c3dc3ce..f4f97e927 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendComplaint/FormListView.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendComplaint/FormListView.js @@ -15,6 +15,7 @@ var bootstrap = function ($, learun) { page.initData(); }, bind: function () { + $('#FilePath').lrUploader(); $('#ReceiverUserId').lrUserSelect({ type: '1' }); }, initData: function () { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendComplaint/FormView.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendComplaint/FormView.cshtml index dafa879f1..2f1423331 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendComplaint/FormView.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendComplaint/FormView.cshtml @@ -12,11 +12,15 @@
主题*
- +
投诉意见*
+
+
附件
+
+
@Html.AppendJsFile("/Areas/EducationalAdministration/Views/Sys_SendComplaint/FormView.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendComplaint/FormView.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendComplaint/FormView.js index f1d03956b..0a48c58bd 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendComplaint/FormView.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendComplaint/FormView.js @@ -15,6 +15,7 @@ var bootstrap = function ($, learun) { page.initData(); }, bind: function () { + $('#FilePath').lrUploader(); }, initData: function () { if (!!keyValue) { diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_ReceiveComplaint/Sys_ReceiveComplaintEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_ReceiveComplaint/Sys_ReceiveComplaintEntity.cs index 801277749..bae34845d 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_ReceiveComplaint/Sys_ReceiveComplaintEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_ReceiveComplaint/Sys_ReceiveComplaintEntity.cs @@ -11,7 +11,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// 日 期：2019-04-16 17:19 /// 描 述：接收投诉意见 /// - public class Sys_ReceiveComplaintEntity + public class Sys_ReceiveComplaintEntity { #region 实体成员 /// @@ -79,6 +79,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// [Column("DELFLAG")] public bool? DelFlag { get; set; } + /// + /// + /// + [Column("FILEPATH")] + public string FilePath { get; set; } #endregion #region 扩展操作 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_SendComplaint/Sys_SendComplaintEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_SendComplaint/Sys_SendComplaintEntity.cs index a5f49fe09..39176452b 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_SendComplaint/Sys_SendComplaintEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_SendComplaint/Sys_SendComplaintEntity.cs @@ -11,7 +11,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// 日 期：2019-04-16 17:09 /// 描 述：发送投诉意见 /// - public class Sys_SendComplaintEntity + public class Sys_SendComplaintEntity { #region 实体成员 /// @@ -99,6 +99,12 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// [Column("REPLYFLAG")] public int? ReplyFlag { get; set; } + + /// + /// ReplyFlag + /// + [Column("FILEPATH")] + public string FilePath { get; set; } #endregion #region 扩展操作 @@ -119,7 +125,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } #endregion #region 扩展字段 - #endregion } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_SendComplaint/Sys_SendComplaintService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_SendComplaint/Sys_SendComplaintService.cs index ac591af1d..574d9618c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_SendComplaint/Sys_SendComplaintService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_SendComplaint/Sys_SendComplaintService.cs @@ -31,22 +31,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration { var strSql = new StringBuilder(); strSql.Append("SELECT "); - strSql.Append(@" - t.SComplaintId, - t.ComplaintCode, - t.CreateUserId, - t.CreateUserName, - t.Title, - t.Contents, - t.CreateTime, - t.SendTime, - t.SendFlag, - t.AssignFlag, - t.AssignTime, - t.ReceiverId, - t.Receiver, - t.ReplyFlag - "); + strSql.Append(@"* "); strSql.Append(" FROM Sys_SendComplaint t "); strSql.Append(" WHERE 1=1 and t.DelFlag=0 "); var queryParam = queryJson.ToJObject(); @@ -235,6 +220,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration sys_ReceiveComplaintEntity.SendTime = DateTime.Now; sys_ReceiveComplaintEntity.ReplyFlag = 0; sys_ReceiveComplaintEntity.DelFlag = false; + sys_ReceiveComplaintEntity.FilePath = sys_SendComplaintEntity.FilePath; db.Insert(sys_ReceiveComplaintEntity); } //更新发送投诉意见 From c332bd092dd34c003f13b2083460896d8cc98b1b Mon Sep 17 00:00:00 2001 From: ndbs Date: Mon, 4 Jul 2022 16:56:17 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E8=A1=8C=E4=B8=BA=E8=A7=84=E8=8C=83?= =?UTF-8?q?=E6=97=A5=E8=80=83=E6=A0=B8-=E9=9C=80=E6=B1=82=E5=8F=98?= =?UTF-8?q?=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/EvaCodeOfContuct/Form.cshtml | 48 +++++-- .../Views/EvaCodeOfContuct/Form.js | 117 ++++++++++++++++- .../Views/EvaCodeOfContuct/Index.cshtml | 24 +++- .../Views/EvaCodeOfContuct/Index.js | 121 +++++++++++++++++- .../EvaCodeOfContuctEntity.cs | 66 +++++++++- .../EvaCodeOfContuctService.cs | 53 ++++++-- 6 files changed, 397 insertions(+), 32 deletions(-) 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); } } From 586955817861fa1943a22075806e47079c0be958 Mon Sep 17 00:00:00 2001 From: ndbs Date: Mon, 4 Jul 2022 18:05:08 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=AD=A6=E7=94=9F=E8=BF=9D=E7=BA=AA?= =?UTF-8?q?=E7=AE=A1=E7=90=86-=E5=8F=98=E6=9B=B4=E9=9C=80=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/StuDisciplineManagement/Form.cshtml | 44 +++++++------ .../Views/StuDisciplineManagement/Form.js | 2 +- .../StuDisciplineManagement/FormView.cshtml | 24 ++++--- .../Views/StuDisciplineManagement/FormView.js | 2 +- .../Views/StuDisciplineManagement/Index.js | 63 ++++++++++++++++++- .../StuDisciplineManagementEntity.cs | 25 +++++++- .../StuDisciplineManagementService.cs | 14 ++--- 7 files changed, 136 insertions(+), 38 deletions(-) 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) { From 4aee40bff97e04619c595e76da24eb9ad3ee075d Mon Sep 17 00:00:00 2001 From: ndbs Date: Tue, 5 Jul 2022 11:51:20 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=AD=A6=E7=B1=8D=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E7=AE=A1=E7=90=86-=E6=9C=AA=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/StuInfoBasic/Form.cshtml | 56 +++++++++++++++---- .../Views/StuInfoBasic/Form.js | 2 +- .../StuInfoBasic/StuInfoBasicEntity.cs | 41 ++++++++++++++ 3 files changed, 86 insertions(+), 13 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Form.cshtml index 6c86ed491..a862ec705 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Form.cshtml @@ -108,20 +108,52 @@
-
父亲姓名*
- +
户籍所在地
+
-
父亲电话*
- +
是否单亲
+
-
母亲姓名*
- +
父亲姓名
+
-
母亲电话*
- +
母亲姓名
+ +
+
+
身份证号
+ +
+
+
身份证号
+ +
+
+
父亲电话
+ +
+
+
母亲电话
+ +
+
+
户籍地址
+ +
+
+
户籍地址
+ +
+
+
现住址
+ +
+
+
现住址
+
家庭出身
@@ -159,6 +191,10 @@
毕业日期
+
+
毕业证书备注
+ +
系所*
@@ -203,9 +239,5 @@
备注
-
-
毕业证书备注
- -
@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuInfoBasic/Form.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Form.js index 7921d6082..d763b8f2c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Form.js @@ -169,7 +169,7 @@ var bootstrap = function ($, learun) { learun.alert.error('请先选择系和专业'); } }); - + $('#IsSingle').lrDataItemSelect({ code: 'YesOrNoBit' }); }, initData: function () { if (!!keyValue) { 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 2e14c2089..b10400a61 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 @@ -723,6 +723,47 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// [Column("BANKLOCATION")] public string BankLocation { get; set; } + + /// + /// + /// + [Column("ISSINGLE")] + public bool? IsSingle { get; set; } + /// + /// 开户银行位置 + /// + [Column("DOMICILE")] + public string Domicile { get; set; } + /// + /// 开户银行位置 + /// + [Column("OneDomicile")] + public string OneDomicile { get; set; } + /// + /// 开户银行位置 + /// + [Column("TWODOMICILE")] + public string TwoDomicile { get; set; } + /// + /// 开户银行位置 + /// + [Column("ONEADDRESS")] + public string OneAddress { get; set; } + /// + /// 开户银行位置 + /// + [Column("TWOADDRESS")] + public string TwoAddress { get; set; } + /// + /// 村委会书记姓名 + /// + [Column("THREENAME")] + public string ThreeName { get; set; } + /// + /// 村委联系方式 + /// + [Column("THREEMOBILE")] + public string ThreeMobile { get; set; } #endregion #region 扩展操作 From aecf7bdb5c003b1776bd676bec8e3e850b7bd868 Mon Sep 17 00:00:00 2001 From: ndbs Date: Tue, 5 Jul 2022 12:00:47 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E8=AF=81=E4=B9=A6=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=99=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/TeacherCertificate/Form.cshtml | 8 ++++++-- .../PersonnelManagement/Views/TeacherCertificate/Form.js | 3 ++- .../TeacherCertificate/TeacherCertificateEntity.cs | 7 +++++-- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherCertificate/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherCertificate/Form.cshtml index d1f963d9f..379a53093 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherCertificate/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherCertificate/Form.cshtml @@ -21,15 +21,19 @@
签发机关
- +
任教学科
- +
取得时间*
+
+
附件
+
+
@Html.AppendJsFile("/Areas/PersonnelManagement/Views/TeacherCertificate/Form.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherCertificate/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherCertificate/Form.js index 94f26ecb5..6cf2bdb97 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherCertificate/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherCertificate/Form.js @@ -23,13 +23,14 @@ var bootstrap = function ($, learun) { value: "empid", text: "empname" }); + $('#FilePath').lrUploader(); }, initData: function () { if (!!keyValue) { $.lrSetForm(top.$.rootUrl + '/PersonnelManagement/TeacherCertificate/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.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeacherCertificate/TeacherCertificateEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeacherCertificate/TeacherCertificateEntity.cs index 1bf32b1da..427ab1c73 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeacherCertificate/TeacherCertificateEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeacherCertificate/TeacherCertificateEntity.cs @@ -69,8 +69,11 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement /// [Column("CHECKUSER")] public string CheckUser { get; set; } - - + /// + /// 附件路径 + /// + [Column("FilePath")] + public string FilePath { get; set; } #endregion #region 扩展操作