三库补充字段
This commit is contained in:
@@ -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>
|
||||
@@ -706,6 +732,7 @@ namespace BLL
|
||||
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,
|
||||
@@ -759,6 +786,7 @@ namespace BLL
|
||||
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;
|
||||
@@ -787,6 +815,7 @@ namespace BLL
|
||||
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;
|
||||
@@ -1459,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,
|
||||
@@ -1512,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;
|
||||
@@ -1538,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;
|
||||
@@ -1558,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>
|
||||
/// 危大工程类型
|
||||
@@ -1602,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
|
||||
@@ -1615,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,
|
||||
@@ -1666,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;
|
||||
|
||||
Reference in New Issue
Block a user