Merge branch '长阳分支中职' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 长阳分支中职

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js

@@ -40,33 +40,83 @@ var bootstrap = function ($, learun) {
                 text: "majorname",
                 param: { strWhere: "1=1 AND CheckMark=1" },
                 select: function (item) {
-                    if (item) {
-                        $('#ClassNo').lrselectRefresh({
-                            allowSearch: true,
-                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
-                            param: { strWhere: "majorno='" + item.majorno + "' AND CheckMark=1" }
-                        });
+                    var Grades = $("#Grade").lrselectGet();
+                    if (Grades) {
+                        if (item) {
+                            $('#ClassNo').lrselectRefresh({
+                                allowSearch: true,
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                                param: { strWhere: "majorno='" + item.majorno + "' AND CheckMark=1 AND Grade='" + Grades + "' order by classno desc" }
+                            });
+                        } else {
+                            $('#ClassNo').lrselectRefresh({
+                                allowSearch: true,
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                                param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" }
+                            });
+                        }
                     } else {
-                        $('#ClassNo').lrselectRefresh({
-                            allowSearch: true,
-                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
-                            param: { strWhere: "1=1 AND CheckMark=1" }
-                        });
+                        if (item) {
+                            $('#ClassNo').lrselectRefresh({
+                                allowSearch: true,
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                                param: { strWhere: "majorno='" + item.majorno + "' AND CheckMark=1 order by classno desc" }
+                            });
+                        } else {
+                            $('#ClassNo').lrselectRefresh({
+                                allowSearch: true,
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                                param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" }
+                            });
+                        }
+                    }
+                }
+            });
+            $('#Grade').lrselect({
+                url: top.$.rootUrl + '/EducationalAdministration/ClassInfo/GenerateNearByYear',
+                value: "value",
+                text: "text",
+                select: function (item) {
+                    var MajorNos = $("#MajorNo").lrselectGet();
+                    if (MajorNos) {
+                        if (item) {
+                            $('#ClassNo').lrselectRefresh({
+                                allowSearch: true,
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                                param: { strWhere: "majorno='" + item.MajorNos + "' AND CheckMark=1 AND Grade='" + item + "' order by classno desc" }
+                            });
+                        } else {
+                            $('#ClassNo').lrselectRefresh({
+                                allowSearch: true,
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                                param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" }
+                            });
+                        }
+                    } else {
+                        if (item) {
+                            $('#ClassNo').lrselectRefresh({
+                                allowSearch: true,
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                                param: { strWhere: " CheckMark=1 AND Grade='" + Grades + "' order by classno desc" }
+                            });
+                        } else {
+                            $('#ClassNo').lrselectRefresh({
+                                allowSearch: true,
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                                param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" }
+                            });
+                        }
                     }
                 }
             });
             $('#ClassNo').lrselect({
                 allowSearch: true,
                 url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
-                param: { strWhere: "1=1 AND CheckMark=1" },
+                param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" },
                 value: "classno",
                 text: "classname"
             });
-            $('#Grade').lrselect({
-                url: top.$.rootUrl + '/EducationalAdministration/ClassInfo/GenerateNearByYear',
-                value: "value",
-                text: "text",
-            });
+
             $('#GenderNo').lrDataItemSelect({ code: 'usersexbit' });
             $('#NationalityNo').lrDataSourceSelect({ code: 'BCdNationality', value: 'nationalityno', text: 'nationality' });
             $('#FiveYear').lrDataItemSelect({ code: 'PieceCultivateWay' });

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingManagement/MeetingManagementService.cs

@@ -136,7 +136,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
             try
             {
                 var data = this.BaseRepository("CollegeMIS").FindEntity<MeetingManagementEntity>(keyValue);
-                if (data!=null)
+                if (data != null)
                 {
                     data.ConferenceRoomName = this.BaseRepository("CollegeMIS").FindEntity<ConferenceRoomEntity>(data.MeetingPlace).Name;
                 }
@@ -232,6 +232,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
                 else
                 {
                     entity.Create(userInfo);
+                    entity.CreateTime = DateTime.Now;
                     db.Insert(entity);
                 }