This commit is contained in:
geh
2026-10-23 09:39:55 +08:00
parent 530ab7114a
commit 2e86cea781
17 changed files with 763 additions and 297 deletions
+197 -270
View File
@@ -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
}
}
/// <summary>
/// 违章作业类型
/// </summary>
/// <returns></returns>
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;
}
/// <summary>
/// 违章作业处理结果
/// </summary>
@@ -662,290 +688,152 @@ namespace BLL
#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>
/// <param name="hazardId">隐患id</param>
/// <param name="noticeId">隐患整改单id</param>
/// <param name="message"></param>
/// <returns></returns>
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<string> errMsgs = new List<string>();
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
}
}
/// <summary>
/// 危大工程状态
/// </summary>
/// <param name="value"></param>
/// <returns></returns>
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;
}
/// <summary>
/// 危大工程类型
@@ -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;