修改一版

2022-05-13 18:12:50 +08:00
parent 894424a00e
commit 6741f11b27
8 changed files with 85 additions and 50 deletions
@@ -224,7 +224,11 @@ namespace IRaCIS.Core.Application
                    return ResponseOutput.NotOk("项目 基础配置、流程配置、加急配置 、访视计划，有未确认项");
                }
            }
-
+            
+            if (trialStatusStr != "Ongoing")
+            {
+                trial.TrialFinishTime = DateTime.Now;
+            }

            trial.TrialStateChangeList.Add(new TrialStateChange() { OriginState = trial.TrialStatusStr, NowState = trialStatusStr, Reason = reason ?? String.Empty, TrialId = trialId });

@@ -276,7 +280,11 @@ namespace IRaCIS.Core.Application
        [HttpPut("{trialId:guid}/{isAbandon:bool}")]
        public async Task<IResponseOutput> AbandonTrial(Guid trialId, /*Guid? signId,*/ bool isAbandon)
        {
-            await _trialRepository.UpdatePartialNowNoQueryAsync(trialId, u => new Trial() { IsDeleted = isAbandon });
+            
+            await _trialRepository.UpdatePartialFromQueryAsync(trialId, u => new Trial() { 
+                IsDeleted = isAbandon,
+                TrialFinishTime= isAbandon?DateTime.Now:null
+            },true);