Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTerm/ArrangeLessonTermService.cs파일 보기
@@ -1217,7 +1217,7 @@ 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,sa.AttendOrNo,sa.Sort
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,sa.AttendOrNo,sa.Sort,sa.ClockPlace,sa.ADPhoto,sa.ALon,sa.ALat,sa.AIsOut,sa.ARemark
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
@@ -2249,9 +2249,34 @@ group by AcademicYearNo,Semester,DeptNo,MajorNo,LessonNo,TeachClassNo,EmpNo,Les
/// </summary>
public string AttendOrNo { get; set; }
/// <summary>
/// 出勤情况分类：准时、迟到、
/// 出勤情况分类：准时、迟到、请假、
/// </summary>
public string Sort { get; set; }
/// <summary>
/// 打卡地点
/// </summary>
public string ClockPlace { get; set; }
/// <summary>
/// 考勤照片
/// </summary>
public string ADPhoto { get; set; }
/// <summary>
/// 经度
/// </summary>
public decimal ALon { get; set; }
/// <summary>
/// 纬度
/// </summary>
public decimal ALat { get; set; }
/// <summary>
/// 是否外勤
/// </summary>
public bool AIsOut { get; set; }
/// <summary>
/// 备注
/// </summary>
public string ARemark { get; set; }
}
+ 20- 26
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTermOfElective/ArrangeLessonTermOfElectiveService.cs파일 보기
//sql = @"select a.LessonDate,a.AcademicYearNo as AcademicYear,a.Semester,a.LessonNo,a.LessonName+'[选修]' as LessonName,a.LessonSection as LessonTime,a.EmpNo,a.EmpName,a.ClassRoomName as ClassroomName,a.ClassRoomNo,a.LessonSortNo,b.OLPEId
// from StuSelectLessonListOfElective b
// left join ArrangeLessonTermOfElective a on b.OLPEId=a.PaiKeId
// where b.StuNo=@userAccount and b.Status=2
// and b.AcademicYearNo=@strAcademicYear and b.Semester=@strSemester
// and a.AcademicYearNo=@strAcademicYear and a.Semester=@strSemester
// and a.LessonDate >= @startDate and a.LessonDate <=@endDate
// and a.CheckMark='1'";
sql = @" select e.EnName,a.LessonDate,a.AcademicYearNo as AcademicYear,a.Semester,a.LessonNo,e.LessonName,a.LessonSection as LessonTime,a.EmpNo,emp.EmpName,cr.ClassroomName,a.ClassRoomNo,a.LessonSortNo,ccc.olpoeid as OLPEId
//选修课管理使用合班模式
sql = @" select e.EnName,a.LessonDate,a.AcademicYearNo as AcademicYear,a.Semester,a.LessonNo,e.LessonName,a.LessonSection as LessonTime,a.EmpNo,emp.EmpName,cr.ClassroomName,a.ClassRoomNo,a.LessonSortNo,ccc.olpoeid as OLPEId,st.AttendOrNo,st.Sort,st.ClockPlace,st.ADPhoto,st.ALon,st.ALat,st.AIsOut,st.ARemark
from
(select olpoeid from ElectiveMergeItem
where emid in (select emid from ElectiveMergeItem aa left
join StuSelectLessonListOfElective bb on aa.olpoeid = bb.olpeid
join StuSelectLessonListOfElective bb on aa.olpoeid = bb.olpeid
where bb.StuNo = @userAccount and bb.Status = 2
and bb.AcademicYearNo = @strAcademicYear and bb.Semester = @strSemester
)) as ccc
left join
left join
ArrangeLessonTermOfElective a on ccc.olpoeid = a.PaiKeId
left join LessonInfo e on a.LessonNo=e.LessonNo
left join EmpInfo emp on a.EmpNo=emp.EmpNo
left join ClassroomInfo cr on a.ClassRoomNo=cr.ClassroomNo
left join StuAttendance st on st.StuNo=@userAccount and st.AcademicYearNo=a.AcademicYearNo and st.Semester=a.Semester and st.LessonNo=a.LessonNo and st.LessonSortNo=a.LessonSortNo and st.LessonTime=a.LessonSection and st.EmpNo=a.EmpNo and st.ClassRoomNo=a.ClassRoomNo
where
a.AcademicYearNo = @strAcademicYear and a.Semester = @strSemester
and a.LessonDate >= @startDate and a.LessonDate <=@endDate
and a.CheckMark = '1'
union
select e.EnName,a.LessonDate,a.AcademicYearNo as AcademicYear,a.Semester,a.LessonNo,e.LessonName,a.LessonSection as LessonTime,a.EmpNo,emp.EmpName,cr.ClassroomName,a.ClassRoomNo,a.LessonSortNo,b.OLPEId
from StuSelectLessonListOfElective b
left join ArrangeLessonTermOfElective a on b.OLPEId=a.PaiKeId
left join LessonInfo e on a.LessonNo=e.LessonNo
left join EmpInfo emp on a.EmpNo=emp.EmpNo
left join ClassroomInfo cr on a.ClassRoomNo=cr.ClassroomNo
where b.StuNo=@userAccount and b.Status=2
and b.AcademicYearNo=@strAcademicYear and b.Semester=@strSemester
and a.AcademicYearNo=@strAcademicYear and a.Semester=@strSemester
and a.LessonDate >= @startDate and a.LessonDate <=@endDate
and a.CheckMark='1'
";
and a.CheckMark = '1' ";
//选修课管理不使用合班模式，则采用以下语句；
//sql = @"select e.EnName,a.LessonDate,a.AcademicYearNo as AcademicYear,a.Semester,a.LessonNo,e.LessonName,a.LessonSection as LessonTime,a.EmpNo,emp.EmpName,cr.ClassroomName,a.ClassRoomNo,a.LessonSortNo,b.OLPEId,st.AttendOrNo,st.Sort,st.ClockPlace,st.ADPhoto,st.ALon,st.ALat,st.AIsOut,st.ARemark
// from StuSelectLessonListOfElective b
// left join ArrangeLessonTermOfElective a on b.OLPEId=a.PaiKeId
// left join LessonInfo e on a.LessonNo=e.LessonNo
// left join EmpInfo emp on a.EmpNo=emp.EmpNo
// left join ClassroomInfo cr on a.ClassRoomNo=cr.ClassroomNo
// left join StuAttendance st on st.StuNo=@userAccount and st.AcademicYearNo=a.AcademicYearNo and st.Semester=a.Semester and st.LessonNo=a.LessonNo and st.LessonSortNo=a.LessonSortNo and st.LessonTime=a.LessonSection and st.EmpNo=a.EmpNo and st.ClassRoomNo=a.ClassRoomNo
// where b.StuNo=@userAccount and b.Status=2
// and b.AcademicYearNo=@strAcademicYear and b.Semester=@strSemester
// and a.AcademicYearNo=@strAcademicYear and a.Semester=@strSemester
// and a.LessonDate >= @startDate and a.LessonDate <=@endDate
// and a.CheckMark='1' ";
}
else
{
+ 31- 0
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuAttendance/StuAttendanceEntity.cs파일 보기
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/ADR_Record/ADR_RecordService.cs파일 보기
var baseDataName = this.BaseRepository().getDbConnection().Database;
var strSql = new StringBuilder();
strSql.Append(@"SELECT t.ID,
strSql.Append(@"SELECT t.*,
emp.F_RealName as UserName,
t.UserNo,
d.F_FullName as Department ,
c.F_ItemName as ADType,
t.ADTime,
t.ClockTime,
t.ClockStatus,
t.ClockPlace,
t.ADYear,
t.ADMonth,
t.ADDay,
t.ADPhoto,t.AISOut
d.F_FullName as Department,
c.F_ItemName as ADType
");
strSql.Append($" FROM ADR_Record t left JOIN {baseDataName}.dbo.LR_Base_User emp ON t.UserNo=emp.F_Account ");
strSql.Append($" left join {baseDataName}.dbo.LR_Base_Department d ON t.UserNo=emp.F_DepartmentId ");
+ 91- 73
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/ADR_Restriction/ADR_RestrictionService.cs파일 보기
dyy
1 년 전