|
|
@ -200,6 +200,8 @@ public class Ghre_SurveyServices : BaseServices<Ghre_Survey, Ghre_SurveyDto, Ins |
|
|
|
public async Task<ServiceResult<Ghre_SurveyExtend>> QueryESSData(long id, long? openClassId = null) |
|
|
|
public async Task<ServiceResult<Ghre_SurveyExtend>> QueryESSData(long id, long? openClassId = null) |
|
|
|
{ |
|
|
|
{ |
|
|
|
long? feedbackId = null; |
|
|
|
long? feedbackId = null; |
|
|
|
|
|
|
|
if (openClassId != null) |
|
|
|
|
|
|
|
{ |
|
|
|
if (await Db.Queryable<Ghre_OpenClassFeedback>().Where(x => x.Source == "ParentTeacher" && (x.Id == id || x.Id == openClassId)).AnyAsync()) |
|
|
|
if (await Db.Queryable<Ghre_OpenClassFeedback>().Where(x => x.Source == "ParentTeacher" && (x.Id == id || x.Id == openClassId)).AnyAsync()) |
|
|
|
{ |
|
|
|
{ |
|
|
|
var feedback = await Db.Queryable<Ghre_OpenClassFeedback>().Where(x => x.Source == "ParentTeacher" && (x.Id == id || x.Id == openClassId)).FirstAsync(); |
|
|
|
var feedback = await Db.Queryable<Ghre_OpenClassFeedback>().Where(x => x.Source == "ParentTeacher" && (x.Id == id || x.Id == openClassId)).FirstAsync(); |
|
|
@ -238,6 +240,7 @@ public class Ghre_SurveyServices : BaseServices<Ghre_Survey, Ghre_SurveyDto, Ins |
|
|
|
&& (x.SurveyId == id || x.Id == openClassId) |
|
|
|
&& (x.SurveyId == id || x.Id == openClassId) |
|
|
|
&& x.OpenClassId == openClassId).Select(x => x.Id).FirstAsync(); |
|
|
|
&& x.OpenClassId == openClassId).Select(x => x.Id).FirstAsync(); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
var entity = await base.QueryById(id); |
|
|
|
var entity = await base.QueryById(id); |
|
|
|
|
|
|
|
|
|
|
|