Merge branch '塔里木分支' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 塔里木分支

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Form.cshtml

@@ -113,7 +113,7 @@
     </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
         <div class="lr-form-item-title">是否单亲</div>
-        <div id="IsSingle" isvalid="yes" checkexpession="NotNull"></div>
+        <div id="IsSingle"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
         <div class="lr-form-item-title">父亲姓名</div>

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

@@ -208,7 +208,17 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers
             return View();
         }
 
+        /// <summary>
+        /// 分类管理
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult ClearForm()
+        {
+            return View();
+        }
 
+        
         #endregion
 
         #region  获取数据
@@ -521,6 +531,16 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers
             return Success("同步成功");
         }
 
+        /// <summary>
+        /// 按条件清空
+        /// </summary>
+        /// <returns></returns>
+        public ActionResult StudentClear(string Grade)
+        {
+            accommodationIBLL.ClearEntity(Grade);
+            return Success("清空成功");
+        }
+
         #endregion
 
     }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_DormitoryRule/Form.cshtml

@@ -13,14 +13,14 @@
     </div>
     <div class="col-xs-12 lr-form-item" data-table="Acc_DormitoryRule">
         <div class="lr-form-item-title">推送班主任<font face="宋体">*</font></div>
-        <div id="ClassDiredctor"></div>
+        <div id="ClassDiredctor"  isvalid="yes" checkexpession="NotNull"></div>
     </div>
     <div class="col-xs-12 lr-form-item" data-table="Acc_DormitoryRule">
         <div class="lr-form-item-title">推送时间点<font face="宋体">*</font></div>
         <input id="PushHour" type="number" class="form-control" isvalid="yes" checkexpession="NotNull" placeholder="请填写0-23数字" />
     </div>
     <div class="col-xs-12 lr-form-item" data-table="Acc_DormitoryRule">
-        <div class="lr-form-item-title">启用<font face="宋体">*</font></div>
+        <div class="lr-form-item-title"  isvalid="yes" checkexpession="NotNull">启用<font face="宋体">*</font></div>
         <div id="IsEnable"></div>
     </div>
 </div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/ClearForm.cshtml

@@ -0,0 +1,11 @@
+@{
+    ViewBag.Title = "开课计划";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<div class="lr-form-wrap" id="form">
+    <div class="col-xs-12 lr-form-item" data-table="ClassPlanTeach">
+        <div class="lr-form-item-title">年级<font face="宋体">*</font></div>
+        <div id="Grade" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/LogisticsManagement/Views/Accommodation/ClearForm.js")

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

@@ -0,0 +1,36 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-11-29 11:43
+ * 描  述：开课计划
+ */
+var acceptClick;
+var keyValue = request('keyValue');
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            $('.lr-form-wrap').lrscroll();
+            page.bind();
+        },
+        bind: function () {
+            $('#Grade').lrselect({
+                url: top.$.rootUrl + '/EducationalAdministration/ClassInfo/GenerateNearByYear',
+                value: 'value',
+                text: 'text'
+            });
+        }
+    };
+    // 保存数据
+    acceptClick = function (callBack) {
+        if (!$('body').lrValidform()) {
+            return false;
+        }
+        var postData = $('#form').lrGetFormData();
+        var Grade = postData.Grade;
+        learun.postForm(top.$.rootUrl + '/LogisticsManagement/Accommodation/StudentClear', { Grade: Grade }, function () {
+            learun.frameTab.currentIframe().refreshGirdData()
+        });
+    };
+    page.init();
+}

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

@@ -80,6 +80,7 @@
                         <a id="lr_Dept" class="btn btn-default"><i class="fa fa-pencil-square"></i>&nbsp;分配系</a>
                         <a id="lr_Class" class="btn btn-default"><i class="fa fa-pencil-square"></i>&nbsp;分配专业班级</a>
                         <a id="lr_Bed" class="btn btn-default"><i class="fa fa-pencil-square"></i>&nbsp;分配宿舍</a>
+                        <a id="lr_Clear" class="btn btn-default"><i class="fa fa-pencil-square"></i>&nbsp;按年级清空</a>
                         <a id="lr_print" class="btn btn-default"><i class="fa fa-print"></i>&nbsp;打印</a>
                     </div>
                 </div>

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

@@ -315,7 +315,19 @@ var bootstrap = function ($, learun) {
                     }
                 });
             });
-
+            //清空
+            $("#lr_Clear").on("click", function () {
+                learun.layerForm({
+                    id: 'form',
+                    title: '按年级清空',
+                    url: top.$.rootUrl + '/LogisticsManagement/Accommodation/ClearForm',
+                    width: 400,
+                    height: 300,
+                    callBack: function (id) {
+                        return top[id].acceptClick();
+                    }
+                });
+            });
         },
         //初始化左侧树
         initTree: function () {

Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj

@@ -1335,6 +1335,7 @@
     <Content Include="Areas\LogisticsManagement\Views\Accommodation\IndexBed.js" />
     <Content Include="Areas\LogisticsManagement\Views\Accommodation\IndexClassify.js" />
     <Content Include="Areas\LogisticsManagement\Views\Accommodation\IndexDistribution.js" />
+    <Content Include="Areas\LogisticsManagement\Views\Accommodation\ClearForm.js" />
     <Content Include="Areas\LogisticsManagement\Views\Acc_DormitoryRule\Form.js" />
     <Content Include="Areas\LogisticsManagement\Views\Acc_DormitoryRule\Index.js" />
     <Content Include="Areas\LogisticsManagement\Views\ADR_Record\AttendanceReportByWeek.js" />
@@ -7911,6 +7912,7 @@
     <Content Include="Areas\EducationalAdministration\Views\StuCancelLeaveManagement\FormView.cshtml" />
     <Content Include="Areas\AssetManagementSystem\Views\Ass_Acceptance\FormView.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\SchoolCalendar\ScheduleIndex.cshtml" />
+    <Content Include="Areas\LogisticsManagement\Views\Accommodation\ClearForm.cshtml" />
     <None Include="Properties\PublishProfiles\CustomProfile.pubxml" />
     <None Include="Properties\PublishProfiles\FolderProfile.pubxml" />
     <Content Include="Views\Login\Default-beifen.cshtml" />

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

@@ -830,6 +830,31 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
 
             }
         }
+
+
+        /// <summary>
+        /// 清空实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        public void ClearEntity(string Grade)
+        {
+            try
+            {
+                accommodationService.ClearEntity(Grade);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
         #endregion
 
     }

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

@@ -106,6 +106,9 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
         object GetFloorList(string parentID);
         object GetRoomList(string parentID);
         object GetBedList(string parentID);
+
+        void ClearEntity(string Grade);
+
         #endregion
 
     }

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

@@ -1866,6 +1866,27 @@ where ID='{ParentID}'
             }
         }
 
+        /// <summary>
+        /// 按年级清空
+        /// </summary>
+        public void ClearEntity(string Grade)
+        {
+            try
+            {
+                BaseRepository("CollegeMIS").ExecuteBySql($"delete from Acc_DormitoryBuild where StudentID in(select StuNo from StuInfoBasic where Grade ='{Grade}')");
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
         #endregion 提交数据
     }
 }