|
|
@@ -254,6 +254,7 @@ namespace TEAMModelOS.FunctionV4.HttpTrigger
|
|
|
}
|
|
|
ScAccessConfig config = $"{accessConfig}".ToObject<ScAccessConfig>();
|
|
|
Code = "GetSchoolDiagnosis";
|
|
|
+ var table = _azureStorage.GetCloudTableClient().GetTableReference("ScYxpt");
|
|
|
parameterMap = new Dictionary<string, object>();
|
|
|
parameterMap.Add("TrainComID", config.trainComID);
|
|
|
List<ScsResult> results = new List<ScsResult>();
|
|
|
@@ -275,7 +276,7 @@ namespace TEAMModelOS.FunctionV4.HttpTrigger
|
|
|
if (diagnoses.IsNotEmpty())
|
|
|
{
|
|
|
projects.Add(new ScsProjectDiagnosis { project = ps, diagnoses = diagnoses, });
|
|
|
- await _azureStorage.SaveOrUpdate<ScProjectDiagnosis>(new ScProjectDiagnosis {schoolCode=$"{schoolCode}",areaId= areaId,
|
|
|
+ await table.SaveOrUpdate<ScProjectDiagnosis>(new ScProjectDiagnosis {schoolCode=$"{schoolCode}",areaId= areaId,
|
|
|
ProjectID=int.Parse(ps.pd),
|
|
|
ProjectItemID=int.Parse(ps.pid),
|
|
|
RowKey = $"{ps.pid}-{schoolCode}", PartitionKey = "ScSchoolDiagnosis", abilityNos = diagnoses.ToJsonString() });
|
|
|
@@ -283,7 +284,7 @@ namespace TEAMModelOS.FunctionV4.HttpTrigger
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- List<ScProjectDiagnosis> teacherDiagnoses = await _azureStorage.FindListByDict<ScProjectDiagnosis>(new Dictionary<string, object> { { "PartitionKey", "ScSchoolDiagnosis" }, { "RowKey", $"{ps.pid}-{schoolCode}" } });
|
|
|
+ List<ScProjectDiagnosis> teacherDiagnoses = await table.FindListByDict<ScProjectDiagnosis>(new Dictionary<string, object> { { "PartitionKey", "ScSchoolDiagnosis" }, { "RowKey", $"{ps.pid}-{schoolCode}" } });
|
|
|
if (teacherDiagnoses.IsNotEmpty())
|
|
|
{
|
|
|
projects.Add(new ScsProjectDiagnosis { project = ps, diagnoses = teacherDiagnoses[0].abilityNos.ToObject<List<ScPDiagnosis>>() });
|
|
|
@@ -304,7 +305,7 @@ namespace TEAMModelOS.FunctionV4.HttpTrigger
|
|
|
{
|
|
|
foreach (var ps in config.p)
|
|
|
{
|
|
|
- List<ScProjectDiagnosis> teacherDiagnoses = await _azureStorage.FindListByDict<ScProjectDiagnosis>(new Dictionary<string, object> { { "PartitionKey", "ScSchoolDiagnosis" }, { "RowKey", $"{ps.pid}-{schoolCode}" } });
|
|
|
+ List<ScProjectDiagnosis> teacherDiagnoses = await table.FindListByDict<ScProjectDiagnosis>(new Dictionary<string, object> { { "PartitionKey", "ScSchoolDiagnosis" }, { "RowKey", $"{ps.pid}-{schoolCode}" } });
|
|
|
if (teacherDiagnoses.IsNotEmpty())
|
|
|
{
|
|
|
projects.Add(new ScsProjectDiagnosis { project = ps, diagnoses = teacherDiagnoses[0].abilityNos.ToObject<List<ScPDiagnosis>>() });
|
|
|
@@ -336,6 +337,7 @@ namespace TEAMModelOS.FunctionV4.HttpTrigger
|
|
|
}
|
|
|
ScAccessConfig config = $"{accessConfig}".ToObject<ScAccessConfig>();
|
|
|
Code = "GetProjectDiagnosis";
|
|
|
+ var table = _azureStorage.GetCloudTableClient().GetTableReference("ScYxpt");
|
|
|
parameterMap = new Dictionary<string, object>();
|
|
|
parameterMap.Add("TrainComID", config.trainComID);
|
|
|
List<ScsResult> results = new List<ScsResult>();
|
|
|
@@ -355,12 +357,12 @@ namespace TEAMModelOS.FunctionV4.HttpTrigger
|
|
|
if (diagnoses.IsNotEmpty())
|
|
|
{
|
|
|
projects.Add(new ScsProjectDiagnosis { project = ps, diagnoses = diagnoses });
|
|
|
- await _azureStorage.SaveOrUpdate<ScProjectDiagnosis>(new ScProjectDiagnosis { areaId=areaId, RowKey = $"{ps.pid}", PartitionKey = "ScProjectDiagnosis", abilityNos = diagnoses.ToJsonString() });
|
|
|
+ await table.SaveOrUpdate<ScProjectDiagnosis>(new ScProjectDiagnosis { areaId=areaId, RowKey = $"{ps.pid}", PartitionKey = "ScProjectDiagnosis", abilityNos = diagnoses.ToJsonString() });
|
|
|
}
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- List<ScProjectDiagnosis> teacherDiagnoses = await _azureStorage.FindListByDict<ScProjectDiagnosis>(new Dictionary<string, object> { { "PartitionKey", "ScProjectDiagnosis" }, { "RowKey", $"{ps.pid}" } });
|
|
|
+ List<ScProjectDiagnosis> teacherDiagnoses = await table.FindListByDict<ScProjectDiagnosis>(new Dictionary<string, object> { { "PartitionKey", "ScProjectDiagnosis" }, { "RowKey", $"{ps.pid}" } });
|
|
|
if (teacherDiagnoses.IsNotEmpty())
|
|
|
{
|
|
|
projects.Add(new ScsProjectDiagnosis { project = ps, diagnoses = teacherDiagnoses[0].abilityNos.ToObject<List<ScPDiagnosis>>() });
|
|
|
@@ -380,7 +382,7 @@ namespace TEAMModelOS.FunctionV4.HttpTrigger
|
|
|
foreach (var ps in config.p)
|
|
|
{
|
|
|
//await _dingDing.SendBotMsg($"{Environment.GetEnvironmentVariable("Option:Location")}，IES5.ScApisService:GetProjectDiagnosis\n{ex.Message}{ex.StackTrace}\n{results.ToJsonString()}\n{data}", GroupNames.成都开发測試群組);
|
|
|
- List<ScProjectDiagnosis> teacherDiagnoses = await _azureStorage.FindListByDict<ScProjectDiagnosis>(new Dictionary<string, object> { { "PartitionKey", "ScProjectDiagnosis" }, { "RowKey", $"{ps.pid}" } });
|
|
|
+ List<ScProjectDiagnosis> teacherDiagnoses = await table.FindListByDict<ScProjectDiagnosis>(new Dictionary<string, object> { { "PartitionKey", "ScProjectDiagnosis" }, { "RowKey", $"{ps.pid}" } });
|
|
|
if (teacherDiagnoses.IsNotEmpty())
|
|
|
{
|
|
|
projects.Add(new ScsProjectDiagnosis { project = ps, diagnoses = teacherDiagnoses[0].abilityNos.ToObject<List<ScPDiagnosis>>() });
|
|
|
@@ -412,6 +414,7 @@ namespace TEAMModelOS.FunctionV4.HttpTrigger
|
|
|
{
|
|
|
areaId = $"{_areaId}";
|
|
|
}
|
|
|
+ var table = _azureStorage.GetCloudTableClient().GetTableReference("ScYxpt");
|
|
|
JsonElement pxid = data.ToObject<JsonElement>().GetProperty("pxid");
|
|
|
JsonElement schoolCode = data.ToObject<JsonElement>().GetProperty("schoolCode");
|
|
|
ScAccessConfig config = $"{accessConfig}".ToObject<ScAccessConfig>();
|
|
|
@@ -432,13 +435,13 @@ namespace TEAMModelOS.FunctionV4.HttpTrigger
|
|
|
}
|
|
|
if (abilityNos.IsNotEmpty())
|
|
|
{
|
|
|
- await _azureStorage.SaveOrUpdate<ScTeacherDiagnosis>(new ScTeacherDiagnosis {areaId = areaId,schoolCode=$"{schoolCode}", RowKey = $"{pxid}", PartitionKey = "ScTeacherDiagnosis", abilityNos = abilityNos.ToJsonString() });
|
|
|
+ await table.SaveOrUpdate<ScTeacherDiagnosis>(new ScTeacherDiagnosis {areaId = areaId,schoolCode=$"{schoolCode}", RowKey = $"{pxid}", PartitionKey = "ScTeacherDiagnosis", abilityNos = abilityNos.ToJsonString() });
|
|
|
}
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
|
|
|
- List<ScTeacherDiagnosis> teacherDiagnoses = await _azureStorage.FindListByDict<ScTeacherDiagnosis>(new Dictionary<string, object> { { "PartitionKey", "ScTeacherDiagnosis" }, { "RowKey", $"{pxid}" } });
|
|
|
+ List<ScTeacherDiagnosis> teacherDiagnoses = await table.FindListByDict<ScTeacherDiagnosis>(new Dictionary<string, object> { { "PartitionKey", "ScTeacherDiagnosis" }, { "RowKey", $"{pxid}" } });
|
|
|
if (teacherDiagnoses.IsNotEmpty())
|
|
|
{
|
|
|
abilityNos = teacherDiagnoses[0].abilityNos.ToObject<List<string>>();
|
|
|
@@ -451,7 +454,7 @@ namespace TEAMModelOS.FunctionV4.HttpTrigger
|
|
|
{
|
|
|
//await _dingDing.SendBotMsg($"{Environment.GetEnvironmentVariable("Option:Location")}，IES5.ScApisService:getDiagnosisListByProject_V2\n{ex.Message}{ex.StackTrace}\n{result.ToJsonString()}\n{data}", GroupNames.成都开发測試群組);
|
|
|
|
|
|
- List<ScTeacherDiagnosis> teacherDiagnoses = await _azureStorage.FindListByDict<ScTeacherDiagnosis>(new Dictionary<string, object> { { "PartitionKey", "ScTeacherDiagnosis" }, { "RowKey", $"{pxid}" } });
|
|
|
+ List<ScTeacherDiagnosis> teacherDiagnoses = await table.FindListByDict<ScTeacherDiagnosis>(new Dictionary<string, object> { { "PartitionKey", "ScTeacherDiagnosis" }, { "RowKey", $"{pxid}" } });
|
|
|
if (teacherDiagnoses.IsNotEmpty())
|
|
|
{
|
|
|
abilityNos = teacherDiagnoses[0].abilityNos.ToObject<List<string>>();
|
|
|
@@ -555,9 +558,9 @@ namespace TEAMModelOS.FunctionV4.HttpTrigger
|
|
|
//{
|
|
|
// teachers.Add(item);
|
|
|
//}
|
|
|
-
|
|
|
- List<ScTeacher> scTeachers= await _azureStorage.FindListByDict<ScTeacher>(new Dictionary<string, object> { { "PartitionKey", "ScTeacher" },{ "schoolCode",$"{school}" } });
|
|
|
- List<ScTeacherDiagnosis> scTeacherDiagnoses = await _azureStorage.FindListByDict<ScTeacherDiagnosis>(new Dictionary<string, object> { { "PartitionKey", "ScTeacherDiagnosis" }, { "schoolCode", $"{school}" } });
|
|
|
+ var table = _azureStorage.GetCloudTableClient().GetTableReference("ScYxpt");
|
|
|
+ List<ScTeacher> scTeachers= await table.FindListByDict<ScTeacher>(new Dictionary<string, object> { { "PartitionKey", "ScTeacher" },{ "schoolCode",$"{school}" } });
|
|
|
+ List<ScTeacherDiagnosis> scTeacherDiagnoses = await table.FindListByDict<ScTeacherDiagnosis>(new Dictionary<string, object> { { "PartitionKey", "ScTeacherDiagnosis" }, { "schoolCode", $"{school}" } });
|
|
|
|
|
|
List<KeyValuePair<TeacherTrain, string>> trainsNO = new List<KeyValuePair<TeacherTrain, string>>();
|
|
|
List<PushFail> fails = new List<PushFail>();
|
CrazyIter_Bin