Commit 011ccabe authored by 黄奎's avatar 黄奎

页面修改

parent 85fe9691
...@@ -160,8 +160,10 @@ where {where} order by bd.Date asc"; ...@@ -160,8 +160,10 @@ where {where} order by bd.Date asc";
where += $@" and b.{nameof(RB_Teaching_BonusDetail.Type)} ={demodel.Type}"; where += $@" and b.{nameof(RB_Teaching_BonusDetail.Type)} ={demodel.Type}";
} }
string sql = $@" select b.*,t.TeacherName,case when b.CouseClassify =3 then '预约课' else case when b.CouseClassify =1 then c.ClassName else tr.LessonName end end as ClassName, string sql = $@"
c.ClassNo,s.SName from RB_Teaching_BonusDetail b select b.*,t.TeacherName,case when b.CouseClassify =3 then '预约课' else case when b.CouseClassify =1 then c.ClassName else tr.LessonName end end as ClassName
,c.ClassNo,s.SName
from RB_Teaching_BonusDetail b
left join rb_teacher t on b.TeacherId = t.TId left join rb_teacher t on b.TeacherId = t.TId
left join rb_class c on b.ClassId = c.ClassId and b.CouseClassify =1 left join rb_class c on b.ClassId = c.ClassId and b.CouseClassify =1
left join rb_school s on b.School_Id = s.SId left join rb_school s on b.School_Id = s.SId
......
...@@ -112,6 +112,7 @@ namespace Edu.WebApi.Controllers.User ...@@ -112,6 +112,7 @@ namespace Edu.WebApi.Controllers.User
int autoLoginId = jobj.GetInt("AutoLoginId",0); int autoLoginId = jobj.GetInt("AutoLoginId",0);
var workId = jobj.GetStringValue("AutoLoginWorkId"); var workId = jobj.GetStringValue("AutoLoginWorkId");
var openId = jobj.GetStringValue("AutoLoginOpenId"); var openId = jobj.GetStringValue("AutoLoginOpenId");
Common.Plugin.LogHelper.WriteInfo("Login::Query __" + Common.Plugin.JsonHelper.Serialize(jobj));
//新增自动登录功能,用于通过推送消息自动登录 //新增自动登录功能,用于通过推送消息自动登录
RB_Account_ViewModel model = null; RB_Account_ViewModel model = null;
if (autoLoginId == 0 && (string.IsNullOrEmpty(workId) && string.IsNullOrEmpty(openId))) if (autoLoginId == 0 && (string.IsNullOrEmpty(workId) && string.IsNullOrEmpty(openId)))
......
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
"ViewFileSiteUrl": "https://viitto-1301420277.cos.ap-chengdu.myqcloud.com", "ViewFileSiteUrl": "https://viitto-1301420277.cos.ap-chengdu.myqcloud.com",
"ErpViewFileSiteUrl": "http://imgfile.oytour.com", "ErpViewFileSiteUrl": "http://imgfile.oytour.com",
"ErpUrl": "http://localhost:8181/#", "ErpUrl": "http://localhost:8181/#",
"WorkAPPDomain": "http://m.kookaku.com/pages",
"Mongo": "mongodb://47.96.23.199:27017", "Mongo": "mongodb://47.96.23.199:27017",
"MongoDBName": "Edu", "MongoDBName": "Edu",
"WkHtmlToPdfPath": "D:/wkhtmltopdf/bin/", "WkHtmlToPdfPath": "D:/wkhtmltopdf/bin/",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment