From 9942cdcf6fa18f55d1b01f376098c2d3bdbb7276 Mon Sep 17 00:00:00 2001 From: 10191 <506754232@qq.com> Date: Fri, 22 Sep 2023 17:36:00 +0800 Subject: [PATCH] 20230922 --- .../SGGLDB_CD_V2023-09-10-001.sql | 5 + .../SGGLDB_CD_V2023-09-16-001.sql | 10 + SGGL/BLL/API/APIBaseInfoService.cs | 4 +- SGGL/BLL/API/HSSE/APITrainingTaskService.cs | 17 +- SGGL/BLL/Common/PrinterDocService.cs | 15 +- SGGL/BLL/HSSE/EduTrain/TrainingPlanService.cs | 47 +- .../GeneralEquipmentInItemService.cs | 10 +- .../BLL/HSSE/SitePerson/PersonInOutService.cs | 19 +- SGGL/BLL/OpenService/GetDataService.cs | 1 + .../File/Word/HSSE/动火作业票.doc | Bin 46592 -> 46592 bytes SGGL/FineUIPro.Web/FineUIPro.Web.csproj | 1 + .../HSSE/Check/CheckSpecialRecord.aspx | 3 +- .../HSSE/Check/CheckSpecialRecord.aspx.cs | 34 +- .../Check/CheckSpecialRecord.aspx.designer.cs | 582 ++++----- .../FineUIPro.Web/HSSE/EduTrain/PlanEdit.aspx | 21 +- .../HSSE/EduTrain/PlanEdit.aspx.cs | 22 +- .../HSSE/EduTrain/PlanEdit.aspx.designer.cs | 399 +++--- .../HSSE/EduTrain/TestRecord.aspx | 2 +- .../HiddenInspection/RiskAnalysisChart.aspx | 96 +- .../RiskAnalysisChart.aspx.cs | 176 ++- .../RiskAnalysisChart.aspx.designer.cs | 264 ++-- .../InApproveManager/GeneralEquipmentIn.aspx | 3 + .../GeneralEquipmentIn.aspx.cs | 4 +- .../GeneralEquipmentInEdit.aspx | 14 +- .../GeneralEquipmentInItemEdit.aspx | 6 + .../GeneralEquipmentInItemEdit.aspx.cs | 5 +- ...eneralEquipmentInItemEdit.aspx.designer.cs | 237 ++-- .../HSSE/QualityAudit/PersonQuality.aspx | 17 + .../HSSE/QualityAudit/PersonQuality.aspx.cs | 46 +- .../PersonQuality.aspx.designer.cs | 381 +++--- .../HSSE/QualityAudit/SafePersonQuality.aspx | 13 +- .../QualityAudit/SafePersonQuality.aspx.cs | 26 +- .../HSSE/SitePerson/PersonInfo.aspx | 6 + .../HSSE/SitePerson/PersonInfo.aspx.cs | 108 +- .../SitePerson/PersonInfo.aspx.designer.cs | 525 ++++---- .../HSSE/SitePerson/PersonList.aspx.cs | 2 +- .../HSSE/SitePerson/PersonListEdit.aspx | 46 +- .../HSSE/SitePerson/PersonListEdit.aspx.cs | 69 +- .../PersonListEdit.aspx.designer.cs | 1146 ++++++++--------- SGGL/FineUIPro.Web/common/PageBase.cs | 2 +- SGGL/FineUIPro.Web/common/mainMenu_JDGL.aspx | 2 +- SGGL/FineUIPro.Web/index.aspx | 23 +- SGGL/FineUIPro.Web/index.aspx.cs | 12 +- SGGL/FineUIPro.Web/index.aspx.designer.cs | 795 ++++++------ SGGL/FineUIPro.Web/indexProject.aspx | 4 +- SGGL/FineUIPro.Web/res/images/Monitoring.png | Bin 0 -> 613 bytes .../APIItem/HSSE/TrainingTaskItemItem.cs | 10 +- SGGL/Model/Model.cs | 48 + .../HSSE/TrainingTaskController.cs | 4 +- 49 files changed, 2907 insertions(+), 2375 deletions(-) create mode 100644 DataBase/版本日志/SGGLDB_CD_V2023-09-10-001.sql create mode 100644 DataBase/版本日志/SGGLDB_CD_V2023-09-16-001.sql create mode 100644 SGGL/FineUIPro.Web/res/images/Monitoring.png diff --git a/DataBase/版本日志/SGGLDB_CD_V2023-09-10-001.sql b/DataBase/版本日志/SGGLDB_CD_V2023-09-10-001.sql new file mode 100644 index 00000000..8122fc1b --- /dev/null +++ b/DataBase/版本日志/SGGLDB_CD_V2023-09-10-001.sql @@ -0,0 +1,5 @@ +alter TABLE [dbo].[Training_TrainingItem] add + [LearningTime] [int] NULL + + Alter TABLE [dbo].[Training_CompanyTrainingItem] add + [LearningTime] [int] NULL \ No newline at end of file diff --git a/DataBase/版本日志/SGGLDB_CD_V2023-09-16-001.sql b/DataBase/版本日志/SGGLDB_CD_V2023-09-16-001.sql new file mode 100644 index 00000000..152bd7fc --- /dev/null +++ b/DataBase/版本日志/SGGLDB_CD_V2023-09-16-001.sql @@ -0,0 +1,10 @@ +alter TABLE [dbo].[InApproveManager_GeneralEquipmentInItem] add + [SpecialEquipmentName] [nvarchar](50) NULL + + +delete from Sys_Menu + where MenuId='1B08048F-93ED-4E84-AE65-DB7917EA2DFB' + +delete from Sys_Menu + where MenuId='DFB56743-17BA-40BA-82EA-FCB9B0DBFAFF' + \ No newline at end of file diff --git a/SGGL/BLL/API/APIBaseInfoService.cs b/SGGL/BLL/API/APIBaseInfoService.cs index 70a68b70..69ea2ecf 100644 --- a/SGGL/BLL/API/APIBaseInfoService.cs +++ b/SGGL/BLL/API/APIBaseInfoService.cs @@ -491,12 +491,12 @@ namespace BLL var getDataLists = (from x in db.Base_WorkPost where strParam == null || x.WorkPostName.Contains(strParam) orderby x.WorkPostName - select new Model.BaseInfoItem { BaseInfoId = x.WorkPostId.ToUpper(), BaseInfoCode = x.WorkPostCode, BaseInfoName = x.WorkPostName }).ToList(); + select new Model.BaseInfoItem { BaseInfoId = x.WorkPostId , BaseInfoCode = x.WorkPostCode, BaseInfoName = x.WorkPostName }).ToList(); if (!string.IsNullOrEmpty(projectId)) { var user = from u in db.SitePerson_Person where u.ProjectId == projectId - select u.WorkPostId.ToUpper(); + select u.WorkPostId ; var postIds = user.Distinct(); foreach (var item in getDataLists) diff --git a/SGGL/BLL/API/HSSE/APITrainingTaskService.cs b/SGGL/BLL/API/HSSE/APITrainingTaskService.cs index 8d21e345..41709ef3 100644 --- a/SGGL/BLL/API/HSSE/APITrainingTaskService.cs +++ b/SGGL/BLL/API/HSSE/APITrainingTaskService.cs @@ -78,6 +78,10 @@ namespace BLL TaskItemId = x.TaskItemId, TaskId = x.TaskId, PlanId = x.PlanId, + StartTime = x.StartTime, + EndTime =x.EndTime, + LearnTime=x.LearnTime, + VideoProgress = x.VideoProgress, PersonId = x.PersonId, TrainingItemCode = x.TrainingItemCode, TrainingItemName = x.TrainingItemName, @@ -257,7 +261,7 @@ namespace BLL /// /// /// 培训计划人员 - public static Model.Training_TaskItem updateTaskItemLearnTime(string taskItemId,DateTime startTime,DateTime endTime) + public static Model.Training_TaskItem updateTaskItemLearnTime(string taskItemId,DateTime startTime,DateTime endTime,string VideoProgress) { using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) { @@ -270,13 +274,16 @@ namespace BLL item.StartTime = startTime; } - if (!item.LearnTime.HasValue) + //if (!item.LearnTime.HasValue) + //{ + // item.LearnTime = 0; + //} + if (!string.IsNullOrEmpty(VideoProgress)) { - item.LearnTime = 0; + item.VideoProgress = int.Parse(VideoProgress); } - var span = endTime.Subtract(startTime); - item.LearnTime = item.LearnTime.Value + (int)span.TotalMinutes; + //item.LearnTime = item.LearnTime.Value + (int)span.TotalMinutes; item.EndTime = endTime; db.SubmitChanges(); return item; diff --git a/SGGL/BLL/Common/PrinterDocService.cs b/SGGL/BLL/Common/PrinterDocService.cs index 729b2b68..301be333 100644 --- a/SGGL/BLL/Common/PrinterDocService.cs +++ b/SGGL/BLL/Common/PrinterDocService.cs @@ -1500,8 +1500,13 @@ { str += "  D." + item.DItem; - } - sb.AppendFormat("{0} ", str); + } + if (!string.IsNullOrEmpty(item.EItem)) + { + str += "  E." + item.EItem; + + } + sb.AppendFormat("{0} ", str); sb.Append(""); //sb.Append(""); @@ -1544,8 +1549,12 @@ { str += "  D." + item.DItem; } + if (!string.IsNullOrEmpty(item.EItem)) + { + str += "  E." + item.EItem; + } - sb.AppendFormat("{0} ", str); + sb.AppendFormat("{0} ", str); sb.Append(""); //sb.Append(""); //sb.AppendFormat("正确答案：{0} ", item.AnswerItems); diff --git a/SGGL/BLL/HSSE/EduTrain/TrainingPlanService.cs b/SGGL/BLL/HSSE/EduTrain/TrainingPlanService.cs index bcdc4c42..21ca8f2c 100644 --- a/SGGL/BLL/HSSE/EduTrain/TrainingPlanService.cs +++ b/SGGL/BLL/HSSE/EduTrain/TrainingPlanService.cs @@ -1,7 +1,12 @@ -using System; +using FineUIPro; +using Model; +using NPOI.Util; +using System; using System.Collections.Generic; using System.Linq; using System.Text; +using System.Web.Caching; +using System.Web.UI.WebControls; namespace BLL { @@ -30,15 +35,28 @@ namespace BLL { Model.Training_Plan newPlan = new Model.Training_Plan { - PlanId = plan.PlanId, - PlanCode = plan.PlanCode, + PlanId = plan.PlanId, + ProjectId = plan.ProjectId, + PlanCode = plan.PlanCode, PlanName = plan.PlanName, DesignerId = plan.DesignerId, DesignerDate = plan.DesignerDate, - WorkPostId = plan.WorkPostId, - States = plan.States - }; - db.Training_Plan.InsertOnSubmit(newPlan); + WorkPostId = plan.WorkPostId, + TrainContent = plan.TrainContent, + TeachMan = plan.TeachMan, + TeachHour = plan.TeachHour, + TrainStartDate = plan.TrainStartDate, + TrainEndDate = plan.TrainEndDate, + TeachAddress = plan.TeachAddress, + UnitIds = plan.UnitIds, + TrainLevelId = plan.TrainLevelId, + TrainTypeId = plan.TrainTypeId, + Cycle = plan.Cycle, + States = plan.States + }; + + + db.Training_Plan.InsertOnSubmit(newPlan); db.SubmitChanges(); } @@ -57,8 +75,19 @@ namespace BLL newPlan.DesignerDate = plan.DesignerDate; newPlan.WorkPostId = plan.WorkPostId; newPlan.QRCodeUrl = plan.QRCodeUrl; - newPlan.States = plan.States; - Funs.DB.SubmitChanges(); + newPlan.TrainContent = plan.TrainContent; + newPlan.TeachMan = plan.TeachMan; + newPlan.TeachHour = plan.TeachHour; + newPlan.TrainStartDate = plan.TrainStartDate; + newPlan.TrainEndDate = plan.TrainEndDate; + newPlan.TeachAddress = plan.TeachAddress; + newPlan.UnitIds = plan.UnitIds; + newPlan.TrainLevelId = plan.TrainLevelId; + newPlan.TrainTypeId = plan.TrainTypeId; + newPlan.Cycle = plan.Cycle; + newPlan.States = plan.States; + + Funs.DB.SubmitChanges(); } } diff --git a/SGGL/BLL/HSSE/InApproveManager/GeneralEquipmentInItemService.cs b/SGGL/BLL/HSSE/InApproveManager/GeneralEquipmentInItemService.cs index 6a8f7aca..d68c6092 100644 --- a/SGGL/BLL/HSSE/InApproveManager/GeneralEquipmentInItemService.cs +++ b/SGGL/BLL/HSSE/InApproveManager/GeneralEquipmentInItemService.cs @@ -40,8 +40,9 @@ namespace BLL Model.InApproveManager_GeneralEquipmentInItem newEquipmentItem = new Model.InApproveManager_GeneralEquipmentInItem { GeneralEquipmentInItemId = generalEquipmentInItem.GeneralEquipmentInItemId, - GeneralEquipmentInId = generalEquipmentInItem.GeneralEquipmentInId, - SpecialEquipmentId = generalEquipmentInItem.SpecialEquipmentId, + GeneralEquipmentInId = generalEquipmentInItem.GeneralEquipmentInId, + SpecialEquipmentId = generalEquipmentInItem.SpecialEquipmentId, + SpecialEquipmentName = generalEquipmentInItem.SpecialEquipmentName, SizeModel = generalEquipmentInItem.SizeModel, OwnerCheck = generalEquipmentInItem.OwnerCheck, CertificateNum = generalEquipmentInItem.CertificateNum, @@ -63,8 +64,9 @@ namespace BLL { newGeneralEquipmentInItem.GeneralEquipmentInId = generalEquipmentInItem.GeneralEquipmentInId; newGeneralEquipmentInItem.SpecialEquipmentId = generalEquipmentInItem.SpecialEquipmentId; - newGeneralEquipmentInItem.SizeModel = generalEquipmentInItem.SizeModel; - newGeneralEquipmentInItem.OwnerCheck = generalEquipmentInItem.OwnerCheck; + newGeneralEquipmentInItem.SizeModel = generalEquipmentInItem.SizeModel; + newGeneralEquipmentInItem.SpecialEquipmentName = generalEquipmentInItem.SpecialEquipmentName; + newGeneralEquipmentInItem.OwnerCheck = generalEquipmentInItem.OwnerCheck; newGeneralEquipmentInItem.CertificateNum = generalEquipmentInItem.CertificateNum; newGeneralEquipmentInItem.IsUsed = generalEquipmentInItem.IsUsed; db.SubmitChanges(); diff --git a/SGGL/BLL/HSSE/SitePerson/PersonInOutService.cs b/SGGL/BLL/HSSE/SitePerson/PersonInOutService.cs index b1ba6b62..5f5ff0ff 100644 --- a/SGGL/BLL/HSSE/SitePerson/PersonInOutService.cs +++ b/SGGL/BLL/HSSE/SitePerson/PersonInOutService.cs @@ -128,7 +128,9 @@ namespace BLL { using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) { - Model.SitePerson_PersonInOut newPersonInOut = new Model.SitePerson_PersonInOut + + + Model.SitePerson_PersonInOut newPersonInOut = new Model.SitePerson_PersonInOut { PersonInOutId = SQLHelper.GetNewID(), IsIn = personInOut.IsIn ?? true, @@ -141,7 +143,7 @@ namespace BLL Remark = personInOut.Remark, }; - Model.SitePerson_Person getPerson = new Model.SitePerson_Person(); + Model.SitePerson_Person getPerson = new Model.SitePerson_Person(); if (!string.IsNullOrEmpty(personInOut.PersonId)) { getPerson = PersonService.GetPersonById(personInOut.PersonId); @@ -151,9 +153,16 @@ namespace BLL getPerson = PersonService.GetPersonByIdentityCard(personInOut.ProjectId, personInOut.IdentityCard); } if (getPerson != null && !string.IsNullOrEmpty(getPerson.PersonId)) - { - newPersonInOut.ProjectId = getPerson.ProjectId; - newPersonInOut.PersonId = getPerson.PersonId; + { + newPersonInOut.PersonId = getPerson.PersonId; + newPersonInOut.ProjectId = getPerson.ProjectId; + var old = db.SitePerson_PersonInOut.Where(x => x.PersonId == newPersonInOut.PersonId && x.IsIn == newPersonInOut.IsIn && x.ProjectId == newPersonInOut.ProjectId && x.ChangeTime > newPersonInOut.ChangeTime.Value.AddMinutes(-2)).FirstOrDefault(); + if(old != null) + { + return; + } + + newPersonInOut.PersonName = getPerson.PersonName; newPersonInOut.IdentityCard = getPerson.IdentityCard; newPersonInOut.UnitId = getPerson.UnitId; diff --git a/SGGL/BLL/OpenService/GetDataService.cs b/SGGL/BLL/OpenService/GetDataService.cs index 82e5d169..f18016c6 100644 --- a/SGGL/BLL/OpenService/GetDataService.cs +++ b/SGGL/BLL/OpenService/GetDataService.cs @@ -39,6 +39,7 @@ namespace BLL PersonId = item.UserId, TrainingItemCode = dataItem.TrainingItemCode, TrainingItemName = dataItem.TrainingItemName, + LearnTime = dataItem.LearnTime, AttachUrl = dataItem.AttachUrl, }; diff --git a/SGGL/FineUIPro.Web/File/Word/HSSE/动火作业票.doc b/SGGL/FineUIPro.Web/File/Word/HSSE/动火作业票.doc index 774bd6af91143e2569f1dbaee83da0d84c75d1be..b37b288433aed71e68b03ff0ab6a3275abce7284 100644 GIT binary patch delta 3838 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 + diff --git a/SGGL/FineUIPro.Web/HSSE/Check/CheckSpecialRecord.aspx b/SGGL/FineUIPro.Web/HSSE/Check/CheckSpecialRecord.aspx index 340c94d7..a3bf3668 100644 --- a/SGGL/FineUIPro.Web/HSSE/Check/CheckSpecialRecord.aspx +++ b/SGGL/FineUIPro.Web/HSSE/Check/CheckSpecialRecord.aspx @@ -69,8 +69,9 @@ -