From 2e86cea78116a9aff95dcc582f4eeb4c9f0591b9 Mon Sep 17 00:00:00 2001 From: geh <1923421292@qq.com> Date: Fri, 23 Oct 2026 09:39:55 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=89=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../版本日志/SUBQHSE_V2026-10-21-xiaj.sql | 57 +++ ...HSE_V2026-10-21-xiaj（SP_SANKU_DATA_INIT）.sql | 280 +++++++++++ .../SanKu/SanKuDataSummaryReportService.cs | 467 ++++++++---------- SUBQHSE/FineUIPro.Web/FineUIPro.Web.csproj | 70 ++- .../SanKu/DangerousEngineering.aspx | 6 + .../SanKu/DangerousEngineering.aspx.cs | 2 +- SUBQHSE/FineUIPro.Web/SanKu/GridPatrol.aspx | 10 +- .../FineUIPro.Web/SanKu/GridPatrol.aspx.cs | 2 +- SUBQHSE/FineUIPro.Web/SanKu/Hazard.aspx | 3 + SUBQHSE/FineUIPro.Web/SanKu/Hazard.aspx.cs | 2 +- SUBQHSE/FineUIPro.Web/SanKu/VioLation.aspx | 5 +- SUBQHSE/FineUIPro.Web/SanKu/VioLation.aspx.cs | 6 +- SUBQHSE/Model/Model.cs | 144 ++++++ .../Model/SanKu/SankuDangerousEngineering.cs | 2 + SUBQHSE/Model/SanKu/SankuGridPatrol.cs | 2 + SUBQHSE/Model/SanKu/SankuHazard.cs | 1 + SUBQHSE/Model/SanKu/SankuViolation.cs | 1 + 17 files changed, 763 insertions(+), 297 deletions(-) create mode 100644 DataBase/版本日志/SUBQHSE_V2026-10-21-xiaj.sql create mode 100644 DataBase/版本日志/SUBQHSE_V2026-10-21-xiaj（SP_SANKU_DATA_INIT）.sql diff --git a/DataBase/版本日志/SUBQHSE_V2026-10-21-xiaj.sql b/DataBase/版本日志/SUBQHSE_V2026-10-21-xiaj.sql new file mode 100644 index 0000000..3145642 --- /dev/null +++ b/DataBase/版本日志/SUBQHSE_V2026-10-21-xiaj.sql @@ -0,0 +1,57 @@ + +--ΥҵΥ¼ +IF NOT EXISTS (SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'SANKU_VIOLATION' AND COLUMN_NAME = 'VIOLATION_LEVEL') +BEGIN + --Υ¼ + ALTER TABLE SANKU_VIOLATION ADD VIOLATION_LEVEL varchar(20); + EXEC sp_addextendedproperty 'MS_Description', N'Υ¼','SCHEMA', N'dbo','TABLE', N'SANKU_VIOLATION','COLUMN', N'VIOLATION_LEVEL'; +END +GO +--¼ʱ +IF NOT EXISTS (SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'SANKU_HAZARD' AND COLUMN_NAME = 'ECTIFICATION_COMPLETIONDATE') +BEGIN + --ʱ + ALTER TABLE SANKU_HAZARD ADD ECTIFICATION_COMPLETIONDATE datetime; + EXEC sp_addextendedproperty 'MS_Description', N'ʱ','SCHEMA', N'dbo','TABLE', N'SANKU_HAZARD','COLUMN', N'ECTIFICATION_COMPLETIONDATE'; +END +GO +--Σ󹤳̣ȼ״̬ +IF NOT EXISTS (SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'SANKU_DANGEROUS_ENGINEERING' AND COLUMN_NAME = 'ENGINEERING_LEVEL') +BEGIN + --ȼ + ALTER TABLE SANKU_DANGEROUS_ENGINEERING ADD ENGINEERING_LEVEL varchar(20); + EXEC sp_addextendedproperty 'MS_Description', N'ȼ','SCHEMA', N'dbo','TABLE', N'SANKU_DANGEROUS_ENGINEERING','COLUMN', N'ENGINEERING_LEVEL'; + --״̬ + ALTER TABLE SANKU_DANGEROUS_ENGINEERING ADD ENGINEERING_STATE varchar(20); + EXEC sp_addextendedproperty 'MS_Description', N'״̬','SCHEMA', N'dbo','TABLE', N'SANKU_DANGEROUS_ENGINEERING','COLUMN', N'ENGINEERING_STATE'; +END +GO +--Ѳ飺ѲѲ +IF NOT EXISTS (SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'SANKU_GRID_PATROL' AND COLUMN_NAME = 'PATROL_WORKITEMS') +BEGIN + --Ѳ + ALTER TABLE SANKU_GRID_PATROL ADD PATROL_WORKITEMS varchar(200); + EXEC sp_addextendedproperty 'MS_Description', N'Ѳ','SCHEMA', N'dbo','TABLE', N'SANKU_GRID_PATROL','COLUMN', N'PATROL_WORKITEMS'; + --Ѳ + ALTER TABLE SANKU_GRID_PATROL ADD PATROL_RECEIVEDATE datetime; + EXEC sp_addextendedproperty 'MS_Description', N'Ѳ','SCHEMA', N'dbo','TABLE', N'SANKU_GRID_PATROL','COLUMN', N'PATROL_RECEIVEDATE'; +END +GO + +--select* from Sys_Const where GroupId='ViolationPersonHandleStep' + +update Sys_Const set ConstValue=5,SortIndex=5 +where GroupId='ViolationPersonHandleStep' and ConstValue=3 and ConstText='' + + +GO + + +--ʷݴ +TRUNCATE TABLE SANKU_VIOLATION; +TRUNCATE TABLE SANKU_DANGEROUS_ENGINEERING; +TRUNCATE TABLE SANKU_GRID_PATROL; +TRUNCATE TABLE SANKU_HAZARD; + + + diff --git a/DataBase/版本日志/SUBQHSE_V2026-10-21-xiaj（SP_SANKU_DATA_INIT）.sql b/DataBase/版本日志/SUBQHSE_V2026-10-21-xiaj（SP_SANKU_DATA_INIT）.sql new file mode 100644 index 0000000..ec6d6b0 --- /dev/null +++ b/DataBase/版本日志/SUBQHSE_V2026-10-21-xiaj（SP_SANKU_DATA_INIT）.sql @@ -0,0 +1,280 @@ + + +ALTER PROCEDURE [dbo].[SP_SANKU_DATA_INIT] + @type VARCHAR(100) = NULL, + @op TINYINT +AS +BEGIN + SET NOCOUNT ON; + DECLARE @trimType VARCHAR(100) = LTRIM(RTRIM(ISNULL(@type, ''))); + + -- op=0 ߼ + IF @op = 0 + BEGIN + IF @trimType = 'SANKU_ACCIDENT_RECORD' + BEGIN + TRUNCATE TABLE SANKU_ACCIDENT_RECORD; + END + ELSE IF @trimType = 'SANKU_VIOLATION' + BEGIN + TRUNCATE TABLE SANKU_VIOLATION; + END + ELSE IF @trimType = 'SANKU_HAZARD' + BEGIN + TRUNCATE TABLE SANKU_HAZARD; + END + ELSE IF @trimType = 'SANKU_SAFETY_REWARD' + BEGIN + TRUNCATE TABLE SANKU_SAFETY_REWARD; + END + ELSE IF @trimType = 'SANKU_ADMIN_PENALTY' + BEGIN + TRUNCATE TABLE SANKU_ADMIN_PENALTY; + END + ELSE IF @trimType = 'SANKU_TRAINING' + BEGIN + TRUNCATE TABLE SANKU_TRAINING; + END + ELSE IF @trimType = 'SANKU_EXAMINATION' + BEGIN + TRUNCATE TABLE SANKU_EXAMINATION; + END + ELSE IF @trimType = 'SANKU_DANGEROUS_ENGINEERING' + BEGIN + TRUNCATE TABLE SANKU_DANGEROUS_ENGINEERING; + END + ELSE IF @trimType = 'SANKU_GRID_PATROL' + BEGIN + TRUNCATE TABLE SANKU_GRID_PATROL; + END + ELSE IF @trimType = '' -- type null/գȫ + BEGIN + TRUNCATE TABLE SANKU_ACCIDENT_RECORD; + TRUNCATE TABLE SANKU_VIOLATION; + TRUNCATE TABLE SANKU_HAZARD; + TRUNCATE TABLE SANKU_SAFETY_REWARD; + TRUNCATE TABLE SANKU_ADMIN_PENALTY; + TRUNCATE TABLE SANKU_TRAINING; + TRUNCATE TABLE SANKU_EXAMINATION; + TRUNCATE TABLE SANKU_DANGEROUS_ENGINEERING; + TRUNCATE TABLE SANKU_GRID_PATROL; + END + END + + -- op=1 ʼ߼ + IF @op = 1 + BEGIN + + -- typeΪNULL/ַгʼűִУtypeִ֧ + IF @type = 'SANKU_ACCIDENT_RECORD' OR @trimType = '' + BEGIN + --¹¼ݳʼ + INSERT INTO SANKU_ACCIDENT_RECORD(ACCIDENT_ID,PROJECT_CODE,PROJECT_NAME,ACCIDENT_NAME,ACCIDENT_TIME,ACCIDENT_LEVEL,ACCIDENT_TYPE,ACCIDENT_LOCATION,ACCIDENT_DESCRIPTION,DEATH_COUNT,SERIOUS_INJURY_COUNT,MINOR_INJURY_COUNT + ,DIRECT_ECONOMIC_LOSS,INDIRECT_ECONOMIC_LOSS,CONTRACTING_RESPONSIBILITY,SUBCONTRACTOR_ID,SUBCONTRACTOR_CODE,SUBCONTRACTOR_NAME,POSITION_NAME,RESPONSIBILITY_TYPE,RESPONSIBILITY_DESC,PERSONNEL_ID_NUMBER,PERSONNEL_NAME,SUBMITTER_ID_NUMBER,SUBMITTER_NAME,UPDATE_TIME,CREATE_TIME) + SELECT tba.AccidentHandleId,pms.pro_code,pms.pro_name,tba.AccidentHandleName,tba.AccidentDate,tba.AccidentLevel,tba.AccidentType,tba.AccidentLocation,tba.AccidentDef,tba.DeathPersonNum,tba.InjuriesPersonNum,tba.MinorInjuriesPersonNum + ,tba.MoneyLoss,tba.IndirectMoneyLoss,tba.ContractingResponsibility + ,bu.MasterAdOrgCode,bu.CollCropCode,CASE WHEN bu.MasterAdOrgCode IS NULL OR LTRIM(RTRIM(bu.MasterAdOrgCode)) = '' THEN bu.UnitName ELSE bu.MasterAdOrgName END AS UnitName + ,tba.PositionName,tba.ResponsibilityType,tba.ResponsibilityDesc,su.IdentityCard,tba.ResponsibleManName,suc.IdentityCard,suc.UserName,tba.CompileDate,tba.CompileDate + FROM Accident_AccidentHandle AS tba WITH(NOLOCK) + LEFT JOIN Base_Unit AS bu WITH(NOLOCK) ON bu.UnitId = tba.UnitId --AND LEN(bu.CollCropCode)=18 + LEFT JOIN Sys_User AS su WITH(NOLOCK) ON su.UserId = tba.ResponsibleMan + LEFT JOIN Sys_User AS suc WITH(NOLOCK) ON suc.UserId = tba.CompileMan + LEFT JOIN Base_Project AS bp WITH(NOLOCK) ON bp.ProjectId = tba.ProjectId + LEFT JOIN ads_pms_pro_info_build AS pms WITH(NOLOCK) ON pms.pro_id = bp.MasterSysId + WHERE bp.MasterSysId IS NOT NULL AND pms.pro_code IS NOT NULL AND tba.AccidentDate>='2026-01-01' + AND (bu.MasterAdOrgCode IS NOT NULL OR LEN(bu.CollCropCode)=18) AND LEN(suc.IdentityCard)=18 AND LEN(su.IdentityCard)=18 + AND tba.AccidentHandleId NOT IN (SELECT ACCIDENT_ID FROM SANKU_ACCIDENT_RECORD WITH(NOLOCK)); + END + + IF @type = 'SANKU_VIOLATION' OR @trimType = '' + BEGIN + --Υҵݳʼ + INSERT INTO SANKU_VIOLATION(RECORD_ID,PROJECT_CODE,PROJECT_NAME,SUBCONTRACTOR_ID,SUBCONTRACTOR_CODE,SUBCONTRACTOR_NAME,PERSONNEL_ID_NUMBER,PERSONNEL_NAME,VIOLATION_DATE,VIOLATION_LEVEL,VIOLATION_TYPE,VIOLATION_CONTENT,PENALTY_RESULT,RECTIFICATION_STATUS,SUBMITTER_ID_NUMBER,SUBMITTER_NAME,UPDATE_TIME,CREATE_TIME) + SELECT tba.ViolationPersonId,pms.pro_code,pms.pro_name,bu.MasterAdOrgCode,bu.CollCropCode + ,CASE WHEN bu.MasterAdOrgCode IS NULL OR LTRIM(RTRIM(bu.MasterAdOrgCode)) = '' THEN bu.UnitName ELSE bu.MasterAdOrgName END AS UnitName + ,spp.IdentityCard,spp.PersonName,tba.ViolationDate,tba.ViolationLevel + ,CASE tba.ViolationName WHEN '1' THEN vpn.ConstText+'-'+vpty1.ConstText WHEN '2' THEN vpn.ConstText+'-'+vpty2.ConstText ELSE '' END AS ViolationType + ,tba.ViolationDef,vphs.ConstText,tba.RectificationStatus,suc.IdentityCard,suc.UserName,tba.CompileDate,tba.CompileDate + FROM Check_ViolationPerson AS tba WITH(NOLOCK) + LEFT JOIN Base_Unit AS bu WITH(NOLOCK) ON bu.UnitId = tba.UnitId --AND LEN(bu.CollCropCode)=18 + LEFT JOIN Sys_Const AS vpn WITH(NOLOCK) ON vpn.ConstValue = tba.ViolationName AND vpn.GroupId='ViolationName' + LEFT JOIN Sys_Const AS vpty1 WITH(NOLOCK) ON vpty1.ConstValue = tba.ViolationType AND tba.ViolationName='1' AND vpty1.GroupId='ViolationType' + LEFT JOIN Sys_Const AS vpty2 WITH(NOLOCK) ON vpty2.ConstValue = tba.ViolationType AND tba.ViolationName='2' AND vpty2.GroupId='ViolationTypeOther' + LEFT JOIN Sys_Const AS vphs WITH(NOLOCK) ON vphs.ConstValue = tba.HandleStep AND vphs.GroupId='ViolationPersonHandleStep' + LEFT JOIN SitePerson_Person AS spp WITH(NOLOCK) ON spp.PersonId = tba.PersonId AND LEN(spp.IdentityCard)=18 + LEFT JOIN Sys_User AS suc WITH(NOLOCK) ON suc.UserId = tba.CompileMan + LEFT JOIN Base_Project AS bp WITH(NOLOCK) ON bp.ProjectId = tba.ProjectId + LEFT JOIN ads_pms_pro_info_build AS pms WITH(NOLOCK) ON pms.pro_id = bp.MasterSysId + WHERE bp.MasterSysId IS NOT NULL AND pms.pro_code IS NOT NULL AND tba.ViolationDate>='2026-01-01' + AND (bu.MasterAdOrgCode IS NOT NULL OR LEN(bu.CollCropCode)=18) AND LEN(suc.IdentityCard)=18 AND LEN(spp.IdentityCard)=18 + AND tba.ViolationPersonId NOT IN (SELECT RECORD_ID FROM SANKU_VIOLATION WITH(NOLOCK)); + END + + IF @type = 'SANKU_SAFETY_REWARD' OR @trimType = '' + BEGIN + --ȫݳʼ + INSERT INTO SANKU_SAFETY_REWARD(RECORD_ID,PROJECT_CODE,PROJECT_NAME,PERSONNEL_ID_NUMBER,PERSONNEL_NAME,REWARD_DATE,REWARD_UNIT_ID,REWARD_UNIT_CODE,REWARD_UNIT_NAME,REWARD_TYPE,REWARD_CONTENT,REWARD_AMOUNT,REWARD_LEVEL,SUBMITTER_ID_NUMBER,SUBMITTER_NAME) + SELECT tba.RewardAndPunishID,pms.pro_code,pms.pro_name,spp.IdentityCard,spp.PersonName,tba.Date + ,bu.MasterAdOrgCode,bu.CollCropCode,CASE WHEN bu.MasterAdOrgCode IS NULL OR LTRIM(RTRIM(bu.MasterAdOrgCode)) = '' THEN bu.UnitName ELSE bu.MasterAdOrgName END AS UnitName + ,(CASE tba.Type WHEN 1 THEN '' WHEN 2 THEN '' ELSE '' END) AS TYPE,tba.Description + ,(CASE WHEN tba.Type = 1 THEN ABS(tba.Money) WHEN tba.Type = 2 THEN -ABS(tba.Money) ELSE tba.Money END) AS Money + ,(CASE tba.Type + WHEN 1 THEN (SELECT ConstText FROM Sys_Const WHERE GroupId='RewardType' AND ConstValue=tba.RewardAndPunishType) + WHEN 2 THEN (SELECT ConstText FROM Sys_Const WHERE GroupId='PunishType' AND ConstValue=tba.RewardAndPunishType) END) AS TYPE + ,suc.IdentityCard,suc.UserName + FROM Check_RewardAndPunish AS tba WITH(NOLOCK) + LEFT JOIN SitePerson_Person AS spp WITH(NOLOCK) ON spp.PersonId = tba.RewardAndPunishMan --AND LEN(spp.IdentityCard)=18 + LEFT JOIN Base_Unit AS bu WITH(NOLOCK) ON bu.UnitId = tba.ResponseUnit --AND LEN(bu.CollCropCode)=18 + LEFT JOIN Sys_User AS suc WITH(NOLOCK) ON suc.UserId = tba.CreateMan + LEFT JOIN Base_Project AS bp WITH(NOLOCK) ON bp.ProjectId = tba.ProjectId + LEFT JOIN ads_pms_pro_info_build AS pms WITH(NOLOCK) ON pms.pro_id = bp.MasterSysId + WHERE bp.MasterSysId IS NOT NULL AND pms.pro_code IS NOT NULL AND tba.Date>='2026-01-01' AND tba.Type IN (1,2) + AND (bu.MasterAdOrgCode IS NOT NULL OR LEN(bu.CollCropCode)=18) AND LEN(spp.IdentityCard)=18 AND LEN(suc.IdentityCard)=18 + AND tba.RewardAndPunishID NOT IN (SELECT RECORD_ID FROM SANKU_SAFETY_REWARD WITH(NOLOCK)); + END + + IF @type = 'SANKU_SAFETY_REWARD' OR @trimType = '' + BEGIN + --ݳʼ + INSERT INTO SANKU_ADMIN_PENALTY(RECORD_ID,PROJECT_CODE,PROJECT_NAME,SUBCONTRACTOR_ID,SUBCONTRACTOR_CODE,SUBCONTRACTOR_NAME,PENALTY_DATE,PENALTY_TYPE,PENALTY_CONTENT,PENALTY_AMOUNT,PENALTY_AUTHORITY,PENALTY_STATUS,SUBMITTER_ID_NUMBER,SUBMITTER_NAME,UPDATE_TIME,CREATE_TIME) + SELECT tba.PenaltyId,pms.pro_code,pms.pro_name + ,bu.MasterAdOrgCode,bu.CollCropCode,CASE WHEN bu.MasterAdOrgCode IS NULL OR LTRIM(RTRIM(bu.MasterAdOrgCode)) = '' THEN bu.UnitName ELSE bu.MasterAdOrgName END AS UnitName + ,tba.PenaltyDate,tba.PenaltyType,tba.PenaltyContent,tba.PenaltyAmount,tba.PenaltyAuthority,tba.PenaltyStatus + ,suc.IdentityCard,suc.UserName,tba.PenaltyDate,tba.PenaltyDate + FROM Check_AdminPenalty AS tba WITH(NOLOCK) + LEFT JOIN Base_Unit AS bu WITH(NOLOCK) ON bu.UnitId = tba.UnitId --AND LEN(bu.CollCropCode)=18 + LEFT JOIN Sys_User AS suc WITH(NOLOCK) ON suc.UserId = tba.CompileMan + LEFT JOIN Base_Project AS bp WITH(NOLOCK) ON bp.ProjectId = tba.ProjectId + LEFT JOIN ads_pms_pro_info_build AS pms WITH(NOLOCK) ON pms.pro_id = bp.MasterSysId + WHERE bp.MasterSysId IS NOT NULL AND pms.pro_code IS NOT NULL AND tba.PenaltyDate>='2026-01-01' + AND (bu.MasterAdOrgCode IS NOT NULL OR LEN(bu.CollCropCode)=18) AND LEN(suc.IdentityCard)=18 + AND tba.PenaltyId NOT IN (SELECT RECORD_ID FROM SANKU_ADMIN_PENALTY WITH(NOLOCK)); + END + + IF @type = 'SANKU_HAZARD' OR @trimType = '' + BEGIN + --¼ݳʼ + INSERT INTO SANKU_HAZARD(RECORD_ID,PROJECT_CODE,PROJECT_NAME,SUBCONTRACTOR_ID,SUBCONTRACTOR_CODE,SUBCONTRACTOR_NAME,RESPONSIBLE_PERSONNEL_ID_NUMBER,RESPONSIBLE_PERSONNEL_NAME,RECTIFIER_PERSONNEL_ID_NUMBER,RECTIFIER_PERSONNEL_NAME + ,DISCOVERY_DATE,HAZARD_TYPE,HAZARD_LEVEL,HAZARD_CONTENT,RECTIFICATION_STATUS,ECTIFICATION_COMPLETIONDATE,RECTIFICATION_DEADLINE_ID,SUBMITTER_ID_NUMBER,SUBMITTER_NAME,UPDATE_TIME,CREATE_TIME) + SELECT tba.RectifyNoticesItemId,pms.pro_code,pms.pro_name + ,bu.MasterAdOrgCode,bu.CollCropCode,CASE WHEN bu.MasterAdOrgCode IS NULL OR LTRIM(RTRIM(bu.MasterAdOrgCode)) = '' THEN bu.UnitName ELSE bu.MasterAdOrgName END AS UnitName + ,suzg.IdentityCard,suzg.UserName,suzg.IdentityCard,suzg.UserName,tbb.CheckedDate,rectify.RectifyName + ,(CASE tbb.HiddenHazardType WHEN 1 THEN 'һ' WHEN 2 THEN 'ϴ' WHEN 3 THEN 'ش' ELSE 'һ' END) AS TYPE,tba.WrongContent + ,(CASE WHEN tbb.States = 2 THEN 'δ' WHEN tbb.States = 3 THEN '' WHEN States = 4 THEN '' WHEN States = 5 THEN '' ELSE 'δ' END) AS StatesName + ,tbb.CompleteDate,tba.LimitTime,suc.IdentityCard,suc.UserName,tbb.CheckedDate,tbb.CheckedDate + FROM Check_RectifyNoticesItem AS tba WITH(NOLOCK) + LEFT JOIN Check_RectifyNotices AS tbb WITH(NOLOCK) ON tbb.RectifyNoticesId = tba.RectifyNoticesId + --LEFT JOIN Check_RectifyNoticesFlowOperate AS tbc WITH(NOLOCK) ON tbc.RectifyNoticesId = tba.RectifyNoticesId + LEFT JOIN Base_Unit AS bu WITH(NOLOCK) ON bu.UnitId = tbb.UnitId --AND LEN(bu.CollCropCode)=18 + LEFT JOIN Sys_User AS suzg WITH(NOLOCK) ON suzg.UserId = tbb.DutyPersonId + LEFT JOIN Sys_User AS suc WITH(NOLOCK) ON suc.UserId = tbb.CompleteManId + LEFT JOIN Base_Project AS bp WITH(NOLOCK) ON bp.ProjectId = tbb.ProjectId + LEFT JOIN ads_pms_pro_info_build AS pms WITH(NOLOCK) ON pms.pro_id = bp.MasterSysId + LEFT JOIN Technique_Rectify AS rectify WITH(NOLOCK) ON tba.RectifyId = rectify.RectifyId + WHERE bp.MasterSysId IS NOT NULL AND pms.pro_code IS NOT NULL AND tbb.CheckedDate>='2026-01-01' AND tbb.States > 1 + AND (bu.MasterAdOrgCode IS NOT NULL OR LEN(bu.CollCropCode)=18) AND LEN(suc.IdentityCard)=18 AND LEN(suzg.IdentityCard)=18 AND rectify.RectifyName IS NOT NULL + AND tba.RectifyNoticesItemId NOT IN (SELECT RECORD_ID FROM SANKU_HAZARD WITH(NOLOCK)); + END + + IF @type = 'SANKU_TRAINING' OR @trimType = '' + BEGIN + --ѵݳʼ + INSERT INTO SANKU_TRAINING(RECORD_ID,PROJECT_CODE,PROJECT_NAME,SUBCONTRACTOR_ID,SUBCONTRACTOR_CODE,SUBCONTRACTOR_NAME,PERSONNEL_ID_NUMBER,PERSONNEL_NAME,TRAINING_DATE,TRAINING_NAME,TRAINING_TYPE,TRAINING_DURATION,TRAINING_ORGANIZER,TRAINING_CONTENT,TRAINING_RESULT,SUBMITTER_ID_NUMBER,SUBMITTER_NAME,UPDATE_TIME,CREATE_TIME) + SELECT tba.TrainDetailId,pms.pro_code,pms.pro_name + ,spu.MasterAdOrgCode,spu.CollCropCode,CASE WHEN spu.MasterAdOrgCode IS NULL OR LTRIM(RTRIM(spu.MasterAdOrgCode)) = '' THEN spu.UnitName ELSE spu.MasterAdOrgName END AS UnitName + ,spp.IdentityCard,spp.PersonName,tbb.TrainStartDate + ,(CASE WHEN ISNULL(tbb.TrainTitle,'')='' THEN bty.TrainTypeName ELSE tbb.TrainTitle END) AS TrainName + ,bty.TrainTypeName,tbb.TeachHour,bu.UnitName + ,(CASE WHEN ISNULL(tbb.TrainContent,'')='' THEN bty.TrainTypeName ELSE tbb.TrainContent END) AS TrainContent + ,(CASE WHEN tba.CheckResult = 1 THEN 'ͨ' WHEN tba.CheckResult = 0 THEN 'δͨ' ELSE 'ȱ' END) AS CheckResult + ,suc.IdentityCard,suc.UserName,tbb.TrainStartDate,tbb.TrainStartDate + FROM EduTrain_TrainRecordDetail AS tba WITH(NOLOCK) + LEFT JOIN EduTrain_TrainRecord AS tbb WITH(NOLOCK) ON tbb.TrainingId = tba.TrainingId + LEFT JOIN Base_Unit AS bu WITH(NOLOCK) ON bu.UnitId = tbb.UnitIds --AND LEN(bu.CollCropCode)=18 + LEFT JOIN SitePerson_Person AS spp WITH(NOLOCK) ON spp.PersonId = tba.PersonId + LEFT JOIN Base_Unit AS spu WITH(NOLOCK) ON spu.UnitId = spp.UnitId --AND LEN(spu.CollCropCode)=18 + LEFT JOIN Base_TrainType AS bty WITH(NOLOCK) ON bty.TrainTypeId = tbb.TrainTypeId + LEFT JOIN Sys_User AS suc WITH(NOLOCK) ON suc.UserId = tbb.CompileMan + LEFT JOIN Base_Project AS bp WITH(NOLOCK) ON bp.ProjectId = tbb.ProjectId + LEFT JOIN ads_pms_pro_info_build AS pms WITH(NOLOCK) ON pms.pro_id = bp.MasterSysId + WHERE tbb.TrainStartDate>='2026-01-01' AND LEN(suc.IdentityCard)=18 AND LEN(spp.IdentityCard)=18 + AND (spu.MasterAdOrgCode IS NOT NULL OR LEN(spu.CollCropCode)=18) AND bp.MasterSysId IS NOT NULL AND pms.pro_code IS NOT NULL + AND tba.TrainDetailId NOT IN (SELECT RECORD_ID FROM SANKU_TRAINING WITH(NOLOCK)); + END + + IF @type = 'SANKU_EXAMINATION' OR @trimType = '' + BEGIN + --Կݳʼ + INSERT INTO SANKU_EXAMINATION(RECORD_ID,PROJECT_CODE,PROJECT_NAME,SUBCONTRACTOR_ID,SUBCONTRACTOR_CODE,SUBCONTRACTOR_NAME,PERSONNEL_ID_NUMBER,PERSONNEL_NAME,EXAM_DATE,EXAM_NAME,EXAM_TYPE,EXAM_SCORE,EXAM_RESULT,EXAM_ORGANIZER,SUBMITTER_ID_NUMBER,SUBMITTER_NAME,UPDATE_TIME,CREATE_TIME) + SELECT tba.TestRecordId,pms.pro_code,pms.pro_name + ,bu.MasterAdOrgCode,bu.CollCropCode,CASE WHEN bu.MasterAdOrgCode IS NULL OR LTRIM(RTRIM(bu.MasterAdOrgCode)) = '' THEN bu.UnitName ELSE bu.MasterAdOrgName END AS UnitName + ,spp.IdentityCard,spp.PersonName,tbb.TestEndTime,tbb.PlanName,'ۿ',tba.TestScores + ,(CASE WHEN tba.TestScores = 0 THEN 'ȱ' WHEN tba.TestScores >=80 THEN 'ͨ' WHEN tba.TestScores < 80 THEN 'δͨ' ELSE 'ȱ' END) AS CheckResult,tbb.UnitNames + ,suc.IdentityCard,suc.UserName,tbb.TestEndTime,tbb.TestEndTime + FROM Training_TestRecord AS tba WITH(NOLOCK) + LEFT JOIN Training_TestPlan AS tbb WITH(NOLOCK) ON tbb.TestPlanId = tba.TestPlanId + LEFT JOIN SitePerson_Person AS spp WITH(NOLOCK) ON spp.PersonId = tba.TestManId + LEFT JOIN Base_Unit AS bu WITH(NOLOCK) ON bu.UnitId = spp.UnitId --AND LEN(bu.CollCropCode)=18 + LEFT JOIN Sys_User AS suc WITH(NOLOCK) ON suc.UserId = tbb.PlanManId + LEFT JOIN Base_Project AS bp WITH(NOLOCK) ON bp.ProjectId = tbb.ProjectId + LEFT JOIN ads_pms_pro_info_build AS pms WITH(NOLOCK) ON pms.pro_id = bp.MasterSysId + WHERE tbb.TestEndTime>='2026-01-01' AND LEN(suc.IdentityCard)=18 AND LEN(spp.IdentityCard)=18 + AND (bu.MasterAdOrgCode IS NOT NULL OR LEN(bu.CollCropCode)=18) AND bp.MasterSysId IS NOT NULL AND pms.pro_code IS NOT NULL + AND tba.TestRecordId NOT IN (SELECT RECORD_ID FROM SANKU_EXAMINATION WITH(NOLOCK)); + END + + IF @type = 'SANKU_DANGEROUS_ENGINEERING' OR @trimType = '' + BEGIN + --Σ󹤳ݳʼ + INSERT INTO SANKU_DANGEROUS_ENGINEERING(RECORD_ID,PROJECT_CODE,PROJECT_NAME,SUBCONTRACTOR_ID,SUBCONTRACTOR_CODE,SUBCONTRACTOR_NAME,ENGINEERING_DATE,ENGINEERING_NAME,ENGINEERING_TYPE,ENGINEERING_LEVEL,ENGINEERING_STATE,ENGINEERING_ADDRESS,ENGINEERING_DESC,STANDBY_PERSONNEL_ID_NUMBER,STANDBY_PERSONNEL_NAME,SUBMITTER_ID_NUMBER,SUBMITTER_NAME,UPDATE_TIME,CREATE_TIME) + SELECT tba.HazardId,pms.pro_code,pms.pro_name,bu.MasterAdOrgCode,bu.CollCropCode + ,CASE WHEN bu.MasterAdOrgCode IS NULL OR LTRIM(RTRIM(bu.MasterAdOrgCode)) = '' THEN bu.UnitName ELSE bu.MasterAdOrgName END AS UnitName + ,ISNULL(tba.ExpectedTime,GETDATE()) AS ExpectedTime,tba.HazardName,sc.ConstText + ,(CASE tba.IsSuperLargerHazard WHEN 1 THEN 'ģΣ' WHEN 0 THEN 'ͨΣ' ELSE 'ͨΣ' END) AS Level + ,(CASE tba.States WHEN 1 THEN 'ʩ׼' WHEN 2 THEN 'ʩ' WHEN 3 THEN '' ELSE 'ʩ' END) AS State + ,tba.Address,tba.Descriptions,spp.IdentityCard,spp.PersonName,suc.IdentityCard,suc.UserName,tba.RecordTime,tba.RecordTime + FROM Solution_LargerHazard AS tba WITH(NOLOCK) + LEFT JOIN Base_Unit AS bu WITH(NOLOCK) ON bu.UnitId = tba.UnitId --AND LEN(bu.CollCropCode)=18 + LEFT JOIN SitePerson_Person AS spp WITH(NOLOCK) ON spp.PersonId = tba.StandbyPersonnelId + LEFT JOIN Sys_Const AS sc WITH(NOLOCK) ON sc.GroupId='LargerHazardType' AND sc.ConstValue= tba.HazardType + LEFT JOIN Sys_User AS suc WITH(NOLOCK) ON suc.UserId = tba.RecardMan + LEFT JOIN Base_Project AS bp WITH(NOLOCK) ON bp.ProjectId = tba.ProjectId + LEFT JOIN ads_pms_pro_info_build AS pms WITH(NOLOCK) ON pms.pro_id = bp.MasterSysId + WHERE tba.RecordTime>='2026-01-01' AND LEN(suc.IdentityCard)=18 AND LEN(spp.IdentityCard)=18 + AND (bu.MasterAdOrgCode IS NOT NULL OR LEN(bu.CollCropCode)=18) AND bp.MasterSysId IS NOT NULL AND pms.pro_code IS NOT NULL + AND tba.HazardId NOT IN (SELECT RECORD_ID FROM SANKU_DANGEROUS_ENGINEERING WITH(NOLOCK)); + END + + IF @type = 'SANKU_GRID_PATROL' OR @trimType = '' + BEGIN + --Ѳ¼ݳʼ + WITH temp_data AS ( + SELECT + tba.HazardRegisterId,pms.pro_code,pms.pro_name,bu.MasterAdOrgCode,bu.CollCropCode + ,CASE WHEN bu.MasterAdOrgCode IS NULL OR LTRIM(RTRIM(bu.MasterAdOrgCode)) = '' THEN bu.UnitName ELSE bu.MasterAdOrgName END AS UnitName + ,suzg.IdentityCard AS pNumber,suzg.UserName AS pUser,ISNULL(wbsu.UnitWorkName,'') AS ItemName,DATEADD(DAY,-1,tba.CheckTime) AS ReceiveDate,tba.CheckTime,'' AS StatusStr,suzg.IdentityCard,suzg.UserName,tba.CheckTime AS UpdateTime,tba.CheckTime AS CreateTime, + ROW_NUMBER() OVER ( + PARTITION BY tba.CheckManId, CAST(tba.CheckTime AS DATE) + ORDER BY tba.CheckTime ASC + ) AS rn + FROM HSSE_Hazard_HazardRegister AS tba WITH(NOLOCK) + LEFT JOIN Base_Project AS bp WITH(NOLOCK) ON bp.ProjectId = tba.ProjectId + LEFT JOIN ads_pms_pro_info_build AS pms WITH(NOLOCK) ON pms.pro_id = bp.MasterSysId + LEFT JOIN WBS_UnitWork AS wbsu WITH(NOLOCK) ON wbsu.UnitWorkId = tba.Place + LEFT JOIN Sys_User AS suzg WITH(NOLOCK) ON suzg.UserId = tba.CheckManId + LEFT JOIN Base_Unit AS bu WITH(NOLOCK) ON bu.UnitId = suzg.UnitId --AND LEN(bu.CollCropCode)=18 + WHERE bp.MasterSysId IS NOT NULL AND pms.pro_code IS NOT NULL AND tba.CheckTime>='2026-01-01' + AND (bu.MasterAdOrgCode IS NOT NULL OR LEN(bu.CollCropCode)=18) AND LEN(suzg.IdentityCard)=18 + ) + --Ѳ¼ݳʼ + INSERT INTO SANKU_GRID_PATROL(RECORD_ID,PROJECT_CODE,PROJECT_NAME,SUBCONTRACTOR_ID,SUBCONTRACTOR_CODE,SUBCONTRACTOR_NAME,PERSONNEL_ID_NUMBER,PERSONNEL_NAME,PATROL_WORKITEMS,PATROL_RECEIVEDATE,PATROL_TIME,PATROL_STATUS,SUBMITTER_ID_NUMBER,SUBMITTER_NAME,UPDATE_TIME,CREATE_TIME) + SELECT HazardRegisterId,pro_code,pro_name,MasterAdOrgCode,CollCropCode,UnitName,pNumber,pUser,'Ѳ쵥λ̣'+ItemName,DATEADD(DAY,-1,CheckTime),CheckTime,StatusStr,IdentityCard,UserName,UpdateTime,CreateTime + FROM temp_data + WHERE rn = 1 AND HazardRegisterId NOT IN (SELECT RECORD_ID FROM SANKU_GRID_PATROL WITH(NOLOCK)); + END + + END +END +GO + + diff --git a/SUBQHSE/BLL/SanKu/SanKuDataSummaryReportService.cs b/SUBQHSE/BLL/SanKu/SanKuDataSummaryReportService.cs index 043863a..8ef3fca 100644 --- a/SUBQHSE/BLL/SanKu/SanKuDataSummaryReportService.cs +++ b/SUBQHSE/BLL/SanKu/SanKuDataSummaryReportService.cs @@ -243,7 +243,8 @@ namespace BLL PERSONNEL_ID_NUMBER = spp.IdentityCard, PERSONNEL_NAME = spp.PersonName, VIOLATION_DATE = (DateTime)tba.ViolationDate, - VIOLATION_TYPE = tba.ViolationLevel, + VIOLATION_LEVEL = tba.ViolationLevel, + VIOLATION_TYPE = ViolatioType(tba.ViolationName, tba.ViolationType), VIOLATION_CONTENT = tba.ViolationDef, PENALTY_RESULT = tba.RectificationStatus, RECTIFICATION_STATUS = ViolatioResult(tba.HandleStep), @@ -295,6 +296,7 @@ namespace BLL exist.PERSONNEL_ID_NUMBER = model.PERSONNEL_ID_NUMBER; exist.PERSONNEL_NAME = model.PERSONNEL_NAME; exist.VIOLATION_DATE = model.VIOLATION_DATE; + exist.VIOLATION_LEVEL = model.VIOLATION_LEVEL; exist.VIOLATION_TYPE = model.VIOLATION_TYPE; exist.VIOLATION_CONTENT = model.VIOLATION_CONTENT; exist.PENALTY_RESULT = model.PENALTY_RESULT; @@ -319,6 +321,7 @@ namespace BLL newModel.PERSONNEL_ID_NUMBER = model.PERSONNEL_ID_NUMBER; newModel.PERSONNEL_NAME = model.PERSONNEL_NAME; newModel.VIOLATION_DATE = model.VIOLATION_DATE; + newModel.VIOLATION_LEVEL = model.VIOLATION_LEVEL; newModel.VIOLATION_TYPE = model.VIOLATION_TYPE; newModel.VIOLATION_CONTENT = model.VIOLATION_CONTENT; newModel.PENALTY_RESULT = model.PENALTY_RESULT; @@ -338,6 +341,29 @@ namespace BLL } } + /// + /// 违章作业类型 + /// + /// + public static string ViolatioType(string name, string type) + { + string result = string.Empty; + var constObj = new Sys_Const(); + if (name == "1") + { + constObj = BLL.ConstValue.GetConstByConstValueAndGroupId(type, BLL.ConstValue.Group_ViolationType); + } + else if (name == "2") + { + constObj = BLL.ConstValue.GetConstByConstValueAndGroupId(type, BLL.ConstValue.Group_ViolationTypeOther); + } + if (constObj != null) + { + result = constObj.ConstText; + } + return result; + } + /// /// 违章作业处理结果 /// @@ -662,290 +688,152 @@ namespace BLL #region 隐患记录 - ///// - ///// 更新隐患记录数据 - ///// - ///// 隐患整改单id - ///// - ///// - //public static string UpdateHazardRecord(string noticeId, ref string message) - //{ - // string result = string.Empty; - // using (Model.SUBQHSEDB db = new Model.SUBQHSEDB(Funs.ConnString)) - // { - // List errMsgs = new List(); - // var list = db.Check_RectifyNoticesItem.Where(x => x.RectifyNoticesId == noticeId).ToList(); - // if (list.Any()) - // { - // foreach (var obj in list) - // { - // int err = 0; - // var models = from tba in db.Check_RectifyNoticesItem - // join tbb in db.Check_RectifyNotices on tba.RectifyNoticesId equals tbb.RectifyNoticesId - // join bu in db.Base_Unit on tbb.UnitId equals bu.UnitId - // join suzg in db.Sys_User on tbb.DutyPersonId equals suzg.UserId - // join suc in db.Sys_User on tbb.CompleteManId equals suc.UserId - // join bp in db.Base_Project on tbb.ProjectId equals bp.ProjectId - // join pms in db.Ads_pms_pro_info_build on bp.MasterSysId equals pms.Pro_id - // where tba.RectifyNoticesItemId == obj.RectifyNoticesItemId - // select new SankuHazard - // { - // RECORD_ID = tba.RectifyNoticesItemId, - // //PROJECT_CODE = pms.Pro_code.ToString(), - // PROJECT_CODE = pms.Pro_code, - // PROJECT_NAME = pms.Pro_name, - // SUBCONTRACTOR_ID = bu.MasterAdOrgCode, - // SUBCONTRACTOR_CODE = bu.CollCropCode, - // SUBCONTRACTOR_NAME = bu.UnitName, - // RESPONSIBLE_PERSONNEL_ID_NUMBER = suzg.IdentityCard, - // RESPONSIBLE_PERSONNEL_NAME = suzg.UserName, - // RECTIFIER_PERSONNEL_ID_NUMBER = suzg.IdentityCard, - // RECTIFIER_PERSONNEL_NAME = suzg.UserName, - // DISCOVERY_DATE = tbb.CheckedDate == null ? DateTime.Now : (DateTime)tbb.CheckedDate, - // HAZARD_TYPE = HazardType(tba.RectifyId), - // HAZARD_LEVEL = HazardLevel(tbb.HiddenHazardType), - // HAZARD_CONTENT = tba.WrongContent, - // RECTIFICATION_STATUS = HazardState(tbb.States), - // RECTIFICATION_DEADLINE_ID = tba.LimitTime == null ? DateTime.Now.AddDays(7) : (DateTime)tba.LimitTime, - // SUBMITTER_ID_NUMBER = suc.IdentityCard, - // SUBMITTER_NAME = suc.UserName, - // //UPDATE_TIME = (DateTime)tba.CompileDate, - // //CREATE_TIME = (DateTime)tba.CompileDate - // }; - // var model = models.ToList().FirstOrDefault(); - // if (model != null) - // { - // if (string.IsNullOrWhiteSpace(model.PROJECT_CODE)) - // { - // err++; - // errMsgs.Add("项目未关联集团主数据"); - // } - // if (string.IsNullOrWhiteSpace(model.SUBCONTRACTOR_ID) && string.IsNullOrWhiteSpace(model.SUBCONTRACTOR_CODE)) - // { - // err++; - // errMsgs.Add("受检单位单位未关联主数据组织且统一社会信用代码为空"); - // } - // else if (string.IsNullOrWhiteSpace(model.SUBCONTRACTOR_ID) && !string.IsNullOrWhiteSpace(model.SUBCONTRACTOR_CODE) && model.SUBCONTRACTOR_CODE.Length != 18) - // { - // err++; - // errMsgs.Add("受检单位单位未关联主数据组织且统一社会信用代码异常"); - // } - // //if (!string.IsNullOrWhiteSpace(model.SUBMITTER_ID_NUMBER) && model.SUBMITTER_ID_NUMBER.Length != 18) - // //{ - // // errMsgs.Add("填报人身份证异常"); - // //} - // if (err > 0) - // { - // continue; - // } - // else - // { - // var exist = db.SANKU_HAZARD.Where(x => x.RECORD_ID == model.RECORD_ID).FirstOrDefault(); - // if (exist != null) - // { - // //更新三库 - // exist.RECORD_ID = model.RECORD_ID; - // exist.PROJECT_CODE = model.PROJECT_CODE; - // exist.PROJECT_NAME = model.PROJECT_NAME; - // exist.SUBCONTRACTOR_ID = model.SUBCONTRACTOR_ID; - // exist.SUBCONTRACTOR_CODE = model.SUBCONTRACTOR_CODE; - // exist.SUBCONTRACTOR_NAME = model.SUBCONTRACTOR_NAME; - // exist.RESPONSIBLE_PERSONNEL_ID_NUMBER = model.RESPONSIBLE_PERSONNEL_ID_NUMBER; - // exist.RESPONSIBLE_PERSONNEL_NAME = model.RESPONSIBLE_PERSONNEL_NAME; - // exist.RECTIFIER_PERSONNEL_ID_NUMBER = model.RECTIFIER_PERSONNEL_ID_NUMBER; - // exist.RECTIFIER_PERSONNEL_NAME = model.RECTIFIER_PERSONNEL_NAME; - // exist.DISCOVERY_DATE = model.DISCOVERY_DATE; - // exist.HAZARD_TYPE = model.HAZARD_TYPE; - // exist.HAZARD_LEVEL = model.HAZARD_LEVEL; - // exist.HAZARD_CONTENT = model.HAZARD_CONTENT; - // exist.RECTIFICATION_STATUS = model.RECTIFICATION_STATUS; - // exist.RECTIFICATION_DEADLINE_ID = model.RECTIFICATION_DEADLINE_ID; - // exist.SUBMITTER_ID_NUMBER = model.SUBMITTER_ID_NUMBER; - // exist.SUBMITTER_NAME = model.SUBMITTER_NAME; - // exist.UPDATE_TIME = DateTime.Now; - // //exist.UPDATE_TIME = model.UPDATE_TIME; - // //exist.CREATE_TIME = model.CREATE_TIME; - // exist.ReportDate = null; - // } - // else - // { - // //新增三库 - // var newModel = new SANKU_HAZARD(); - // newModel.RECORD_ID = model.RECORD_ID; - // newModel.PROJECT_CODE = model.PROJECT_CODE; - // newModel.PROJECT_NAME = model.PROJECT_NAME; - // newModel.SUBCONTRACTOR_ID = model.SUBCONTRACTOR_ID; - // newModel.SUBCONTRACTOR_CODE = model.SUBCONTRACTOR_CODE; - // newModel.SUBCONTRACTOR_NAME = model.SUBCONTRACTOR_NAME; - // newModel.PROJECT_NAME = model.PROJECT_NAME; - // newModel.RESPONSIBLE_PERSONNEL_ID_NUMBER = model.RESPONSIBLE_PERSONNEL_ID_NUMBER; - // newModel.RESPONSIBLE_PERSONNEL_NAME = model.RESPONSIBLE_PERSONNEL_NAME; - // newModel.RECTIFIER_PERSONNEL_ID_NUMBER = model.RECTIFIER_PERSONNEL_ID_NUMBER; - // newModel.RECTIFIER_PERSONNEL_NAME = model.RECTIFIER_PERSONNEL_NAME; - // newModel.DISCOVERY_DATE = model.DISCOVERY_DATE; - // newModel.HAZARD_TYPE = model.HAZARD_TYPE; - // newModel.HAZARD_LEVEL = model.HAZARD_LEVEL; - // newModel.HAZARD_CONTENT = model.HAZARD_CONTENT; - // newModel.RECTIFICATION_STATUS = model.RECTIFICATION_STATUS; - // newModel.RECTIFICATION_DEADLINE_ID = model.RECTIFICATION_DEADLINE_ID; - // newModel.SUBMITTER_ID_NUMBER = model.SUBMITTER_ID_NUMBER; - // newModel.SUBMITTER_NAME = model.SUBMITTER_NAME; - // newModel.UPDATE_TIME = DateTime.Now; - // //newModel.UPDATE_TIME = model.UPDATE_TIME; - // newModel.CREATE_TIME = DateTime.Now; - // db.SANKU_HAZARD.InsertOnSubmit(newModel); - // } - // db.SubmitChanges(); - // } - // } - // } - - // errMsgs = errMsgs.Distinct().ToList(); - // if (errMsgs.Any()) - // { - // message = $"部分无法更新三库，数据异常：{string.Join(",", errMsgs)}"; - // } - // } - // //else - // //{ - // // message = $"不更新三库，整改单无隐患明细"; - // //} - // return result; - // } - //} - /// /// 更新隐患记录数据 /// - /// 隐患id + /// 隐患整改单id /// /// - public static string UpdateHazardRecord(string hazardId, ref string message) + public static string UpdateHazardRecord(string noticeId, ref string message) { string result = string.Empty; using (Model.SUBQHSEDB db = new Model.SUBQHSEDB(Funs.ConnString)) { - var models = from tba in db.HSSE_Hazard_HazardRegister - join bu in db.Base_Unit on tba.ResponsibleUnit equals bu.UnitId - join regType in db.HSSE_Hazard_HazardRegisterTypes on tba.RegisterTypesId equals regType.RegisterTypesId - join suzg in db.Sys_User on tba.ResponsibleMan equals suzg.UserId - join suc in db.Sys_User on tba.CheckManId equals suc.UserId - join bp in db.Base_Project on tba.ProjectId equals bp.ProjectId - join pms in db.Ads_pms_pro_info_build on bp.MasterSysId equals pms.Pro_id - where tba.HazardRegisterId == hazardId - select new SankuHazard - { - RECORD_ID = tba.HazardRegisterId, - //PROJECT_CODE = pms.Pro_code.ToString(), - PROJECT_CODE = pms.Pro_code, - PROJECT_NAME = pms.Pro_name, - SUBCONTRACTOR_ID = bu.MasterAdOrgCode, - SUBCONTRACTOR_CODE = bu.CollCropCode, - SUBCONTRACTOR_NAME = bu.UnitName, - RESPONSIBLE_PERSONNEL_ID_NUMBER = suzg.IdentityCard, - RESPONSIBLE_PERSONNEL_NAME = suzg.UserName, - RECTIFIER_PERSONNEL_ID_NUMBER = suzg.IdentityCard, - RECTIFIER_PERSONNEL_NAME = suzg.UserName, - DISCOVERY_DATE = tba.CheckTime == null ? DateTime.Now : (DateTime)tba.CheckTime, - HAZARD_TYPE = regType.RegisterTypesName, - HAZARD_LEVEL = HazardLevel(tba.Risk_Level), - HAZARD_CONTENT = tba.RegisterDef, - RECTIFICATION_STATUS = HazardState(tba.States), - RECTIFICATION_DEADLINE_ID = tba.RectificationPeriod == null ? DateTime.Now.AddDays(7) : (DateTime)tba.RectificationPeriod, - SUBMITTER_ID_NUMBER = suc.IdentityCard, - SUBMITTER_NAME = suc.UserName, - //UPDATE_TIME = (DateTime)tba.CompileDate, - //CREATE_TIME = (DateTime)tba.CompileDate - }; - var model = models.ToList().FirstOrDefault(); List errMsgs = new List(); - if (model != null) + var list = db.Check_RectifyNoticesItem.Where(x => x.RectifyNoticesId == noticeId).ToList(); + if (list.Any()) { - if (string.IsNullOrWhiteSpace(model.PROJECT_CODE)) + foreach (var obj in list) { - errMsgs.Add("项目未关联集团主数据"); + int err = 0; + var models = from tba in db.Check_RectifyNoticesItem + join tbb in db.Check_RectifyNotices on tba.RectifyNoticesId equals tbb.RectifyNoticesId + join bu in db.Base_Unit on tbb.UnitId equals bu.UnitId + join suzg in db.Sys_User on tbb.DutyPersonId equals suzg.UserId + join suc in db.Sys_User on tbb.CompleteManId equals suc.UserId + join bp in db.Base_Project on tbb.ProjectId equals bp.ProjectId + join pms in db.Ads_pms_pro_info_build on bp.MasterSysId equals pms.Pro_id + where tba.RectifyNoticesItemId == obj.RectifyNoticesItemId + select new SankuHazard + { + RECORD_ID = tba.RectifyNoticesItemId, + //PROJECT_CODE = pms.Pro_code.ToString(), + PROJECT_CODE = pms.Pro_code, + PROJECT_NAME = pms.Pro_name, + SUBCONTRACTOR_ID = bu.MasterAdOrgCode, + SUBCONTRACTOR_CODE = bu.CollCropCode, + SUBCONTRACTOR_NAME = bu.UnitName, + RESPONSIBLE_PERSONNEL_ID_NUMBER = suzg.IdentityCard, + RESPONSIBLE_PERSONNEL_NAME = suzg.UserName, + RECTIFIER_PERSONNEL_ID_NUMBER = suzg.IdentityCard, + RECTIFIER_PERSONNEL_NAME = suzg.UserName, + DISCOVERY_DATE = tbb.CheckedDate == null ? DateTime.Now : (DateTime)tbb.CheckedDate, + HAZARD_TYPE = HazardType(tba.RectifyId), + HAZARD_LEVEL = HazardLevel(tbb.HiddenHazardType), + HAZARD_CONTENT = tba.WrongContent, + RECTIFICATION_STATUS = HazardState(tbb.States), + ECTIFICATION_COMPLETIONDATE = tbb.CompleteDate, + RECTIFICATION_DEADLINE_ID = tba.LimitTime == null ? DateTime.Now.AddDays(7) : (DateTime)tba.LimitTime, + SUBMITTER_ID_NUMBER = suc.IdentityCard, + SUBMITTER_NAME = suc.UserName, + //UPDATE_TIME = (DateTime)tba.CompileDate, + //CREATE_TIME = (DateTime)tba.CompileDate + }; + var model = models.ToList().FirstOrDefault(); + if (model != null) + { + if (string.IsNullOrWhiteSpace(model.PROJECT_CODE)) + { + err++; + errMsgs.Add("项目未关联集团主数据"); + } + if (string.IsNullOrWhiteSpace(model.SUBCONTRACTOR_ID) && string.IsNullOrWhiteSpace(model.SUBCONTRACTOR_CODE)) + { + err++; + errMsgs.Add("受检单位单位未关联主数据组织且统一社会信用代码为空"); + } + else if (string.IsNullOrWhiteSpace(model.SUBCONTRACTOR_ID) && !string.IsNullOrWhiteSpace(model.SUBCONTRACTOR_CODE) && model.SUBCONTRACTOR_CODE.Length != 18) + { + err++; + errMsgs.Add("受检单位单位未关联主数据组织且统一社会信用代码异常"); + } + //if (!string.IsNullOrWhiteSpace(model.SUBMITTER_ID_NUMBER) && model.SUBMITTER_ID_NUMBER.Length != 18) + //{ + // errMsgs.Add("填报人身份证异常"); + //} + if (err > 0) + { + continue; + } + else + { + var exist = db.SANKU_HAZARD.Where(x => x.RECORD_ID == model.RECORD_ID).FirstOrDefault(); + if (exist != null) + { + //更新三库 + exist.RECORD_ID = model.RECORD_ID; + exist.PROJECT_CODE = model.PROJECT_CODE; + exist.PROJECT_NAME = model.PROJECT_NAME; + exist.SUBCONTRACTOR_ID = model.SUBCONTRACTOR_ID; + exist.SUBCONTRACTOR_CODE = model.SUBCONTRACTOR_CODE; + exist.SUBCONTRACTOR_NAME = model.SUBCONTRACTOR_NAME; + exist.RESPONSIBLE_PERSONNEL_ID_NUMBER = model.RESPONSIBLE_PERSONNEL_ID_NUMBER; + exist.RESPONSIBLE_PERSONNEL_NAME = model.RESPONSIBLE_PERSONNEL_NAME; + exist.RECTIFIER_PERSONNEL_ID_NUMBER = model.RECTIFIER_PERSONNEL_ID_NUMBER; + exist.RECTIFIER_PERSONNEL_NAME = model.RECTIFIER_PERSONNEL_NAME; + exist.DISCOVERY_DATE = model.DISCOVERY_DATE; + exist.HAZARD_TYPE = model.HAZARD_TYPE; + exist.HAZARD_LEVEL = model.HAZARD_LEVEL; + exist.HAZARD_CONTENT = model.HAZARD_CONTENT; + exist.RECTIFICATION_STATUS = model.RECTIFICATION_STATUS; + exist.ECTIFICATION_COMPLETIONDATE = model.ECTIFICATION_COMPLETIONDATE; + exist.RECTIFICATION_DEADLINE_ID = model.RECTIFICATION_DEADLINE_ID; + exist.SUBMITTER_ID_NUMBER = model.SUBMITTER_ID_NUMBER; + exist.SUBMITTER_NAME = model.SUBMITTER_NAME; + exist.UPDATE_TIME = DateTime.Now; + //exist.UPDATE_TIME = model.UPDATE_TIME; + //exist.CREATE_TIME = model.CREATE_TIME; + exist.ReportDate = null; + } + else + { + //新增三库 + var newModel = new SANKU_HAZARD(); + newModel.RECORD_ID = model.RECORD_ID; + newModel.PROJECT_CODE = model.PROJECT_CODE; + newModel.PROJECT_NAME = model.PROJECT_NAME; + newModel.SUBCONTRACTOR_ID = model.SUBCONTRACTOR_ID; + newModel.SUBCONTRACTOR_CODE = model.SUBCONTRACTOR_CODE; + newModel.SUBCONTRACTOR_NAME = model.SUBCONTRACTOR_NAME; + newModel.PROJECT_NAME = model.PROJECT_NAME; + newModel.RESPONSIBLE_PERSONNEL_ID_NUMBER = model.RESPONSIBLE_PERSONNEL_ID_NUMBER; + newModel.RESPONSIBLE_PERSONNEL_NAME = model.RESPONSIBLE_PERSONNEL_NAME; + newModel.RECTIFIER_PERSONNEL_ID_NUMBER = model.RECTIFIER_PERSONNEL_ID_NUMBER; + newModel.RECTIFIER_PERSONNEL_NAME = model.RECTIFIER_PERSONNEL_NAME; + newModel.DISCOVERY_DATE = model.DISCOVERY_DATE; + newModel.HAZARD_TYPE = model.HAZARD_TYPE; + newModel.HAZARD_LEVEL = model.HAZARD_LEVEL; + newModel.HAZARD_CONTENT = model.HAZARD_CONTENT; + newModel.RECTIFICATION_STATUS = model.RECTIFICATION_STATUS; + newModel.ECTIFICATION_COMPLETIONDATE = model.ECTIFICATION_COMPLETIONDATE; + newModel.RECTIFICATION_DEADLINE_ID = model.RECTIFICATION_DEADLINE_ID; + newModel.SUBMITTER_ID_NUMBER = model.SUBMITTER_ID_NUMBER; + newModel.SUBMITTER_NAME = model.SUBMITTER_NAME; + newModel.UPDATE_TIME = DateTime.Now; + //newModel.UPDATE_TIME = model.UPDATE_TIME; + newModel.CREATE_TIME = DateTime.Now; + db.SANKU_HAZARD.InsertOnSubmit(newModel); + } + db.SubmitChanges(); + } + } } - if (string.IsNullOrWhiteSpace(model.SUBCONTRACTOR_ID) && string.IsNullOrWhiteSpace(model.SUBCONTRACTOR_CODE)) - { - errMsgs.Add("受检单位单位未关联主数据组织且统一社会信用代码为空"); - } - else if (string.IsNullOrWhiteSpace(model.SUBCONTRACTOR_ID) && !string.IsNullOrWhiteSpace(model.SUBCONTRACTOR_CODE) && model.SUBCONTRACTOR_CODE.Length != 18) - { - errMsgs.Add("受检单位单位未关联主数据组织且统一社会信用代码异常"); - } - //if (!string.IsNullOrWhiteSpace(model.SUBMITTER_ID_NUMBER) && model.SUBMITTER_ID_NUMBER.Length != 18) - //{ - // errMsgs.Add("填报人身份证异常"); - //} + + errMsgs = errMsgs.Distinct().ToList(); if (errMsgs.Any()) { - message = $"无法更新三库，数据异常：{string.Join(",", errMsgs)}"; + message = $"部分无法更新三库，数据异常：{string.Join(",", errMsgs)}"; } - else - { - var exist = db.SANKU_HAZARD.Where(x => x.RECORD_ID == model.RECORD_ID).FirstOrDefault(); - if (exist != null) - { - //更新三库 - exist.RECORD_ID = model.RECORD_ID; - exist.PROJECT_CODE = model.PROJECT_CODE; - exist.PROJECT_NAME = model.PROJECT_NAME; - exist.SUBCONTRACTOR_ID = model.SUBCONTRACTOR_ID; - exist.SUBCONTRACTOR_CODE = model.SUBCONTRACTOR_CODE; - exist.SUBCONTRACTOR_NAME = model.SUBCONTRACTOR_NAME; - exist.RESPONSIBLE_PERSONNEL_ID_NUMBER = model.RESPONSIBLE_PERSONNEL_ID_NUMBER; - exist.RESPONSIBLE_PERSONNEL_NAME = model.RESPONSIBLE_PERSONNEL_NAME; - exist.RECTIFIER_PERSONNEL_ID_NUMBER = model.RECTIFIER_PERSONNEL_ID_NUMBER; - exist.RECTIFIER_PERSONNEL_NAME = model.RECTIFIER_PERSONNEL_NAME; - exist.DISCOVERY_DATE = model.DISCOVERY_DATE; - exist.HAZARD_TYPE = model.HAZARD_TYPE; - exist.HAZARD_LEVEL = model.HAZARD_LEVEL; - exist.HAZARD_CONTENT = model.HAZARD_CONTENT; - exist.RECTIFICATION_STATUS = model.RECTIFICATION_STATUS; - exist.RECTIFICATION_DEADLINE_ID = model.RECTIFICATION_DEADLINE_ID; - exist.SUBMITTER_ID_NUMBER = model.SUBMITTER_ID_NUMBER; - exist.SUBMITTER_NAME = model.SUBMITTER_NAME; - exist.UPDATE_TIME = DateTime.Now; - //exist.UPDATE_TIME = model.UPDATE_TIME; - //exist.CREATE_TIME = model.CREATE_TIME; - exist.ReportDate = null; - } - else - { - //新增三库 - var newModel = new SANKU_HAZARD(); - newModel.RECORD_ID = model.RECORD_ID; - newModel.PROJECT_CODE = model.PROJECT_CODE; - newModel.PROJECT_NAME = model.PROJECT_NAME; - newModel.SUBCONTRACTOR_ID = model.SUBCONTRACTOR_ID; - newModel.SUBCONTRACTOR_CODE = model.SUBCONTRACTOR_CODE; - newModel.SUBCONTRACTOR_NAME = model.SUBCONTRACTOR_NAME; - newModel.PROJECT_NAME = model.PROJECT_NAME; - newModel.RESPONSIBLE_PERSONNEL_ID_NUMBER = model.RESPONSIBLE_PERSONNEL_ID_NUMBER; - newModel.RESPONSIBLE_PERSONNEL_NAME = model.RESPONSIBLE_PERSONNEL_NAME; - newModel.RECTIFIER_PERSONNEL_ID_NUMBER = model.RECTIFIER_PERSONNEL_ID_NUMBER; - newModel.RECTIFIER_PERSONNEL_NAME = model.RECTIFIER_PERSONNEL_NAME; - newModel.DISCOVERY_DATE = model.DISCOVERY_DATE; - newModel.HAZARD_TYPE = model.HAZARD_TYPE; - newModel.HAZARD_LEVEL = model.HAZARD_LEVEL; - newModel.HAZARD_CONTENT = model.HAZARD_CONTENT; - newModel.RECTIFICATION_STATUS = model.RECTIFICATION_STATUS; - newModel.RECTIFICATION_DEADLINE_ID = model.RECTIFICATION_DEADLINE_ID; - newModel.SUBMITTER_ID_NUMBER = model.SUBMITTER_ID_NUMBER; - newModel.SUBMITTER_NAME = model.SUBMITTER_NAME; - newModel.UPDATE_TIME = DateTime.Now; - //newModel.UPDATE_TIME = model.UPDATE_TIME; - newModel.CREATE_TIME = DateTime.Now; - db.SANKU_HAZARD.InsertOnSubmit(newModel); - } - db.SubmitChanges(); - } - } - - errMsgs = errMsgs.Distinct().ToList(); - if (errMsgs.Any()) - { - message = $"部分无法更新三库，数据异常：{string.Join(",", errMsgs)}"; } //else //{ @@ -1600,6 +1488,8 @@ namespace BLL ENGINEERING_DATE = tba.ExpectedTime == null ? DateTime.Now : (DateTime)tba.ExpectedTime, ENGINEERING_NAME = tba.HazardName, ENGINEERING_TYPE = LargerHazardType(tba.HazardType), + ENGINEERING_LEVEL = tba.IsSuperLargerHazard != null && tba.IsSuperLargerHazard == true ? "超规模危大" : "普通危大", + ENGINEERING_STATE = LargerHazardState(tba.States), ENGINEERING_ADDRESS = tba.Address, ENGINEERING_DESC = tba.Descriptions, STANDBY_PERSONNEL_ID_NUMBER = spp.IdentityCard, @@ -1653,6 +1543,8 @@ namespace BLL exist.ENGINEERING_DATE = model.ENGINEERING_DATE; exist.ENGINEERING_NAME = model.ENGINEERING_NAME; exist.ENGINEERING_TYPE = model.ENGINEERING_TYPE; + exist.ENGINEERING_LEVEL = model.ENGINEERING_LEVEL; + exist.ENGINEERING_STATE = model.ENGINEERING_STATE; exist.ENGINEERING_ADDRESS = model.ENGINEERING_ADDRESS; exist.ENGINEERING_DESC = model.ENGINEERING_DESC; exist.STANDBY_PERSONNEL_ID_NUMBER = model.STANDBY_PERSONNEL_ID_NUMBER; @@ -1679,6 +1571,8 @@ namespace BLL newModel.ENGINEERING_DATE = model.ENGINEERING_DATE; newModel.ENGINEERING_NAME = model.ENGINEERING_NAME; newModel.ENGINEERING_TYPE = model.ENGINEERING_TYPE; + newModel.ENGINEERING_LEVEL = model.ENGINEERING_LEVEL; + newModel.ENGINEERING_STATE = model.ENGINEERING_STATE; newModel.ENGINEERING_ADDRESS = model.ENGINEERING_ADDRESS; newModel.ENGINEERING_DESC = model.ENGINEERING_DESC; newModel.STANDBY_PERSONNEL_ID_NUMBER = model.STANDBY_PERSONNEL_ID_NUMBER; @@ -1699,6 +1593,34 @@ namespace BLL } } + /// + /// 危大工程状态 + /// + /// + /// + public static string LargerHazardState(string value) + { + string result = string.Empty; + if (!string.IsNullOrWhiteSpace(value)) + { + switch (value) + { + case "1": + result = "施工准备"; + break; + case "2": + result = "正在施工"; + break; + case "3": + result = "验收完成"; + break; + default: + result = "正在施工"; + break; + } + } + return result; + } /// /// 危大工程类型 @@ -1743,6 +1665,7 @@ namespace BLL var models = from tba in db.HSSE_Hazard_HazardRegister join bp in db.Base_Project on tba.ProjectId equals bp.ProjectId join pms in db.Ads_pms_pro_info_build on bp.MasterSysId equals pms.Pro_id + join wbsu in db.WBS_UnitWork on tba.Place equals wbsu.UnitWorkId join suzg in db.Sys_User on tba.CheckManId equals suzg.UserId join bu in db.Base_Unit on suzg.UnitId equals bu.UnitId where tba.HazardRegisterId == hazardId @@ -1756,6 +1679,8 @@ namespace BLL SUBCONTRACTOR_NAME = bu.UnitName, PERSONNEL_ID_NUMBER = suzg.IdentityCard, PERSONNEL_NAME = suzg.UserName, + PATROL_WORKITEMS = "巡检单位工程：" + wbsu.UnitWorkName, + PATROL_RECEIVEDATE = tba.CheckTime == null ? DateTime.Now.AddDays(-1) : ((DateTime)tba.CheckTime).AddDays(-1), PATROL_TIME = tba.CheckTime == null ? DateTime.Now : (DateTime)tba.CheckTime, PATROL_STATUS = "已完成", SUBMITTER_ID_NUMBER = suzg.IdentityCard, @@ -1807,11 +1732,13 @@ namespace BLL newModel.RECORD_ID = model.RECORD_ID; newModel.PROJECT_CODE = model.PROJECT_CODE; newModel.PROJECT_NAME = model.PROJECT_NAME; - exist.SUBCONTRACTOR_ID = model.SUBCONTRACTOR_ID; + newModel.SUBCONTRACTOR_ID = model.SUBCONTRACTOR_ID; newModel.SUBCONTRACTOR_CODE = model.SUBCONTRACTOR_CODE; newModel.SUBCONTRACTOR_NAME = model.SUBCONTRACTOR_NAME; newModel.PERSONNEL_ID_NUMBER = model.PERSONNEL_ID_NUMBER; newModel.PERSONNEL_NAME = model.PERSONNEL_NAME; + newModel.PATROL_WORKITEMS = model.PATROL_WORKITEMS; + newModel.PATROL_RECEIVEDATE = model.PATROL_RECEIVEDATE; newModel.PATROL_TIME = model.PATROL_TIME; newModel.PATROL_STATUS = model.PATROL_STATUS; //newModel.SOURCE_SYSTEM_ID = model.SOURCE_SYSTEM_ID; diff --git a/SUBQHSE/FineUIPro.Web/FineUIPro.Web.csproj b/SUBQHSE/FineUIPro.Web/FineUIPro.Web.csproj index 4b8491a..a1459b1 100644 --- a/SUBQHSE/FineUIPro.Web/FineUIPro.Web.csproj +++ b/SUBQHSE/FineUIPro.Web/FineUIPro.Web.csproj @@ -7388,9 +7388,13 @@ ProjectSysSet.aspx - + + ASPXCodeBehind + - + + ASPXCodeBehind + CheckFineList.aspx @@ -12685,7 +12689,9 @@ indexProjectOld.aspx - + + ASPXCodeBehind + LocationSelect.aspx @@ -12719,9 +12725,13 @@ MasterProjectDataUsage.aspx - + + ASPXCodeBehind + - + + ASPXCodeBehind + ProjectDevices.aspx @@ -12737,29 +12747,53 @@ ProjectDevicesEdit.aspx - + + ASPXCodeBehind + - + + ASPXCodeBehind + - + + ASPXCodeBehind + - + + ASPXCodeBehind + - + + ASPXCodeBehind + - + + ASPXCodeBehind + - + + ASPXCodeBehind + - + + ASPXCodeBehind + - + + ASPXCodeBehind + - + + ASPXCodeBehind + - + + ASPXCodeBehind + - + + ASPXCodeBehind + Schedule.aspx @@ -18634,7 +18668,7 @@ - +