lpf/SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改项目安全实施计划

Browse Source
This commit is contained in:
高飞
2023-06-01 17:15:29 +08:00
parent 75b2d905c9 f105770a47
commit 2da49a3513
213 changed files with 27714 additions and 4712 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/BLL/HSSE/Accident/AccidentPersonRecordService.cs
+2
View File
@@ -43,6 +43,7 @@ namespace BLL
FileContent = accidentPersonRecord.FileContent,
CompileMan = accidentPersonRecord.CompileMan,
CompileDate = accidentPersonRecord.CompileDate,
IsAttempt = accidentPersonRecord.IsAttempt,
States = accidentPersonRecord.States
};
db.Accident_AccidentPersonRecord.InsertOnSubmit(newAccidentPersonRecord);
@@ -73,6 +74,7 @@ namespace BLL
newAccidentPersonRecord.FileContent = accidentPersonRecord.FileContent;
newAccidentPersonRecord.CompileMan = accidentPersonRecord.CompileMan;
newAccidentPersonRecord.CompileDate = accidentPersonRecord.CompileDate;
newAccidentPersonRecord.IsAttempt = accidentPersonRecord.IsAttempt;
newAccidentPersonRecord.States = accidentPersonRecord.States;
db.SubmitChanges();
}
SGGL/BLL/HSSE/Check/Check_ProjectLeaderCheckService.cs
+214
View File
@@ -0,0 +1,214 @@
using FineUIPro;
using System;
using System.Collections;
using System.Collections.Generic;
using System.Linq;
using System.Web.UI.WebControls;
namespace BLL
{
/// <summary>
/// 领导带班检查
/// </summary>
public static class Check_ProjectLeaderCheckService
{
public static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 根据主键获取领导带班检查
/// </summary>
/// <param name="ProjectLeaderCheckId"></param>
/// <returns></returns>
public static Model.Check_ProjectLeaderCheck GetProjectLeaderCheckById(string ProjectLeaderCheckId)
{
return Funs.DB.Check_ProjectLeaderCheck.FirstOrDefault(e => e.ProjectLeaderCheckId == ProjectLeaderCheckId);
}
#region 公司两级领导带班检查列表
/// <summary>
/// 记录数
/// </summary>
public static int count
{
get;
set;
}
/// <summary>
/// 定义变量
/// </summary>
private static IQueryable<Model.Check_ProjectLeaderCheck> getDataLists = from x in db.Check_ProjectLeaderCheck
select x;
/// <summary>
/// 数据列表
/// </summary>
/// <param name="unitId"></param>
/// <param name="Grid1"></param>
/// <returns></returns>
public static IEnumerable getListData(string projectId, string startTime, string endTime, Grid Grid1)
{
IQueryable<Model.Check_ProjectLeaderCheck> getDataList = getDataLists;
if (!string.IsNullOrEmpty(projectId))
{
getDataList = getDataList.Where(x => x.ProjectId == projectId);
}
if (!string.IsNullOrEmpty(startTime))
{
DateTime? startTimeD = Funs.GetNewDateTime(startTime);
if (startTimeD.HasValue)
{
getDataList = getDataList.Where(x => x.CheckDate >= startTimeD);
}
}
if (!string.IsNullOrEmpty(endTime))
{
DateTime? endTimeD = Funs.GetNewDateTime(endTime);
if (endTimeD.HasValue)
{
getDataList = getDataList.Where(x => x.CheckDate <= endTimeD);
}
}
count = getDataList.Count();
if (count == 0)
{
return null;
}
getDataList = SortConditionHelper.SortingAndPaging(getDataList, Grid1.SortField, Grid1.SortDirection, Grid1.PageIndex, Grid1.PageSize);
return from x in getDataList
join y in db.Base_Project on x.ProjectId equals y.ProjectId
into ps
from y in ps.DefaultIfEmpty()
select new
{
x.ProjectLeaderCheckId,
x.ProjectId,
db.Base_Project.First(u => u.ProjectId == x.ProjectId).ProjectName,
x.CheckCode,
x.UnitIds,
x.LeaderIds,
x.LeaderNames,
x.QuestionDef,
x.CheckDate,
x.IsHoldMeet,
IsHoldMeetName = x.IsHoldMeet == true ? "是" : "否",
x.Requirement,
};
}
#endregion
/// <summary>
/// 根据日期获取领导带班检查集合
/// </summary>
/// <param name="startTime">开始时间</param>
/// <param name="endTime">结束时间</param>
/// <param name="projectId">项目号</param>
/// <returns>领导带班检查集合</returns>
public static List<Model.Check_ProjectLeaderCheck> GetProjectLeaderCheckListsByDate(DateTime startTime, DateTime endTime, string projectId)
{
return (from x in Funs.DB.Check_ProjectLeaderCheck where x.CheckDate >= startTime && x.CheckDate <= endTime && x.ProjectId == projectId orderby x.CheckDate select x).ToList();
}
/// <summary>
/// 根据时间段获取HSE领导带班检查集合
/// </summary>
/// <param name="startTime">开始时间</param>
/// <param name="endTime">结束时间</param>
/// <param name="projectId">项目Id</param>
/// <returns>时间段内的HSE领导带班检查集合</returns>
public static int GetCountByDate(DateTime startTime, DateTime endTime, string projectId)
{
return (from x in Funs.DB.Check_ProjectLeaderCheck where x.CheckDate >= startTime && x.CheckDate <= endTime && x.ProjectId == projectId select x).Count();
}
/// <summary>
/// 添加领导带班检查
/// </summary>
/// <param name="ProjectLeaderCheck"></param>
public static void AddProjectLeaderCheck(Model.Check_ProjectLeaderCheck ProjectLeaderCheck)
{
Model.SGGLDB db = Funs.DB;
Model.Check_ProjectLeaderCheck newProjectLeaderCheck = new Model.Check_ProjectLeaderCheck
{
ProjectLeaderCheckId = ProjectLeaderCheck.ProjectLeaderCheckId,
ProjectId = ProjectLeaderCheck.ProjectId,
UnitIds = ProjectLeaderCheck.UnitIds,
CheckCode = ProjectLeaderCheck.CheckCode,
LeaderIds = ProjectLeaderCheck.LeaderIds,
CheckDate = ProjectLeaderCheck.CheckDate,
QuestionDef = ProjectLeaderCheck.QuestionDef,
IsHoldMeet = ProjectLeaderCheck.IsHoldMeet,
Requirement = ProjectLeaderCheck.Requirement,
LeaderNames = ProjectLeaderCheck.LeaderNames,
CompileMan = ProjectLeaderCheck.CompileMan,
CompileDate = ProjectLeaderCheck.CompileDate,
};
db.Check_ProjectLeaderCheck.InsertOnSubmit(newProjectLeaderCheck);
db.SubmitChanges();
CodeRecordsService.InsertCodeRecordsByMenuIdProjectIdUnitId(Const.ProjectLeaderCheckMenuId, ProjectLeaderCheck.ProjectId, null, ProjectLeaderCheck.ProjectLeaderCheckId, ProjectLeaderCheck.CheckDate);
}
/// <summary>
/// 修改领导带班检查
/// </summary>
/// <param name="ProjectLeaderCheck"></param>
public static void UpdateProjectLeaderCheck(Model.Check_ProjectLeaderCheck ProjectLeaderCheck)
{
Model.SGGLDB db = Funs.DB;
Model.Check_ProjectLeaderCheck newProjectLeaderCheck = db.Check_ProjectLeaderCheck.FirstOrDefault(e => e.ProjectLeaderCheckId == ProjectLeaderCheck.ProjectLeaderCheckId);
if (newProjectLeaderCheck != null)
{
newProjectLeaderCheck.UnitIds = ProjectLeaderCheck.UnitIds;
newProjectLeaderCheck.CheckCode = ProjectLeaderCheck.CheckCode;
newProjectLeaderCheck.LeaderIds = ProjectLeaderCheck.LeaderIds;
newProjectLeaderCheck.CheckDate = ProjectLeaderCheck.CheckDate;
newProjectLeaderCheck.QuestionDef = ProjectLeaderCheck.QuestionDef;
newProjectLeaderCheck.IsHoldMeet = ProjectLeaderCheck.IsHoldMeet;
newProjectLeaderCheck.Requirement = ProjectLeaderCheck.Requirement;
newProjectLeaderCheck.LeaderNames = ProjectLeaderCheck.LeaderNames;
newProjectLeaderCheck.CompileMan = ProjectLeaderCheck.CompileMan;
newProjectLeaderCheck.CompileDate = ProjectLeaderCheck.CompileDate;
db.SubmitChanges();
}
}
/// <summary>
/// 根据主键删除领导带班检查
/// </summary>
/// <param name="ProjectLeaderCheckId"></param>
public static void DeleteProjectLeaderCheckById(string ProjectLeaderCheckId)
{
Model.SGGLDB db = Funs.DB;
Model.Check_ProjectLeaderCheck ProjectLeaderCheck = db.Check_ProjectLeaderCheck.FirstOrDefault(e => e.ProjectLeaderCheckId == ProjectLeaderCheckId);
if (ProjectLeaderCheck != null)
{
CodeRecordsService.DeleteCodeRecordsByDataId(ProjectLeaderCheckId);
////删除附件表
BLL.CommonService.DeleteAttachFileById(ProjectLeaderCheckId);
db.Check_ProjectLeaderCheck.DeleteOnSubmit(ProjectLeaderCheck);
db.SubmitChanges();
}
}
public static string getLeaderName(object ProjectLeaderCheckId)
{
string name = string.Empty;
if (ProjectLeaderCheckId != null)
{
var getData = Check_ProjectLeaderCheckService.GetProjectLeaderCheckById(ProjectLeaderCheckId.ToString());
if (getData != null)
{
if (!string.IsNullOrEmpty(getData.LeaderIds))
{
name = Person_PersonsService.getPersonsNamesPersonIds(getData.LeaderIds);
}
if (!string.IsNullOrEmpty(getData.LeaderNames))
{
name += "," + getData.LeaderNames;
}
}
}
return name;
}
}
}
SGGL/BLL/HSSE/CostGoods/ExpenseDetailService.cs
+52 -91
View File
@@ -1,126 +1,87 @@
using System;
using System.Collections.Generic;
using System.Linq;
using WIA;
namespace BLL
{
public class ExpenseDetailService
{
public static decimal? GetSumCostMoneyByExpenseId(string expenseId)
{
return (from x in Funs.DB.CostGoods_ExpenseDetail where x.ExpenseId == expenseId select x.CostMoney).Sum();
}
public static List<Model.CostGoods_ExpenseDetail> GetExpenseDetailsByExpenseId(string expenseId)
{
return (from x in Funs.DB.CostGoods_ExpenseDetail where x.ExpenseId == expenseId select x).ToList();
}
public static decimal GetSumCostMoneyByExpenseIdAndType(string expenseId, string costType)
{
Model.CostGoods_ExpenseDetail detail = (from x in Funs.DB.CostGoods_ExpenseDetail where x.ExpenseId == expenseId && x.CostType == costType select x).FirstOrDefault();
if (detail != null)
{
return detail.CostMoney ?? 0;
}
else
{
return 0;
}
}
/// <summary>
/// 根据单位和时间获取费用明细集合
/// </summary>
/// <param name="unitId"></param>
/// <param name="startTime"></param>
/// <param name="endTime"></param>
/// <returns></returns>
public static List<Model.CostGoods_ExpenseDetail> GetCostDetailsByUnitId(string unitId, DateTime startTime, DateTime endTime)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
return (from x in db.CostGoods_ExpenseDetail
join y in db.CostGoods_Expense on x.ExpenseId equals y.ExpenseId
where y.UnitId == unitId && y.States == BLL.Const.State_2 && y.ApproveDate >= startTime && y.ApproveDate < endTime
select x).Distinct().ToList();
}
}
/// <summary>
/// 根据单位和时间及费用类型获取当期费用
/// </summary>
/// <param name="unitId"></param>
/// <param name="startTime"></param>
/// <param name="endTime"></param>
/// <param name="costType"></param>
/// <returns></returns>
public static decimal GetCostDetailsByUnitIdAndCostType(string unitId, DateTime startTime, DateTime endTime, string costType)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
decimal cost = 0;
var q = from x in db.CostGoods_ExpenseDetail
join y in db.CostGoods_Expense on x.ExpenseId equals y.ExpenseId
join z in db.Sys_FlowOperate
on y.ExpenseId equals z.DataId
where y.UnitId == unitId && y.States == BLL.Const.State_2 && z.State == BLL.Const.State_2 && z.OperaterTime >= startTime && z.OperaterTime < endTime && x.CostType.Contains(costType)
select x.CostMoney;
foreach (var item in q)
{
if (item != null)
{
cost += Funs.GetNewDecimalOrZero(item.ToString());
}
}
return cost;
//return (from x in Funs.DB.CostGoods_ExpenseDetail
// join y in Funs.DB.CostGoods_Expense on x.ExpenseId equals y.ExpenseId
// where y.UnitId == unitId && y.States == BLL.Const.State_2 && y.ApproveDate >= startTime && y.ApproveDate < endTime && x.CostType.Contains(costType)
// select x.CostMoney ?? 0).Sum();
}
}
/// <summary>
/// 增加费用明细信息
/// </summary>
/// <param name="pauseNotice">费用明细实体</param>
public static void AddCostDetail(string expenseId, string costType, decimal costMoney, string costDef)
public static void AddCostDetail(string expenseId)
{
Model.SGGLDB db = Funs.DB;
Model.CostGoods_ExpenseDetail newExpenseDetail = new Model.CostGoods_ExpenseDetail
DeleteCostDetailByExpenseId(expenseId);
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
ExpenseDetailId = SQLHelper.GetNewID(typeof(Model.CostGoods_ExpenseDetail)),
ExpenseId = expenseId,
CostType = costType,
CostMoney = costMoney,
CostDef = costDef
};
db.CostGoods_ExpenseDetail.InsertOnSubmit(newExpenseDetail);
db.SubmitChanges();
var getItems = from x in db.Base_CostTypeItem
join y in db.Base_CostType on x.CostTypeId equals y.CostTypeId
select new
{
ExpenseId=expenseId,
SupCostTypeId = y.CostTypeId,
SupCostTypeName = y.CostTypeName,
SupSortIndex = y.CostTypeCode,
CostType = x.CostTypeItemId,
CostTypeName = x.CostTypeItemName,
SortIndex = x.SortIndex,
CostMoney = 0,
};
foreach (var item in getItems)
{
Model.CostGoods_ExpenseDetail newExpenseDetail = new Model.CostGoods_ExpenseDetail
{
ExpenseDetailId = SQLHelper.GetNewID(),
ExpenseId = expenseId,
SupCostTypeId = item.SupCostTypeId,
SupCostTypeName = item.SupCostTypeName,
SupSortIndex = item.SupSortIndex,
CostType = item.CostType,
CostTypeName = item.CostTypeName,
SortIndex = item.SortIndex,
CostMoney = item.CostMoney,
};
db.CostGoods_ExpenseDetail.InsertOnSubmit(newExpenseDetail);
db.SubmitChanges();
}
}
}
/// <summary>
/// 根据费用编号和费用类型获取费用明细信息
/// </summary>
/// <param name="expenseId"></param>
/// <param name="costType"></param>
/// <returns></returns>
public static Model.CostGoods_ExpenseDetail GetCostDetailByExpenseIdAndCostType(string expenseId, string costType)
public static void UpdateExpenseDetail(Model.CostGoods_ExpenseDetail newItem)
{
return Funs.DB.CostGoods_ExpenseDetail.FirstOrDefault(e => (e.ExpenseId == expenseId && e.CostType == costType));
var getData = Funs.DB.CostGoods_ExpenseDetail.FirstOrDefault(x => x.ExpenseDetailId == newItem.ExpenseDetailId);
if (getData != null)
{
getData.CostMoney = newItem.CostMoney;
Funs.DB.SubmitChanges();
}
}
/// <summary>
/// 根据费用编号删除对应的费用明细信息
/// </summary>
/// <param name="expenseId">编号</param>
public static void DeleteCostDetailByExpenseId(string expenseId)
{
Model.SGGLDB db = Funs.DB;
var q = (from x in db.CostGoods_ExpenseDetail where x.ExpenseId == expenseId select x).ToList();
db.CostGoods_ExpenseDetail.DeleteAllOnSubmit(q);
db.SubmitChanges();
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
var q = from x in db.CostGoods_ExpenseDetail where x.ExpenseId == expenseId select x;
if (q.Count() > 0)
{
db.CostGoods_ExpenseDetail.DeleteAllOnSubmit(q);
db.SubmitChanges();
}
}
}
}
}
SGGL/BLL/HSSE/CostGoods/ExpenseService.cs
+76 -15
View File
@@ -21,6 +21,28 @@ namespace BLL
return Funs.DB.CostGoods_Expense.FirstOrDefault(e => e.ExpenseId == expenseId);
}
/// <summary>
/// 根据主键获取措施费用使用计划
/// </summary>
/// <param name="expenseId"></param>
/// <returns></returns>
public static List<Model.CostGoods_Expense> GetExpenseList(string projectId, string unitId, int? year)
{
var getData = from x in Funs.DB.CostGoods_Expense
where x.ProjectId == projectId
select x;
if (!string.IsNullOrEmpty(unitId) && unitId != Const._Null)
{
getData = getData.Where(x =>x.UnitId == unitId);
}
if (year.HasValue)
{
getData = getData.Where(x => x.Year == year);
}
return getData.OrderBy(x => x.SortIndex).ToList();
}
/// <summary>
/// 根据时间获取当期单位Id集合
/// </summary>
@@ -49,22 +71,17 @@ namespace BLL
ProjectId = expense.ProjectId,
ExpenseCode = expense.ExpenseCode,
UnitId = expense.UnitId,
//newExpense.CompileMan = expense.CompileMan;
ReportDate=expense.ReportDate,
CreateDate = expense.CreateDate,
States = expense.States,
Months = expense.Months,
ReportDate = expense.ReportDate,
PlanCostA = expense.PlanCostA,
PlanCostB = expense.PlanCostB,
CompileMan = expense.CompileMan,
CompileDate = expense.CompileDate,
// newExpense.CheckMan = expense.CheckMan;
CheckDate = expense.CheckDate,
// newExpense.ApproveMan = expense.ApproveMan;
ApproveDate = expense.ApproveDate
SortIndex = expense.SortIndex,
Year = expense.Year,
};
db.CostGoods_Expense.InsertOnSubmit(newExpense);
db.SubmitChanges();
BLL.CodeRecordsService.InsertCodeRecordsByMenuIdProjectIdUnitId(Const.ProjectExpenseMenuId, expense.ProjectId, null, expense.ExpenseId, expense.CreateDate);
}
/// <summary>
@@ -79,20 +96,22 @@ namespace BLL
{
//newExpense.ProjectId = expense.ProjectId;
newExpense.ExpenseCode = expense.ExpenseCode;
newExpense.UnitId = expense.UnitId;
// newExpense.CompileMan = expense.CompileMan;
newExpense.CreateDate = expense.CreateDate;
newExpense.UnitId = expense.UnitId;
newExpense.States = expense.States;
newExpense.Months = expense.Months;
newExpense.ReportDate = expense.ReportDate;
newExpense.PlanCostA = expense.PlanCostA;
newExpense.PlanCostB = expense.PlanCostB;
newExpense.CompileDate = expense.CompileDate;
newExpense.CompileMan = expense.CompileMan;
//newExpense.CheckMan = expense.CheckMan;
newExpense.CheckDate = expense.CheckDate;
//newExpense.CheckDate = expense.CheckDate;
//newExpense.ApproveMan = expense.ApproveMan;
newExpense.ApproveDate = expense.ApproveDate;
// newExpense.ApproveDate = expense.ApproveDate;
newExpense.SortIndex = expense.SortIndex;
newExpense.Year = expense.Year;
db.SubmitChanges();
}
}
@@ -112,6 +131,48 @@ namespace BLL
BLL.CommonService.DeleteFlowOperateByID(expenseId);
db.CostGoods_Expense.DeleteOnSubmit(expense);
db.SubmitChanges();
if (expense.Year.HasValue)
{
SetSumYearExpense(expense.ProjectId, expense.Year.Value);
}
}
}
/// <summary>
/// 当前合计数
/// </summary>
/// <param name="projectId"></param>
/// <param name="Year"></param>
public static void SetSumYearExpense(string projectId,int Year)
{
var getYearEx = Funs.DB. CostGoods_Expense.FirstOrDefault(x=>x.ProjectId == projectId && x.Year == Year && x.UnitId == null);
if (getYearEx != null)
{
Funs.DB.CostGoods_Expense.DeleteOnSubmit(getYearEx);
Funs.DB.SubmitChanges();
}
var getALLEx=from x in Funs.DB.CostGoods_Expense where x.ProjectId == projectId && x.Year == Year && x.UnitId != null select x;
if (getALLEx.Count() > 0)
{
Model.CostGoods_Expense newExpense = new Model.CostGoods_Expense
{
ExpenseId = SQLHelper.GetNewID(),
ProjectId = projectId,
UnitId = null,
CreateDate = DateTime.Now,
Months = DateTime.Now,
ReportDate = DateTime.Now,
CompileDate = DateTime.Now,
CheckDate = DateTime.Now,
ApproveDate = DateTime.Now,
SortIndex = 0,
Year = Year,
};
db.CostGoods_Expense.InsertOnSubmit(newExpense);
db.SubmitChanges();
}
}
}
SGGL/BLL/HSSE/Meeting/SafetyLeaderGroupMeetingService.cs
+152
View File
@@ -0,0 +1,152 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace BLL
{
/// <summary>
/// 安全领导小组会议
/// </summary>
public static class SafetyLeaderGroupMeetingService
{
public static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 根据主键获取安全领导小组会议
/// </summary>
/// <param name="SafetyLeaderGroupMeetingId"></param>
/// <returns></returns>
public static Model.Meeting_SafetyLeaderGroupMeeting GetSafetyLeaderGroupMeetingById(string SafetyLeaderGroupMeetingId)
{
return Funs.DB.Meeting_SafetyLeaderGroupMeeting.FirstOrDefault(e => e.SafetyLeaderGroupMeetingId == SafetyLeaderGroupMeetingId);
}
/// <summary>
/// 根据时间段获取安全领导小组会议集合
/// </summary>
/// <param name="startTime"></param>
/// <param name="endTime"></param>
/// <param name="projectId"></param>
/// <returns></returns>
public static int GetCountByTime(DateTime startTime, DateTime endTime, string projectId)
{
return (from x in Funs.DB.Meeting_SafetyLeaderGroupMeeting where x.SafetyLeaderGroupMeetingDate >= startTime && x.SafetyLeaderGroupMeetingDate < endTime && x.ProjectId == projectId && x.States == BLL.Const.State_2 select x).Count();
}
/// <summary>
/// 根据时间段获取安全领导小组会议参会人数
/// </summary>
/// <param name="startTime"></param>
/// <param name="endTime"></param>
/// <param name="projectId"></param>
/// <returns></returns>
public static int? GetSumAttentPersonNumByMeetingDate(DateTime startTime, DateTime endTime, string projectId)
{
int? sumAttentPersonNum = (from x in Funs.DB.Meeting_SafetyLeaderGroupMeeting where x.SafetyLeaderGroupMeetingDate >= startTime && x.SafetyLeaderGroupMeetingDate < endTime && x.ProjectId == projectId && x.States == BLL.Const.State_2 select x.AttentPersonNum).Sum();
if (sumAttentPersonNum == null)
{
return 0;
}
return sumAttentPersonNum;
}
/// <summary>
/// 根据日期和类型获取会议记录集合
/// </summary>
/// <param name="startTime">开始时间</param>
/// <param name="endTime">结束时间</param>
/// <param name="projectId">项目号</param>
/// <returns>会议记录集合</returns>
public static List<Model.Meeting_SafetyLeaderGroupMeeting> GetMeetingListsByDate(DateTime startTime, DateTime endTime, string projectId)
{
return (from x in Funs.DB.Meeting_SafetyLeaderGroupMeeting where x.SafetyLeaderGroupMeetingDate >= startTime && x.SafetyLeaderGroupMeetingDate <= endTime && x.ProjectId == projectId orderby x.SafetyLeaderGroupMeetingDate select x).ToList();
}
/// <summary>
/// 添加安全领导小组会议
/// </summary>
/// <param name="SafetyLeaderGroupMeeting"></param>
public static void AddSafetyLeaderGroupMeeting(Model.Meeting_SafetyLeaderGroupMeeting SafetyLeaderGroupMeeting)
{
Model.SGGLDB db = Funs.DB;
Model.Meeting_SafetyLeaderGroupMeeting newSafetyLeaderGroupMeeting = new Model.Meeting_SafetyLeaderGroupMeeting
{
SafetyLeaderGroupMeetingId = SafetyLeaderGroupMeeting.SafetyLeaderGroupMeetingId,
ProjectId = SafetyLeaderGroupMeeting.ProjectId,
UnitId = SafetyLeaderGroupMeeting.UnitId,
SafetyLeaderGroupMeetingCode = SafetyLeaderGroupMeeting.SafetyLeaderGroupMeetingCode,
SafetyLeaderGroupMeetingName = SafetyLeaderGroupMeeting.SafetyLeaderGroupMeetingName,
SafetyLeaderGroupMeetingDate = SafetyLeaderGroupMeeting.SafetyLeaderGroupMeetingDate,
CompileMan = SafetyLeaderGroupMeeting.CompileMan,
SafetyLeaderGroupMeetingContents = SafetyLeaderGroupMeeting.SafetyLeaderGroupMeetingContents,
CompileDate = SafetyLeaderGroupMeeting.CompileDate,
States = SafetyLeaderGroupMeeting.States,
AttentPersonNum = SafetyLeaderGroupMeeting.AttentPersonNum,
MeetingHours = SafetyLeaderGroupMeeting.MeetingHours,
MeetingHostMan = SafetyLeaderGroupMeeting.MeetingHostMan,
AttentPerson = SafetyLeaderGroupMeeting.AttentPerson,
MeetingPlace = SafetyLeaderGroupMeeting.MeetingPlace,
MeetingHostManId = SafetyLeaderGroupMeeting.MeetingHostManId,
AttentPersonIds = SafetyLeaderGroupMeeting.AttentPersonIds,
MeetingHostManOther = SafetyLeaderGroupMeeting.MeetingHostManOther
};
db.Meeting_SafetyLeaderGroupMeeting.InsertOnSubmit(newSafetyLeaderGroupMeeting);
db.SubmitChanges();
////增加一条编码记录
BLL.CodeRecordsService.InsertCodeRecordsByMenuIdProjectIdUnitId(BLL.Const.ProjectSafetyLeaderGroupMeetingMenuId, SafetyLeaderGroupMeeting.ProjectId, null, SafetyLeaderGroupMeeting.SafetyLeaderGroupMeetingId, SafetyLeaderGroupMeeting.CompileDate);
}
/// <summary>
/// 修改安全领导小组会议
/// </summary>
/// <param name="SafetyLeaderGroupMeeting"></param>
public static void UpdateSafetyLeaderGroupMeeting(Model.Meeting_SafetyLeaderGroupMeeting SafetyLeaderGroupMeeting)
{
Model.SGGLDB db = Funs.DB;
Model.Meeting_SafetyLeaderGroupMeeting newSafetyLeaderGroupMeeting = db.Meeting_SafetyLeaderGroupMeeting.FirstOrDefault(e => e.SafetyLeaderGroupMeetingId == SafetyLeaderGroupMeeting.SafetyLeaderGroupMeetingId);
if (newSafetyLeaderGroupMeeting != null)
{
//newSafetyLeaderGroupMeeting.ProjectId = SafetyLeaderGroupMeeting.ProjectId;
newSafetyLeaderGroupMeeting.UnitId = SafetyLeaderGroupMeeting.UnitId;
newSafetyLeaderGroupMeeting.SafetyLeaderGroupMeetingCode = SafetyLeaderGroupMeeting.SafetyLeaderGroupMeetingCode;
newSafetyLeaderGroupMeeting.SafetyLeaderGroupMeetingName = SafetyLeaderGroupMeeting.SafetyLeaderGroupMeetingName;
newSafetyLeaderGroupMeeting.SafetyLeaderGroupMeetingDate = SafetyLeaderGroupMeeting.SafetyLeaderGroupMeetingDate;
newSafetyLeaderGroupMeeting.CompileMan = SafetyLeaderGroupMeeting.CompileMan;
newSafetyLeaderGroupMeeting.SafetyLeaderGroupMeetingContents = SafetyLeaderGroupMeeting.SafetyLeaderGroupMeetingContents;
newSafetyLeaderGroupMeeting.CompileDate = SafetyLeaderGroupMeeting.CompileDate;
newSafetyLeaderGroupMeeting.States = SafetyLeaderGroupMeeting.States;
newSafetyLeaderGroupMeeting.AttentPersonNum = SafetyLeaderGroupMeeting.AttentPersonNum;
newSafetyLeaderGroupMeeting.MeetingHours = SafetyLeaderGroupMeeting.MeetingHours;
newSafetyLeaderGroupMeeting.MeetingHostMan = SafetyLeaderGroupMeeting.MeetingHostMan;
newSafetyLeaderGroupMeeting.AttentPerson = SafetyLeaderGroupMeeting.AttentPerson;
newSafetyLeaderGroupMeeting.MeetingPlace = SafetyLeaderGroupMeeting.MeetingPlace;
newSafetyLeaderGroupMeeting.MeetingHostManId = SafetyLeaderGroupMeeting.MeetingHostManId;
newSafetyLeaderGroupMeeting.AttentPersonIds = SafetyLeaderGroupMeeting.AttentPersonIds;
newSafetyLeaderGroupMeeting.MeetingHostManOther = SafetyLeaderGroupMeeting.MeetingHostManOther;
db.SubmitChanges();
}
}
/// <summary>
/// 根据主键删除安全领导小组会议
/// </summary>
/// <param name="SafetyLeaderGroupMeetingId"></param>
public static void DeleteSafetyLeaderGroupMeetingById(string SafetyLeaderGroupMeetingId)
{
Model.SGGLDB db = Funs.DB;
Model.Meeting_SafetyLeaderGroupMeeting SafetyLeaderGroupMeeting = db.Meeting_SafetyLeaderGroupMeeting.FirstOrDefault(e => e.SafetyLeaderGroupMeetingId == SafetyLeaderGroupMeetingId);
if (SafetyLeaderGroupMeeting != null)
{
///删除编码表记录
BLL.CodeRecordsService.DeleteCodeRecordsByDataId(SafetyLeaderGroupMeetingId);
BLL.CommonService.DeleteAttachFileById(SafetyLeaderGroupMeetingId);
////删除流程表
BLL.CommonService.DeleteFlowOperateByID(SafetyLeaderGroupMeeting.SafetyLeaderGroupMeetingId);
db.Meeting_SafetyLeaderGroupMeeting.DeleteOnSubmit(SafetyLeaderGroupMeeting);
db.SubmitChanges();
}
}
}
}
SGGL/BLL/HSSE/SitePerson/SitePerson_PersonService.cs
+4 -2
View File
@@ -45,7 +45,7 @@ namespace BLL
/// <returns></returns>
public static IEnumerable getListData(string projetcId, string unitId, string workPostId, string name, string idCard, string states, string personType, Grid Grid1)
{
IQueryable<Model.View_SitePerson_Person> getDataList = getDataLists.OrderBy(x => x.ProjectId).ThenBy(x => x.UnitId);
IQueryable<Model.View_SitePerson_Person> getDataList = getDataLists;
if (!string.IsNullOrEmpty(projetcId) && projetcId != Const._Null)
{
getDataList = getDataList.Where(e => e.ProjectId == projetcId);
@@ -79,7 +79,7 @@ namespace BLL
{
return null;
}
getDataList = SortConditionHelper.SortingAndPaging(getDataList, Grid1.SortField, Grid1.SortDirection, Grid1.PageIndex, Grid1.PageSize);
getDataList = SortConditionHelper.SortingAndPaging(getDataList.OrderBy(x => x.ProjectId).ThenBy(x => x.UnitId), Grid1.SortField, Grid1.SortDirection, Grid1.PageIndex, Grid1.PageSize);
return from x in getDataList
select new
{
@@ -698,6 +698,7 @@ namespace BLL
InTime = person.InTime.HasValue ? person.InTime : DateTime.Now,
Isprint = "0",
States = person.States,
IsSafetyMonitoring=person.IsSafetyMonitoring,
};
////现场人员项目出入场记录
@@ -767,6 +768,7 @@ namespace BLL
newPerson.States = person.States;
setPersonItemInOut = true;
}
newPerson.IsSafetyMonitoring = person.IsSafetyMonitoring;
db.SubmitChanges();
if (!setPersonItemInOut)