Kaynağa Gözat

调整时间

CrazyIter_Bin 4 yıl önce
ebeveyn
işleme
bcdde866c3

+ 1 - 1
TEAMModelOS.SDK/Models/Cosmos/Common/Vote.cs

@@ -42,7 +42,7 @@ namespace TEAMModelOS.SDK.Models
         /// <summary>
         /// pending 待发布|going 已发布|finish 已结束
         /// </summary>
-        [Required(ErrorMessage = "progress 必须设置")]
+        //[Required(ErrorMessage = "progress 必须设置")]
         public string progress { get; set; }
         /// <summary>
         /// 投票选项

+ 10 - 2
TEAMModelOS/Controllers/Common/SurveyController.cs

@@ -57,11 +57,19 @@ namespace TEAMModelOS.Controllers
             try {
                 var client = _azureCosmos.GetCosmosClient();
                 request.code = request.pk + "-" + request.code;
-                request.createTime = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds();
+                long now = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds();
+                request.createTime = now;
                 if (string.IsNullOrEmpty(request.id))
                 {
                     request.id = Guid.NewGuid().ToString();
-                    request.progress = "pending";
+                    if (request.startTime < now)
+                    {
+                        request.progress = "pending";
+                    }
+                    else
+                    {
+                        request.progress = "going";
+                    }
                     request = await client.GetContainer("TEAMModelOS", "Common").CreateItemAsync(request, new PartitionKey($"{request.code}"));
                 }
                 else {

+ 11 - 3
TEAMModelOS/Controllers/Common/VoteController.cs

@@ -69,12 +69,20 @@ namespace TEAMModelOS.Controllers.Learn
                 //新增Vote
                 var client = _azureCosmos.GetCosmosClient();
                 request.code = request.pk + "-" + request.code;
-                request.createTime = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds();
-
+                
+                long now = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds();
+                request.createTime = now;
                 if (string.IsNullOrEmpty(request.id))
                 {
                     request.id = Guid.NewGuid().ToString();
-                    request.progress = "pending";
+                    if (request.startTime < now)
+                    {
+                        request.progress = "pending";
+                    }
+                    else { 
+                        request.progress = "going"; 
+                    }
+                        
                     request = await client.GetContainer("TEAMModelOS", "Common").CreateItemAsync(request, new PartitionKey($"{request.code}"));
                 }
                 else