111

SGGL/BLL/API/HSSE/APITrainingPlanService.cs

@@ -116,8 +116,9 @@ namespace BLL
                                         CompanyTrainingCode = y.CompanyTrainingCode,
                                         CompanyTrainingItemId = x.CompanyTrainingItemId,
                                         CompanyTrainingItemCode = z.CompanyTrainingItemCode,
-                                        CompanyTrainingItemName = z.CompanyTrainingItemName,
-                                    }).ToList();
+										CompanyTrainingItemName = z.CompanyTrainingItemName,
+										LearningTime = z.LearningTime,
+									}).ToList();
                 return getDataLists;
             }
         }

SGGL/BLL/Common/Const.cs

@@ -6047,5 +6047,16 @@ namespace BLL
         /// 项目应急物资管理
         /// </summary>
         public const string ServerEmergencySupplyMenuId = "3EA741CE-66A6-4CF8-8620-0C5906AC7D94";
-    }
+		/// <summary>
+		/// 开工报告
+		/// </summary>
+		public const string PZHGL_StartWorkReportMenuId = "68A54450-557C-4C33-9121-797C15AF1047";
+		/// <summary>
+		/// 施工总平面布置	
+		/// </summary>
+		public const string PZHGL_LayoutMaptMenuId = "F266456A-991F-45A3-BCD6-CF2515D71E39";
+
+
+
+	}
 }

SGGL/BLL/HSSE/EduTrain/CompanyTrainingItemService.cs

@@ -32,8 +32,9 @@ namespace BLL
             newCompanyTrainingItem.CompanyTrainingItemName = companyTrainingItem.CompanyTrainingItemName;
             newCompanyTrainingItem.AttachUrl = companyTrainingItem.AttachUrl;
             newCompanyTrainingItem.CompileMan = companyTrainingItem.CompileMan;
-            newCompanyTrainingItem.CompileDate = companyTrainingItem.CompileDate;
-            db.Training_CompanyTrainingItem.InsertOnSubmit(newCompanyTrainingItem);
+			newCompanyTrainingItem.CompileDate = companyTrainingItem.CompileDate;
+			newCompanyTrainingItem.LearningTime = companyTrainingItem.LearningTime;
+			db.Training_CompanyTrainingItem.InsertOnSubmit(newCompanyTrainingItem);
             db.SubmitChanges();
         }
 
@@ -50,8 +51,9 @@ namespace BLL
                 newCompanyTrainingItem.CompanyTrainingItemName = companyTrainingItem.CompanyTrainingItemName;
                 newCompanyTrainingItem.AttachUrl = companyTrainingItem.AttachUrl;
                 newCompanyTrainingItem.CompileMan = companyTrainingItem.CompileMan;
-                newCompanyTrainingItem.CompileDate = companyTrainingItem.CompileDate;
-                db.SubmitChanges();
+				newCompanyTrainingItem.CompileDate = companyTrainingItem.CompileDate;
+				newCompanyTrainingItem.LearningTime = companyTrainingItem.LearningTime;
+				db.SubmitChanges();
             }
         }
 

SGGL/BLL/HSSE/EduTrain/TrainingItemService.cs

@@ -52,7 +52,8 @@ namespace BLL
                 ResourcesFromType = trainingItem.ResourcesFromType,
                 IsPass = trainingItem.IsPass,
                 UnitId = trainingItem.UnitId,
-                UpState = trainingItem.UpState
+                UpState = trainingItem.UpState,
+				LearningTime=trainingItem.LearningTime
             };
 
             db.Training_TrainingItem.InsertOnSubmit(newTrainingItem);
@@ -79,9 +80,10 @@ namespace BLL
                 newTrainingItem.VersionNum = trainingItem.VersionNum;
                 newTrainingItem.ResourcesFrom = trainingItem.ResourcesFrom;
                 newTrainingItem.ResourcesFromType = trainingItem.ResourcesFromType;
-                newTrainingItem.UpState = trainingItem.UpState;
+				newTrainingItem.UpState = trainingItem.UpState;
+				newTrainingItem.LearningTime = trainingItem.LearningTime;
 
-                db.SubmitChanges();
+				db.SubmitChanges();
             }
         }