xiaju/SGGL_JT
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

三库隐患记录取值改成从安全健康检查取

Browse Source
This commit is contained in:
夏菊
2026-09-15 17:50:46 +08:00
parent 33462d35e8
commit fade838afa
6 changed files with 329 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files
DataBase/版本日志/SUBQHSE_V2026-08-21-xiaj（三库菜单）.sql
+5
View File
@@ -29,6 +29,11 @@ update Sys_Menu set MenuName='Υ
where MenuId='06958288-96F4-4291-909A-FFC2FC76814D' where MenuId='06958288-96F4-4291-909A-FFC2FC76814D'
GO GO
--违规人员记录菜单修改为：违章作业
update Sys_Menu set MenuName='违章作业',IsUsed=1,MenuType='Menu_HSSE_P'
where MenuId='16e865eb-f4b7-4192-98d4-78a3e6bcaa45'
GO
delete Sys_Menu WHERE MenuId = '004EE400-0000-0000-0000-E2EF9AFA6F8D' or SuperMenu='004EE400-0000-0000-0000-E2EF9AFA6F8D' delete Sys_Menu WHERE MenuId = '004EE400-0000-0000-0000-E2EF9AFA6F8D' or SuperMenu='004EE400-0000-0000-0000-E2EF9AFA6F8D'
DataBase/版本日志/SUBQHSE_V2026-09-07-xiaj（SP_SANKU_DATA_INIT）.sql
+35 -16
View File
@@ -150,24 +150,43 @@ 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 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,RECTIFICATION_DEADLINE_ID,SUBMITTER_ID_NUMBER,SUBMITTER_NAME,UPDATE_TIME,CREATE_TIME) ,DISCOVERY_DATE,HAZARD_TYPE,HAZARD_LEVEL,HAZARD_CONTENT,RECTIFICATION_STATUS,RECTIFICATION_DEADLINE_ID,SUBMITTER_ID_NUMBER,SUBMITTER_NAME,UPDATE_TIME,CREATE_TIME)
SELECT tba.RectifyNoticesItemId,pms.pro_code,pms.pro_name 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 ,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 ,suzg.IdentityCard,suzg.UserName,suzg.IdentityCard,suzg.UserName,tba.CheckTime,regType.RegisterTypesName
,(CASE tbb.HiddenHazardType WHEN 1 THEN '一般隐患' WHEN 2 THEN '较大隐患' WHEN 3 THEN '重大隐患' ELSE '一般隐患' END) AS TYPE,tba.WrongContent ,(CASE tba.Risk_Level WHEN '一般' THEN '一般隐患' WHEN '较大' THEN '较大隐患' WHEN '重大' THEN '重大隐患' ELSE '一般隐患' END) AS TYPE,tba.RegisterDef
,(CASE WHEN tbb.States = 2 THEN '未整改' WHEN tbb.States = 3 THEN '整改中' WHEN States = 4 THEN '已整改' WHEN States = 5 THEN '已验收' ELSE '未整改' END) AS StatesName ,(CASE tba.States WHEN 1 THEN '未整改' WHEN 2 THEN '已验收' WHEN 3 THEN '已整改' WHEN 4 THEN '整改中' ELSE '整改中' END) AS StatesName
,tba.LimitTime,suc.IdentityCard,suc.UserName,tbb.CheckedDate,tbb.CheckedDate ,tba.RectificationPeriod,suc.IdentityCard,suc.UserName,tba.CheckTime,tba.CheckTime
FROM Check_RectifyNoticesItem AS tba WITH(NOLOCK) FROM HSSE_Hazard_HazardRegister AS tba WITH(NOLOCK)
LEFT JOIN Check_RectifyNotices AS tbb WITH(NOLOCK) ON tbb.RectifyNoticesId = tba.RectifyNoticesId LEFT JOIN Base_Unit AS bu WITH(NOLOCK) ON bu.UnitId = tba.ResponsibleUnit --AND LEN(bu.CollCropCode)=18
--LEFT JOIN Check_RectifyNoticesFlowOperate AS tbc WITH(NOLOCK) ON tbc.RectifyNoticesId = tba.RectifyNoticesId LEFT JOIN Sys_User AS suzg WITH(NOLOCK) ON suzg.UserId = tba.ResponsibleMan
LEFT JOIN Base_Unit AS bu WITH(NOLOCK) ON bu.UnitId = tbb.UnitId --AND LEN(bu.CollCropCode)=18 LEFT JOIN HSSE_Hazard_HazardRegisterTypes AS regType WITH(NOLOCK) ON tba.RegisterTypesId = regType.RegisterTypesId
LEFT JOIN Sys_User AS suzg WITH(NOLOCK) ON suzg.UserId = tbb.DutyPersonId LEFT JOIN Sys_User AS suc WITH(NOLOCK) ON suc.UserId = tba.CheckManId
LEFT JOIN Sys_User AS suc WITH(NOLOCK) ON suc.UserId = tbb.CompleteManId LEFT JOIN Base_Project AS bp WITH(NOLOCK) ON bp.ProjectId = tba.ProjectId
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 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 tba.CheckTime>='2026-01-01' AND ISNULL(tba.States,0) >= 0
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 regType.RegisterTypesName IS NOT NULL
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.HazardRegisterId NOT IN (SELECT RECORD_ID FROM SANKU_HAZARD WITH(NOLOCK));
AND tba.RectifyNoticesItemId NOT IN (SELECT RECORD_ID FROM SANKU_HAZARD WITH(NOLOCK)); ----隐患记录数据初始化
--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,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
-- ,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 END
IF @type = 'SANKU_TRAINING' OR @trimType = '' IF @type = 'SANKU_TRAINING' OR @trimType = ''
SUBQHSE/BLL/SanKu/SanKuDataSummaryReportService.cs
+268 -127
View File
@@ -662,149 +662,290 @@ namespace BLL
#region 隐患记录 #region 隐患记录
///// <summary>
///// 更新隐患记录数据
///// </summary>
///// <param name="noticeId">隐患整改单id</param>
///// <param name="message"></param>
///// <returns></returns>
//public static string UpdateHazardRecord(string noticeId, ref string message)
//{
// string result = string.Empty;
// using (Model.SUBQHSEDB db = new Model.SUBQHSEDB(Funs.ConnString))
// {
// List<string> errMsgs = new List<string>();
// 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;
// }
//}
/// <summary> /// <summary>
/// 更新隐患记录数据 /// 更新隐患记录数据
/// </summary> /// </summary>
/// <param name="noticeId">隐患整改单id</param> /// <param name="hazardId">隐患id</param>
/// <param name="message"></param> /// <param name="message"></param>
/// <returns></returns> /// <returns></returns>
public static string UpdateHazardRecord(string noticeId, ref string message) public static string UpdateHazardRecord(string hazardId, ref string message)
{ {
string result = string.Empty; string result = string.Empty;
using (Model.SUBQHSEDB db = new Model.SUBQHSEDB(Funs.ConnString)) 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<string> errMsgs = new List<string>(); List<string> errMsgs = new List<string>();
var list = db.Check_RectifyNoticesItem.Where(x => x.RectifyNoticesId == noticeId).ToList(); if (model != null)
if (list.Any())
{ {
foreach (var obj in list) if (string.IsNullOrWhiteSpace(model.PROJECT_CODE))
{ {
int err = 0; errMsgs.Add("项目未关联集团主数据");
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();
}
}
} }
if (string.IsNullOrWhiteSpace(model.SUBCONTRACTOR_ID) && string.IsNullOrWhiteSpace(model.SUBCONTRACTOR_CODE))
errMsgs = errMsgs.Distinct().ToList(); {
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("填报人身份证异常");
//}
if (errMsgs.Any()) 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 //else
//{ //{
SUBQHSE/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationAdd.aspx.cs
+7
View File
@@ -333,6 +333,13 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
BLL.LogService.AddSys_Log(this.CurrUser, register.HazardCode, register.HazardRegisterId, BLL.Const.HiddenRectificationMenuId, BLL.Const.BtnAdd); BLL.LogService.AddSys_Log(this.CurrUser, register.HazardCode, register.HazardRegisterId, BLL.Const.HiddenRectificationMenuId, BLL.Const.BtnAdd);
} }
//更新三库隐患记录
string message = string.Empty;
SanKuDataSummaryReportService.UpdateHazardRecord(register.HazardRegisterId, ref message);
if (!string.IsNullOrWhiteSpace(message))
{
ShowNotify(message, MessageBoxIcon.Warning);
}
//Project_HSSEData_HSSEService.StatisticalData(this.CurrUser.LoginProjectId, Project_HSSEData_HSSEService.HSSEDateType.SupervisionAndInspection); //Project_HSSEData_HSSEService.StatisticalData(this.CurrUser.LoginProjectId, Project_HSSEData_HSSEService.HSSEDateType.SupervisionAndInspection);
if (isClosed) if (isClosed)
{ {
SUBQHSE/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationConfirm.aspx.cs
+7
View File
@@ -204,6 +204,13 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
} }
}
//更新三库隐患记录
string message = string.Empty;
SanKuDataSummaryReportService.UpdateHazardRecord(register.HazardRegisterId, ref message);
if (!string.IsNullOrWhiteSpace(message))
{
ShowNotify(message, MessageBoxIcon.Warning);
} }
BLL.LogService.AddSys_Log(this.CurrUser, register.HazardCode, register.HazardRegisterId, BLL.Const.HiddenRectificationMenuId, BLL.Const.BtnModify); BLL.LogService.AddSys_Log(this.CurrUser, register.HazardCode, register.HazardRegisterId, BLL.Const.HiddenRectificationMenuId, BLL.Const.BtnModify);
SUBQHSE/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationRectify.aspx.cs
+7
View File
@@ -159,6 +159,13 @@ namespace FineUIPro.Web.HiddenInspection
register.Rectification = this.txtRectification.Text.Trim(); register.Rectification = this.txtRectification.Text.Trim();
register.RectificationTime = DateTime.Now; register.RectificationTime = DateTime.Now;
BLL.HSSE_Hazard_HazardRegisterService.UpdateHazardRegister(register); BLL.HSSE_Hazard_HazardRegisterService.UpdateHazardRegister(register);
//更新三库隐患记录
string message = string.Empty;
SanKuDataSummaryReportService.UpdateHazardRecord(register.HazardRegisterId, ref message);
if (!string.IsNullOrWhiteSpace(message))
{
ShowNotify(message, MessageBoxIcon.Warning);
}
BLL.LogService.AddSys_Log(this.CurrUser, register.HazardCode, register.HazardRegisterId, BLL.Const.HSSE_HiddenRectificationListMenuId, BLL.Const.BtnModify); BLL.LogService.AddSys_Log(this.CurrUser, register.HazardCode, register.HazardRegisterId, BLL.Const.HSSE_HiddenRectificationListMenuId, BLL.Const.BtnModify);
if (isClosed) if (isClosed)
{ {