From 331172c12b97bf69a66006e7ad0546016c6c74a3 Mon Sep 17 00:00:00 2001
From: 10191 <506754232@qq.com>
Date: Tue, 14 May 2024 10:52:21 +0800
Subject: [PATCH] 0514

---
 .../BaseInfo/PerfomanceContent.aspx           |  8 +++---
 .../BaseInfo/PerfomanceContent.aspx.cs        |  4 +--
 .../HSSE/EduTrain/CompanyTraining.aspx        |  4 +--
 .../Controllers/HSSE/TestPlanController.cs    | 27 +++++++++++++++++++
 4 files changed, 34 insertions(+), 9 deletions(-)

diff --git a/SGGL/FineUIPro.Web/BaseInfo/PerfomanceContent.aspx b/SGGL/FineUIPro.Web/BaseInfo/PerfomanceContent.aspx
index 75a33e33..a18f3e19 100644
--- a/SGGL/FineUIPro.Web/BaseInfo/PerfomanceContent.aspx
+++ b/SGGL/FineUIPro.Web/BaseInfo/PerfomanceContent.aspx
@@ -21,11 +21,9 @@
                              <f:DropDownList ID="drpType" runat="server" Label="类别" LabelAlign="Right" AutoPostBack="true"  OnSelectedIndexChanged ="drpType_SelectedIndexChanged"
                                     LabelWidth="80px">
                                     <f:ListItem Value="1" Text="分包方"  Selected="true"/>
-                                    <f:ListItem Value="2" Text="个人" />
-                                    <f:ListItem Value="3" Text="项目管理人员" />
-                            </f:DropDownList> 
-                           
-                             
+                                    <f:ListItem Value="2" Text="项目组管理人员" />
+                                    <f:ListItem Value="3" Text="分包方主要负责人" />
+                            </f:DropDownList>  
                         </Items>
                     </f:Toolbar>
                 </Toolbars>
diff --git a/SGGL/FineUIPro.Web/BaseInfo/PerfomanceContent.aspx.cs b/SGGL/FineUIPro.Web/BaseInfo/PerfomanceContent.aspx.cs
index 5ed89558..b57bee61 100644
--- a/SGGL/FineUIPro.Web/BaseInfo/PerfomanceContent.aspx.cs
+++ b/SGGL/FineUIPro.Web/BaseInfo/PerfomanceContent.aspx.cs
@@ -206,9 +206,9 @@ namespace FineUIPro.Web.BaseInfo
                 case "1":                    
                         return "分包方";                    
                 case "2":                    
-                        return "个人";                     
+                        return "项目组管理人员";                     
                 case "3":                    
-                        return "项目管理人员";                    
+                        return "分包方主要负责人";                    
                 default:
                     return "";
             }
diff --git a/SGGL/FineUIPro.Web/HSSE/EduTrain/CompanyTraining.aspx b/SGGL/FineUIPro.Web/HSSE/EduTrain/CompanyTraining.aspx
index 7296d975..e47296d9 100644
--- a/SGGL/FineUIPro.Web/HSSE/EduTrain/CompanyTraining.aspx
+++ b/SGGL/FineUIPro.Web/HSSE/EduTrain/CompanyTraining.aspx
@@ -124,11 +124,11 @@
     </f:Panel>
     <f:Window ID="Window1" Title="类别" Hidden="true" EnableIFrame="true" EnableMaximize="true"
         Target="Parent" EnableResize="false" runat="server" OnClose="Window1_Close" IsModal="true"
-        Width="600px" Height="400px">
+        Width="700px" Height="600px">
     </f:Window>
     <f:Window ID="Window2" Title="详情" Hidden="true" EnableIFrame="true" EnableMaximize="true"
         Target="Parent" EnableResize="false" runat="server" OnClose="Window2_Close" IsModal="true"
-        Width="600px" Height="400px">
+        Width="700px" Height="600px">
     </f:Window>
     <f:Window ID="WindowAtt" Title="弹出窗体" Hidden="true" EnableIFrame="true" EnableMaximize="true"
         Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="700px"
diff --git a/SGGL/WebAPI/Controllers/HSSE/TestPlanController.cs b/SGGL/WebAPI/Controllers/HSSE/TestPlanController.cs
index f9c9a085..44f81aab 100644
--- a/SGGL/WebAPI/Controllers/HSSE/TestPlanController.cs
+++ b/SGGL/WebAPI/Controllers/HSSE/TestPlanController.cs
@@ -5,6 +5,7 @@ using System.Net;
 using System.Net.Http;
 using System.Web.Http;
 using BLL;
+using Model;
 
 namespace WebAPI.Controllers
 {
@@ -350,6 +351,32 @@ namespace WebAPI.Controllers
                                     responeData.code = 2;
                                     responeData.data = new { testRecordId };
                                 }
+                                else
+                                {
+                                    Training_TestRecord training_TestRecord = new Training_TestRecord();
+                                    training_TestRecord.TestRecordId = Guid.NewGuid().ToString();
+                                    training_TestRecord.ProjectId = projectId;
+                                    training_TestRecord.CompanyTrainingItemId = getCompanyTraining.CompanyTrainingItemId;
+                                    training_TestRecord.TestManId = person.PersonId;
+                                    db.Training_TestRecord.InsertOnSubmit(training_TestRecord);
+                                    db.SubmitChanges();
+                                    string testRecordId = APITestRecordService.CreateTestRecordItem(getCompanyTraining, training_TestRecord.TestRecordId, person, user);
+                                    responeData.code = 2;
+                                    responeData.data = new { testRecordId };
+                                }
+                            }
+                            else
+                            {
+                                Training_TestRecord training_TestRecord =  new Training_TestRecord();
+                                training_TestRecord.TestRecordId = Guid.NewGuid().ToString();
+                                training_TestRecord.ProjectId = projectId;
+                                training_TestRecord.CompanyTrainingItemId= getCompanyTraining.CompanyTrainingItemId;
+                                training_TestRecord.TestManId = user.UserId;
+                                db.Training_TestRecord.InsertOnSubmit(training_TestRecord);
+                                db.SubmitChanges();
+                                string testRecordId = APITestRecordService.CreateTestRecordItem(getCompanyTraining, training_TestRecord.TestRecordId, person, user);
+                                responeData.code = 2;
+                                responeData.data = new { testRecordId };
                             }
                         }
                     }