@@ -74,8 +74,13 @@ | |||||
}, | }, | ||||
rowRender: function (_index, _item, _$item, $page) {// 渲染列表行数据 | rowRender: function (_index, _item, _$item, $page) {// 渲染列表行数据 | ||||
_$item.addClass('lr-list-item lr-list-item-multi'); | _$item.addClass('lr-list-item lr-list-item-multi'); | ||||
_$item.append($('<p class="lr-ellipsis"><span>时间:</span></p>').dataFormatter({ | |||||
value: _item.Date, | |||||
_$item.append($('<p class="lr-ellipsis"><span>开始时间:</span></p>').dataFormatter({ | |||||
value: _item.StartTime, | |||||
type: 'datetime', | |||||
dateformat: 'yyyy-MM-dd' | |||||
})); | |||||
_$item.append($('<p class="lr-ellipsis"><span>结束时间:</span></p>').dataFormatter({ | |||||
value: _item.EndTime, | |||||
type: 'datetime', | type: 'datetime', | ||||
dateformat: 'yyyy-MM-dd' | dateformat: 'yyyy-MM-dd' | ||||
})); | })); | ||||
@@ -118,6 +118,8 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers | |||||
} | } | ||||
entity.State = 0; | entity.State = 0; | ||||
entity.IsAllowEdit = true; | entity.IsAllowEdit = true; | ||||
entity.LessonSortNo = "1"; | |||||
entity.CheckMark = "1"; | |||||
entity.MakeDate = DateTime.Now; | entity.MakeDate = DateTime.Now; | ||||
var model = classPlanIBLL.GetRepetitions(entity.F_SchoolId, entity.AcademicYearNo, entity.Semester, entity.MajorNo, entity.Grade, entity.LessonNo); | var model = classPlanIBLL.GetRepetitions(entity.F_SchoolId, entity.AcademicYearNo, entity.Semester, entity.MajorNo, entity.Grade, entity.LessonNo); | ||||
if (model != null) | if (model != null) | ||||
@@ -144,27 +146,29 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers | |||||
public ActionResult CourseArranging(string keyValue) | public ActionResult CourseArranging(string keyValue) | ||||
{ | { | ||||
var entity = classPlanIBLL.GetListById(keyValue); | var entity = classPlanIBLL.GetListById(keyValue); | ||||
List<TeachClassEntity> TeachList = new List<TeachClassEntity>(); | List<TeachClassEntity> TeachList = new List<TeachClassEntity>(); | ||||
for (int i = 0; i < entity.Count; i++) | for (int i = 0; i < entity.Count; i++) | ||||
{ | { | ||||
var lessonList = classInfoIBLL.GetAllClass(). | |||||
var classList = classInfoIBLL.GetAllClass(). | |||||
Where(x => x.MajorNo == entity[i].MajorNo && x.Grade == entity[i].Grade) | Where(x => x.MajorNo == entity[i].MajorNo && x.Grade == entity[i].Grade) | ||||
.OrderBy(x => x.ClassNo).Select(x => x.ClassNo).ToList(); | |||||
if (lessonList.Count > 0) | |||||
.OrderBy(x => x.ClassNo).Select(stringClass => new { stringClass.ClassNo, stringClass.ClassName }).ToList(); | |||||
if (classList.Count > 0) | |||||
{ | { | ||||
for (int j = 0; j < lessonList.Count; j++) | |||||
for (int j = 0; j < classList.Count; j++) | |||||
{ | { | ||||
TeachClassEntity TeachEntity = new TeachClassEntity(); | |||||
TeachEntity.TeachClassNo = lessonList[j]; | |||||
TeachEntity.AcademicYearNo = entity[i].AcademicYearNo; | |||||
TeachEntity.MajorNo = entity[i].MajorNo; | |||||
TeachEntity.Grade = entity[i].Grade; | |||||
TeachEntity.Semester = entity[i].Semester; | |||||
TeachEntity.LessonNo = entity[i].LessonNo; | |||||
TeachEntity.StuNum = entity[i].StuNum; | |||||
TeachEntity.LessonSortNo = entity[i].LessonSortNo; | |||||
TeachEntity.F_SchoolId = entity[i].F_SchoolId; | |||||
TeachClassEntity TeachEntity = new TeachClassEntity | |||||
{ | |||||
TeachClassNo = classList[j].ClassNo, | |||||
AcademicYearNo = entity[i].AcademicYearNo, | |||||
MajorNo = entity[i].MajorNo, | |||||
Grade = entity[i].Grade, | |||||
Semester = entity[i].Semester, | |||||
LessonNo = entity[i].LessonNo, | |||||
StuNum = entity[i].StuNum, | |||||
LessonSortNo = entity[i].LessonSortNo, | |||||
F_SchoolId = entity[i].F_SchoolId | |||||
}; | |||||
TeachList.Add(TeachEntity); | TeachList.Add(TeachEntity); | ||||
} | } | ||||
} | } | ||||
@@ -22,6 +22,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers | |||||
private TeachClassIBLL teachClassIBLL = new TeachClassBLL(); | private TeachClassIBLL teachClassIBLL = new TeachClassBLL(); | ||||
private StuSelectLessonListIBLL StuSelectLesson = new StuSelectLessonListBLL(); | private StuSelectLessonListIBLL StuSelectLesson = new StuSelectLessonListBLL(); | ||||
private StuInfoBasicIBLL stuInfoBasicIBLL = new StuInfoBasicBLL(); | private StuInfoBasicIBLL stuInfoBasicIBLL = new StuInfoBasicBLL(); | ||||
private LessonInfoIBLL lessonInfoIBLL = new LessonInfoBLL(); | |||||
#region 视图功能 | #region 视图功能 | ||||
@@ -142,48 +143,50 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers | |||||
public ActionResult SetTeach(string keyValue, string EmpNo) | public ActionResult SetTeach(string keyValue, string EmpNo) | ||||
{ | { | ||||
var entityList = teachClassIBLL.GetTeachListById(keyValue); | var entityList = teachClassIBLL.GetTeachListById(keyValue); | ||||
var lessonData = lessonInfoIBLL.GetAllLesson(); | |||||
List<StuSelectLessonListEntity> TeachList = new List<StuSelectLessonListEntity>(); | List<StuSelectLessonListEntity> TeachList = new List<StuSelectLessonListEntity>(); | ||||
for (int i = 0; i < entityList.Count; i++) | for (int i = 0; i < entityList.Count; i++) | ||||
{ | { | ||||
var stuDataList = stuInfoBasicIBLL.GetAllList().Where(s => | |||||
s.MajorNo == entityList[i].MajorNo | |||||
&& s.F_SchoolId == entityList[i].F_SchoolId | |||||
&& s.ClassNo == entityList[i].TeachClassNo | |||||
var stuDataList = stuInfoBasicIBLL.GetAllList().Where( | |||||
s => s.DeptNo == entityList[i].DeptNo && s.MajorNo == entityList[i].MajorNo | |||||
&& s.F_SchoolId == entityList[i].F_SchoolId && s.ClassNo == entityList[i].TeachClassNo | |||||
).ToList(); | ).ToList(); | ||||
if (stuDataList.Count > 0) | if (stuDataList.Count > 0) | ||||
{ | { | ||||
for (int j = 0; j < stuDataList.Count; j++) | for (int j = 0; j < stuDataList.Count; j++) | ||||
{ | { | ||||
StuSelectLessonListEntity TeachEntity = new StuSelectLessonListEntity(); | StuSelectLessonListEntity TeachEntity = new StuSelectLessonListEntity(); | ||||
TeachEntity.NoticeBookNo = stuDataList[j].StuNo; | |||||
TeachEntity.StuNo = stuDataList[j].StuNo; | TeachEntity.StuNo = stuDataList[j].StuNo; | ||||
TeachEntity.DeptNo = entityList[i].DeptNo; | |||||
TeachEntity.MajorNo = entityList[i].MajorNo; | TeachEntity.MajorNo = entityList[i].MajorNo; | ||||
TeachEntity.ClassNo = stuDataList[j].ClassNo; | TeachEntity.ClassNo = stuDataList[j].ClassNo; | ||||
TeachEntity.GenderNo = stuDataList[j].GenderNo == true ? "0" : "1"; | |||||
TeachEntity.MajorDetailNo = entityList[i].MajorDetailNo; | |||||
TeachEntity.MajorDetailName = entityList[i].MajorDetailName; | |||||
TeachEntity.StuName = stuDataList[j].StuName; | TeachEntity.StuName = stuDataList[j].StuName; | ||||
TeachEntity.GenderNo = Convert.ToInt32(stuDataList[j].GenderNo).ToString(); | |||||
TeachEntity.AcademicYearNo = entityList[i].AcademicYearNo; | TeachEntity.AcademicYearNo = entityList[i].AcademicYearNo; | ||||
TeachEntity.Semester = entityList[i].Semester; | TeachEntity.Semester = entityList[i].Semester; | ||||
TeachEntity.OpenLessonDeptNo = entityList[i].DeptNo; | TeachEntity.OpenLessonDeptNo = entityList[i].DeptNo; | ||||
TeachEntity.OpenLessonMajorNo = entityList[i].MajorNo; | TeachEntity.OpenLessonMajorNo = entityList[i].MajorNo; | ||||
TeachEntity.LessonNo = entityList[i].LessonNo; | TeachEntity.LessonNo = entityList[i].LessonNo; | ||||
TeachEntity.PartCode = entityList[i].PartCode; | |||||
TeachEntity.LessonName = lessonData.FirstOrDefault(m => m.LessonNo == TeachEntity.LessonNo)?.LessonName; | |||||
TeachEntity.PartCode = ""; | |||||
TeachEntity.OrdinaryScoreScale = 0; | TeachEntity.OrdinaryScoreScale = 0; | ||||
TeachEntity.TermInScoreScale = 0; | TeachEntity.TermInScoreScale = 0; | ||||
TeachEntity.TermEndScoreScale = 0; | TeachEntity.TermEndScoreScale = 0; | ||||
TeachEntity.OtherScoreScale = 0; | TeachEntity.OtherScoreScale = 0; | ||||
TeachEntity.TeachClassNo = entityList[i].TeachClassNo; | TeachEntity.TeachClassNo = entityList[i].TeachClassNo; | ||||
TeachEntity.LessonSortNo = entityList[i].LessonSortNo; | TeachEntity.LessonSortNo = entityList[i].LessonSortNo; | ||||
TeachEntity.StuSortNo = entityList[i].LessonSortNo; | |||||
TeachEntity.StuSortNo = "02"; | |||||
TeachEntity.Grade = entityList[i].Grade; | TeachEntity.Grade = entityList[i].Grade; | ||||
TeachEntity.StudyScore = 2; | |||||
TeachEntity.TotalStudyHour = 2; | |||||
TeachEntity.StudyScore = 0; | |||||
TeachEntity.TotalStudyHour = 0; | |||||
TeachEntity.IsInEffect = "1"; | TeachEntity.IsInEffect = "1"; | ||||
TeachEntity.IsPitchOn = "1"; | TeachEntity.IsPitchOn = "1"; | ||||
TeachEntity.EmpNo = EmpNo; | |||||
TeachEntity.F_SchoolId = entityList[i].F_SchoolId; | TeachEntity.F_SchoolId = entityList[i].F_SchoolId; | ||||
TeachEntity.CheckMark = "1"; | TeachEntity.CheckMark = "1"; | ||||
TeachEntity.InsertTime = DateTime.Now; | TeachEntity.InsertTime = DateTime.Now; | ||||
TeachList.Add(TeachEntity); | |||||
} | } | ||||
} | } | ||||
else | else | ||||
@@ -211,7 +214,6 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers | |||||
&& y.F_SchoolId == entityList[i].F_SchoolId | && y.F_SchoolId == entityList[i].F_SchoolId | ||||
&& y.ClassNo == entityList[i].TeachClassNo | && y.ClassNo == entityList[i].TeachClassNo | ||||
&& y.LessonNo == entityList[i].LessonNo | && y.LessonNo == entityList[i].LessonNo | ||||
&& y.CheckMark == "1" | |||||
).Select(x => x.SelectId.ToString()).ToList(); | ).Select(x => x.SelectId.ToString()).ToList(); | ||||
Nid += string.Join(",", ssList) + ","; | Nid += string.Join(",", ssList) + ","; | ||||
} | } | ||||
@@ -15,8 +15,8 @@ var bootstrap = function ($, learun) { | |||||
// 数据处理 | // 数据处理 | ||||
var html = '<tr style="height: 30px;"><td>节次/星期</td><td>星期一</td><td>星期二</td><td>星期三</td><td>星期四</td><td>星期五</td><td>星期六</td><td>星期日</td><td>星期八</td><td>星期九</td><td>星期十</td></tr>'; | var html = '<tr style="height: 30px;"><td>节次/星期</td><td>星期一</td><td>星期二</td><td>星期三</td><td>星期四</td><td>星期五</td><td>星期六</td><td>星期日</td><td>星期八</td><td>星期九</td><td>星期十</td></tr>'; | ||||
var weekLists = data.weekList; | var weekLists = data.weekList; | ||||
//十节课 | |||||
for (var i = 1; i < 11; i++) { | |||||
//十节课 2022.6.14 修改为一天十一节课 | |||||
for (var i = 1; i < 12; i++) { | |||||
(function (arg) { | (function (arg) { | ||||
var args = arg - 1; | var args = arg - 1; | ||||
var datas = flogs(arg, weekLists, 'time'); | var datas = flogs(arg, weekLists, 'time'); | ||||
@@ -60,7 +60,7 @@ var bootstrap = function ($, learun) { | |||||
//某节课空 | //某节课空 | ||||
function tdHandle() { | function tdHandle() { | ||||
var html = ''; | var html = ''; | ||||
for (var j = 0; j < 10; j++) { | |||||
for (var j = 0; j < 11; j++) { | |||||
html += '<td class="active" id="" num="' + (j + 1) + '"><div></div><div></div><div></div><div></div></td>'; | html += '<td class="active" id="" num="' + (j + 1) + '"><div></div><div></div><div></div><div></div></td>'; | ||||
} | } | ||||
return html; | return html; | ||||
@@ -69,7 +69,7 @@ var bootstrap = function ($, learun) { | |||||
//某节课不空 | //某节课不空 | ||||
function tdHandles(lists) { | function tdHandles(lists) { | ||||
var html = ''; | var html = ''; | ||||
for (var k = 1; k < 11; k++) { | |||||
for (var k = 1; k < 12; k++) { | |||||
(function (arg) { | (function (arg) { | ||||
var args = arg - 1; | var args = arg - 1; | ||||
var datas = flogs2(arg, lists, 'day'); | var datas = flogs2(arg, lists, 'day'); | ||||
@@ -330,7 +330,7 @@ var bootstrap = function ($, learun) { | |||||
maxHeight: 300, | maxHeight: 300, | ||||
allowSearch: true, | allowSearch: true, | ||||
//type: 'multiple', | //type: 'multiple', | ||||
data: [{ text: '1节', value: '1' }, { text: '2节', value: '2' }, { text: '3节', value: '3' }, { text: '4节', value: '4' }, { text: '5节', value: '5' }, { text: '6节', value: '6' }, { text: '7节', value: '7' }, { text: '8节', value: '8' }, { text: '9节', value: '9' }, { text: '10节', value: '10' }], | |||||
data: [{ text: '1节', value: '1' }, { text: '2节', value: '2' }, { text: '3节', value: '3' }, { text: '4节', value: '4' }, { text: '5节', value: '5' }, { text: '6节', value: '6' }, { text: '7节', value: '7' }, { text: '8节', value: '8' }, { text: '9节', value: '9' }, { text: '10节', value: '10' }, { text: '11节', value: '11' }], | |||||
value: 'value', | value: 'value', | ||||
text: 'text' | text: 'text' | ||||
}); | }); | ||||
@@ -16,7 +16,7 @@ var bootstrap = function ($, learun) { | |||||
var html = '<tr style="height: 30px;"><td>节次/星期</td><td>星期一</td><td>星期二</td><td>星期三</td><td>星期四</td><td>星期五</td><td>星期六</td><td>星期日</td><td>星期八</td><td>星期九</td><td>星期十</td></tr>'; | var html = '<tr style="height: 30px;"><td>节次/星期</td><td>星期一</td><td>星期二</td><td>星期三</td><td>星期四</td><td>星期五</td><td>星期六</td><td>星期日</td><td>星期八</td><td>星期九</td><td>星期十</td></tr>'; | ||||
var weekLists = data.weekList; | var weekLists = data.weekList; | ||||
//十节课 | //十节课 | ||||
for (var i = 1; i < 11; i++) { | |||||
for (var i = 1; i < 12; i++) { | |||||
(function (arg) { | (function (arg) { | ||||
var args = arg - 1; | var args = arg - 1; | ||||
var datas = flogs(arg, weekLists, 'time'); | var datas = flogs(arg, weekLists, 'time'); | ||||
@@ -60,7 +60,7 @@ var bootstrap = function ($, learun) { | |||||
//某节课空 | //某节课空 | ||||
function tdHandle() { | function tdHandle() { | ||||
var html = ''; | var html = ''; | ||||
for (var j = 0; j < 10; j++) { | |||||
for (var j = 0; j < 11; j++) { | |||||
html += '<td class="active" id="" num="' + (j + 1) + '"><div></div><div></div><div></div><div></div></td>'; | html += '<td class="active" id="" num="' + (j + 1) + '"><div></div><div></div><div></div><div></div></td>'; | ||||
} | } | ||||
return html; | return html; | ||||
@@ -69,7 +69,7 @@ var bootstrap = function ($, learun) { | |||||
//某节课不空 | //某节课不空 | ||||
function tdHandles(lists) { | function tdHandles(lists) { | ||||
var html = ''; | var html = ''; | ||||
for (var k = 1; k < 11; k++) { | |||||
for (var k = 1; k < 12; k++) { | |||||
(function (arg) { | (function (arg) { | ||||
var args = arg - 1; | var args = arg - 1; | ||||
var datas = flogs2(arg, lists, 'day'); | var datas = flogs2(arg, lists, 'day'); | ||||
@@ -16,7 +16,7 @@ var bootstrap = function ($, learun) { | |||||
var html = '<tr style="height: 30px;"><td>节次/星期</td><td>星期一</td><td>星期二</td><td>星期三</td><td>星期四</td><td>星期五</td><td>星期六</td><td>星期日</td><td>星期八</td><td>星期九</td><td>星期十</td></tr>'; | var html = '<tr style="height: 30px;"><td>节次/星期</td><td>星期一</td><td>星期二</td><td>星期三</td><td>星期四</td><td>星期五</td><td>星期六</td><td>星期日</td><td>星期八</td><td>星期九</td><td>星期十</td></tr>'; | ||||
var weekLists = data.weekList; | var weekLists = data.weekList; | ||||
//十节课 | //十节课 | ||||
for (var i = 1; i < 11; i++) { | |||||
for (var i = 1; i < 12; i++) { | |||||
(function (arg) { | (function (arg) { | ||||
var args = arg - 1; | var args = arg - 1; | ||||
var datas = flogs(arg, weekLists, 'time'); | var datas = flogs(arg, weekLists, 'time'); | ||||
@@ -60,7 +60,7 @@ var bootstrap = function ($, learun) { | |||||
//某节课空 | //某节课空 | ||||
function tdHandle() { | function tdHandle() { | ||||
var html = ''; | var html = ''; | ||||
for (var j = 0; j < 10; j++) { | |||||
for (var j = 0; j < 11; j++) { | |||||
html += '<td class="active" id="" num="' + (j + 1) + '"><div></div><div></div><div></div><div></div></td>'; | html += '<td class="active" id="" num="' + (j + 1) + '"><div></div><div></div><div></div><div></div></td>'; | ||||
} | } | ||||
return html; | return html; | ||||
@@ -69,7 +69,7 @@ var bootstrap = function ($, learun) { | |||||
//某节课不空 | //某节课不空 | ||||
function tdHandles(lists) { | function tdHandles(lists) { | ||||
var html = ''; | var html = ''; | ||||
for (var k = 1; k < 11; k++) { | |||||
for (var k = 1; k < 12; k++) { | |||||
(function (arg) { | (function (arg) { | ||||
var args = arg - 1; | var args = arg - 1; | ||||
var datas = flogs2(arg, lists, 'day'); | var datas = flogs2(arg, lists, 'day'); | ||||
@@ -243,7 +243,7 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers | |||||
[AjaxOnly] | [AjaxOnly] | ||||
public ActionResult GetBedListByRoomId(string RoomId) | public ActionResult GetBedListByRoomId(string RoomId) | ||||
{ | { | ||||
var data = accommodationIBLL.GetBedListByRoomId(RoomId).OrderBy(x => x.DNo); | |||||
var data = accommodationIBLL.GetBedListByRoomId(RoomId).OrderBy(x => Convert.ToInt32(x.DNo)); | |||||
return Success(data); | return Success(data); | ||||
} | } | ||||
/// <summary> | /// <summary> | ||||
@@ -434,6 +434,11 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers | |||||
public ActionResult SaveBedForm(string keyValue, string ParentID, string strEntity) | public ActionResult SaveBedForm(string keyValue, string ParentID, string strEntity) | ||||
{ | { | ||||
Acc_DormitoryBuildEntity entity = strEntity.ToObject<Acc_DormitoryBuildEntity>(); | Acc_DormitoryBuildEntity entity = strEntity.ToObject<Acc_DormitoryBuildEntity>(); | ||||
if (entity.Name.Contains("床")) | |||||
{ | |||||
entity.DNo = entity.Name.Replace("床", ""); | |||||
} | |||||
accommodationIBLL.SaveBedEntity(keyValue, ParentID, entity); | accommodationIBLL.SaveBedEntity(keyValue, ParentID, entity); | ||||
return Success("保存成功!"); | return Success("保存成功!"); | ||||
} | } | ||||
@@ -262,10 +262,10 @@ var bootstrap = function ($, learun) { | |||||
} | } | ||||
}); | }); | ||||
} | } | ||||
}); | }); | ||||
//分类管理 | //分类管理 | ||||
$("#lr_Classify").on("click", function () { | $("#lr_Classify").on("click", function () { | ||||
learun.layerForm({ | learun.layerForm({ | ||||
@@ -304,14 +304,14 @@ var bootstrap = function ($, learun) { | |||||
selectedParent.ChildType = "5"; | selectedParent.ChildType = "5"; | ||||
} | } | ||||
var param = {}; | var param = {}; | ||||
if (item.title == '1') | if (item.title == '1') | ||||
param.ApartmentId = item.value; | param.ApartmentId = item.value; | ||||
else if (item.title == '2') | else if (item.title == '2') | ||||
param.UnitId = item.value; | param.UnitId = item.value; | ||||
else if (item.title == '3') | else if (item.title == '3') | ||||
param.FloorId = item.value; | param.FloorId = item.value; | ||||
//page.initGird(); | //page.initGird(); | ||||
//page.search({ ParentID: item.value }); | //page.search({ ParentID: item.value }); | ||||
page.search(param); | page.search(param); | ||||
@@ -433,6 +433,7 @@ var bootstrap = function ($, learun) { | |||||
sidx: 'ApartmentId asc,UnitId asc ,FloorId asc ', | sidx: 'ApartmentId asc,UnitId asc ,FloorId asc ', | ||||
//sord: 'ASC', | //sord: 'ASC', | ||||
isSubGrid: true, // 是否有子表 | isSubGrid: true, // 是否有子表 | ||||
//床位信息 | |||||
subGridExpanded: function (subContentId, rowItem) { | subGridExpanded: function (subContentId, rowItem) { | ||||
$('#' + subContentId).jfGrid({ | $('#' + subContentId).jfGrid({ | ||||
url: top.$.rootUrl + '/LogisticsManagement/Accommodation/GetBedListByRoomId?RoomId=' + rowItem.ID, | url: top.$.rootUrl + '/LogisticsManagement/Accommodation/GetBedListByRoomId?RoomId=' + rowItem.ID, | ||||
@@ -454,7 +455,7 @@ var bootstrap = function ($, learun) { | |||||
], | ], | ||||
mainId: 'ID', | mainId: 'ID', | ||||
isPage: false, | isPage: false, | ||||
//sidx: 'DNo', | |||||
sidx: ' CAST(REPLACE(Name,\'床\',\'\') as int)' | |||||
//sord: 'ASC', | //sord: 'ASC', | ||||
}); | }); | ||||
//var param; | //var param; | ||||
@@ -467,7 +468,7 @@ var bootstrap = function ($, learun) { | |||||
//$("#gridtable").empty(); | //$("#gridtable").empty(); | ||||
//$("#gridtable")[0].dfop = undefined; | //$("#gridtable")[0].dfop = undefined; | ||||
//if (selectedParent.BuildType == undefined || selectedParent.BuildType === "3") { | //if (selectedParent.BuildType == undefined || selectedParent.BuildType === "3") { | ||||
//} else { | //} else { | ||||
// //lrAuthorizeJfGridLei | // //lrAuthorizeJfGridLei | ||||
// $('#gridtable').jfGrid({ | // $('#gridtable').jfGrid({ | ||||
@@ -563,7 +564,7 @@ var bootstrap = function ($, learun) { | |||||
// }); | // }); | ||||
//} | //} | ||||
}, | }, | ||||
search: function (param) { | search: function (param) { | ||||
param = param || {}; | param = param || {}; | ||||
@@ -85,9 +85,7 @@ var bootstrap = function ($, learun) { | |||||
], | ], | ||||
mainId: 'ID', | mainId: 'ID', | ||||
isPage: false, | isPage: false, | ||||
//isMultiselect: true, | |||||
//sidx: 'ApartmentId asc,UnitId asc ,FloorId asc ', | |||||
//sord: 'ASC', | |||||
//sidx: ' CAST(REPLACE(Name,\'床\',\'\') as int)' | |||||
}); | }); | ||||
page.search(); | page.search(); | ||||
@@ -490,8 +490,7 @@ var bootstrap = function ($, learun) { | |||||
], | ], | ||||
mainId: 'ID', | mainId: 'ID', | ||||
isPage: false, | isPage: false, | ||||
//sidx: 'DNo', | |||||
//sord: 'ASC', | |||||
//sidx: ' CAST(REPLACE(Name,\'床\',\'\') as int)' | |||||
}); | }); | ||||
//var param; | //var param; | ||||
//param = param || {}; | //param = param || {}; | ||||
@@ -62,7 +62,7 @@ var bootstrap = function ($, learun) { | |||||
}, | }, | ||||
// 初始化列表 | // 初始化列表 | ||||
initGird: function () { | initGird: function () { | ||||
$('#gridtable').lrAuthorizeJfGrid({ | |||||
$('#gridtable').jfGrid({ | |||||
url: top.$.rootUrl + '/PersonnelManagement/DutySchedule/GetPageList', | url: top.$.rootUrl + '/PersonnelManagement/DutySchedule/GetPageList', | ||||
headData: [ | headData: [ | ||||
{ label: "值班开始时间", name: "StartTime", width: 200, align: "left" }, | { label: "值班开始时间", name: "StartTime", width: 200, align: "left" }, | ||||
@@ -7775,6 +7775,8 @@ | |||||
<None Include="Properties\PublishProfiles\FolderProfile3.pubxml" /> | <None Include="Properties\PublishProfiles\FolderProfile3.pubxml" /> | ||||
<None Include="Properties\PublishProfiles\FolderProfile4.pubxml" /> | <None Include="Properties\PublishProfiles\FolderProfile4.pubxml" /> | ||||
<None Include="Properties\PublishProfiles\FolderProfile5.pubxml" /> | <None Include="Properties\PublishProfiles\FolderProfile5.pubxml" /> | ||||
<None Include="Properties\PublishProfiles\FolderProfile6.pubxml" /> | |||||
<None Include="Properties\PublishProfiles\FolderProfile7.pubxml" /> | |||||
<None Include="Properties\PublishProfiles\learunadms6.1.pubxml" /> | <None Include="Properties\PublishProfiles\learunadms6.1.pubxml" /> | ||||
<Content Include="Views\Utility\ListContentIndexLost.cshtml" /> | <Content Include="Views\Utility\ListContentIndexLost.cshtml" /> | ||||
</ItemGroup> | </ItemGroup> | ||||
@@ -414,7 +414,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration | |||||
//直接修改 | //直接修改 | ||||
//判断是否冲突(新时间是否存在课程) | //判断是否冲突(新时间是否存在课程) | ||||
if (db.FindList<ArrangeLessonTermEntity>(x => | if (db.FindList<ArrangeLessonTermEntity>(x => | ||||
x.LessonDate == lessonDateNew && x.LessonTime == lessiontimeNow && x.CheckMark == "1" && x.ALTId != keyValue).Count() > 0) | |||||
x.LessonDate == lessonDateNew && x.LessonTime == lessiontimeNow && x.CheckMark == "1" && x.TeachClassNo == model.TeachClassNo && x.ALTId != keyValue).Count() > 0) | |||||
{ | { | ||||
return "第" + weektime + "周当前课程冲突!"; | return "第" + weektime + "周当前课程冲突!"; | ||||
} | } | ||||
@@ -1090,7 +1090,7 @@ WHERE (AcademicYearNo = '" + strAcademicYear + "') and semester='" + strSemest | |||||
LEFT JOIN tb_teacher teacher ON teacher.id = a.teacher | LEFT JOIN tb_teacher teacher ON teacher.id = a.teacher | ||||
WHERE semester.year = '" + entity.AcademicYearNo | WHERE semester.year = '" + entity.AcademicYearNo | ||||
+ "' AND semester.number = '" | + "' AND semester.number = '" | ||||
+ entity.Semester + "' and a.type='1' "); | |||||
+ entity.Semester + "' and a.type='1' and teacher.number is not null "); | |||||
var TeachClassData = (await BaseRepository("CollegeMIS").FindListAsync<TeachClassEntity>(@"SELECT * | var TeachClassData = (await BaseRepository("CollegeMIS").FindListAsync<TeachClassEntity>(@"SELECT * | ||||
FROM TeachClass | FROM TeachClass | ||||
WHERE (AcademicYearNo = '" + entity.AcademicYearNo + "') and semester='" + entity.Semester + "' and F_SchoolId='" + entity.F_SchoolId + "' ")).ToList(); | WHERE (AcademicYearNo = '" + entity.AcademicYearNo + "') and semester='" + entity.Semester + "' and F_SchoolId='" + entity.F_SchoolId + "' ")).ToList(); | ||||
@@ -1179,7 +1179,7 @@ WHERE (AcademicYearNo = '" + strAcademicYear + "') and semester='" + strSemest | |||||
LEFT JOIN tb_course cour ON cour.id= p.`course` | LEFT JOIN tb_course cour ON cour.id= p.`course` | ||||
LEFT JOIN tb_curriculum curr ON curr.id=cour.`course` | LEFT JOIN tb_curriculum curr ON curr.id=cour.`course` | ||||
WHERE s.year = '" + entity.AcademicYearNo + "' AND s.number = '" + entity.Semester | WHERE s.year = '" + entity.AcademicYearNo + "' AND s.number = '" + entity.Semester | ||||
+ "' AND curr.`ification` ='1' ORDER BY p.`major` "); | |||||
+ "' AND curr.`ification` ='1' and tt.EmpNo is not null ORDER BY p.`major` "); | |||||
var majorData = (await BaseRepository("CollegeMIS").FindListAsync<CdMajorEntity>()).ToList(); | var majorData = (await BaseRepository("CollegeMIS").FindListAsync<CdMajorEntity>()).ToList(); | ||||
var lessonData = (await BaseRepository("CollegeMIS").FindListAsync<LessonInfoEntity>()).ToList(); | var lessonData = (await BaseRepository("CollegeMIS").FindListAsync<LessonInfoEntity>()).ToList(); | ||||
if (TeachList.Count() > 0) | if (TeachList.Count() > 0) | ||||
@@ -1199,7 +1199,7 @@ WHERE (AcademicYearNo = '" + strAcademicYear + "') and semester='" + strSemest | |||||
MakeDate = now, | MakeDate = now, | ||||
AcademicYearNo = item.AcademicYearNo, | AcademicYearNo = item.AcademicYearNo, | ||||
Semester = item.Semester, | Semester = item.Semester, | ||||
DeptNo = majorData.FirstOrDefault(m => m.MajorNo ==item.MajorNo)?.DeptNo, | |||||
DeptNo = majorData.FirstOrDefault(m => m.MajorNo == item.MajorNo)?.DeptNo, | |||||
MajorNo = item.MajorNo, | MajorNo = item.MajorNo, | ||||
LessonNo = item.LessonNo, | LessonNo = item.LessonNo, | ||||
LessonName = item.LessonName, | LessonName = item.LessonName, | ||||
@@ -266,18 +266,28 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration | |||||
{ | { | ||||
foreach (var item in List) | foreach (var item in List) | ||||
{ | { | ||||
TeachClassEntity Teach = new TeachClassEntity(); | |||||
Teach.TeachClassNo = item.TeachClassNo; | |||||
Teach.AcademicYearNo = item.AcademicYearNo; | |||||
Teach.DeptNo = item.DeptNo; | |||||
Teach.MajorNo = item.MajorNo; | |||||
Teach.Grade = item.Grade; | |||||
Teach.Semester = item.Semester; | |||||
Teach.LessonNo = item.LessonNo; | |||||
Teach.StuNum = item.StuNum; | |||||
Teach.LessonSortNo = item.LessonSortNo; | |||||
Teach.F_SchoolId = item.F_SchoolId; | |||||
db.Insert(Teach); | |||||
TeachClassEntity Teach = new TeachClassEntity | |||||
{ | |||||
TeachClassNo = item.TeachClassNo, | |||||
AcademicYearNo = item.AcademicYearNo, | |||||
DeptNo = item.DeptNo, | |||||
MajorNo = item.MajorNo, | |||||
Grade = item.Grade, | |||||
EmpNo = item.EmpNo, | |||||
Semester = item.Semester, | |||||
LessonNo = item.LessonNo, | |||||
StuNum = item.StuNum, | |||||
LessonSortNo = item.LessonSortNo, | |||||
F_SchoolId = item.F_SchoolId | |||||
}; | |||||
if (db.FindEntity<TeachClassEntity>( | |||||
x => x.F_SchoolId == Teach.F_SchoolId && x.AcademicYearNo == Teach.AcademicYearNo | |||||
&& x.Semester == Teach.Semester && x.DeptNo == Teach.DeptNo | |||||
&& x.MajorNo == Teach.MajorNo && x.TeachClassNo == Teach.TeachClassNo | |||||
&& x.Grade == Teach.Grade && x.LessonNo == Teach.LessonNo) == null) | |||||
{ | |||||
db.Insert(Teach); | |||||
} | |||||
} | } | ||||
db.Commit(); | db.Commit(); | ||||
} | } | ||||