学籍异动审核-奖助学金,sql语句修改

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/QueryScholarshipIndex.js

@@ -87,7 +87,7 @@ var bootstrap = function ($, learun) {
                         label: "奖学金类型", name: "SchoolType", width: 150, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData', {
-                                url: '/EducationalAdministration/Scholarship/GetList?queryJson=' + JSON.stringify({ IsType: 0, IsValid: 0 }),
+                                url: '/EducationalAdministration/Scholarship/GetList?queryJson=' + JSON.stringify({ IsType: 1, IsValid: 0 }),
                                 key: value,
                                 keyId: 'Id',
                                 callback: function (_data) {
@@ -118,6 +118,7 @@ var bootstrap = function ($, learun) {
             param = param || {};
             param.StuNo = StuNo;
             param.IsType = 1;
+            param.State = 1;
             $('#gridtableTwo').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }
     };

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuTransferInfo/StuTransferInfoService.cs

@@ -445,7 +445,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                             var StuScoreHistory = db.FindList<StuScoreEntity>(x => x.StuNo == InsertStuTran.StuNo
                                                 && x.DeptNo == InsertStuTran.DeptNo && x.MajorNo == InsertStuTran.MajorNo
                                                 && x.ClassNo == InsertStuTran.ClassNo && x.F_SchoolId == InsertStuTran.F_SchoolId);
-                            if (StuScoreHistory != null)
+                            if (StuScoreHistory.Any())
                             {
                                 foreach (var itemScore in StuScoreHistory)
                                 {
@@ -493,7 +493,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                             var StuScoreNotPassHistory = db.FindList<StuScoreNotPassEntity>(x => x.StuNo == InsertStuTran.StuNo
                                                 && x.DeptNo == InsertStuTran.DeptNo && x.MajorNo == InsertStuTran.MajorNo
                                                 && x.ClassNo == InsertStuTran.ClassNo && x.F_SchoolId == InsertStuTran.F_SchoolId);
-                            if (StuScoreNotPassHistory != null)
+                            if (StuScoreNotPassHistory.Any())
                             {
                                 foreach (var itemScore in StuScoreNotPassHistory)
                                 {
@@ -507,7 +507,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                             var StuScoreNotPassTwoHistory = db.FindList<StuScoreNotPassTwoEntity>(x => x.StuNo == InsertStuTran.StuNo
                                                 && x.DeptNo == InsertStuTran.DeptNo && x.MajorNo == InsertStuTran.MajorNo
                                                 && x.ClassNo == InsertStuTran.ClassNo && x.F_SchoolId == InsertStuTran.F_SchoolId);
-                            if (StuScoreNotPassTwoHistory != null)
+                            if (StuScoreNotPassTwoHistory.Any())
                             {
                                 foreach (var itemScore in StuScoreNotPassTwoHistory)
                                 {
@@ -520,12 +520,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                             #endregion
                             #region 助学金奖学金（ScholarshipAudit，新-写入，旧-删除；）
                             var ScholarshipHistory = db.FindList<ScholarshipxjEntity>(x => x.StuNo == InsertStuTran.StuNo);
-                            if (ScholarshipHistory != null)
+                            if (ScholarshipHistory.Any())
                             {
                                 foreach (var items in ScholarshipHistory)
                                 {
-                                    db.ExecuteBySql(" insert into ScholarshipTran select * from ScholarshipAudit where IsType = 1  and State =1 and id = '" + items.Id + "'");
-                                    db.ExecuteBySql(" insert into ScholarshipTran select * from ScholarshipAudit where IsType = 0  and id =  '" + items.Id + "'");
+                                    db.ExecuteBySql(" insert into ScholarshipTran select * from ScholarshipAudit where id = '" + items.Id + "'");
                                     // 删除旧数据
                                     db.Delete<ScholarshipxjEntity>(x => x.Id == items.Id);
                                 }
@@ -533,11 +532,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                             #endregion
                             #region 学生心理健康档案（APStuHealthRecords，新-写入，旧-删除；）
                             var AspHistory = db.FindList<APStuHealthRecordsEntity>(x => x.Stuno == InsertStuTran.StuNo);
-                            if (AspHistory != null)
+                            if (AspHistory.Any())
                             {
                                 foreach (var items in AspHistory)
                                 {
-                                    db.ExecuteBySql(" insert into APStuHealthRecordsTran select * from APStuHealthRecords where ID = " + items.ID + "'");
+                                    db.ExecuteBySql(" insert into APStuHealthRecordsTran select * from APStuHealthRecords where ID = '" + items.ID + "'");
                                     // 删除旧数据
                                     db.Delete<APStuHealthRecordsEntity>(x => x.ID == items.ID);
                                 }
@@ -545,11 +544,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                             #endregion
                             #region 兵役一（MSRIntentionManagement，新-写入，旧-删除；）
                             var MSRIntentionHistory = db.FindList<MSRIntentionManagementEntity>(x => x.StuNo == InsertStuTran.StuNo);
-                            if (MSRIntentionHistory != null)
+                            if (MSRIntentionHistory.Any())
                             {
                                 foreach (var items in MSRIntentionHistory)
                                 {
-                                    db.ExecuteBySql(" insert into MSRIntentionManagementTran select * from MSRIntentionManagement where ID = " + items.ID + "'");
+                                    db.ExecuteBySql(" insert into MSRIntentionManagementTran select * from MSRIntentionManagement where ID = '" + items.ID + "'");
                                     // 删除旧数据
                                     db.Delete<MSRIntentionManagementEntity>(x => x.ID == items.ID);
                                 }
@@ -557,11 +556,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                             #endregion
                             #region 兵役二（MSRMilitaryRecord，新-写入，旧-删除；）
                             var MSRMilitaryRecordHistory = db.FindList<MSRMilitaryRecordEntity>(x => x.StuNo == InsertStuTran.StuNo);
-                            if (MSRMilitaryRecordHistory != null)
+                            if (MSRMilitaryRecordHistory.Any())
                             {
                                 foreach (var items in MSRMilitaryRecordHistory)
                                 {
-                                    db.ExecuteBySql(" insert into MSRMilitaryRecordTran select * from MSRMilitaryRecord where ID = " + items.ID + "'");
+                                    db.ExecuteBySql(" insert into MSRMilitaryRecordTran select * from MSRMilitaryRecord where ID = '" + items.ID + "'");
                                     // 删除旧数据
                                     db.Delete<MSRMilitaryRecordEntity>(x => x.ID == items.ID);
                                 }
@@ -569,11 +568,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                             #endregion
                             #region 兵役三（MSRMilitaryServiceRegistration，新-写入，旧-删除；）
                             var MSRMilitaryServiceRegistrationHistory = db.FindList<MSRMilitaryServiceRegistrationEntity>(x => x.StuNo == InsertStuTran.StuNo);
-                            if (MSRMilitaryServiceRegistrationHistory != null)
+                            if (MSRMilitaryServiceRegistrationHistory.Any())
                             {
                                 foreach (var items in MSRMilitaryServiceRegistrationHistory)
                                 {
-                                    db.ExecuteBySql(" insert into MSRMilitaryServiceRegistrationTran select * from MSRMilitaryServiceRegistration where ID = " + items.ID + "'");
+                                    db.ExecuteBySql(" insert into MSRMilitaryServiceRegistrationTran select * from MSRMilitaryServiceRegistration where ID = '" + items.ID + "'");
                                     // 删除旧数据
                                     db.Delete<MSRMilitaryRecordEntity>(x => x.ID == items.ID);
                                 }
@@ -581,11 +580,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                             #endregion
                             #region 奖励（StuEncourgement，新-写入，旧-删除；）
                             var StuEncourgementHistory = db.FindList<StuEncourgementEntity>(x => x.StuNo == InsertStuTran.StuNo);
-                            if (StuEncourgementHistory != null)
+                            if (StuEncourgementHistory.Any())
                             {
                                 foreach (var items in StuEncourgementHistory)
                                 {
-                                    db.ExecuteBySql(" insert into StuEncourgementTran select * from StuEncourgement where ID = " + items.ID + "'");
+                                    db.ExecuteBySql(" insert into StuEncourgementTran select * from StuEncourgement where ID = '" + items.ID + "'");
                                     // 删除旧数据
                                     db.Delete<StuEncourgementEntity>(x => x.ID == items.ID);
                                 }
@@ -593,11 +592,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                             #endregion
                             #region 处分（StuPunishment，新-写入，旧-删除；）
                             var StuPunishmentHistory = db.FindList<StuPunishmentEntity>(x => x.StuNo == InsertStuTran.StuNo);
-                            if (StuPunishmentHistory != null)
+                            if (StuPunishmentHistory.Any())
                             {
                                 foreach (var items in StuPunishmentHistory)
                                 {
-                                    db.ExecuteBySql(" insert into StuPunishmentTran select * from StuPunishment where ID = " + items.Id + "'");
+                                    db.ExecuteBySql(" insert into StuPunishmentTran select * from StuPunishment where ID = '" + items.Id + "'");
                                     // 删除旧数据
                                     db.Delete<StuPunishmentEntity>(x => x.Id == items.Id);
                                 }