bjquanjiang
/
DigitalScholl
1
0
Форк 0
Код Проблеми 0 Запити на злиття 0 Релізи 0 Вікі Активність
Переглянути джерело

学籍异动 复学查看休学前数据 

学籍异动 综合查询心理预约查看回显列表查询错误
怀来职教中心中职
ndbs 1 рік тому
джерело
bc62232f3f
коміт
e0c8bbe72b
3 змінених файлів з 40 додано та 63 видалено
Розділений перегляд
Параметри порівняння
Показати статистику Завантажити патч Завантажити файл різниці
  1. +10
    -10
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuEncourgementTranController.cs
  2. +10
    -33
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/QueryAPStuHealthIndex.js
  3. +20
    -20
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuTransferInfo/StuTransferInfoService.cs

+ 10
- 10
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuEncourgementTranController.cs Переглянути файл

@@ -16,7 +16,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
/// </summary>
public class StuEncourgementTranController : MvcControllerBase
{
private StuEncourgementIBLL stuEncourgementIBLL = new StuEncourgementBLL();
private StuEncourgementTranIBLL stuEncourgementTranIBLL = new StuEncourgementTranBLL();

#region 视图功能

@@ -88,7 +88,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
public ActionResult GetPageList(string pagination, string queryJson)
{
Pagination paginationobj = pagination.ToObject<Pagination>();
var data = stuEncourgementIBLL.GetPageList(paginationobj, queryJson);
var data = stuEncourgementTranIBLL.GetPageList(paginationobj, queryJson);
var jsonData = new
{
rows = data,
@@ -107,7 +107,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
[AjaxOnly]
public ActionResult GetPageListOne(string queryJson)
{
var data = stuEncourgementIBLL.GetPageList(queryJson);
var data = stuEncourgementTranIBLL.GetPageList(queryJson);
var data1 = data.GroupBy(x => new { x.AcademicYearNo, x.Semester, x.DeptNo, x.Num }).Select(x => new
{
AcademicYearNo = x.Key.AcademicYearNo,
@@ -126,7 +126,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
[AjaxOnly]
public ActionResult GetPageListTwo(string queryJson)
{
var data = stuEncourgementIBLL.GetPageList(queryJson);
var data = stuEncourgementTranIBLL.GetPageList(queryJson);
var data1 = data.GroupBy(x => new { x.AcademicYearNo, x.Semester, x.DeptNo, x.Grade, x.Num }).Select(x => new
{
AcademicYearNo = x.Key.AcademicYearNo,
@@ -146,7 +146,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
[AjaxOnly]
public ActionResult GetPageListThree(string queryJson)
{
var data = stuEncourgementIBLL.GetPageList(queryJson);
var data = stuEncourgementTranIBLL.GetPageList(queryJson);
var data1 = data.GroupBy(x => new
{
x.AcademicYearNo,
@@ -177,7 +177,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
[AjaxOnly]
public ActionResult GetPageListStu(string queryJson)
{
var data = stuEncourgementIBLL.GetPageList(queryJson);
var data = stuEncourgementTranIBLL.GetPageList(queryJson);
var data1 = data.GroupBy(x => new { x.AcademicYearNo, x.Semester, x.StuNo, x.StuName, x.Num }).Select(x => new
{
AcademicYearNo = x.Key.AcademicYearNo,
@@ -197,7 +197,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
[AjaxOnly]
public ActionResult GetFormData(string keyValue)
{
var StuEncourgementData = stuEncourgementIBLL.GetStuEncourgementEntity(keyValue);
var StuEncourgementData = stuEncourgementTranIBLL.GetStuEncourgementEntity(keyValue);
var jsonData = new
{
StuEncourgement = StuEncourgementData,
@@ -217,7 +217,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
[AjaxOnly]
public ActionResult DeleteForm(string keyValue)
{
stuEncourgementIBLL.DeleteEntity(keyValue);
stuEncourgementTranIBLL.DeleteEntity(keyValue);
return Success("删除成功！");
}
/// <summary>
@@ -230,8 +230,8 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
[AjaxOnly]
public ActionResult SaveForm(string keyValue, string strEntity)
{
StuEncourgementEntity entity = strEntity.ToObject<StuEncourgementEntity>();
stuEncourgementIBLL.SaveEntity(keyValue, entity);
StuEncourgementTranEntity entity = strEntity.ToObject<StuEncourgementTranEntity>();
stuEncourgementTranIBLL.SaveEntity(keyValue, entity);
return Success("保存成功！");
}
#endregion


+ 10
- 33
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/QueryAPStuHealthIndex.js Переглянути файл

@@ -22,20 +22,7 @@ var bootstrap = function ($, learun) {
url: top.$.rootUrl + '/LogisticsManagement/APStuHealthRecordsTran/GetPageList',
headData: [
{
label: "申请人", name: "PStuNo", width: 100, align: "left",
formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('custmerData', {
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'StuInfoBasic',
key: value,
keyId: 'stuno',
callback: function (_data) {
callback(_data['stuname']);
}
});
}
},
{
label: "系", name: "PDeptNo", width: 100, align: "left",
label: "系", name: "DeptNo", width: 100, align: "left",
formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('custmerData', {
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdDeptInfo',
@@ -48,7 +35,7 @@ var bootstrap = function ($, learun) {
}
},
{
label: "专业", name: "PMajorNo", width: 100, align: "left",
label: "专业", name: "MajorNo", width: 100, align: "left",
formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('custmerData', {
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdMajorInfo',
@@ -61,7 +48,7 @@ var bootstrap = function ($, learun) {
}
},
{
label: "班级", name: "PClassNo", width: 100, align: "left",
label: "班级", name: "ClassNo", width: 100, align: "left",
formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('custmerData', {
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'bjsj',
@@ -73,31 +60,21 @@ var bootstrap = function ($, learun) {
});
}
},
{ label: "预约时间", name: "PTime", width: 100, align: "left" },
{
label: "预约老师", name: "PEmpNo", width: 100, align: "left",
label: "学生", name: "Stuno", width: 100, align: "left",
formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('custmerData', {
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Psychology',
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'StuInfoBasic',
key: value,
keyId: 'f_account',
keyId: 'stuno',
callback: function (_data) {
callback(_data['f_realname']);
callback(_data['stuname']);
}
});
}
},
{
label: "预约成功", name: "PAgreee", width: 100, align: "left",
formatter(val) {
if (val === 'true') {
return '成功';
} else {
return '待处理';
}
}
},
{ label: "备注", name: "Remark", width: 100, align: "left" },

{ label: "描述", name: "Remark", width: 100, align: "left" },
],
mainId: 'ID',
isPage: true
@@ -106,7 +83,7 @@ var bootstrap = function ($, learun) {
},
search: function (param) {
param = param || {};
param.StuNo = StuNo;
param.Stuno = StuNo;
$('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
}
};


+ 20
- 20
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuTransferInfo/StuTransferInfoService.cs Переглянути файл

@@ -346,6 +346,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
//历史数据
InsertEntity.StuId = item.StuId;
InsertEntity.ReturnSchoolId = item.ID;
InsertEntity.StuTranId = item.StuTranId;
InsertEntity.StuNo = item.StuNo;
InsertEntity.StuName = item.StuName;
InsertEntity.Gender = item.Gender;
@@ -452,7 +453,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
foreach (var itemScore in StuScoreHistory)
{
//插入新数据
db.ExecuteBySql(" insert into StuScoreTran select * from StuScore where Scoreid = '" + itemScore.ScoreId + "' and Scoreid not in ('" + itemScore.ScoreId + "')");
db.ExecuteBySql(" insert into StuScoreTran select * from StuScore where Scoreid = '" + itemScore.ScoreId + "'");
//删除旧数据
db.Delete<StuScoreEntity>(x => x.ScoreId == itemScore.ScoreId);
}
@@ -466,7 +467,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
foreach (var entity in StuSelectLessonListHistory)
{
//插入新数据
db.ExecuteBySql("insert into StuSelectLessonListTran select * from StuSelectLessonList where SelectId='" + entity.SelectId + "' and SelectId not in ('" + entity.SelectId + "')");
db.ExecuteBySql("insert into StuSelectLessonListTran select * from StuSelectLessonList where SelectId='" + entity.SelectId + "'");
//删除旧数据
db.Delete<StuSelectLessonListEntity>(x => x.SelectId == entity.SelectId);
}
@@ -480,7 +481,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
foreach (var entity in StuSelectLessonListOfElectiveHistory)
{
//插入新数据
db.ExecuteBySql("insert into StuSelectLessonListOfElectiveTran select * from StuSelectLessonListOfElective where Id='" + entity.Id + "' and Id not in ('" + entity.Id + "')");
db.ExecuteBySql("insert into StuSelectLessonListOfElectiveTran select * from StuSelectLessonListOfElective where Id='" + entity.Id + "'");
//修改旧数据：报名成功时，选课表中报名成功人数字段减一；
if (entity.Status == 2)
{
@@ -499,7 +500,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
{
foreach (var itemScore in StuScoreNotPassHistory)
{
db.ExecuteBySql(" insert into StuScoreNotPassTran select * from StuScoreNotPass where Scoreid = '" + itemScore.ScoreId + "' and Scoreid not in ('" + itemScore.ScoreId + "')");
db.ExecuteBySql(" insert into StuScoreNotPassTran select * from StuScoreNotPass where Scoreid = '" + itemScore.ScoreId + "'");
//删除旧数据
db.Delete<StuScoreNotPassTranEntity>(x => x.ScoreId == itemScore.ScoreId);
}
@@ -514,7 +515,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
foreach (var itemScore in StuScoreNotPassTwoHistory)
{
//插入数据
db.ExecuteBySql(" insert into StuScoreNotPassTwoTran select * from StuScoreNotPassTwo where Scoreid = '" + itemScore.ScoreId + "' and Scoreid not in ('" + itemScore.ScoreId + "')");
db.ExecuteBySql(" insert into StuScoreNotPassTwoTran select * from StuScoreNotPassTwo where Scoreid = '" + itemScore.ScoreId + "'");
//删除旧数据
db.Delete<StuScoreNotPassTwoTranEntity>(x => x.ScoreId == itemScore.ScoreId);
}
@@ -526,9 +527,9 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
{
foreach (var items in ScholarshipHistory)
{
db.ExecuteBySql(" insert into ScholarshipTran select * from ScholarshipAudit where id = '" + items.Id + "' and Id not in ('" + items.Id + "')");
db.ExecuteBySql(" insert into ScholarshipTran select * from ScholarshipAudit where id = '" + items.Id + "' ");
// 删除旧数据
db.Delete<ScholarshipxjEntity>(x => x.Id == items.Id);
//db.Delete<ScholarshipxjEntity>(x => x.Id == items.Id);
}
}
#endregion
@@ -538,9 +539,9 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
{
foreach (var items in AspHistory)
{
db.ExecuteBySql(" insert into APStuHealthRecordsTran select * from APStuHealthRecords where ID = '" + items.ID + "' and ID not in ('" + items.ID + "')");
db.ExecuteBySql(" insert into APStuHealthRecordsTran select * from APStuHealthRecords where ID = '" + items.ID + "'");
// 删除旧数据
db.Delete<APStuHealthRecordsEntity>(x => x.ID == items.ID);
//db.Delete<APStuHealthRecordsEntity>(x => x.ID == items.ID);
}
}
#endregion
@@ -550,9 +551,9 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
{
foreach (var items in MSRIntentionHistory)
{
db.ExecuteBySql(" insert into MSRIntentionManagementTran select * from MSRIntentionManagement where ID = '" + items.ID + "' and ID not in ('" + items.ID + "')");
db.ExecuteBySql(" insert into MSRIntentionManagementTran select * from MSRIntentionManagement where ID = '" + items.ID + "'");
// 删除旧数据
db.Delete<MSRIntentionManagementEntity>(x => x.ID == items.ID);
//db.Delete<MSRIntentionManagementEntity>(x => x.ID == items.ID);
}
}
#endregion
@@ -562,9 +563,9 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
{
foreach (var items in MSRMilitaryRecordHistory)
{
db.ExecuteBySql(" insert into MSRMilitaryRecordTran select * from MSRMilitaryRecord where ID = '" + items.ID + "' and ID not in ('" + items.ID + "')");
db.ExecuteBySql(" insert into MSRMilitaryRecordTran select * from MSRMilitaryRecord where ID = '" + items.ID + "'");
// 删除旧数据
db.Delete<MSRMilitaryRecordEntity>(x => x.ID == items.ID);
//db.Delete<MSRMilitaryRecordEntity>(x => x.ID == items.ID);
}
}
#endregion
@@ -574,9 +575,9 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
{
foreach (var items in MSRMilitaryServiceRegistrationHistory)
{
db.ExecuteBySql(" insert into MSRMilitaryServiceRegistrationTran select * from MSRMilitaryServiceRegistration where ID = '" + items.ID + "' and ID not in ('" + items.ID + "')");
db.ExecuteBySql(" insert into MSRMilitaryServiceRegistrationTran select * from MSRMilitaryServiceRegistration where ID = '" + items.ID + "'");
// 删除旧数据
db.Delete<MSRMilitaryRecordEntity>(x => x.ID == items.ID);
//db.Delete<MSRMilitaryRecordEntity>(x => x.ID == items.ID);
}
}
#endregion
@@ -586,9 +587,9 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
{
foreach (var items in StuEncourgementHistory)
{
db.ExecuteBySql(" insert into StuEncourgementTran select * from StuEncourgement where ID = '" + items.ID + "' and ID not in ('" + items.ID + "')");
db.ExecuteBySql(" insert into StuEncourgementTran select * from StuEncourgement where ID = '" + items.ID + "'");
// 删除旧数据
db.Delete<StuEncourgementEntity>(x => x.ID == items.ID);
//db.Delete<StuEncourgementEntity>(x => x.ID == items.ID);
}
}
#endregion
@@ -598,9 +599,9 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
{
foreach (var items in StuPunishmentHistory)
{
db.ExecuteBySql(" insert into StuPunishmentTran select * from StuPunishment where ID = '" + items.Id + "' and ID not in ('" + items.Id + "')");
db.ExecuteBySql(" insert into StuPunishmentTran select * from StuPunishment where ID = '" + items.Id + "'");
// 删除旧数据
db.Delete<StuPunishmentEntity>(x => x.Id == items.Id);
//db.Delete<StuPunishmentEntity>(x => x.Id == items.Id);
}
}
#endregion
@@ -674,7 +675,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
upTrua.F_EnabledMark = 1;
upTrua.CheckTime = DateTime.Now;
upTrua.CheckUserId = userInfo.userId;

//修改关联休学记录的 IsReturnSchool = 1
db.ExecuteBySql(" update StuTransferInfo set IsReturnSchool = 1 where ID = '" + upTrua.ReturnSchoolId + "'");



Писати Попередній перегляд
Завантаження…
Відмінити
Зберегти