bjquanjiang
/
DigitalScholl
1
0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

【增加】增加实训课的排课同步；全院、个人课程表显示实训课，增加实训标识；

塔里木分支
dyy 1 year ago
parent
27cf99545b
commit
a6f1862308
7 changed files with 109 additions and 14 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +12
    -7
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/TimeTableController.cs
  2. +1
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TimeTable/ClassIndexInEducation.js
  3. +1
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TimeTable/Index.cshtml
  4. +5
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TimeTable/Index.js
  5. +2
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TimeTable/IndexInEducation.js
  6. +1
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/database.config
  7. +87
    -5
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTerm/ArrangeLessonTermService.cs

+ 12
- 7
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/TimeTableController.cs View File

@@ -163,6 +163,7 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
{
var weekdatelist = new List<WeekDate>();
var yearsemester = Common.GetSemesterAndYear();

var arrangelessonlist = arrangeLessonTermIBLL.GetListForTimeTable("{\"AcademicYearNo\":\"" + yearsemester.AcademicYearShort + "\",\"Semester\":\"" + yearsemester.Semester + "\"}").OrderBy(m => m.LessonDate);
if (arrangelessonlist.Any())
{
@@ -171,13 +172,13 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
var monday = firstday.LessonDate.Value.AddDays(-Convert.ToInt32(firstday.LessonDate.Value.DayOfWeek) + 1);
var sunday = lastday.LessonDate.Value.AddDays(7 - Convert.ToInt32(lastday.LessonDate.Value.DayOfWeek));
//总周数
var weekCount = Math.Ceiling(Convert.ToDouble((sunday - monday).Days+1) / 7);
var weekCount = Math.Ceiling(Convert.ToDouble((sunday - monday).Days + 1) / 7);
for (var i = 0; i < weekCount; i++)
{
var wentity = new WeekDate();
wentity.week = i + 1;
wentity.startdate = monday.AddDays(i * 7).ToString("yyyy-MM-dd");
wentity.enddate = monday.AddDays(i * 7+6).ToString("yyyy-MM-dd");
wentity.enddate = monday.AddDays(i * 7 + 6).ToString("yyyy-MM-dd");
wentity.textweek = "第" + wentity.week + "周 (" + wentity.startdate + "~" + wentity.enddate + ")";
weekdatelist.Add(wentity);
}
@@ -330,7 +331,7 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
curriculum = string.IsNullOrEmpty(e.EnName) ? (e.LessonSortNo == "2" ? e.LessonName + "[选修]" : e.LessonName) : (e.LessonSortNo == "2" ? e.EnName + "[选修]" : e.EnName),
lessonName = e.LessonName,
teacher = e.EmpName,
classRoom = e.ClassroomName?.Trim(),
classRoom = string.IsNullOrEmpty(e.ClassroomName) ? "" : e.ClassroomName.Trim(),
academicyear = semesterAndYear.AcademicYearShort,
semester = strSemester,
lessonNo = e?.LessonNo,
@@ -338,10 +339,12 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
empno = e?.EmpNo,
lessonTime = e.LessonTime,
lessonDate = e.LessonDate.ToString("yyyy-MM-dd"),
classRoomNo = e?.ClassRoomNo.Trim(),
classRoomNo = string.IsNullOrEmpty(e.ClassRoomNo) ? "" : e.ClassRoomNo.Trim(),
lessonSortNo = e.LessonSortNo,
e.OLPEId,
className = string.IsNullOrEmpty(e.ClassName) ? "" : e.ClassName,
lessonTypeCode = e.LessonTypeCode,
lessonTypeName = e.LessonTypeName,
leaveType = leaveList.Any(c => c.LessonNo == e.LessonNo && c.StuNo == userInfo.account && c.LessonDate == e.LessonDate && c.LessonTime == e.LessonTime) ? 1 : 0,
checkType = leaveList.FirstOrDefault(c => c.LessonNo == e.LessonNo && c.StuNo == userInfo.account && c.LessonDate == e.LessonDate && c.LessonTime == e.LessonTime)?.IsCheck,

@@ -455,7 +458,9 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
classRoomNo = string.IsNullOrEmpty(e.ClassRoomNo) ? "" : e.ClassRoomNo.Trim(),
lessonSortNo = e.LessonSortNo,
e?.OLPEId,
className = string.IsNullOrEmpty(e.ClassName) ? "" : e.ClassName
className = string.IsNullOrEmpty(e.ClassName) ? "" : e.ClassName,
lessonTypeCode = e.LessonTypeCode,
lessonTypeName = e.LessonTypeName
}
}
;
@@ -510,7 +515,7 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
where ee == g.Key
select new
{
AltId=e.AltId,
AltId = e.AltId,
day = e.LessonTime.ToCharArray()[0],
lessonTime = e.LessonTime,
lessonDate = e.LessonDate.ToString("yyyy-MM-dd"),
@@ -518,7 +523,7 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
academicyear = semesterAndYear.AcademicYearShort,
semester = strSemester,
deptNo = e?.DeptNo,
deptname="",
deptname = "",
majorNo = e?.MajorNo,
lessonNo = e?.LessonNo,
curriculum = e.LessonSortNo == "2" ? e.LessonName + "[选修]" : e.LessonName,


+ 1
- 0
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TimeTable/ClassIndexInEducation.js View File

@@ -77,6 +77,7 @@ var bootstrap = function ($, learun) {
}
html += '<div>课程：' +
item.curriculum +
(item.lessonTypeCode == "Professional2" ? "【实训】" : "") +
'</div>' +
'<div>教师：' +
item.teacher +


+ 1
- 0
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TimeTable/Index.cshtml View File

@@ -116,6 +116,7 @@
</div>
<div class="lr-layout-tool-right">
<div class=" btn-group btn-group-sm">
<a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
<a id="perBtn" class="btn btn-default"><i class="fa fa-print"></i>&nbsp;打印课程表</a>
</div>
</div>


+ 5
- 0
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TimeTable/Index.js View File

@@ -103,6 +103,7 @@ var bootstrap = function ($, learun) {
}
html += '<div>课程：' +
item.curriculum +
(item.lessonTypeCode == "Professional2" ? "【实训】" : "") +
'</div>' +
'<div>教师：' +
item.teacher +
@@ -143,6 +144,10 @@ var bootstrap = function ($, learun) {
});
},
bind: function () {
// 刷新
$('#lr_refresh').on('click', function () {
location.reload();
});
$("#datesearch").lrselect({
placeholder: "请选择周次",
width: "250px",


+ 2
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TimeTable/IndexInEducation.js View File

@@ -77,6 +77,7 @@ var bootstrap = function ($, learun) {
}
html += '<div>课程：' +
item.curriculum +
(item.lessonTypeCode == "Professional2" ? "【实训】" : "") +
'</div>' +
'<div>教师：' +
item.teacher +
@@ -298,7 +299,7 @@ var bootstrap = function ($, learun) {
});
$("#datesearch").lrselect({
placeholder: "请选择周次",
width:"250px",
width: "250px",
allowSearch: true,
url: top.$.rootUrl + '/PersonnelManagement/TimeTable/GetWeeksData',
value: 'week',


+ 1
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/database.config View File

@@ -41,7 +41,7 @@
<add name="BaseDb" connectionString="Server=123.57.209.16;Initial Catalog=adms7ultimate2_塔里木;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
<add name="CollegeMIS" connectionString="Server=123.57.209.16;Initial Catalog=CollegeMIS_塔里木;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
<add name="hangfireString" connectionString="Server=123.57.209.16;Initial Catalog=Hangfire;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
<add name="paikeDbString" connectionString="Data Source=10.30.0.11;Database=paike;User ID=root;Password=12345678;" providerName="MySql.Data.MySqlClient" />
<add name="paikeDbString" connectionString="Data Source=8.141.155.183;Port=23306;Database=cspaike;User ID=root;Password=QJKJ@bjqj@123;" providerName="MySql.Data.MySqlClient" />
<!--塔里木中间库一卡通-->
<!--<add name="TLMYKTDBString" connectionString="Data Source=orcl;Persist Security Info=True;User ID=bjqj;Password=bjqj;" providerName="System.Data.OracleClient" />-->
<add name="TLMZYMIDDLEString" connectionString="Data Source=(DESCRIPTION=(ADDRESS=(PROTOCOL=tcp)(HOST=127.0.0.1)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=TLMZYMIDDLE)));Persist Security Info=True;User ID=digitalschool;Password=digitalschool;" providerName="Oracle.ManagedDataAccess.Client" />

+ 87
- 5
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTerm/ArrangeLessonTermService.cs View File

@@ -784,6 +784,8 @@ WHERE (AcademicYearNo = '" + strAcademicYear + "') and semester='" + strSemest
var classroomData = (await BaseRepository("CollegeMIS").FindListAsync<ClassroomInfoEntity>()).ToList();
if (entity.SyncType == "1")
{
var oldArrangeLessonTermList = (await BaseRepository("CollegeMIS").FindListAsync<ArrangeLessonTermEntity>($"select * from ArrangeLessonTerm t where t.AcademicYearNo='{entity.AcademicYearNo}' and t.Semester='{entity.Semester}' ")).ToList();

var LessonList = BaseRepository("paikeDbString").FindList<paikeList>(
@"SELECT a.week AS 'week', a.section AS 'section',a.timetext AS 'timetext',c.name AS 'classname',c.number AS 'classnumber',
r.name AS 'roomname',r.number AS 'ClassroomNo',t.name AS 'teachername',t.number AS 'teacherNumber', cu.name AS 'curriculunName',
@@ -798,7 +800,6 @@ WHERE (AcademicYearNo = '" + strAcademicYear + "') and semester='" + strSemest

if (LessonList.Count() > 0)
{
var oldArrangeLessonTermList = (await BaseRepository("CollegeMIS").FindListAsync<ArrangeLessonTermEntity>()).ToList();
var insertDataList = new List<ArrangeLessonTermEntity>();
foreach (var item in LessonList)
{
@@ -845,6 +846,67 @@ WHERE (AcademicYearNo = '" + strAcademicYear + "') and semester='" + strSemest
}

}

//实训课
var LessonListOfPracticalTrain = BaseRepository("paikeDbString").FindList<paikeList>(
@"SELECT a.WEEK AS 'week',a.section AS 'section',a.timetext AS 'timetext',c.NAME AS 'classname',c.number AS 'classnumber',
r.NAME AS 'roomname',r.number AS 'ClassroomNo',t.NAME AS 'teachername',t.number AS 'teacherNumber',cu.NAME AS 'curriculunName',
cu.number AS 'curriculunNumber',s.YEAR AS 'year',s.number AS 'semester',a.teachers_number AS 'teachersNumber',a.teachers_name AS 'teachersName'
FROM tb_practicaltraining_paike a
LEFT JOIN tb_clazz c ON c.id = a.`clazzid`
LEFT JOIN tb_classroom r ON r.id = a.`classroomid`
LEFT JOIN tb_teacher t ON t.id = a.`teacherid`
LEFT JOIN tb_curriculum cu ON cu.id = a.`curriculunid`
LEFT JOIN tb_semester s ON s.id = a.`semester`
WHERE 1 = 1 AND c.number IS NOT NULL AND s.YEAR = '" + entity.AcademicYearNo + "' AND s.number = '" + entity.Semester + "'");
if (LessonListOfPracticalTrain.Any())
{
var insertDataList = new List<ArrangeLessonTermEntity>();
foreach (var item in LessonListOfPracticalTrain)
{
var classinfo = classData.FirstOrDefault(m => m.ClassNo == item.classnumber);
var timesArr = item.timetext.Substring(0, item.timetext.Length - 1).Split(',');
foreach (var timesItem in timesArr)
{
var insertData = new ArrangeLessonTermEntity
{
ALTId = Guid.NewGuid().ToString(),
LessonDate = DateTime.Parse(timesItem),
AcademicYearNo = item.year,
Semester = item.semester,
DeptNo = classinfo?.DeptNo,
MajorNo = classinfo?.MajorNo,
LessonNo = item.curriculunNumber,
LessonName = item.curriculunName,
TeachClassNo = item.curriculunName + classinfo?.ClassNo,
EmpNo = item.teacherNumber,
EmpName = item.teachername,
LessonSortNo = lessonData.FirstOrDefault(m => m.LessonNo == item.curriculunNumber)?.LessonSortNo,
ClassroomNo = classroomData.FirstOrDefault(m => m.ClassroomNo == item.ClassroomNo)?.ClassroomNo,
LessonTime = item.week + item.section,
CheckMark = "1",
F_SchoolId = entity.F_SchoolId
};
if (oldArrangeLessonTermList.Count(m => m.AcademicYearNo == insertData.AcademicYearNo && m.Semester == insertData.Semester
&& m.LessonNo == insertData.LessonNo && m.LessonDate.Value.Date == insertData.LessonDate.Value.Date
&& m.DeptNo == insertData.DeptNo && m.MajorNo == insertData.MajorNo
&& m.TeachClassNo == insertData.TeachClassNo && m.EmpNo == insertData.EmpNo
&& m.ClassroomNo == insertData.ClassroomNo && m.LessonTime == insertData.LessonTime
&& m.F_SchoolId == insertData.F_SchoolId) == 0
&& insertDataList.Count(m => m.AcademicYearNo == insertData.AcademicYearNo && m.Semester == insertData.Semester
&& m.LessonNo == insertData.LessonNo && m.LessonDate.Value.Date == insertData.LessonDate.Value.Date
&& m.DeptNo == insertData.DeptNo && m.MajorNo == insertData.MajorNo
&& m.TeachClassNo == insertData.TeachClassNo && m.EmpNo == insertData.EmpNo
&& m.ClassroomNo == insertData.ClassroomNo && m.LessonTime == insertData.LessonTime
&& m.F_SchoolId == insertData.F_SchoolId) == 0)
{
insertDataList.Add(insertData);
BaseRepository("CollegeMIS").Insert(insertData);
}
}
}
}

}
else
{
@@ -1192,21 +1254,25 @@ WHERE (AcademicYearNo = '" + strAcademicYear + "') and semester='" + strSemest
if (userType == "学生")
{
sql = @"SELECT
b.LessonNo,b.AcademicYearNo as AcademicYear,b.LessonName,b.LessonTime,b.LessonDate,b.Empname EmpName,b.EmpNo,c.ClassroomName,b.Semester,b.ClassroomNo as ClassRoomNo,b.LessonSortNo,d.ClassName,e.EnName from StuSelectLessonList a
b.LessonNo,b.AcademicYearNo as AcademicYear,b.LessonName,b.LessonTime,b.LessonDate,b.Empname EmpName,b.EmpNo,c.ClassroomName,b.Semester,b.ClassroomNo as ClassRoomNo,b.LessonSortNo,d.ClassName,e.EnName,f.LessonTypeName,f.LessonTypeCode
from StuSelectLessonList a
left join ArrangeLessonTerm b on b.TeachClassNo=RTRIM(a.LessonName) + RTRIM(a.PartCode) + RTRIM(a.TeachClassNo)
left join ClassroomInfo c on c.ClassroomNo=b.classroomNo
left join ClassInfo d on replace(b.TeachClassNo,b.LessonName,'')=d.ClassNo
left join LessonInfo e on a.LessonNo=e.LessonNo
left join CdLessonType f on e.LessonTypeId=f.LTId
where a.StuNo=@userAccount and a.AcademicYearNo=@strAcademicYear and a.Semester=@strSemester
and b.AcademicYearNo=@strAcademicYear and b.Semester=@strSemester
and b.LessonDate>=@startDate and b.LessonDate<=@endDate and b.CheckMark=1";
}
else
{
sql = @"select b.AcademicYearNo as AcademicYear,b.LessonNo,e.EnName,b.LessonName,b.LessonTime,b.LessonDate,b.EmpNo,b.Empname EmpName,replace(b.TeachClassNo,b.LessonName,'') TeachClassNo, c.ClassroomName,b.Semester,b.ClassroomNo as ClassRoomNo,b.LessonSortNo,d.ClassName from ArrangeLessonTerm b
sql = @"select b.AcademicYearNo as AcademicYear,b.LessonNo,e.EnName,b.LessonName,b.LessonTime,b.LessonDate,b.EmpNo,b.Empname EmpName,replace(b.TeachClassNo,b.LessonName,'') TeachClassNo, c.ClassroomName,b.Semester,b.ClassroomNo as ClassRoomNo,b.LessonSortNo,d.ClassName,f.LessonTypeName,f.LessonTypeCode
from ArrangeLessonTerm b
left join ClassroomInfo c on c.ClassroomNo=b.classroomNo
left join ClassInfo d on replace(b.TeachClassNo,b.LessonName,'')=d.ClassNo
left join LessonInfo e on b.LessonNo=e.LessonNo
left join CdLessonType f on e.LessonTypeId=f.LTId
where b.EmpNo=@userAccount and b.AcademicYearNo=@strAcademicYear and b.Semester=@strSemester
and b.LessonDate>=@startDate and b.LessonDate<=@endDate and b.CheckMark=1";
}
@@ -1669,10 +1735,12 @@ group by AcademicYearNo,Semester,DeptNo,MajorNo,LessonNo,TeachClassNo,EmpNo,Les
var semesterAndYear = Common.GetSemesterAndYear(startDate);
var strAcademicYear = semesterAndYear.AcademicYearShort;
var strSemester = semesterAndYear.Semester;
string sql = @"select b.AltId,b.F_SchoolId,b.DeptNo,b.MajorNo,b.AcademicYearNo as AcademicYear,b.LessonNo,b.LessonName,b.LessonTime,b.LessonDate,b.EmpNo,b.Empname EmpName,replace (b.TeachClassNo,b.LessonName,'') TeachClassNo, c.ClassroomName,b.Semester,b.ClassroomNo as ClassRoomNo,b.LessonSortNo,d.ClassName
string sql = @"select b.AltId,b.F_SchoolId,b.DeptNo,b.MajorNo,b.AcademicYearNo as AcademicYear,b.LessonNo,b.LessonName,b.LessonTime,b.LessonDate,b.EmpNo,b.Empname EmpName,replace (b.TeachClassNo,b.LessonName,'') TeachClassNo, c.ClassroomName,b.Semester,b.ClassroomNo as ClassRoomNo,b.LessonSortNo,d.ClassName,f.LessonTypeName,f.LessonTypeCode
from ArrangeLessonTerm b
left join ClassroomInfo c on c.ClassroomNo=b.classroomNo
left join ClassInfo d on replace(b.TeachClassNo,b.LessonName,'')=d.ClassNo
left join ClassInfo d on replace(b.TeachClassNo,b.LessonName,'')=d.ClassNo
left join LessonInfo e on b.LessonNo=e.LessonNo
left join CdLessonType f on e.LessonTypeId=f.LTId
where b.AcademicYearNo=@strAcademicYear and b.Semester=@strSemester
and b.LessonDate>=@startDate and b.LessonDate<=@endDate
and b.CheckMark=1";
@@ -2217,6 +2285,12 @@ group by AcademicYearNo,Semester,DeptNo,MajorNo,LessonNo,TeachClassNo,EmpNo,Les
public string F_SchoolId { get; set; }
public string DeptNo { get; set; }
public string MajorNo { get; set; }
/// <summary>
/// 课程类型
/// </summary>
public string LessonTypeName { get; set; }
public string LessonTypeCode { get; set; }


}

@@ -2856,6 +2930,14 @@ group by AcademicYearNo,Semester,DeptNo,MajorNo,LessonNo,TeachClassNo,EmpNo,Les
public string year { get; set; }
public string semester { get; set; }
public string schoolno { get; set; }
/// <summary>
/// 副讲老师编号
/// </summary>
public string teachersNumber { get; set; }
/// <summary>
/// 副讲老师名称
/// </summary>
public string teachersName { get; set; }
}
#endregion
}


Write Preview
Loading…
Cancel
Save