提交代码
This commit is contained in:
+80
-21
@@ -1,4 +1,5 @@
|
||||
using FineUIPro;
|
||||
using Microsoft.SqlServer.Dts.Runtime;
|
||||
using Model;
|
||||
using System;
|
||||
using System.Collections;
|
||||
@@ -113,8 +114,9 @@ namespace BLL
|
||||
}
|
||||
public static void AddBulkProject_HSSEData_HiddenDangerDetails(List<Model.Project_HSSEData_HiddenDangerDetail> newtables)
|
||||
{
|
||||
using (var db = new SGGLDB(Funs.ConnString))
|
||||
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
|
||||
{
|
||||
|
||||
db.Project_HSSEData_HiddenDangerDetail.InsertAllOnSubmit(newtables);
|
||||
db.SubmitChanges();
|
||||
}
|
||||
@@ -174,7 +176,7 @@ namespace BLL
|
||||
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
|
||||
{
|
||||
|
||||
var table = db.Project_HSSEData_HiddenDangerDetail.Where(x => x.ReportDate.Value.Date.CompareTo(reportDate.Value.Date) == 0);
|
||||
var table = db.Project_HSSEData_HiddenDangerDetail.Where(x => x.ReportDate.Value.Date.CompareTo(reportDate.Value.Date) == 0 );
|
||||
db.Project_HSSEData_HiddenDangerDetail.DeleteAllOnSubmit(table);
|
||||
db.SubmitChanges();
|
||||
}
|
||||
@@ -208,10 +210,68 @@ namespace BLL
|
||||
select x).FirstOrDefault();
|
||||
return q;
|
||||
}
|
||||
/// <summary>
|
||||
/// 获取当天的隐患类别数据
|
||||
/// </summary>
|
||||
/// <returns></returns>
|
||||
public static List<Model.HSSEDataHiddenDangerDetailItem> GetTodayModel()
|
||||
{
|
||||
var q = (from x in Funs.DB.Project_HSSEData_HiddenDangerDetail
|
||||
where x.ReportDate < DateTime.Now.AddDays(1).Date && x.ReportDate >= DateTime.Now.Date
|
||||
where x.ReportDate < DateTime.Now.AddDays(1).Date && x.ReportDate >= DateTime.Now.Date
|
||||
group x by x.TypeName into g
|
||||
select new Model.HSSEDataHiddenDangerDetailItem
|
||||
{
|
||||
Id = SQLHelper.GetNewID(),
|
||||
TypeName= g.Key,
|
||||
NeedRectifyNum= g.Sum(p => p.NeedRectifyNum),
|
||||
TotalNum= g.Sum(p => p.TotalNum)
|
||||
}).ToList();
|
||||
return q;
|
||||
}
|
||||
/// <summary>
|
||||
/// 根据单位id和日期 获取单位关联项目次日期的数据
|
||||
/// </summary>
|
||||
/// <param name="Unitid"></param>
|
||||
/// <param name="reportdate"></param>
|
||||
/// <returns></returns>
|
||||
public static List<Model.HSSEDataHiddenDangerDetailItem> GetModelByUnitIdAndReportDate(string Unitid, DateTime? reportdate)
|
||||
{
|
||||
var projectlist = BLL.ProjectService.GetProjectWorkList();
|
||||
var q = (from x in Funs.DB.Project_HSSEData_HiddenDangerDetail
|
||||
where x.ReportDate == reportdate && projectlist.Select(e => e.ProjectId).Contains(x.ProjectId)
|
||||
group x by x.TypeName into g
|
||||
select new Model.HSSEDataHiddenDangerDetailItem
|
||||
{
|
||||
Id = SQLHelper.GetNewID(),
|
||||
TypeName = g.Key,
|
||||
NeedRectifyNum = g.Sum(p => p.NeedRectifyNum),
|
||||
TotalNum = g.Sum(p => p.TotalNum)
|
||||
}).ToList();
|
||||
return q;
|
||||
}
|
||||
/// <summary>
|
||||
/// 根据日期 获取隐患类别数据
|
||||
/// </summary>
|
||||
/// <param name="reportdate"></param>
|
||||
/// <returns></returns>
|
||||
public static List<Model.HSSEDataHiddenDangerDetailItem> GetModelByReportDate( DateTime? reportdate)
|
||||
{
|
||||
var q = (from x in Funs.DB.Project_HSSEData_HiddenDangerDetail
|
||||
where x.ReportDate == reportdate
|
||||
group x by x.TypeName into g
|
||||
select new Model.HSSEDataHiddenDangerDetailItem
|
||||
{
|
||||
Id = SQLHelper.GetNewID(),
|
||||
TypeName = g.Key,
|
||||
NeedRectifyNum = g.Sum(p => p.NeedRectifyNum),
|
||||
TotalNum = g.Sum(p => p.TotalNum)
|
||||
}).ToList();
|
||||
return q;
|
||||
}
|
||||
public static List<Model.HSSEDataHiddenDangerDetailItem> GetModelByReportDate(DateTime? reportdate,string projectid)
|
||||
{
|
||||
var q = (from x in Funs.DB.Project_HSSEData_HiddenDangerDetail
|
||||
where x.ReportDate == reportdate && x.ProjectId==projectid
|
||||
group x by x.TypeName into g
|
||||
select new Model.HSSEDataHiddenDangerDetailItem
|
||||
{
|
||||
@@ -226,7 +286,7 @@ namespace BLL
|
||||
{
|
||||
var db = Funs.DB;
|
||||
|
||||
var projectids = ProjectService.GetCNCECShowProjectList().Select(x => x.ProjectId).ToList();
|
||||
var projectids = ProjectService.GetProjectWorkList().Select(x => x.ProjectId).ToList();
|
||||
var thisUnitId = string.Empty;
|
||||
var thisUnit = CommonService.GetIsThisUnit();
|
||||
if (thisUnit != null)
|
||||
@@ -234,25 +294,24 @@ namespace BLL
|
||||
thisUnitId = thisUnit.UnitId;
|
||||
}
|
||||
var baseUnit = BLL.UnitService.GetUnitByUnitId(thisUnitId);
|
||||
var list = from x in db.HSSE_Hazard_HazardRegister
|
||||
where projectids.Contains(x.ProjectId)
|
||||
select x;
|
||||
var list = from x in db.HSSE_Hazard_HazardRegister where projectids.Contains(x.ProjectId)
|
||||
select x;
|
||||
var data = (from x in list
|
||||
join y in db.HSSE_Hazard_HazardRegisterTypes on x.RegisterTypesId equals y.RegisterTypesId
|
||||
group x by new
|
||||
{ x.ProjectId, x.RegisterTypesId, y.RegisterTypesName }
|
||||
join y in db.HSSE_Hazard_HazardRegisterTypes on x.RegisterTypesId equals y.RegisterTypesId
|
||||
group x by new
|
||||
{ x.ProjectId, x.RegisterTypesId ,y.RegisterTypesName}
|
||||
into g
|
||||
select new
|
||||
{
|
||||
UnitId = thisUnitId,
|
||||
CollCropCode = baseUnit.CollCropCode,
|
||||
UnitName = baseUnit.UnitName,
|
||||
ProjectId = g.Key.ProjectId,
|
||||
ReportDate = DateTime.Now.Date,
|
||||
TypeName = g.Key.RegisterTypesName,
|
||||
TotalNum = g.Count(),
|
||||
NeedRectifyNum = g.Count(x => x.States == "1"),
|
||||
}).ToList();
|
||||
select new
|
||||
{
|
||||
UnitId = thisUnitId,
|
||||
CollCropCode = baseUnit.CollCropCode,
|
||||
UnitName = baseUnit.UnitName,
|
||||
ProjectId= g.Key.ProjectId,
|
||||
ReportDate = DateTime.Now.Date,
|
||||
TypeName=g.Key.RegisterTypesName,
|
||||
TotalNum = g.Count(),
|
||||
NeedRectifyNum = g.Count(x => x.States == "1"),
|
||||
}).ToList();
|
||||
DeleteProject_HSSEData_HiddenDangerDetailByDate(DateTime.Now.Date);
|
||||
var projectHsseDataHiddenDangerDetails = new List<Project_HSSEData_HiddenDangerDetail>();
|
||||
foreach (var item in data)
|
||||
|
||||
Reference in New Issue
Block a user