危险源管理模块接入真实数据库:新增危大/超危工程、风险控制清单、安全验收、安全巡检、临时用电管理(含前端页面、BLL/API服务、WebAPI控制器、Model项、SQL脚本与接口文档)
排除 CreateModel.bat(含明文sa密码与本地服务器名,未入库)
This commit is contained in:
@@ -860,7 +860,7 @@ namespace BLL
|
||||
|
||||
res = tb.Rows[0][0].ToString();
|
||||
}
|
||||
catch (Exception e) { }
|
||||
catch (Exception) { }
|
||||
}
|
||||
return res;
|
||||
}
|
||||
|
||||
@@ -116,7 +116,6 @@ namespace BLL
|
||||
SL_ScanUrl = x.SL_ScanUrl.Replace("\\", "/")
|
||||
};
|
||||
return getData.ToList();
|
||||
return null;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -69,7 +69,7 @@ namespace BLL
|
||||
readStream.Close();
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
catch (Exception)
|
||||
{
|
||||
returnValue = "";
|
||||
}
|
||||
@@ -97,7 +97,7 @@ namespace BLL
|
||||
{
|
||||
mywebclient.DownloadFile(url, filepath);
|
||||
}
|
||||
catch (Exception ex)
|
||||
catch (Exception)
|
||||
{
|
||||
filepath = "";
|
||||
}
|
||||
|
||||
@@ -119,7 +119,7 @@ namespace BLL
|
||||
{
|
||||
newEquipmentQuality.EquipmentCount = int.Parse(newItem.EquipmentCount);
|
||||
}
|
||||
catch (Exception e) { }
|
||||
catch (Exception) { }
|
||||
}
|
||||
var updateEquipmentQuality = db.QualityAudit_GeneralEquipmentQuality.FirstOrDefault(x => x.GeneralEquipmentQualityId == newItem.EquipmentQualityId);
|
||||
if (updateEquipmentQuality == null)
|
||||
|
||||
@@ -0,0 +1,76 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
|
||||
namespace BLL
|
||||
{
|
||||
/// <summary>
|
||||
/// 危大、超危工程清单API服务
|
||||
/// </summary>
|
||||
public static class APIHazardProjectService
|
||||
{
|
||||
/// <summary>
|
||||
/// 根据项目获取危大、超危工程清单列表(按分部分项工程搜索)
|
||||
/// </summary>
|
||||
/// <param name="projectId">项目主键</param>
|
||||
/// <param name="keyword">分部分项工程关键字</param>
|
||||
/// <returns></returns>
|
||||
public static List<Model.HazardProjectItem> getHazardProjectList(string projectId, string keyword)
|
||||
{
|
||||
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
|
||||
{
|
||||
IQueryable<Model.HSSE_HazardProject> query = db.HSSE_HazardProject.Where(x => x.ProjectId == projectId);
|
||||
if (!string.IsNullOrEmpty(keyword))
|
||||
{
|
||||
query = query.Where(x => x.ProjectName.Contains(keyword));
|
||||
}
|
||||
var list = from x in query
|
||||
orderby x.ProjectCode
|
||||
select new Model.HazardProjectItem
|
||||
{
|
||||
HazardProjectId = x.HazardProjectId,
|
||||
ProjectId = x.ProjectId,
|
||||
ProjectCode = x.ProjectCode,
|
||||
ProjectName = x.ProjectName,
|
||||
WorkContent = x.WorkContent,
|
||||
RiskLevel = x.RiskLevel,
|
||||
StartDate = x.StartDate,
|
||||
EndDate = x.EndDate,
|
||||
ManagerMan = x.ManagerMan,
|
||||
Remark = x.Remark
|
||||
};
|
||||
return list.ToList();
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 根据主键获取危大、超危工程详情
|
||||
/// </summary>
|
||||
/// <param name="hazardProjectId">主键</param>
|
||||
/// <returns></returns>
|
||||
public static Model.HazardProjectItem getHazardProjectById(string hazardProjectId)
|
||||
{
|
||||
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
|
||||
{
|
||||
var x = db.HSSE_HazardProject.FirstOrDefault(e => e.HazardProjectId == hazardProjectId);
|
||||
if (x == null)
|
||||
{
|
||||
return null;
|
||||
}
|
||||
return new Model.HazardProjectItem
|
||||
{
|
||||
HazardProjectId = x.HazardProjectId,
|
||||
ProjectId = x.ProjectId,
|
||||
ProjectCode = x.ProjectCode,
|
||||
ProjectName = x.ProjectName,
|
||||
WorkContent = x.WorkContent,
|
||||
RiskLevel = x.RiskLevel,
|
||||
StartDate = x.StartDate,
|
||||
EndDate = x.EndDate,
|
||||
ManagerMan = x.ManagerMan,
|
||||
Remark = x.Remark
|
||||
};
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -202,17 +202,28 @@ namespace BLL
|
||||
/// <param name="projectId"></param>
|
||||
/// <param name="meetingType">会议类型(C-班前会;W-周例会;M-例会;S-专题例会;A-其他会议)</param>
|
||||
/// <param name="states">状态(0-待提交;1-已提交)</param>
|
||||
/// <param name="startDate">编制日期开始日期(yyyy-MM-dd,为空不限制)</param>
|
||||
/// <param name="endDate">编制日期结束日期(yyyy-MM-dd,包含当天,为空不限制)</param>
|
||||
/// <returns></returns>
|
||||
public static List<Model.MeetingItem> getMeetingByProjectIdStates(string projectId, string meetingType, string states,int pageIndex)
|
||||
public static List<Model.MeetingItem> getMeetingByProjectIdStates(string projectId, string meetingType, string states,int pageIndex, string startDate, string endDate)
|
||||
{
|
||||
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
|
||||
{
|
||||
List<Model.MeetingItem> getMeetItem = new List<Model.MeetingItem>();
|
||||
// 编制日期(CompileDate)范围过滤:startDate/endDate为空时不限制;endDate取整天(包含endDate当天)
|
||||
DateTime? dStart = Funs.GetNewDateTime(startDate);
|
||||
DateTime? dEnd = Funs.GetNewDateTime(endDate);
|
||||
if (dEnd.HasValue)
|
||||
{
|
||||
dEnd = dEnd.Value.Date.AddDays(1);
|
||||
}
|
||||
if (meetingType == "C")
|
||||
{
|
||||
getMeetItem = (from x in db.Meeting_ClassMeeting
|
||||
where x.ProjectId == projectId
|
||||
&& (states == null || (states == "0" && (x.States == "0" || x.States == null)) || (states == "1" && (x.States == "1" || x.States == "2")))
|
||||
&& (!dStart.HasValue || (x.CompileDate.HasValue && x.CompileDate.Value >= dStart))
|
||||
&& (!dEnd.HasValue || (x.CompileDate.HasValue && x.CompileDate.Value < dEnd))
|
||||
orderby x.ClassMeetingDate descending
|
||||
select new Model.MeetingItem
|
||||
{
|
||||
@@ -247,6 +258,8 @@ namespace BLL
|
||||
getMeetItem = (from x in db.Meeting_WeekMeeting
|
||||
where x.ProjectId == projectId
|
||||
&& (states == null || (states == "0" && (x.States == "0" || x.States == null)) || (states == "1" && (x.States == "1" || x.States == "2")))
|
||||
&& (!dStart.HasValue || (x.CompileDate.HasValue && x.CompileDate.Value >= dStart))
|
||||
&& (!dEnd.HasValue || (x.CompileDate.HasValue && x.CompileDate.Value < dEnd))
|
||||
orderby x.WeekMeetingDate descending
|
||||
select new Model.MeetingItem
|
||||
{
|
||||
@@ -278,6 +291,8 @@ namespace BLL
|
||||
getMeetItem = (from x in db.Meeting_MonthMeeting
|
||||
where x.ProjectId == projectId
|
||||
&& (states == null || (states == "0" && (x.States == "0" || x.States == null)) || (states == "1" && (x.States == "1" || x.States == "2")))
|
||||
&& (!dStart.HasValue || (x.CompileDate.HasValue && x.CompileDate.Value >= dStart))
|
||||
&& (!dEnd.HasValue || (x.CompileDate.HasValue && x.CompileDate.Value < dEnd))
|
||||
orderby x.MonthMeetingDate descending
|
||||
select new Model.MeetingItem
|
||||
{
|
||||
@@ -310,6 +325,8 @@ namespace BLL
|
||||
getMeetItem = (from x in db.Meeting_SpecialMeeting
|
||||
where x.ProjectId == projectId
|
||||
&& (states == null || (states == "0" && (x.States == "0" || x.States == null)) || (states == "1" && (x.States == "1" || x.States == "2")))
|
||||
&& (!dStart.HasValue || (x.CompileDate.HasValue && x.CompileDate.Value >= dStart))
|
||||
&& (!dEnd.HasValue || (x.CompileDate.HasValue && x.CompileDate.Value < dEnd))
|
||||
orderby x.SpecialMeetingDate descending
|
||||
select new Model.MeetingItem
|
||||
{
|
||||
@@ -342,6 +359,8 @@ namespace BLL
|
||||
getMeetItem = (from x in db.Meeting_AttendMeeting
|
||||
where x.ProjectId == projectId
|
||||
&& (states == null || (states == "0" && (x.States == "0" || x.States == null)) || (states == "1" && (x.States == "1" || x.States == "2")))
|
||||
&& (!dStart.HasValue || (x.CompileDate.HasValue && x.CompileDate.Value >= dStart))
|
||||
&& (!dEnd.HasValue || (x.CompileDate.HasValue && x.CompileDate.Value < dEnd))
|
||||
orderby x.AttendMeetingDate descending
|
||||
select new Model.MeetingItem
|
||||
{
|
||||
|
||||
@@ -0,0 +1,128 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
|
||||
namespace BLL
|
||||
{
|
||||
/// <summary>
|
||||
/// 安全防护验收API服务
|
||||
/// </summary>
|
||||
public static class APISafetyAcceptanceService
|
||||
{
|
||||
/// <summary>
|
||||
/// 根据项目获取安全防护验收列表(按工程名称搜索)
|
||||
/// </summary>
|
||||
/// <param name="projectId">项目主键</param>
|
||||
/// <param name="keyword">工程名称关键字</param>
|
||||
/// <returns></returns>
|
||||
public static List<Model.SafetyAcceptanceItem> getSafetyAcceptanceList(string projectId, string keyword)
|
||||
{
|
||||
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
|
||||
{
|
||||
IQueryable<Model.HSSE_SafetyAcceptance> query = db.HSSE_SafetyAcceptance.Where(x => x.ProjectId == projectId);
|
||||
if (!string.IsNullOrEmpty(keyword))
|
||||
{
|
||||
query = query.Where(x => x.HazardProjectName.Contains(keyword));
|
||||
}
|
||||
var list = from x in query
|
||||
orderby x.AcceptanceDate descending
|
||||
select new Model.SafetyAcceptanceItem
|
||||
{
|
||||
AcceptanceId = x.AcceptanceId,
|
||||
ProjectId = x.ProjectId,
|
||||
HazardProjectId = x.HazardProjectId,
|
||||
HazardProjectName = x.HazardProjectName,
|
||||
AcceptanceResult = x.AcceptanceResult,
|
||||
AcceptanceMan = x.AcceptanceMan,
|
||||
AcceptanceDate = x.AcceptanceDate,
|
||||
Remark = x.Remark
|
||||
};
|
||||
return list.ToList();
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 根据主键获取安全防护验收详情
|
||||
/// </summary>
|
||||
/// <param name="acceptanceId">主键</param>
|
||||
/// <returns></returns>
|
||||
public static Model.SafetyAcceptanceItem getSafetyAcceptanceById(string acceptanceId)
|
||||
{
|
||||
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
|
||||
{
|
||||
var x = db.HSSE_SafetyAcceptance.FirstOrDefault(e => e.AcceptanceId == acceptanceId);
|
||||
if (x == null)
|
||||
{
|
||||
return null;
|
||||
}
|
||||
return new Model.SafetyAcceptanceItem
|
||||
{
|
||||
AcceptanceId = x.AcceptanceId,
|
||||
ProjectId = x.ProjectId,
|
||||
HazardProjectId = x.HazardProjectId,
|
||||
HazardProjectName = x.HazardProjectName,
|
||||
AcceptanceResult = x.AcceptanceResult,
|
||||
AcceptanceMan = x.AcceptanceMan,
|
||||
AcceptanceDate = x.AcceptanceDate,
|
||||
Remark = x.Remark
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 新增安全防护验收(返回主键)
|
||||
/// </summary>
|
||||
/// <param name="item">验收项</param>
|
||||
/// <returns></returns>
|
||||
public static string addSafetyAcceptance(Model.SafetyAcceptanceItem item)
|
||||
{
|
||||
if (string.IsNullOrEmpty(item.AcceptanceId))
|
||||
{
|
||||
item.AcceptanceId = Guid.NewGuid().ToString();
|
||||
}
|
||||
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
|
||||
{
|
||||
Model.HSSE_SafetyAcceptance newItem = new Model.HSSE_SafetyAcceptance
|
||||
{
|
||||
AcceptanceId = item.AcceptanceId,
|
||||
ProjectId = item.ProjectId,
|
||||
HazardProjectId = item.HazardProjectId,
|
||||
HazardProjectName = item.HazardProjectName,
|
||||
AcceptanceResult = item.AcceptanceResult,
|
||||
AcceptanceMan = item.AcceptanceMan,
|
||||
AcceptanceDate = item.AcceptanceDate,
|
||||
Remark = item.Remark
|
||||
};
|
||||
db.HSSE_SafetyAcceptance.InsertOnSubmit(newItem);
|
||||
db.SubmitChanges();
|
||||
}
|
||||
return item.AcceptanceId;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 更新安全防护验收
|
||||
/// </summary>
|
||||
/// <param name="item">验收项</param>
|
||||
/// <returns>是否更新成功</returns>
|
||||
public static bool updateSafetyAcceptance(Model.SafetyAcceptanceItem item)
|
||||
{
|
||||
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
|
||||
{
|
||||
Model.HSSE_SafetyAcceptance newItem = db.HSSE_SafetyAcceptance.FirstOrDefault(x => x.AcceptanceId == item.AcceptanceId);
|
||||
if (newItem == null)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
newItem.ProjectId = item.ProjectId;
|
||||
newItem.HazardProjectId = item.HazardProjectId;
|
||||
newItem.HazardProjectName = item.HazardProjectName;
|
||||
newItem.AcceptanceResult = item.AcceptanceResult;
|
||||
newItem.AcceptanceMan = item.AcceptanceMan;
|
||||
newItem.AcceptanceDate = item.AcceptanceDate;
|
||||
newItem.Remark = item.Remark;
|
||||
db.SubmitChanges();
|
||||
return true;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,138 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
|
||||
namespace BLL
|
||||
{
|
||||
/// <summary>
|
||||
/// 安全巡检API服务
|
||||
/// </summary>
|
||||
public static class APISafetyPatrolService
|
||||
{
|
||||
/// <summary>
|
||||
/// 根据项目获取安全巡检列表(按工程名称搜索)
|
||||
/// </summary>
|
||||
/// <param name="projectId">项目主键</param>
|
||||
/// <param name="keyword">工程名称关键字</param>
|
||||
/// <returns></returns>
|
||||
public static List<Model.SafetyPatrolItem> getSafetyPatrolList(string projectId, string keyword)
|
||||
{
|
||||
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
|
||||
{
|
||||
IQueryable<Model.HSSE_SafetyPatrol> query = db.HSSE_SafetyPatrol.Where(x => x.ProjectId == projectId);
|
||||
if (!string.IsNullOrEmpty(keyword))
|
||||
{
|
||||
query = query.Where(x => x.HazardProjectName.Contains(keyword));
|
||||
}
|
||||
var list = from x in query
|
||||
orderby x.PatrolDate descending
|
||||
select new Model.SafetyPatrolItem
|
||||
{
|
||||
PatrolId = x.PatrolId,
|
||||
ProjectId = x.ProjectId,
|
||||
HazardProjectId = x.HazardProjectId,
|
||||
HazardProjectName = x.HazardProjectName,
|
||||
PatrolDate = x.PatrolDate,
|
||||
PatrolMan = x.PatrolMan,
|
||||
PatrolStatus = x.PatrolStatus,
|
||||
Content = x.Content
|
||||
};
|
||||
return list.ToList();
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 根据主键获取安全巡检详情
|
||||
/// </summary>
|
||||
/// <param name="patrolId">主键</param>
|
||||
/// <returns></returns>
|
||||
public static Model.SafetyPatrolItem getSafetyPatrolById(string patrolId)
|
||||
{
|
||||
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
|
||||
{
|
||||
var x = db.HSSE_SafetyPatrol.FirstOrDefault(e => e.PatrolId == patrolId);
|
||||
if (x == null)
|
||||
{
|
||||
return null;
|
||||
}
|
||||
return new Model.SafetyPatrolItem
|
||||
{
|
||||
PatrolId = x.PatrolId,
|
||||
ProjectId = x.ProjectId,
|
||||
HazardProjectId = x.HazardProjectId,
|
||||
HazardProjectName = x.HazardProjectName,
|
||||
PatrolDate = x.PatrolDate,
|
||||
PatrolMan = x.PatrolMan,
|
||||
PatrolStatus = x.PatrolStatus,
|
||||
Content = x.Content
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 新增安全巡检(返回主键)
|
||||
/// </summary>
|
||||
/// <param name="item">巡检项</param>
|
||||
/// <returns></returns>
|
||||
public static string addSafetyPatrol(Model.SafetyPatrolItem item)
|
||||
{
|
||||
if (string.IsNullOrEmpty(item.PatrolId))
|
||||
{
|
||||
item.PatrolId = Guid.NewGuid().ToString();
|
||||
}
|
||||
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
|
||||
{
|
||||
Model.HSSE_SafetyPatrol newItem = new Model.HSSE_SafetyPatrol
|
||||
{
|
||||
PatrolId = item.PatrolId,
|
||||
ProjectId = item.ProjectId,
|
||||
HazardProjectId = item.HazardProjectId,
|
||||
HazardProjectName = item.HazardProjectName,
|
||||
PatrolDate = item.PatrolDate,
|
||||
PatrolMan = item.PatrolMan,
|
||||
PatrolStatus = item.PatrolStatus,
|
||||
Content = item.Content
|
||||
};
|
||||
db.HSSE_SafetyPatrol.InsertOnSubmit(newItem);
|
||||
db.SubmitChanges();
|
||||
}
|
||||
////保存巡检图片附件
|
||||
if (!string.IsNullOrEmpty(item.AttachUrl))
|
||||
{
|
||||
APIUpLoadFileService.SaveAttachUrl(Const.SafetyPatrolMenuId, item.PatrolId, item.AttachUrl, "0");
|
||||
}
|
||||
return item.PatrolId;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 更新安全巡检
|
||||
/// </summary>
|
||||
/// <param name="item">巡检项</param>
|
||||
/// <returns>是否更新成功</returns>
|
||||
public static bool updateSafetyPatrol(Model.SafetyPatrolItem item)
|
||||
{
|
||||
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
|
||||
{
|
||||
Model.HSSE_SafetyPatrol newItem = db.HSSE_SafetyPatrol.FirstOrDefault(x => x.PatrolId == item.PatrolId);
|
||||
if (newItem == null)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
newItem.ProjectId = item.ProjectId;
|
||||
newItem.HazardProjectId = item.HazardProjectId;
|
||||
newItem.HazardProjectName = item.HazardProjectName;
|
||||
newItem.PatrolDate = item.PatrolDate;
|
||||
newItem.PatrolMan = item.PatrolMan;
|
||||
newItem.PatrolStatus = item.PatrolStatus;
|
||||
newItem.Content = item.Content;
|
||||
db.SubmitChanges();
|
||||
}
|
||||
////保存巡检图片附件
|
||||
if (!string.IsNullOrEmpty(item.AttachUrl))
|
||||
{
|
||||
APIUpLoadFileService.SaveAttachUrl(Const.SafetyPatrolMenuId, item.PatrolId, item.AttachUrl, "0");
|
||||
}
|
||||
return true;
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user