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

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/FormClass.js

@@ -18,6 +18,7 @@ var bootstrap = function ($, learun) {
         bind: function () {
 
             $('#Class').lrselect({
+                type: 'multiple',// default,tree,treemultiple,gird,multiple
                 value: "classno",
                 text: "classname"
             });
@@ -31,7 +32,7 @@ var bootstrap = function ($, learun) {
                     if (item) {
                         $('#Class').lrselectRefresh({
                             url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable',
-                            param: { code: "bjsj", strWhere: "DeptNo='" + item.deptno + "' and majorno='" + item.majorno + "'" }
+                            param: { code: "bjsj", strWhere: "DeptNo='" + item.deptno + "' and majorno='" + item.majorno + "' order by classno desc" }
                         });
                     }
 

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/FormRoom.js

@@ -24,7 +24,22 @@ var bootstrap = function ($, learun) {
             if (!!keyValue) {
                 $.lrSetForm(top.$.rootUrl + '/LogisticsManagement/Accommodation/GetBedListByRoomId?RoomId=' + keyValue, function (data) {
                     $('#content').html('');
-                    var strWhere = " ClassNo='" + Class + "'";
+                    var strWhere = "";
+                    var cArray = Class.split(',');
+                    if (cArray.length > 1) {
+                        strWhere += '( '
+                        for (var j = 0; j < cArray.length; j++) {
+                            if (j == 0) {
+                                strWhere += ' ClassNo = ' + cArray[j] + ' ';
+                            } else {
+                                strWhere += ' or ClassNo = ' + cArray[j] + ' ';
+                            }
+                        }
+                        strWhere += ') ';
+                    } else {
+                        strWhere += " ClassNo='" + Class + "'";
+                    }
+                    //console.log(strWhere, "strWhere")
                     if (Sex == '0') {
                         strWhere += " and GenderNo=0";
                     }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/IndexDistribution.js

@@ -426,15 +426,35 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     {
-                        label: "班级", name: "Class", 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: "Class", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            if (value && value.indexOf(',') != -1) {
+                                var content = '';
+                                var texts = value.split(',');
+                                for (var i = 0; i < texts.length; i++) {
+                                    learun.clientdata.getAsync('custmerData',
+                                        {
+                                            url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'bjsj',
+                                            key: texts[i],
+                                            keyId: 'classno',
+                                            callback: function (_data) {
+                                                content += _data['classname'] + ',';
+                                            }
+                                        });
                                 }
-                            });
+                                content = content.substring(0, content.length - 1);
+                                callback(content);
+                            } else {
+                                learun.clientdata.getAsync('custmerData',
+                                    {
+                                        url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'bjsj',
+                                        key: value,
+                                        keyId: 'classno',
+                                        callback: function (_data) {
+                                            callback(_data['classname']);
+                                        }
+                                    });
+                            }
                         }
                     },
                     {

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/CdMajor/CdMajorService.cs

@@ -294,7 +294,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         {
             try
             {
-                return this.BaseRepository("CollegeMIS").FindTable("select * from CdMajor where CheckMark=1 ");
+                return this.BaseRepository("CollegeMIS").FindTable("select * from CdMajor where CheckMark=1 order by MajorNo desc");
             }
             catch (Exception ex)
             {

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ClassInfo/ClassInfoService.cs

@@ -204,7 +204,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         {
             try
             {
-                return this.BaseRepository("CollegeMIS").FindTable("select * from ClassInfo where CheckMark=1 ");
+                return this.BaseRepository("CollegeMIS").FindTable("select * from ClassInfo where CheckMark=1 order by classno desc ");
             }
             catch (Exception ex)
             {