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

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/TextBookOutController.cs

@@ -102,7 +102,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         public ActionResult GetFormData(string keyValue)
         {
             var TextBookInOutData = textBookInOutIBLL.GetKCEntity(keyValue);
-            var TextBookOutData = textBookOutIBLL.GetTextBookOutEntity(TextBookInOutData.BookCode);
+            var TextBookOutData = textBookOutIBLL.GetListByCode(TextBookInOutData.BookCode);
             var jsonData = new
             {
                 TextBookInOut = TextBookInOutData,

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasicChange/FormView.cshtml

@@ -16,7 +16,6 @@
         <div class="lr-form-item-title">姓名<font face="宋体">*</font></div>
         <input id="StuName" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" readonly="readonly" />
     </div>
-
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasicChange">
         <div class="lr-form-item-title">异动类型<font face="宋体">*</font></div>
         <div id="StuChangeType" isvalid="yes" checkexpession="NotNull" readonly="readonly"></div>
@@ -25,22 +24,20 @@
         <div class="lr-form-item-title">异动原因<font face="宋体">*</font></div>
         <div id="StuChangeReason" isvalid="yes" checkexpession="NotNull" readonly="readonly"></div>
     </div>
-
-    <div class="col-xs-12 text-center">学籍原安排</div>
+    <div class="col-xs-12 text-center">学籍异动前信息</div>
     <div class="col-xs-4 lr-form-item" data-table="StuInfoBasicChange">
         <div class="lr-form-item-title">系部<font face="宋体">*</font></div>
-        <div id="DeptNo" isvalid="yes" checkexpession="NotNull" readonly="readonly"></div>
+        <div id="DeptNo" readonly="readonly"></div>
     </div>
     <div class="col-xs-4 lr-form-item" data-table="StuInfoBasicChange">
         <div class="lr-form-item-title">专业<font face="宋体">*</font></div>
-        <div id="MajorNo" isvalid="yes" checkexpession="NotNull" readonly="readonly"></div>
+        <div id="MajorNo" readonly="readonly"></div>
     </div>
     <div class="col-xs-4 lr-form-item" data-table="StuInfoBasicChange">
         <div class="lr-form-item-title">班级<font face="宋体">*</font></div>
-        <div id="ClassNo" isvalid="yes" checkexpession="NotNull" readonly="readonly"></div>
+        <div id="ClassNo" readonly="readonly"></div>
     </div>
-
-    <div class="col-xs-12 text-center">学籍新安排</div>
+    <div class="col-xs-12 text-center">学籍异动后信息</div>
     <div class="NewContainer" style="display:none;">
         <div class="col-xs-4 lr-form-item" data-table="StuInfoBasicChange">
             <div class="lr-form-item-title" data-title="新系部">新系部</div>
@@ -55,7 +52,13 @@
             <div id="NewClassNo" class="contentDiv zhuanban"></div>
         </div>
     </div>
-
+    <div class="col-xs-12 text-center">转出学校</div>
+    <div class="NewSchool" style="display:none;">
+        <div class="col-xs-12 lr-form-item" data-table="StuInfoBasicChange">
+            <div class="lr-form-item-title" data-title="转出学校">转出学校</div>
+            <input id="OutSchool" type="text" class="form-control" />
+        </div>
+    </div>
     <div class="col-xs-12 lr-form-item" data-table="StuInfoBasicChange">
         <div class="lr-form-item-title">备注</div>
         <textarea id="StuChangeRemark" class="form-control" style="height:50px;" readonly="readonly"></textarea>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasicChange/FormView.js

@@ -31,22 +31,41 @@ var bootstrap = function ($, learun) {
                         $("#NewMajorNo").siblings('div').html($("#NewMajorNo").siblings('div').attr('data-title') + '<font face="宋体">*</font>');
                         $("#NewClassNo").siblings('div').html($("#NewClassNo").siblings('div').attr('data-title') + '<font face="宋体">*</font>');
                         $(".NewContainer").show();
-                        if (item.id === "01" || item.id === "02") { //降级、转班
-                            //$(".NewContainer").find('.contentDiv.zhuanban').removeAttr('readonly');
+                        if (item.id === "01") { //留级
+                            $(".NewSchool").hide();
+                            $(".NewContainer").find('.contentDiv.zhuanban').removeAttr('readonly');
                             $("#NewDeptNo").lrselectSet($("#DeptNo").lrselectGet());
                             $("#NewMajorNo").lrselectSet($("#MajorNo").lrselectGet());
+                            $('#OutSchool').val('');
+                        } else if (item.id === "02") {//转校
+                            $(".NewSchool").show();
+                            $(".NewContainer").find('.contentDiv').removeAttr("isvalid");
+                            $(".NewContainer").find('.contentDiv').removeAttr("checkexpession");
+                            $(".NewContainer").find('.contentDiv').removeAttr('readonly');
+                            $(".NewSchool").find('.OutSchool').attr("isvalid", 'yes');
+                            $(".NewSchool").find('.OutSchool').attr("checkexpession");
+                            $(".NewSchool").find('.OutSchool').attr('readonly');
+                        } else if (item.id === "03") { //复学
+                            $(".NewSchool").hide();
+                            $(".NewContainer").find('.contentDiv').removeAttr('readonly');
+                            $(".NewSchool").find('.OutSchool').attr("isvalid", "Null");
+                            $('#OutSchool').val('');
+                        } else if (item.id === "04") { //转入
+                            $(".NewSchool").hide();
+                            $(".NewContainer").find('.contentDiv').removeAttr('readonly');
+                            $(".NewSchool").find('.OutSchool').attr("isvalid", "Null");
+                            $('#OutSchool').val('');
                         }
-                        else if (item.id === "03") {    //转专业
-                            //$(".NewContainer").find('.contentDiv').removeAttr('readonly');
-                        }
-                        else if (item.id === "04" || item.id === "05") {    //退学、休学
+                        else { //退学、休学、
                             $(".NewContainer").find('.contentDiv').removeAttr("isvalid");
                             $(".NewContainer").find('.contentDiv').removeAttr("checkexpession");
-                            //$(".NewContainer").find('.contentDiv').removeAttr('readonly');
+                            $(".NewContainer").find('.contentDiv').removeAttr('readonly');
                             $("#NewDeptNo").siblings('div').html($("#NewDeptNo").siblings('div').attr('data-title'));
                             $("#NewMajorNo").siblings('div').html($("#NewMajorNo").siblings('div').attr('data-title'));
                             $("#NewClassNo").siblings('div').html($("#NewClassNo").siblings('div').attr('data-title'));
                             $(".NewContainer").hide();
+                            $(".NewSchool").hide();
+                            $('#OutSchool').val('');
                         }
 
                     }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/AccommodationController.cs

@@ -463,7 +463,12 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers
         public ActionResult SaveRoom(string RoomId, List<Acc_DormitoryBuildEntity> list)
         {
             //List<Acc_DormitoryBuildEntity> list = strEntity.ToObject<List<Acc_DormitoryBuildEntity>>();
-            accommodationIBLL.SaveRoom(RoomId, list);
+            string res = accommodationIBLL.SaveRoom(RoomId, list);
+            if (!string.IsNullOrEmpty(res))
+            {
+                return Fail(res);
+            }
+
             return Success("保存成功！");
         }
 

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

@@ -18,7 +18,7 @@ var bootstrap = function ($, learun) {
             page.initData();
         },
         bind: function () {
-            
+
         },
         initData: function () {
             if (!!keyValue) {
@@ -51,16 +51,16 @@ var bootstrap = function ($, learun) {
                             value: "stuno",
                             text: "stuname",
                             url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable',
-                            param: { code: "StuInfoBasic", strWhere: strWhere  },
+                            param: { code: "StuInfoBasic", strWhere: strWhere },
                             // 是否允许搜索
                             allowSearch: true,
                             select: function (item) {
-                               // console.log(item);
+                                // console.log(item);
                                 var stuid = '';
                                 if (item) {
                                     stuid = item.stuno;
 
-                                } 
+                                }
                                 var id = $(this).attr('id');
                                 //console.log('id', id);
                                 //console.log('item',item);
@@ -78,9 +78,9 @@ var bootstrap = function ($, learun) {
 
                         //arr.push({ ID: data[i].ID, StudentID: data[i].StudentID });
                     }
-                    
-                    
-                    
+
+
+
                 });
             }
         },
@@ -93,8 +93,14 @@ var bootstrap = function ($, learun) {
         //var postData = {
         //    strEntity: JSON.stringify($('body').lrGetFormData())
         //};
-        //console.log('arr',arr);
-       
+        //console.log('arr', arr);
+        for (var i = 0; i < arr.length - 1; i++) {
+            for (var j = i + 1; j < arr.length; j++) {
+                if (!!arr[i].StudentID && arr[i].StudentID === arr[j].StudentID) {
+                    return learun.alert.warning('学生不可重复！');
+                }
+            }
+        }
         var postData = {
             list: arr
         };

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TextBookOut/TextBookOutBLL.cs

@@ -42,7 +42,24 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 }
             }
         }
-
+        public IEnumerable<TextBookOutEntity> GetListByCode(string code)
+        {
+            try
+            {
+                return textBookOutService.GetListByCode(code);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
         /// <summary>
         /// 获取TextBookOut表实体数据
         /// </summary>

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TextBookOut/TextBookOutIBLL.cs

@@ -21,6 +21,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// <param name="queryJson">查询参数</param>
         /// <returns></returns>
         IEnumerable<TextBookOutEntity> GetPageList(Pagination pagination, string queryJson);
+        IEnumerable<TextBookOutEntity> GetListByCode(string code);
         /// <summary>
         /// 获取TextBookOut表实体数据
         /// </summary>

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TextBookOut/TextBookOutService.cs

@@ -105,6 +105,24 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             }
         }
 
+        public IEnumerable<TextBookOutEntity> GetListByCode(string code)
+        {
+            try
+            {
+                return this.BaseRepository("CollegeMIS").FindList<TextBookOutEntity>(x => x.InOutCode == code);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
         /// <summary>
         /// 获取TextBookOut表实体数据
         /// </summary>

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Accommodation/AccommodationBLL.cs

@@ -681,11 +681,11 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
             }
         }
 
-        public void SaveRoom(string RoomId, List<Acc_DormitoryBuildEntity> list)
+        public string SaveRoom(string RoomId, List<Acc_DormitoryBuildEntity> list)
         {
             try
             {
-                accommodationService.SaveRoom(RoomId, list);
+                return accommodationService.SaveRoom(RoomId, list);
             }
             catch (Exception ex)
             {

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Accommodation/AccommodationIBLL.cs

@@ -83,7 +83,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
         void SaveEntity(string keyValue, Acc_DormitoryBuildEntity entity);
         void SaveBedEntity(string keyValue,string ParentID, Acc_DormitoryBuildEntity entity);
         void SaveDeptClass(string keyValue, Acc_DormitoryBuildEntity entity,int type);
-        void SaveRoom(string RoomId, List<Acc_DormitoryBuildEntity> list);
+        string SaveRoom(string RoomId, List<Acc_DormitoryBuildEntity> list);
 
         /// <summary>
         /// 批量添加单元、楼层、房间、床位

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Accommodation/AccommodationService.cs

@@ -1721,13 +1721,25 @@ where ID='{ParentID}'
         /// </summary>
         /// <param name="RoomId"></param>
         /// <param name="list"></param>
-        public void SaveRoom(string RoomId, List<Acc_DormitoryBuildEntity> list)
+        public string SaveRoom(string RoomId, List<Acc_DormitoryBuildEntity> list)
         {
             var db = this.BaseRepository("CollegeMIS").BeginTrans();
             try
             {
                 foreach (var entity in list)
                 {
+                    //判断该学生是否已分配
+                    if (!string.IsNullOrEmpty(entity.StudentID))
+                    {
+                        var count = db.FindList<Acc_DormitoryBuildEntity>().Count(x => x.StudentID == entity.StudentID && x.ID != entity.ID);
+                        if (count > 0)
+                        {
+                            var stuname = db.FindEntity<StuInfoBasicEntity>(x => x.StuNo == entity.StudentID)?.StuName;
+                            return "学生" + stuname + "已分配床位，不可重复分配！";
+                        }
+                    }
+
+                    //分配床位
                     string sql = $"update Acc_DormitoryBuild set StudentID='{entity.StudentID}' where ID='{entity.ID}'";
                     db.ExecuteBySql(sql);
                 }
@@ -1737,6 +1749,7 @@ where ID='{ParentID}'
                 db.ExecuteBySql(checkInSql);
 
                 db.Commit();
+                return "";
             }
             catch (Exception ex)
             {