Merge branch 'master' of http://110.188.24.182:10023/Fengwo/hotline

src/Hotline.Api/Controllers/OrderController.cs

@@ -2950,7 +2950,10 @@ public class OrderController : BaseController
         if (special is null) throw UserFriendlyException.SameMessage("无效特提审批信息！");
         if (special.State != 0) throw UserFriendlyException.SameMessage("无效特提审批信息,特提审批信息错误,该信息已审核！");
         _mapper.Map(dto, special);
-        if (dto.Files.Any())
+        dto.NextStepCode = special.NextStepCode;
+        dto.NextStepName = special.NextStepName;
+        dto.NextHandlers = special.NextHandlers;
+		if (dto.Files.Any())
             special.ReplyFileJson =
                 await _fileRepository.AddFileAsync(dto.Files, special.Id, "", HttpContext.RequestAborted);
         await _orderSpecialRepository.UpdateAsync(special, HttpContext.RequestAborted);

src/Hotline.Api/Controllers/QualityController.cs

@@ -587,45 +587,47 @@ namespace Hotline.Api.Controllers
 							{
 								QualityId = quality.Id,
 								Second = 0,
+								EndSecond = 0,
 								Name = item2.name,
 								Content = item2.description,
 								Intelligent = true,
 								Grade = item2.score,
 								Check = true,
 							};
-							if (item2?.qualityModels.Count > 0)
+							if (item2?.qualityModels?.Count > 0)
 							{
 								foreach (var models  in item2.qualityModels)
 								{
-									if (models?.sentenceResults.Count > 0)
+									if (models?.sentenceResults?.Count > 0)
 									{
-										foreach (var sentence in models.sentenceResults)
+										for (int i = 0; i < models.sentenceResults.Count; i++)
 										{
-											if (sentence?.index > 0)
-											{
-												var sentenceList = item.trans_data.sentence_list.First(x => x.index == sentence.index);
-												detail.Second = sentenceList.start;
-												detail.EndSecond = sentenceList.end;
-												detail.Content = sentenceList.text;
-												detailsSentence.Add(detail);
-											}
+											var newDetail = new QualityDetail();
+											_mapper.Map(detail,newDetail);
+											var sentenceList = item.trans_data.sentence_list.First(x => x.index == models.sentenceResults[i].index);
+											newDetail.Second = sentenceList.start;
+											newDetail.EndSecond = sentenceList.end == null? 0: sentenceList.end;
+											newDetail.Content = sentenceList.text;
+											detailsSentence.Add(newDetail);
 										}
 									}
 								}
 							}
-							if (item2?.audioAttributes.Count > 0)
+							if (item2?.audioAttributes?.Count > 0)
 							{
 								foreach (var audio in item2.audioAttributes)
 								{
-									if (audio?.sentenceResults.Count > 0)
+									if (audio?.sentenceResults?.Count > 0)
 									{
-										foreach (var sentence in audio.sentenceResults)
-										{
-											var sentenceList = item.trans_data.sentence_list.First(x => x.index == sentence.index);
-											detail.Second = sentenceList.start;
-											detail.EndSecond = sentenceList.end;
-											detail.Content = sentenceList.text;
-											detailsSentence.Add(detail);
+                                        for (int i = 0; i < audio.sentenceResults.Count; i++)
+                                        {
+											var newDetail = new QualityDetail() ;
+											_mapper.Map(detail,newDetail);
+											var sentenceList = item.trans_data.sentence_list.First(x => x.index == audio.sentenceResults[i].index);
+											newDetail.Second = sentenceList.start;
+											newDetail.EndSecond = sentenceList.end == null ? 0 : sentenceList.end;
+											newDetail.Content = sentenceList.text;
+											detailsSentence.Add(newDetail);
 										}
 									}