From d0d46133a11453b84a3cf0869d3c501f49a0c761 Mon Sep 17 00:00:00 2001
From: xiaju <1784803958@qq.com>
Date: Thu, 23 Oct 2025 17:47:10 +0800
Subject: [PATCH] 1

---
 .../HSSE/EduTrain/TestTrainingItemIn.aspx     |  6 ++++-
 .../HSSE/EduTrain/TestTrainingItemIn.aspx.cs  | 24 ++++++++++---------
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/SGGL/FineUIPro.Web/HSSE/EduTrain/TestTrainingItemIn.aspx b/SGGL/FineUIPro.Web/HSSE/EduTrain/TestTrainingItemIn.aspx
index ddfcee1..8e83207 100644
--- a/SGGL/FineUIPro.Web/HSSE/EduTrain/TestTrainingItemIn.aspx
+++ b/SGGL/FineUIPro.Web/HSSE/EduTrain/TestTrainingItemIn.aspx
@@ -67,7 +67,11 @@
                 </f:FormRow>
                 <f:FormRow>
                     <Items>
-                        <f:Label ID="lblBottom" runat="server" Text="说明：1 导入模板为.xls后缀的EXCEL文件，黑体字为必填项。2 对于导入信息中重复记录自动过滤插入一条记录。3 题型为单选题、多选题、判断题，多岗位时用,隔开。4 适合岗位空时为通用试题。 5 数据导入完成，成功后自动返回，如果有不成功数据页面弹出提示框，列表显示导入成功数据。">
+                        <f:Label ID="lblBottom" runat="server" Text="说明：1、导入模板为.xls后缀的EXCEL文件，黑体字为必填项；
+                            2、对于导入信息中重复记录自动过滤插入一条记录；
+                            3、题型为单选题、多选题、判断题，多岗位时用,隔开，多选答案时用,隔开；
+                            4、适合岗位空时为通用试题；
+                            5、数据导入完成，成功后自动返回，如果有不成功数据页面弹出提示框，列表显示导入成功数据。">
                         </f:Label>
                     </Items>
                 </f:FormRow>
diff --git a/SGGL/FineUIPro.Web/HSSE/EduTrain/TestTrainingItemIn.aspx.cs b/SGGL/FineUIPro.Web/HSSE/EduTrain/TestTrainingItemIn.aspx.cs
index 3031803..175caac 100644
--- a/SGGL/FineUIPro.Web/HSSE/EduTrain/TestTrainingItemIn.aspx.cs
+++ b/SGGL/FineUIPro.Web/HSSE/EduTrain/TestTrainingItemIn.aspx.cs
@@ -172,7 +172,7 @@ namespace FineUIPro.Web.HSSE.EduTrain
                     {
                         TrainingCode = pds.Rows[i][0].ToString().Trim(),
                         TrainingItemCode = pds.Rows[i][2].ToString().Trim(),
-                        Abstracts = pds.Rows[i][5].ToString().Trim(),
+                        //Abstracts = pds.Rows[i][5].ToString().Trim(),
                         AItem = pds.Rows[i][6].ToString().Trim(),
                         BItem = pds.Rows[i][7].ToString().Trim(),
                     };
@@ -301,12 +301,22 @@ namespace FineUIPro.Web.HSSE.EduTrain
                     }
 
                     ////试题内容
-                    if (string.IsNullOrEmpty(newViewTrainingItem.Abstracts))
+                    string abstracts = pds.Rows[i][5].ToString().Trim();
+                    if (string.IsNullOrEmpty(abstracts))
                     {
                         errorInfos.Add(new ErrorInfo { Row = (i + 2).ToString(), Column = "试题内容", Reason = "此项为必填项！" });
                     }
                     else
                     {
+                        if (abstracts.Contains("(") || abstracts.Contains(")")
+                                || abstracts.Contains("（") || abstracts.Contains("）"))
+                        {
+                            newViewTrainingItem.Abstracts = abstracts;
+                        }
+                        else
+                        {
+                            newViewTrainingItem.Abstracts = abstracts + "( )";
+                        }
                         var addTrainingItem = Funs.DB.Training_TestTrainingItem.FirstOrDefault(x => x.Abstracts == newViewTrainingItem.Abstracts
                                                             && x.TrainingId == newViewTrainingItem.TrainingId);
                         if (addTrainingItem == null)
@@ -331,15 +341,7 @@ namespace FineUIPro.Web.HSSE.EduTrain
                                 // Score = newViewTrainingItem.Score,
                                 AnswerItems = newViewTrainingItem.AnswerItems,
                             };
-                            if (newViewTrainingItem.Abstracts.Contains("(") || newViewTrainingItem.Abstracts.Contains(")")
-                                || newViewTrainingItem.Abstracts.Contains("（") || newViewTrainingItem.Abstracts.Contains("）"))
-                            {
-                                newTrainingItem.Abstracts = newViewTrainingItem.Abstracts;
-                            }
-                            else
-                            {
-                                newTrainingItem.Abstracts = newViewTrainingItem.Abstracts + "( )";
-                            }
+                           
 
                             ///加入培训试题库
                             viewTrainingItems.Add(newViewTrainingItem);