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

# Conflicts:
#	Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/config/config.js

@@ -7,8 +7,8 @@
 //    web:"http://112.230.201.53/:8081/"//web地址，用于配置logo
 //};
 var config = {
-   webapi: 'http://localhost:31173/',
-   web: "http://localhost:20472/"//web地址，用于配置logo
+   webapi: 'http://localhost:8088/',
+   web: "http://localhost:8087/"//web地址，用于配置logo
 }; 
 // var config = {
 //    webapi: 'http://123.57.209.16:31173/',

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

@@ -316,6 +316,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         public ActionResult GetFormData(string keyValue)
         {
             var StuInfoFreshData = stuInfoFreshIBLL.GetStuInfoFreshEntity(keyValue);
+            StuInfoFreshData.Files = StuInfoFreshData.ID;
             //获取头像地址
             var url = Config.GetValue("defaultheadimg");
             if (StuInfoFreshData.IsPhoto == true && !string.IsNullOrEmpty(StuInfoFreshData.Photo))

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

@@ -21,7 +21,7 @@
                                     <input id="StuName" type="text" class="form-control" />
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">第几级</div>
+                                    <div class="lr-form-item-title">年级</div>
                                     <input id="Grade" type="text" class="form-control" />
                                 </div>
                                 <div class="col-xs-12 lr-form-item">

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

@@ -50,10 +50,14 @@ var bootstrap = function ($, learun) {
             //校园卡注销
             $('#lr_cardderegistrate').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('StuId');
+                var CardDeregistrateStatus = $('#gridtable').jfGridValue('CardDeregistrateStatus');
                 if (learun.checkrow(keyValue)) {
+                    if (CardDeregistrateStatus.indexOf('1') != -1) {
+                        return learun.alert.warning("选中项包括已注销数据！");
+                    }
                     learun.layerConfirm('是否确认注销校园卡！', function (res) {
                         if (res) {
-                            learun.httpAsync('post', top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/IsCardDeregistrate', { keyValue: keyValue,status:'1' }, function () {
+                            learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/IsCardDeregistrate', { keyValue: keyValue, status: '1' }, function () {
                                 refreshGirdData();
                             });
                         }
@@ -66,7 +70,7 @@ var bootstrap = function ($, learun) {
                 if (learun.checkrow(keyValue)) {
                     learun.layerConfirm('是否确认取消注销校园卡！', function (res) {
                         if (res) {
-                            learun.httpAsync('post', top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/IsCardDeregistrate', { keyValue: keyValue, status: '0' }, function () {
+                            learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/IsCardDeregistrate', { keyValue: keyValue, status: '0' }, function () {
                                 refreshGirdData();
                             });
                         }

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

@@ -21,7 +21,7 @@
                                     <input id="StuName" type="text" class="form-control" />
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">第几级</div>
+                                    <div class="lr-form-item-title">年级</div>
                                     <input id="Grade" type="text" class="form-control" />
                                 </div>
                                 <div class="col-xs-12 lr-form-item">

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

@@ -50,10 +50,14 @@ var bootstrap = function ($, learun) {
             //办理退住手续
             $('#lr_checkout').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('StuId');
+                var CheckOutStatus = $('#gridtable').jfGridValue('CheckOutStatus');
                 if (learun.checkrow(keyValue)) {
+                    if (CheckOutStatus.indexOf('1') != -1) {
+                        return learun.alert.warning("选中项包括已办理退住数据！");
+                    }
                     learun.layerConfirm('是否确认办理退住手续！', function (res) {
                         if (res) {
-                            learun.httpAsync('post', top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/IsCheckOut', { keyValue: keyValue,status:'1' }, function () {
+                            learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/IsCheckOut', { keyValue: keyValue, status: '1' }, function () {
                                 refreshGirdData();
                             });
                         }
@@ -66,7 +70,7 @@ var bootstrap = function ($, learun) {
                 if (learun.checkrow(keyValue)) {
                     learun.layerConfirm('是否确认取消办理退住手续！', function (res) {
                         if (res) {
-                            learun.httpAsync('post', top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/IsCheckOut', { keyValue: keyValue, status: '0' }, function () {
+                            learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/IsCheckOut', { keyValue: keyValue, status: '0' }, function () {
                                 refreshGirdData();
                             });
                         }

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

@@ -21,7 +21,7 @@
                                     <input id="StuName" type="text" class="form-control" />
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">第几级</div>
+                                    <div class="lr-form-item-title">年级</div>
                                     <input id="Grade" type="text" class="form-control" />
                                 </div>
                                 <div class="col-xs-12 lr-form-item">

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

@@ -50,10 +50,14 @@ var bootstrap = function ($, learun) {
             //毕业证领取
             $('#lr_getcard').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('StuId');
+                var DiplomaReceiveStatus = $('#gridtable').jfGridValue('DiplomaReceiveStatus');
                 if (learun.checkrow(keyValue)) {
+                    if (DiplomaReceiveStatus.indexOf('1') != -1) {
+                        return learun.alert.warning("选中项包括已领取数据！");
+                    }
                     learun.layerConfirm('是否确认领取毕业证！', function (res) {
                         if (res) {
-                            learun.httpAsync('post', top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/GetCard', { keyValue: keyValue,status:'1' }, function () {
+                            learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/GetCard', { keyValue: keyValue, status: '1' }, function () {
                                 refreshGirdData();
                             });
                         }
@@ -66,7 +70,7 @@ var bootstrap = function ($, learun) {
                 if (learun.checkrow(keyValue)) {
                     learun.layerConfirm('是否确认取消领取毕业证！', function (res) {
                         if (res) {
-                            learun.httpAsync('post', top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/GetCard', { keyValue: keyValue, status: '0' }, function () {
+                            learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/GetCard', { keyValue: keyValue, status: '0' }, function () {
                                 refreshGirdData();
                             });
                         }

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

@@ -21,7 +21,7 @@
                                     <input id="StuName" type="text" class="form-control" />
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">第几级</div>
+                                    <div class="lr-form-item-title">年级</div>
                                     <input id="Grade" type="text" class="form-control" />
                                 </div>
                                 <div class="col-xs-12 lr-form-item">

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

@@ -50,10 +50,14 @@ var bootstrap = function ($, learun) {
             //就业协议备案
             $('#lr_employagree').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('StuId');
+                var EmployAgreeStatus = $('#gridtable').jfGridValue('EmployAgreeStatus');
                 if (learun.checkrow(keyValue)) {
+                    if (EmployAgreeStatus.indexOf('1') != -1) {
+                        return learun.alert.warning("选中项包括已备案数据！");
+                    }
                     learun.layerConfirm('是否确认备案就业协议！', function (res) {
                         if (res) {
-                            learun.httpAsync('post', top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/IsEmployAgree', { keyValue: keyValue,status:'1' }, function () {
+                            learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/IsEmployAgree', { keyValue: keyValue, status: '1' }, function () {
                                 refreshGirdData();
                             });
                         }
@@ -66,7 +70,7 @@ var bootstrap = function ($, learun) {
                 if (learun.checkrow(keyValue)) {
                     learun.layerConfirm('是否确认取消备案就业协议！', function (res) {
                         if (res) {
-                            learun.httpAsync('post', top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/IsEmployAgree', { keyValue: keyValue, status: '0' }, function () {
+                            learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/IsEmployAgree', { keyValue: keyValue, status: '0' }, function () {
                                 refreshGirdData();
                             });
                         }

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

@@ -21,7 +21,7 @@
                                     <input id="StuName" type="text" class="form-control" />
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">第几级</div>
+                                    <div class="lr-form-item-title">年级</div>
                                     <input id="Grade" type="text" class="form-control" />
                                 </div>
                                 <div class="col-xs-12 lr-form-item">

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

@@ -50,10 +50,14 @@ var bootstrap = function ($, learun) {
             //学杂费结算
             $('#lr_feesettle').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('StuId');
+                var FeeSettleStatus = $('#gridtable').jfGridValue('FeeSettleStatus');
                 if (learun.checkrow(keyValue)) {
+                    if (FeeSettleStatus.indexOf('1') != -1) {
+                        return learun.alert.warning("选中项包括已结算数据！");
+                    }
                     learun.layerConfirm('是否确认结算学杂费！', function (res) {
                         if (res) {
-                            learun.httpAsync('post', top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/IsFeeSettle', { keyValue: keyValue,status:'1' }, function () {
+                            learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/IsFeeSettle', { keyValue: keyValue, status: '1' }, function () {
                                 refreshGirdData();
                             });
                         }
@@ -66,7 +70,7 @@ var bootstrap = function ($, learun) {
                 if (learun.checkrow(keyValue)) {
                     learun.layerConfirm('是否确认取消结算学杂费！', function (res) {
                         if (res) {
-                            learun.httpAsync('post', top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/IsFeeSettle', { keyValue: keyValue, status: '0' }, function () {
+                            learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/IsFeeSettle', { keyValue: keyValue, status: '0' }, function () {
                                 refreshGirdData();
                             });
                         }

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

@@ -21,7 +21,7 @@
                                     <input id="StuName" type="text" class="form-control" />
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">第几级</div>
+                                    <div class="lr-form-item-title">年级</div>
                                     <input id="Grade" type="text" class="form-control" />
                                 </div>
                                 <div class="col-xs-12 lr-form-item">

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

@@ -50,10 +50,14 @@ var bootstrap = function ($, learun) {
             //档案与组织关系转出
             $('#lr_filetransfer').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('StuId');
+                var FileTransferStatus = $('#gridtable').jfGridValue('FileTransferStatus');
                 if (learun.checkrow(keyValue)) {
+                    if (FileTransferStatus.indexOf('1') != -1) {
+                        return learun.alert.warning("选中项包括已转出数据！");
+                    }
                     learun.layerConfirm('是否确认转出档案与组织关系！', function (res) {
                         if (res) {
-                            learun.httpAsync('post', top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/IsFileTransfer', { keyValue: keyValue,status:'1' }, function () {
+                            learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/IsFileTransfer', { keyValue: keyValue, status: '1' }, function () {
                                 refreshGirdData();
                             });
                         }
@@ -66,7 +70,7 @@ var bootstrap = function ($, learun) {
                 if (learun.checkrow(keyValue)) {
                     learun.layerConfirm('是否确认取消转出档案与组织关系！', function (res) {
                         if (res) {
-                            learun.httpAsync('post', top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/IsFileTransfer', { keyValue: keyValue, status: '0' }, function () {
+                            learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/IsFileTransfer', { keyValue: keyValue, status: '0' }, function () {
                                 refreshGirdData();
                             });
                         }

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

@@ -21,7 +21,7 @@
                                     <input id="StuName" type="text" class="form-control" />
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">第几级</div>
+                                    <div class="lr-form-item-title">年级</div>
                                     <input id="Grade" type="text" class="form-control" />
                                 </div>
                                 <div class="col-xs-12 lr-form-item">

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

@@ -50,10 +50,14 @@ var bootstrap = function ($, learun) {
             //图书资料归还
             $('#lr_returnbooks').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('StuId');
+                var ReturnBooksStatus = $('#gridtable').jfGridValue('ReturnBooksStatus');
                 if (learun.checkrow(keyValue)) {
+                    if (ReturnBooksStatus.indexOf('1') != -1) {
+                        return learun.alert.warning("选中项包括已归还数据！");
+                    }
                     learun.layerConfirm('是否确认归还图书资料！', function (res) {
                         if (res) {
-                            learun.httpAsync('post', top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/IsReturnBooks', { keyValue: keyValue,status:'1' }, function () {
+                            learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/IsReturnBooks', { keyValue: keyValue, status: '1' }, function () {
                                 refreshGirdData();
                             });
                         }
@@ -66,7 +70,7 @@ var bootstrap = function ($, learun) {
                 if (learun.checkrow(keyValue)) {
                     learun.layerConfirm('是否确认取消归还图书资料！', function (res) {
                         if (res) {
-                            learun.httpAsync('post', top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/IsReturnBooks', { keyValue: keyValue, status: '0' }, function () {
+                            learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/IsReturnBooks', { keyValue: keyValue, status: '0' }, function () {
                                 refreshGirdData();
                             });
                         }

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

@@ -35,8 +35,8 @@ var bootstrap = function ($, learun) {
             $('#gridtable').lrAuthorizeJfGrid({
                 url: top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/GetPageList',
                 headData: [
-                    { label: "学号", name: "StuNo", width: 100, align: "left" },
-                    { label: "学籍号", name: "StuCode", width: 100, align: "left" },
+                    { label: "学号", name: "StuNo", width: 200, align: "left" },
+                    { label: "学籍号", name: "StuCode", width: 200, align: "left" },
                     { label: "姓名", name: "StuName", width: 100, align: "left" },
                     {
                         label: "性别", name: "GenderNo", width: 80, align: "left",
@@ -44,8 +44,12 @@ var bootstrap = function ($, learun) {
                             return cellvalue == true ? "男" : "女";
                         }
                     },
-                    { label: "出生日期", name: "Birthday", width: 100, align: "left" },
-                    { label: "身份证号", name: "IdentityCardNo", width: 100, align: "left" },
+                    {
+                        label: "出生日期", name: "Birthday", width: 100, align: "left",
+                        formatter: function (cellvalue) {
+                            return learun.formatDate(cellvalue, 'yyyy-MM-dd');
+                        } },
+                    { label: "身份证号", name: "IdentityCardNo", width: 150, align: "left" },
                     {
                         label: "民族", name: "NationalityNo", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
@@ -120,8 +124,18 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
-                    { label: "报到日期", name: "RegisterDate", width: 100, align: "left" },
-                    { label: "入学年月", name: "EntranceDate", width: 100, align: "left" },
+                    {
+                        label: "报到日期", name: "RegisterDate", width: 100, align: "left",
+                        formatter: function (cellvalue) {
+                            return learun.formatDate(cellvalue, 'yyyy-MM-dd');
+                        }
+                    },
+                    {
+                        label: "入学年月", name: "EntranceDate", width: 100, align: "left",
+                        formatter: function (cellvalue) {
+                            return learun.formatDate(cellvalue, 'yyyy-MM-dd');
+                        }
+                    },
                     {
                         label: "异动状态", name: "AbmormityMoveMark", width: 80, align: "center",
                         formatter: function (cellvalue) {
@@ -137,7 +151,7 @@ var bootstrap = function ($, learun) {
                 ],
                 mainId: 'StuId',
                 isPage: true,
-                isMultiselect: true,
+                //isMultiselect: true,
                 //onSelectRow: function (rowdata) {
                 //    if (rowdata.CheckMark == "1") {
                 //        $("#check").hide();
@@ -153,7 +167,7 @@ var bootstrap = function ($, learun) {
                 //}
 
             });
-            //page.search();
+            page.search();
         },
         search: function (param) {
             param = param || {};

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

@@ -61,9 +61,9 @@
         <div id="ResidenceNo"></div>
     </div>
     @*<div class="col-xs-6 lr-form-item" data-table="StuInfoFresh">
-        <div class="lr-form-item-title">考生类型 </div>
-        <div id="TestStuSortNo"></div>
-    </div>*@
+            <div class="lr-form-item-title">考生类型 </div>
+            <div id="TestStuSortNo"></div>
+        </div>*@
     <div class="col-xs-6 lr-form-item" data-table="StuInfoFresh">
         <div class="lr-form-item-title">第几志愿 <font face="宋体">*</font> </div>
         <input id="WillNo" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
@@ -129,6 +129,10 @@
         <div class="lr-form-item-title">精准贫困户</div>
         <div id="IsPoor"></div>
     </div>
+    @*<div class="col-xs-12 lr-form-item" data-table="StuInfoFresh">
+        <div class="lr-form-item-title">附件</div>
+        <div id="Files"></div>
+    </div>*@
 
 
     <div class="col-xs-12" id="photoBox">

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/Form.js

@@ -25,6 +25,8 @@ var bootstrap = function ($, learun) {
             $("#MatriculateSort").lrDataItemSelect({ code: 'enrollType' });
             $('#ResidenceNo').lrDataItemSelect({ code: 'ResidenceNo' });
             $('#IsPoor').lrDataItemSelect({ code: 'YesOrNoInt' });
+            //附件
+            //$('#Files').lrUploader();
 
             $('#StuInfoFreshFamily').jfGrid({
                 headData: [

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

@@ -104,7 +104,16 @@ var bootstrap = function ($, learun) {
                     { label: "学号", name: "StuNo", width: 200, align: "left" },
                     { label: "姓名", name: "StuName", width: 200, align: "left" },
                     {
-                        label: "处分名称", name: "PunishName", width: 200, align: "left"
+                        label: "处分名称", name: "PunishNo", width: 200, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'Punishment',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
                     },
                     { label: "处分原因", name: "PunishReason", width: 300, align: "left" },
                     { label: "处分日期", name: "PunishDate", width: 200, align: "left" },

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/ScoreQueryAllIndex.js

@@ -45,9 +45,13 @@ var bootstrap = function ($, learun) {
                 if (learun.checkrow(keyValue)) {
                     learun.layerConfirm('是否准许 ' + stuName + ' 毕业？', function (res) {
                         if (res) {
-                            learun.httpAsync('get', top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/AllowGraduate', { stuNo: keyValue, status: '1' }, function () {
-                                $('#btn_Search').trigger('click');
+                            learun.getForm(top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/AllowGraduate?stuNo=' + keyValue +'&status=1',  function () {
+                                refreshGirdData();
+                                //$('#btn_Search').trigger('click');
                             });
+                            //learun.httpAsync('get', top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/AllowGraduate', { stuNo: keyValue, status: '1' }, function () {
+                            //    $('#btn_Search').trigger('click');
+                            //});
                         }
                     });
                 }
@@ -59,7 +63,7 @@ var bootstrap = function ($, learun) {
                 if (learun.checkrow(keyValue)) {
                     learun.layerConfirm('是否不准 ' + stuName + ' 毕业？', function (res) {
                         if (res) {
-                            learun.httpAsync('get', top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/AllowGraduate', { stuNo: keyValue, status: '0' }, function () {
+                            learun.getForm(top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/AllowGraduate?stuNo=' + keyValue + '&status=0', function () {
                                 $('#btn_Search').trigger('click');
                             });
                         }

Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/StuInfoFreshApi.cs

@@ -26,6 +26,8 @@ namespace Learun.Application.WebApi.Modules
             Get["/pageList"] = GetPageList;
             Get["/form"] = GetForm;
             Post["/save"] = SaveForm;
+            Post["/upload"] = Upload;
+            Post["/deleteFiles"] = DeleteFiles;
 
         }
 
@@ -99,8 +101,20 @@ namespace Learun.Application.WebApi.Modules
                     if (annexesFileEntity != null)
                     {
                         url = annexesFileEntity.F_FilePath.Substring(annexesFileEntity.F_FilePath.IndexOf("Resource"));
+                        StuInfoFreshEntity.Url = url;
                     }
                 }
+                //获取附件列表
+                var annexesFileList = annexesFileIBLL.GetList(StuInfoFreshEntity.ID);
+                if (annexesFileList.Any())
+                {
+                    foreach (var item in annexesFileList)
+                    {
+                        item.F_FilePath = item.F_FilePath.Substring(item.F_FilePath.IndexOf("Resource"));
+                    }
+                    StuInfoFreshEntity.FilesList = annexesFileList.ToList();
+                }
+
                 StuInfoFreshEntity.DormitoryName = accdormitoryIBLL.GetDormitoryInfoByPlanStuNo(StuInfoFreshEntity.ID);
                 if (StuInfoFreshEntity.IsPoor != "1")
                 {
@@ -335,6 +349,89 @@ namespace Learun.Application.WebApi.Modules
             return Success("保存成功！");
         }
 
+        /// <summary>
+        /// 上传附件图片文件
+        /// <summary>
+        /// <returns></returns>
+        public Response Upload(dynamic _)
+        {
+            var files = (List<HttpFile>)this.Context.Request.Files;
+            var folderId = this.GetReq<FileModel>().folderId;//文件夹id=新生id
+            var name = this.GetReq<FileModel>().name;//文件夹id=新生id
+
+
+            string filePath = Config.GetValue("AnnexesFile");
+            string uploadDate = DateTime.Now.ToString("yyyyMMdd");
+            string FileEextension = name;
+            string fileGuid = Guid.NewGuid().ToString();
+
+            string virtualPath = string.Format("{0}/{1}/{2}/{3}{4}", filePath, userInfo.userId, uploadDate, fileGuid, FileEextension);
+
+            //创建文件夹
+            string path = Path.GetDirectoryName(virtualPath);
+            Directory.CreateDirectory(path);
+            AnnexesFileEntity fileAnnexesEntity = new AnnexesFileEntity();
+            if (!System.IO.File.Exists(virtualPath))
+            {
+                byte[] bytes = new byte[files[0].Value.Length];
+                files[0].Value.Read(bytes, 0, bytes.Length);
+                FileInfo file = new FileInfo(virtualPath);
+                FileStream fs = file.Create();
+                fs.Write(bytes, 0, bytes.Length);
+                fs.Close();
+
+                //文件信息写入数据库
+                fileAnnexesEntity.F_Id = fileGuid;
+                fileAnnexesEntity.F_FolderId = folderId;
+                fileAnnexesEntity.F_FileName = name;
+                fileAnnexesEntity.F_FilePath = virtualPath;
+                fileAnnexesEntity.F_FileSize = files[0].Value.Length.ToString();
+                fileAnnexesEntity.F_FileExtensions = FileEextension;
+                fileAnnexesEntity.F_FileType = FileEextension.Replace(".", "");
+                fileAnnexesEntity.F_CreateUserId = userInfo.userId;
+                fileAnnexesEntity.F_CreateUserName = userInfo.realName;
+
+                annexesFileIBLL.SaveEntity(folderId, fileAnnexesEntity);
+            }
+
+            //文件地址截取到resource后
+            fileAnnexesEntity.F_FilePath = fileAnnexesEntity.F_FilePath.Substring(fileAnnexesEntity.F_FilePath.IndexOf("Resource"));
+
+            return Success(fileAnnexesEntity);
+        }
+
+        /// <summary>
+        /// 删除附件
+        /// </summary>
+        /// <param name="_"></param>
+        /// <returns></returns>
+        public Response DeleteFiles(dynamic _)
+        {
+            var fileId = this.GetReqData<FileModel>().id;
+
+            AnnexesFileEntity fileInfoEntity = annexesFileIBLL.GetEntity(fileId);
+            if (fileInfoEntity != null)
+            {
+                //删除附件表
+                annexesFileIBLL.DeleteEntity(fileId);
+                //删除文件
+                if (System.IO.File.Exists(fileInfoEntity.F_FilePath))
+                {
+                    System.IO.File.Delete(fileInfoEntity.F_FilePath);
+                }
+
+
+                //下载
+                //if (FileDownHelper.FileExists(fileInfoEntity.F_FilePath))
+                //{
+                //    FileDownHelper.DownLoadnew(fileInfoEntity.F_FilePath);
+                //}
+            }
+
+            return Success("删除成功");
+        }
+
+
         #region  私有类
 
         /// <summary>
@@ -389,6 +486,7 @@ namespace Learun.Application.WebApi.Modules
             /// </summary>
             public List<StuInfoFreshEmergePeopleEntity> StuInfoFreshEmergePeopleEntities { get; set; }
 
+
         }
 
         public class PhotoModel
@@ -397,5 +495,11 @@ namespace Learun.Application.WebApi.Modules
             public string account { get; set; }
         }
 
+        public class FileModel
+        {
+            public string folderId { get; set; }
+            public string name { get; set; }
+            public string id { get; set; }
+        }
     }
 }

Learun.Framework.Ultimate V7/Learun.Application.WebApi/XmlConfig/system.config

@@ -65,7 +65,7 @@
 
   <add key="userKey" value="14B417B0-463D-4F2B-8075-0A20EEDB773A" />
   <!-- ==================注意附件上传地址  修改到主网站部署目录下的Resource要不然飞星会报错================== -->
-  <add key="AnnexesFile" value="D:\leiprojects\西昌单校区\Learun.Application.Web\Resource" />
+  <add key="AnnexesFile" value="D:\Job\DigitalScholl\Learun.Framework.Ultimate V7\Learun.Application.Web\Resource" />
   <add key="ReportFile" value="~/Reports" />
   <!-- ================== 工作流服务地址 ================== -->
   <add key="workflowapi" value="http://localhost:8013" />

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/SystemModule/Annexes/AnnexesFileService.cs

@@ -13,7 +13,7 @@ namespace Learun.Application.Base.SystemModule
     /// 日 期：2017.03.08
     /// 描 述：附件管理
     /// </summary>
-    public class AnnexesFileService:RepositoryFactory
+    public class AnnexesFileService : RepositoryFactory
     {
         #region  属性 构造函数
         private string fieldSql;
@@ -188,7 +188,7 @@ namespace Learun.Application.Base.SystemModule
         {
             try
             {
-                this.BaseRepository().Delete(new AnnexesFileEntity() { F_Id = fileId });
+                this.BaseRepository().Delete<AnnexesFileEntity>(x => x.F_Id == fileId);
             }
             catch (Exception ex)
             {

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicService.cs

@@ -345,7 +345,12 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             try
             {
                 var ClassDiredctorNo = LoginUserInfo.Get().account;
-                return this.BaseRepository("CollegeMIS").FindTable($" SELECT * FROM dbo.ClassInfo where ClassDiredctorNo='{ClassDiredctorNo}' or ClassTutorNo='{ClassDiredctorNo}'");
+                string sql = " SELECT * FROM dbo.ClassInfo  where CheckMark=1 ";
+                if (ClassDiredctorNo.ToUpper() != "SYSTEM")
+                {
+                    sql += $"  and ClassDiredctorNo='{ClassDiredctorNo}' or ClassTutorNo='{ClassDiredctorNo}'";
+                }
+                return this.BaseRepository("CollegeMIS").FindTable(sql);
             }
             catch (Exception ex)
             {
@@ -512,7 +517,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// <param name="keyValue">主键</param>
         /// <summary>
         /// <returns></returns>
-        public void GetCard(string keyValue,string status)
+        public void GetCard(string keyValue, string status)
         {
             var db = this.BaseRepository("CollegeMIS").BeginTrans();
             try

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshEntity.cs

@@ -1,5 +1,7 @@
-using Learun.Util;
+using Learun.Application.Base.SystemModule;
+using Learun.Util;
 using System;
+using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
 namespace Learun.Application.TwoDevelopment.EducationalAdministration
 
@@ -716,6 +718,23 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         [NotMapped]
         public bool? IsStudentEdit { get; set; }
 
+        /// <summary>
+        /// 图片显示地址
+        /// </summary>
+        [NotMapped]
+        public string Url { get; set; }
+
+        /// <summary>
+        /// 附件(文件夹id)
+        /// </summary>
+        [NotMapped]
+        public string Files { get; set; }
+        /// <summary>
+        /// 附件列表
+        /// </summary>
+        [NotMapped]
+        public List<AnnexesFileEntity> FilesList { get; set; }
+
         #endregion
     }
 }