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

# Conflicts:
#	Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/customform.js
#	Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/mixins.js

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

@@ -67,7 +67,13 @@ var bootstrap = function ($, learun) {
             //取消校园卡注销
             $('#lr_cancelcardderegistrate').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('StuId');
+                var CardDeregistrateStatus = $('#gridtable').jfGridValue('CardDeregistrateStatus');
                 if (learun.checkrow(keyValue)) {
+                    for (var i = 0; i < CardDeregistrateStatus.split(',').length; i++) {
+                        if (CardDeregistrateStatus.split(',')[i] != 1) {
+                            return learun.alert.warning("选中项包括未注销数据！");
+                        }
+                    }
                     learun.layerConfirm('是否确认取消注销校园卡！', function (res) {
                         if (res) {
                             learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/IsCardDeregistrate', { keyValue: keyValue, status: '0' }, function () {

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

@@ -67,7 +67,13 @@ var bootstrap = function ($, learun) {
             //取消办理退住手续
             $('#lr_cancelcheckout').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('StuId');
+                var CheckOutStatus = $('#gridtable').jfGridValue('CheckOutStatus');
                 if (learun.checkrow(keyValue)) {
+                    for (var i = 0; i < CheckOutStatus.split(',').length; i++) {
+                        if (CheckOutStatus.split(',')[i] != 1) {
+                            return learun.alert.warning("选中项包括未办理退住数据！");
+                        }
+                    }
                     learun.layerConfirm('是否确认取消办理退住手续！', function (res) {
                         if (res) {
                             learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/IsCheckOut', { keyValue: keyValue, status: '0' }, function () {

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

@@ -67,7 +67,13 @@ var bootstrap = function ($, learun) {
             //取消毕业证领取
             $('#lr_cancelgetcard').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('StuId');
+                var DiplomaReceiveStatus = $('#gridtable').jfGridValue('DiplomaReceiveStatus');
                 if (learun.checkrow(keyValue)) {
+                    for (var i = 0; i < DiplomaReceiveStatus.split(',').length; i++) {
+                        if (DiplomaReceiveStatus.split(',')[i] != 1) {
+                            return learun.alert.warning("选中项包括未领取数据！");
+                        }
+                    }
                     learun.layerConfirm('是否确认取消领取毕业证！', function (res) {
                         if (res) {
                             learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/GetCard', { keyValue: keyValue, status: '0' }, function () {

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

@@ -67,7 +67,13 @@ var bootstrap = function ($, learun) {
             //取消就业协议备案
             $('#lr_cancelemployagree').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('StuId');
+                var EmployAgreeStatus = $('#gridtable').jfGridValue('EmployAgreeStatus');
                 if (learun.checkrow(keyValue)) {
+                    for (var i = 0; i < EmployAgreeStatus.split(',').length; i++) {
+                        if (EmployAgreeStatus.split(',')[i] != 1) {
+                            return learun.alert.warning("选中项包括未备案数据！");
+                        }
+                    }
                     learun.layerConfirm('是否确认取消备案就业协议！', function (res) {
                         if (res) {
                             learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/IsEmployAgree', { keyValue: keyValue, status: '0' }, function () {

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

@@ -67,7 +67,13 @@ var bootstrap = function ($, learun) {
             //取消学杂费结算
             $('#lr_cancelfeesettle').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('StuId');
+                var FeeSettleStatus = $('#gridtable').jfGridValue('FeeSettleStatus');
                 if (learun.checkrow(keyValue)) {
+                    for (var i = 0; i < FeeSettleStatus.split(',').length; i++) {
+                        if (FeeSettleStatus.split(',')[i] != 1) {
+                            return learun.alert.warning("选中项包括未结算数据！");
+                        }
+                    }
                     learun.layerConfirm('是否确认取消结算学杂费！', function (res) {
                         if (res) {
                             learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/IsFeeSettle', { keyValue: keyValue, status: '0' }, function () {

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

@@ -67,7 +67,13 @@ var bootstrap = function ($, learun) {
             //取消档案与组织关系转出
             $('#lr_cancelfiletransfer').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('StuId');
+                var FileTransferStatus = $('#gridtable').jfGridValue('FileTransferStatus');
                 if (learun.checkrow(keyValue)) {
+                    for (var i = 0; i < FileTransferStatus.split(',').length; i++) {
+                        if (FileTransferStatus.split(',')[i] != 1) {
+                            return learun.alert.warning("选中项包括未转出数据！");
+                        }
+                    }
                     learun.layerConfirm('是否确认取消转出档案与组织关系！', function (res) {
                         if (res) {
                             learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/IsFileTransfer', { keyValue: keyValue, status: '0' }, function () {

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

@@ -67,7 +67,13 @@ var bootstrap = function ($, learun) {
             //取消图书资料归还
             $('#lr_cancelreturnbooks').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('StuId');
+                var ReturnBooksStatus = $('#gridtable').jfGridValue('ReturnBooksStatus');
                 if (learun.checkrow(keyValue)) {
+                    for (var i = 0; i < ReturnBooksStatus.split(',').length; i++) {
+                        if (ReturnBooksStatus.split(',')[i] != 1) {
+                            return learun.alert.warning("选中项包括未归还数据！");
+                        }
+                    }
                     learun.layerConfirm('是否确认取消归还图书资料！', function (res) {
                         if (res) {
                             learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/IsReturnBooks', { keyValue: keyValue, status: '0' }, function () {

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

@@ -395,15 +395,39 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// </summary>
         public void AllowGraduate(string stuNo, string status)
         {
+            var db = this.BaseRepository("CollegeMIS").BeginTrans();
             try
             {
-
                 var list = stuNo.Split(',').ToList().Select(a => "'" + a + "'");
                 var stulist = string.Join(",", list);
-                this.BaseRepository("CollegeMIS").ExecuteBySql($"UPDATE dbo.StuInfoBasic SET FinishSchoolMark ='{status}' WHERE StuNo in({stulist})");
+
+                if (status == "1")//准许毕业
+                {
+                    //判断离校手续是否全办完，若满足则修改毕业状态为已毕业和毕业时间，若不满足则修改毕业状态为准许毕业；
+                    foreach (var item in stuNo.Split(','))
+                    {
+                        var itementity = db.FindEntity<StuInfoBasicEntity>(x => x.StuNo == item);
+                        if (itementity.ReturnBooksStatus == "1" && itementity.EmployAgreeStatus == "1" && itementity.FeeSettleStatus == "1" && itementity.CheckOutStatus == "1" && itementity.CardDeregistrateStatus == "1" && itementity.DiplomaReceiveStatus == "1" && itementity.FileTransferStatus == "1")
+                        {
+                            db.ExecuteBySql($"UPDATE dbo.StuInfoBasic SET FinishSchoolMark ='2',FinishSchoolDate='" + DateTime.Now + "' WHERE StuNo='" + item + "' ");
+                        }
+                        else
+                        {
+                            db.ExecuteBySql($"UPDATE dbo.StuInfoBasic SET FinishSchoolMark ='{status}',FinishSchoolDate=null WHERE StuNo='" + item + "' ");
+                        }
+                    }
+                }
+                else//不准毕业
+                {
+                    //毕业状态修改为不准毕业，毕业时间为空；
+                    db.ExecuteBySql($"UPDATE dbo.StuInfoBasic SET FinishSchoolMark ='{status}',FinishSchoolDate=null WHERE StuNo in({stulist})");
+                }
+
+                db.Commit();
             }
             catch (Exception ex)
             {
+                db.Rollback();
                 if (ex is ExceptionEx)
                 {
                     throw;

Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/customform.js

@@ -274,7 +274,6 @@ export default {
 
         case 'upload':
           const uploadUid = []
-		  console.log(val,'val上传前')
 		  
           for (const item of val) {
             if (item.uid) {

Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/custompage.js

@@ -256,7 +256,7 @@ export default {
             const fileType = fileInfo.F_FileType
             const fileSize = fileInfo.F_FileSize
 
-            const path = this.API + '/annexes/wxdown?' + this.URL_QUERY(uid, true)
+            const path = this.API + '/learun/adms/annexes/wxdown?' + this.URL_QUERY(uid, true)
 
             fileList.push({ path, type: fileType, uid, size: fileSize })
           }

Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/mixins.js

@@ -259,7 +259,6 @@ export default {
 		//   filePath 为临时文件的路径
 		//   formData 为请求附带的提交数据
 		async HTTP_UPLOAD(filePath, formData) {
-			
 			const [err, res] = await this.UPLOAD('/learun/adms/annexes/wxupload', filePath, formData)
 
 			return this.handleResult(err, res)
@@ -277,7 +276,7 @@ export default {
 		//   url 为请求地址
 		//   formData 为请求附带的提交数据
 		async HTTP_DOWNLOAD(formData) {
-			const [err, res] = await this.DOWNLOAD('/annexes/wxdown', formData)
+			const [err, res] = await this.DOWNLOAD('/learun/adms/annexes/wxdown', formData)
 
 			return this.handleResult(err, res)
 		},
@@ -342,7 +341,7 @@ export default {
 			// 	})
 			// })
 			// #endif
-			console.log(filePath,'filePath上传内')
+
 			// #ifndef MP-DINGTALK
 			return uni.uploadFile({
 				url: uploadUrl,
@@ -352,11 +351,9 @@ export default {
 				formData: query
 			}).then(([err, result]) => {
 				if (!err) {
-					
 					result.data = JSON.parse(result.data)
 					return [null, result]
 				} else {
-					
 					return [err, null]
 				}
 

Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js

@@ -21,10 +21,10 @@ export default {
   //   "http://192.168.2.98:8088/"
   // ],
   "apiHost": [
-    // "http://localhost:31173/"
-	"http://192.168.10.85:8088/"
+    "http://localhost:31173/"
+	// "http://192.168.10.85:8088/"
   ],
-  "webHost":"http://192.168.10.85:8087/",
+  "webHost":"http://localhost:20472/",
   // 开发环境下自动填充登录账号密码，与接口地址一一对应，只在开发环境下显示
   "devAccount": [
 	  // 20201130230 21364200000400266 老师 420528196310072253 学生 420528200606205026      420528200507261428