三库隐患记录取值改成从安全健康检查取
This commit is contained in:
@@ -662,149 +662,290 @@ 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="noticeId">隐患整改单id</param>
|
||||
/// <param name="hazardId">隐患id</param>
|
||||
/// <param name="message"></param>
|
||||
/// <returns></returns>
|
||||
public static string UpdateHazardRecord(string noticeId, ref string message)
|
||||
public static string UpdateHazardRecord(string hazardId, 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>();
|
||||
var list = db.Check_RectifyNoticesItem.Where(x => x.RectifyNoticesId == noticeId).ToList();
|
||||
if (list.Any())
|
||||
if (model != null)
|
||||
{
|
||||
foreach (var obj in list)
|
||||
if (string.IsNullOrWhiteSpace(model.PROJECT_CODE))
|
||||
{
|
||||
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.Add("项目未关联集团主数据");
|
||||
}
|
||||
|
||||
errMsgs = errMsgs.Distinct().ToList();
|
||||
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("填报人身份证异常");
|
||||
//}
|
||||
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
|
||||
//{
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
//更新三库隐患记录
|
||||
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);
|
||||
if (isClosed)
|
||||
{
|
||||
|
||||
@@ -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);
|
||||
|
||||
|
||||
@@ -159,6 +159,13 @@ namespace FineUIPro.Web.HiddenInspection
|
||||
register.Rectification = this.txtRectification.Text.Trim();
|
||||
register.RectificationTime = DateTime.Now;
|
||||
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);
|
||||
if (isClosed)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user