@@ -71,11 +71,12 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration | |||||
if (!queryParam["ClassManagerNo"].IsEmpty()) | if (!queryParam["ClassManagerNo"].IsEmpty()) | ||||
{ | { | ||||
dp.Add("ClassManagerNo", queryParam["ClassManagerNo"].ToString(), DbType.String); | dp.Add("ClassManagerNo", queryParam["ClassManagerNo"].ToString(), DbType.String); | ||||
strSql.Append(" AND (c.ClassDiredctorNo = @ClassManagerNo or c.ClassTutorNo = @ClassManagerNo) "); | |||||
dp.Add("ClassManagerNo2", "%" + queryParam["ClassManagerNo"].ToString() + "%", DbType.String); | |||||
strSql.Append(" AND (c.ClassDiredctorNo = @ClassManagerNo or c.ClassTutorNo like @ClassManagerNo2) "); | |||||
} | } | ||||
var result = this.BaseRepository("CollegeMIS").FindList<StuAttendanceLeaveEntity>(strSql.ToString(), dp, pagination); | var result = this.BaseRepository("CollegeMIS").FindList<StuAttendanceLeaveEntity>(strSql.ToString(), dp, pagination); | ||||
return result; | return result; | ||||
} | } | ||||
catch (Exception ex) | catch (Exception ex) | ||||
@@ -516,7 +516,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration | |||||
string sql = " SELECT * FROM dbo.ClassInfo where CheckMark=1 "; | string sql = " SELECT * FROM dbo.ClassInfo where CheckMark=1 "; | ||||
if (ClassDiredctorNo.ToUpper() != "SYSTEM") | if (ClassDiredctorNo.ToUpper() != "SYSTEM") | ||||
{ | { | ||||
sql += $" and ClassDiredctorNo='{ClassDiredctorNo}' or ClassTutorNo='{ClassDiredctorNo}'"; | |||||
sql += $" and ClassDiredctorNo='{ClassDiredctorNo}' or ClassTutorNo like '%{ClassDiredctorNo}%'"; | |||||
} | } | ||||
return this.BaseRepository("CollegeMIS").FindTable(sql); | return this.BaseRepository("CollegeMIS").FindTable(sql); | ||||
} | } | ||||
@@ -405,8 +405,9 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration | |||||
//班主任/辅导员 | //班主任/辅导员 | ||||
if (!queryParam["EmpNo"].IsEmpty()) | if (!queryParam["EmpNo"].IsEmpty()) | ||||
{ | { | ||||
strSql.Append(" and (c.ClassDiredctorNo = @EmpNo or c.ClassTutorNo = @EmpNo) "); | |||||
strSql.Append(" and (c.ClassDiredctorNo = @EmpNo or c.ClassTutorNo like @EmpNo2) "); | |||||
dp.Add("EmpNo", queryParam["EmpNo"].ToString(), DbType.String); | dp.Add("EmpNo", queryParam["EmpNo"].ToString(), DbType.String); | ||||
dp.Add("EmpNo2", "%" + queryParam["EmpNo"].ToString() + "%", DbType.String); | |||||
} | } | ||||
return this.BaseRepository("CollegeMIS").FindList<StuInfoFreshEntity>(strSql.ToString(), dp, pagination); | return this.BaseRepository("CollegeMIS").FindList<StuInfoFreshEntity>(strSql.ToString(), dp, pagination); | ||||