|
@@ -585,21 +585,24 @@ namespace TEAMModelOS.Controllers.Analysis
|
|
|
JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
|
|
|
HashSet<string> classList = new HashSet<string>();
|
|
|
List<Dictionary<string, object>> exerciseScatter = new List<Dictionary<string, object>>();
|
|
|
- //Dictionary<string, object> scatterAnalysis = new Dictionary<string, object>();
|
|
|
+ Dictionary<string, object> scatterAnalysis = new Dictionary<string, object>();
|
|
|
request.@params.TryGetValue("subjectCode", out object subjectCode);
|
|
|
request.@params.TryGetValue("schoolCode", out object schoolCode);
|
|
|
request.@params.TryGetValue("examCode", out object examCode);
|
|
|
+ request.@params.TryGetValue("scopeCode", out object scopeCode);
|
|
|
Dictionary<string, object> sub = new Dictionary<string, object>
|
|
|
{
|
|
|
- { "subjectCode", subjectCode.ToString()}
|
|
|
+ { "subjectCode", subjectCode.ToString()},
|
|
|
+ { "scopeCode",scopeCode.ToString()}
|
|
|
};
|
|
|
Dictionary<string, object> examMap = new Dictionary<string, object>
|
|
|
{
|
|
|
{ "subjectCode", subjectCode.ToString()},
|
|
|
- { "examCode", examCode.ToString()}
|
|
|
+ { "examCode", scopeCode.ToString()},
|
|
|
+ { "schoolCode", schoolCode.ToString()}
|
|
|
};
|
|
|
List<ExamResult> exams = await azureCosmosDBRepository.FindByDict<ExamResult>(examMap);
|
|
|
- List<ExamPaper> paper = await azureCosmosDBRepository.FindByDict<ExamPaper>(sub);
|
|
|
+ List<ExamPaper> paper = await azureCosmosDBRepository.FindByDict<ExamPaper> (sub);
|
|
|
List<string> key = new List<string>
|
|
|
{
|
|
|
"id",
|