|
@@ -212,6 +212,14 @@ namespace TEAMModelOS.Controllers
|
|
|
areaStudy.scope = "school";
|
|
|
areaStudy.code = "Study-" + id.GetString();
|
|
|
areaStudy.createTime = now;
|
|
|
+ if (areaStudy.startTime > now)
|
|
|
+ {
|
|
|
+ areaStudy.progress = "pending";
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ areaStudy.progress = "going";
|
|
|
+ }
|
|
|
if (string.IsNullOrEmpty(areaStudy.id))
|
|
|
{
|
|
|
areaStudy.id = Guid.NewGuid().ToString();
|
|
@@ -227,6 +235,15 @@ namespace TEAMModelOS.Controllers
|
|
|
study.ttl = -1;
|
|
|
study.code = "Study-" + pa.sId;
|
|
|
study.createTime = now;
|
|
|
+
|
|
|
+ if (study.startTime > now)
|
|
|
+ {
|
|
|
+ study.progress = "pending";
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ study.progress = "going";
|
|
|
+ }
|
|
|
study.tchLists = pa.gId;
|
|
|
study.pId = areaStudy.id;
|
|
|
study.scope = "school";
|
|
@@ -1085,7 +1102,14 @@ namespace TEAMModelOS.Controllers
|
|
|
areaExam.id = Guid.NewGuid().ToString();
|
|
|
}
|
|
|
List<string> allName = new();
|
|
|
-
|
|
|
+ if (areaExam.startTime > now)
|
|
|
+ {
|
|
|
+ areaExam.progress = "pending";
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ areaExam.progress = "going";
|
|
|
+ }
|
|
|
foreach (parameter pa in parameters)
|
|
|
{
|
|
|
ExamLite trExam = exam.ToObject<ExamLite>();
|
|
@@ -1098,6 +1122,14 @@ namespace TEAMModelOS.Controllers
|
|
|
trExam.owner = "area";
|
|
|
trExam.pId = areaExam.id;
|
|
|
trExam.targetType = "research";
|
|
|
+ if (trExam.startTime > now)
|
|
|
+ {
|
|
|
+ trExam.progress = "pending";
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ trExam.progress = "going";
|
|
|
+ }
|
|
|
if (pa.gName.Count == 0)
|
|
|
{
|
|
|
string sName = pa.sName + "-" + "所有老师(未分组)";
|