|
@@ -52,8 +52,8 @@ namespace TEAMModelOS.SDK.Services
|
|
|
{
|
|
|
return (msgid, -1);
|
|
|
}
|
|
|
-
|
|
|
- try
|
|
|
+
|
|
|
+ try
|
|
|
{
|
|
|
//1.再次检查投票
|
|
|
var client = _azureCosmos.GetCosmosClient();
|
|
@@ -69,15 +69,38 @@ namespace TEAMModelOS.SDK.Services
|
|
|
{
|
|
|
|
|
|
//判断投票时间是否在起止时间内
|
|
|
+
|
|
|
+ string optfrom = "";
|
|
|
+ ///操作来源,如果是研修的,不限制,否则现在活动结束后不能再投票或者提交问卷作答。
|
|
|
+ if (request.TryGetProperty("optfrom", out JsonElement _optFrom))
|
|
|
+ {
|
|
|
+ optfrom = $"{_optFrom}";
|
|
|
+ }
|
|
|
// if (curr >= vote.startTime && curr <= vote.endTime)
|
|
|
- if (curr >= vote.startTime)
|
|
|
+ bool intime=true;//默认有效期内
|
|
|
+ var endDtae = DateTimeOffset.FromUnixTimeMilliseconds(vote.endTime);
|
|
|
+ if (!string.IsNullOrWhiteSpace(optfrom) && optfrom.Equals("train"))
|
|
|
+ { //"optfrom":"train" 代表是研修的
|
|
|
+ if (curr >= vote.startTime)
|
|
|
+ {
|
|
|
+ intime = true;
|
|
|
+
|
|
|
+ }
|
|
|
+ else { intime = false; }
|
|
|
+ endDtae = DateTimeOffset.UtcNow;
|
|
|
+ }
|
|
|
+ else {
|
|
|
+ if (curr >= vote.startTime && curr <= vote.endTime)
|
|
|
+ {
|
|
|
+ intime = true;
|
|
|
+ endDtae = DateTimeOffset.FromUnixTimeMilliseconds(vote.endTime);
|
|
|
+ }
|
|
|
+ else { intime = false; }
|
|
|
+ }
|
|
|
+ if (intime)
|
|
|
{
|
|
|
string endField = null;
|
|
|
-
|
|
|
string Field = "";
|
|
|
- //放开投票
|
|
|
- // var endDtae = DateTimeOffset.FromUnixTimeMilliseconds(vote.endTime);
|
|
|
- var endDtae = DateTimeOffset.UtcNow;
|
|
|
RedisValue value;
|
|
|
switch (vote.times)
|
|
|
{
|
|
@@ -549,9 +572,37 @@ namespace TEAMModelOS.SDK.Services
|
|
|
}
|
|
|
if (survey != null)
|
|
|
{
|
|
|
+ string optfrom = "";
|
|
|
+ ///操作来源,如果是研修的,不限制,否则现在活动结束后不能再投票或者提交问卷作答。
|
|
|
+ if (request.TryGetProperty("optfrom", out JsonElement _optFrom))
|
|
|
+ {
|
|
|
+ optfrom = $"{_optFrom}";
|
|
|
+ }
|
|
|
+ // if (curr >= vote.startTime && curr <= vote.endTime)
|
|
|
+ bool intime = true;//默认有效期内
|
|
|
+ var endDtae = DateTimeOffset.FromUnixTimeMilliseconds(survey.endTime);
|
|
|
+ if (!string.IsNullOrWhiteSpace(optfrom) && optfrom.Equals("train"))
|
|
|
+ { //"optfrom":"train" 代表是研修的
|
|
|
+ if (curr >= survey.startTime)
|
|
|
+ {
|
|
|
+ intime = true;
|
|
|
+
|
|
|
+ }
|
|
|
+ else { intime = false; }
|
|
|
+ endDtae = DateTimeOffset.UtcNow;
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ if (curr >= survey.startTime && curr <= survey.endTime)
|
|
|
+ {
|
|
|
+ intime = true;
|
|
|
+ endDtae = DateTimeOffset.FromUnixTimeMilliseconds(survey.endTime);
|
|
|
+ }
|
|
|
+ else { intime = false; }
|
|
|
+ }
|
|
|
//判断投票时间是否在起止时间内
|
|
|
// if (curr >= survey.startTime && curr <= survey.endTime)
|
|
|
- if (curr >= survey.startTime )
|
|
|
+ if (intime)
|
|
|
{
|
|
|
if (request.TryGetProperty("record", out JsonElement _record))
|
|
|
{
|