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

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

@@ -124,14 +124,14 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         public ActionResult Lock(string keyValue)
         {
             lessonInfoIBLL.Lock(keyValue);
-            return Success("审核成功！");
+            return Success("操作成功！");
         }
         [HttpPost]
         [AjaxOnly]
         public ActionResult UnLock(string keyValue)
         {
             lessonInfoIBLL.UnLock(keyValue);
-            return Success("去审成功！");
+            return Success("操作成功！");
         }
         /// <summary>
         /// 删除实体数据

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

@@ -29,11 +29,11 @@
     </div>
     <div class="col-xs-6 lr-form-item" data-table="ClassroomInfo">
         <div class="lr-form-item-title">容纳人数<font face="宋体">*</font></div>
-        <input id="ContainStuNum" type="text" class="form-control" isvalid="yes" checkexpession="Num" />
+        <input id="ContainStuNum" type="text" class="form-control" isvalid="yes" checkexpession="PositiveInteger" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="ClassroomInfo">
         <div class="lr-form-item-title">考试人数<font face="宋体">*</font></div>
-        <input id="TestContainStuNum" type="text" class="form-control" isvalid="yes" checkexpession="Num" />
+        <input id="TestContainStuNum" type="text" class="form-control" isvalid="yes" checkexpession="PositiveInteger" />
     </div>
 </div>
 @Html.AppendJsFile("/Areas/EducationalAdministration/Views/ClassroomInfo/Form.js")

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

@@ -99,7 +99,7 @@ var bootstrap = function ($, learun) {
                     //    learun.alert.warning("当前项目已审核无需再审！");
                     //    return;
                     //}
-                    learun.layerConfirm('是否确认审核该项！', function (res) {
+                    learun.layerConfirm('是否确认启用该项！', function (res) {
                         if (res) {
                             learun.deleteForm(top.$.rootUrl + '/EducationalAdministration/LessonInfo/Lock', { keyValue: keyValue }, function () {
                                 refreshGirdData();
@@ -121,7 +121,7 @@ var bootstrap = function ($, learun) {
                     //    learun.alert.warning("当前项目还未审核不需要去审核！");
                     //    return;
                     //}
-                    learun.layerConfirm('是否确认去审核该项！', function (res) {
+                    learun.layerConfirm('是否确认停用该项！', function (res) {
                         if (res) {
                             learun.deleteForm(top.$.rootUrl + '/EducationalAdministration/LessonInfo/UnLock', { keyValue: keyValue }, function () {
                                 refreshGirdData();

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/LostArticleInfo/Index.js

@@ -109,13 +109,16 @@ var bootstrap = function ($, learun) {
 
             //  发布
             $('#lr-publish').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('F_LId');
+                if (keyValue.indexOf(',') != -1) {
+                    learun.alert.warning("只能选择一条记录进行发布！");
+                    return;
+                }
                 var F_State = $('#gridtable').jfGridValue('F_State');
                 if (F_State != "0") {
                     learun.alert.warning("当前项目已提交不能发布！");
                     return;
                 }
-
-                var keyValue = $('#gridtable').jfGridValue('F_LId');
                 if (learun.checkrow(keyValue)) {
                     learun.layerConfirm('是否确认发布！', function (res) {
                         if (res) {

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/LostArticleInfo/LostArticleInfoService.cs

@@ -98,7 +98,12 @@ namespace Learun.Application.OA
         {
             try
             {
-                this.BaseRepository().Delete<LostArticleInfoEntity>(t => t.F_LId == keyValue);
+                //多个删除
+                var keyValueArr = keyValue.Split(',');
+                foreach (var item in keyValueArr)
+                {
+                    this.BaseRepository().Delete<LostArticleInfoEntity>(t => t.F_LId == item);
+                }
             }
             catch (Exception ex)
             {
@@ -208,7 +213,7 @@ namespace Learun.Application.OA
             try
             {
                 //草稿0、待认领1、已认领2
-                string sql = $"update LostArticleInfo set F_State=0 where F_LId='{keyValue}'";
+                string sql = $"update LostArticleInfo set F_State=0,F_User='',F_UserTime=null,F_ClaimImage='' where F_LId='{keyValue}'";
                 this.BaseRepository().ExecuteBySql(sql);
             }
             catch (Exception ex)