集团数据对接
This commit is contained in:
parent
c4f1ae6768
commit
fa41b65ed4
|
@ -527,7 +527,9 @@ namespace BLL
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 项目安全总监岗位Id
|
/// 项目安全总监岗位Id
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public static string WorkPost_ProjectHSSEDirector = "5e6e259e-ea0a-4a63-8f52-df4a19a6c9fa";
|
public static string WorkPost_ProjectHSSEDirector = "8A7C2CDF-AFB5-4826-9951-343253342DAC";
|
||||||
|
//public static string WorkPost_ProjectHSSEDirector = "5e6e259e-ea0a-4a63-8f52-df4a19a6c9fa";
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// HSE经理岗位Id
|
/// HSE经理岗位Id
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|
|
@ -249,6 +249,67 @@ namespace BLL
|
||||||
return responeData;
|
return responeData;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
public static HJGLData StatisticalData()
|
||||||
|
{
|
||||||
|
var data = new HJGLData();
|
||||||
|
var thisUnitId = string.Empty;
|
||||||
|
var thisUnit = CommonService.GetIsThisUnit();
|
||||||
|
if (thisUnit != null) thisUnitId = thisUnit.UnitId;
|
||||||
|
var baseUnit = UnitService.GetUnitByUnitId(thisUnitId);
|
||||||
|
var ProjectData = (from x in Funs.DB.Project_HJGLData_HJGL
|
||||||
|
where x.ReportDate < DateTime.Now.AddDays(1).Date && x.ReportDate >= DateTime.Now.Date
|
||||||
|
select x).ToList();
|
||||||
|
Project_HJGLData_HJGLService.StatisticalAllProjectData();
|
||||||
|
Project_HJGLData_DefectService.StatisticalAllProjectData();
|
||||||
|
|
||||||
|
var table = new HJGLData_HJGL
|
||||||
|
{
|
||||||
|
UnitId = thisUnitId,
|
||||||
|
CollCropCode = baseUnit.CollCropCode,
|
||||||
|
UnitName = baseUnit.UnitName,
|
||||||
|
ReportDate = DateTime.Now.Date,
|
||||||
|
WelderNum = ProjectData.Sum(x => x.WelderNum),
|
||||||
|
TotalDineNum = ProjectData.Sum(x => x.TotalDineNum),
|
||||||
|
CompleteDineNum = ProjectData.Sum(x => x.CompleteDineNum),
|
||||||
|
TotalFilmNum = ProjectData.Sum(x => x.TotalFilmNum),
|
||||||
|
OKFilmNum = ProjectData.Sum(x => x.OKFilmNum),
|
||||||
|
CreateMan = Const.sysglyId,
|
||||||
|
CreateDate = DateTime.Now
|
||||||
|
};
|
||||||
|
if (IsReportByToday())
|
||||||
|
{
|
||||||
|
table.Id = GetTodayData().Id;
|
||||||
|
table.State = Const.CNCEC_State_1;
|
||||||
|
UpdateHJGLData_HJGL(table);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
table.Id = SQLHelper.GetNewID();
|
||||||
|
table.State = Const.CNCEC_State_0;
|
||||||
|
|
||||||
|
AddHJGLData_HJGL(table);
|
||||||
|
}
|
||||||
|
|
||||||
|
var item = new HJGLDataItem();
|
||||||
|
item.CollCropCode = table.CollCropCode;
|
||||||
|
item.CompleteDineNum = table.CompleteDineNum;
|
||||||
|
item.Id = table.Id;
|
||||||
|
item.OKFilmNum = table.OKFilmNum;
|
||||||
|
item.ReportDate = table.ReportDate.Value.ToShortDateString();
|
||||||
|
item.TotalDineNum = table.TotalDineNum;
|
||||||
|
item.TotalFilmNum = table.TotalFilmNum;
|
||||||
|
item.UnitId = table.UnitId;
|
||||||
|
item.WelderNum = table.WelderNum;
|
||||||
|
item.HJGLDataDefectItems = Project_HJGLData_DefectService.getTodayProject_HJGLData_Defect();
|
||||||
|
var hJGLDataItems = new List<HJGLDataItem>();
|
||||||
|
hJGLDataItems.Add(item);
|
||||||
|
|
||||||
|
data.HJGLDataItems = hJGLDataItems;
|
||||||
|
return data;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
public static async Task<HJGLData> StatisticalDataAsync()
|
public static async Task<HJGLData> StatisticalDataAsync()
|
||||||
{
|
{
|
||||||
var data = new HJGLData();
|
var data = new HJGLData();
|
||||||
|
@ -256,23 +317,30 @@ namespace BLL
|
||||||
var thisUnit = CommonService.GetIsThisUnit();
|
var thisUnit = CommonService.GetIsThisUnit();
|
||||||
if (thisUnit != null) thisUnitId = thisUnit.UnitId;
|
if (thisUnit != null) thisUnitId = thisUnit.UnitId;
|
||||||
var baseUnit = UnitService.GetUnitByUnitId(thisUnitId);
|
var baseUnit = UnitService.GetUnitByUnitId(thisUnitId);
|
||||||
|
|
||||||
|
Project_HJGLData_HJGLService.StatisticalAllProjectData();
|
||||||
Project_HJGLData_DefectService.StatisticalAllProjectData();
|
Project_HJGLData_DefectService.StatisticalAllProjectData();
|
||||||
// 并行执行异步方法
|
// 并行执行异步方法
|
||||||
var welderNumTask = HJGLData_HJGLService.GetWelderNumAsync(); //获取焊工总数
|
var projectHJGLDataListTask = HJGLData_HJGLService.GetProjectHJGLDataAsync(); //获取焊接检查信息
|
||||||
var dineInfoListTask = HJGLData_HJGLService.GetDineInfoAsync(); //获达因数信息
|
|
||||||
var chCheckItemListTask = HJGLData_HJGLService.GetCHCheckItemAsync(); //获取焊接检查信息
|
//// 并行执行异步方法
|
||||||
|
//var welderNumTask = HJGLData_HJGLService.GetWelderNumAsync(); //获取焊工总数
|
||||||
|
//var dineInfoListTask = HJGLData_HJGLService.GetDineInfoAsync(); //获达因数信息
|
||||||
|
//var chCheckItemListTask = HJGLData_HJGLService.GetCHCheckItemAsync(); //获取焊接检查信息
|
||||||
|
|
||||||
// 等待所有异步方法执行完成
|
// 等待所有异步方法执行完成
|
||||||
await Task.WhenAll(
|
await Task.WhenAll(
|
||||||
welderNumTask,
|
projectHJGLDataListTask
|
||||||
dineInfoListTask,
|
//welderNumTask,
|
||||||
chCheckItemListTask
|
//dineInfoListTask,
|
||||||
|
//chCheckItemListTask
|
||||||
);
|
);
|
||||||
|
|
||||||
// 统一获取异步方法的返回值
|
// 统一获取异步方法的返回值
|
||||||
var welderNum = await welderNumTask;
|
var projectHJGLDataList = await projectHJGLDataListTask;
|
||||||
var dineInfoList = await dineInfoListTask;
|
//var welderNum = await welderNumTask;
|
||||||
var chCheckItemList = await chCheckItemListTask;
|
//var dineInfoList = await dineInfoListTask;
|
||||||
|
//var chCheckItemList = await chCheckItemListTask;
|
||||||
|
|
||||||
|
|
||||||
var table = new HJGLData_HJGL
|
var table = new HJGLData_HJGL
|
||||||
|
@ -281,67 +349,71 @@ namespace BLL
|
||||||
CollCropCode = baseUnit.CollCropCode,
|
CollCropCode = baseUnit.CollCropCode,
|
||||||
UnitName = baseUnit.UnitName,
|
UnitName = baseUnit.UnitName,
|
||||||
ReportDate = DateTime.Now.Date,
|
ReportDate = DateTime.Now.Date,
|
||||||
WelderNum = welderNum.Count(),
|
WelderNum = projectHJGLDataList.Sum(x => x.WelderNum),
|
||||||
TotalDineNum = Convert.ToInt32(dineInfoList.Sum(x => x.Size)),
|
TotalDineNum = projectHJGLDataList.Sum(x => x.TotalDineNum),
|
||||||
CompleteDineNum = Convert.ToInt32(dineInfoList.Sum(x => x.DoneDin)),
|
CompleteDineNum = projectHJGLDataList.Sum(x => x.CompleteDineNum),
|
||||||
TotalFilmNum = Convert.ToInt32(chCheckItemList.Sum(x => x.CHT_TotalFilm)),
|
TotalFilmNum = projectHJGLDataList.Sum(x => x.TotalFilmNum),
|
||||||
OKFilmNum = Convert.ToInt32(chCheckItemList.Sum(x => x.CHT_PassFilm)),
|
OKFilmNum = projectHJGLDataList.Sum(x => x.OKFilmNum),
|
||||||
|
//WelderNum = welderNum.Count(),
|
||||||
|
//TotalDineNum = Convert.ToInt32(dineInfoList.Sum(x => x.Size)),
|
||||||
|
//CompleteDineNum = Convert.ToInt32(dineInfoList.Sum(x => x.DoneDin)),
|
||||||
|
//TotalFilmNum = Convert.ToInt32(chCheckItemList.Sum(x => x.CHT_TotalFilm)),
|
||||||
|
//OKFilmNum = Convert.ToInt32(chCheckItemList.Sum(x => x.CHT_PassFilm)),
|
||||||
CreateMan = Const.sysglyId,
|
CreateMan = Const.sysglyId,
|
||||||
CreateDate = DateTime.Now
|
CreateDate = DateTime.Now
|
||||||
};
|
};
|
||||||
|
//Project_HJGLData_HJGLService.DeleteProject_HJGLData_HJGLByDate(DateTime.Now.Date);
|
||||||
|
//// 预先对 dineInfoList 和 chCheckItemList 按 ProjectId 进行分组
|
||||||
|
//var dineInfoDict = dineInfoList
|
||||||
|
// .Where(x => BeUnderConstructionList.Contains(x.ProjectId))
|
||||||
|
// .GroupBy(x => x.ProjectId)
|
||||||
|
// .ToDictionary(g => g.Key, g => new
|
||||||
|
// {
|
||||||
|
// TotalDineNum = g.Sum(x => x.Size),
|
||||||
|
// CompleteDineNum = g.Sum(x => x.DoneDin)
|
||||||
|
// });
|
||||||
|
|
||||||
Project_HJGLData_HJGLService.DeleteProject_HJGLData_HJGLByDate(DateTime.Now.Date);
|
//var chCheckItemDict = chCheckItemList
|
||||||
// 预先对 dineInfoList 和 chCheckItemList 按 ProjectId 进行分组
|
// .Where(x => BeUnderConstructionList.Contains(x.ProjectId))
|
||||||
var dineInfoDict = dineInfoList
|
// .GroupBy(x => x.ProjectId)
|
||||||
.Where(x => BeUnderConstructionList.Contains(x.ProjectId))
|
// .ToDictionary(g => g.Key, g => new
|
||||||
.GroupBy(x => x.ProjectId)
|
// {
|
||||||
.ToDictionary(g => g.Key, g => new
|
// TotalFilmNum = g.Sum(x => x.CHT_TotalFilm),
|
||||||
{
|
// OKFilmNum = g.Sum(x => x.CHT_PassFilm)
|
||||||
TotalDineNum = g.Sum(x => x.Size),
|
// });
|
||||||
CompleteDineNum = g.Sum(x => x.DoneDin)
|
|
||||||
});
|
|
||||||
|
|
||||||
var chCheckItemDict = chCheckItemList
|
//foreach (var projectid in BeUnderConstructionList)
|
||||||
.Where(x => BeUnderConstructionList.Contains(x.ProjectId))
|
//{
|
||||||
.GroupBy(x => x.ProjectId)
|
// // 获取焊工数量
|
||||||
.ToDictionary(g => g.Key, g => new
|
// int welderCount = welderNum.Count(x => x.ProjectId == projectid);
|
||||||
{
|
|
||||||
TotalFilmNum = g.Sum(x => x.CHT_TotalFilm),
|
|
||||||
OKFilmNum = g.Sum(x => x.CHT_PassFilm)
|
|
||||||
});
|
|
||||||
|
|
||||||
foreach (var projectid in BeUnderConstructionList)
|
// // 获取达因信息
|
||||||
{
|
// var dineInfo = dineInfoDict.TryGetValue(projectid, out var dineData)
|
||||||
// 获取焊工数量
|
// ? dineData
|
||||||
int welderCount = welderNum.Count(x => x.ProjectId == projectid);
|
// : new { TotalDineNum = (double?)0, CompleteDineNum = (double?)0 };
|
||||||
|
|
||||||
// 获取达因信息
|
// // 获取拍片信息
|
||||||
var dineInfo = dineInfoDict.TryGetValue(projectid, out var dineData)
|
// var chCheckItem = chCheckItemDict.TryGetValue(projectid, out var checkData)
|
||||||
? dineData
|
// ? checkData
|
||||||
: new { TotalDineNum = (double?)0, CompleteDineNum = (double?)0 };
|
// : new { TotalFilmNum = (int?)0, OKFilmNum = (int?)0 };
|
||||||
|
|
||||||
// 获取拍片信息
|
// var projectCqmsData = new Project_HJGLData_HJGL()
|
||||||
var chCheckItem = chCheckItemDict.TryGetValue(projectid, out var checkData)
|
// {
|
||||||
? checkData
|
// Id = SQLHelper.GetNewID(),
|
||||||
: new { TotalFilmNum = (int?)0, OKFilmNum = (int?)0 };
|
// ProjectId = projectid,
|
||||||
|
// UnitId = thisUnitId,
|
||||||
|
// CollCropCode = baseUnit.CollCropCode,
|
||||||
|
// UnitName = baseUnit.UnitName,
|
||||||
|
// ReportDate = DateTime.Now.Date,
|
||||||
|
// WelderNum = welderCount,
|
||||||
|
// TotalDineNum = Convert.ToInt32(dineInfo.TotalDineNum),
|
||||||
|
// CompleteDineNum = Convert.ToInt32(dineInfo.CompleteDineNum),
|
||||||
|
// TotalFilmNum = chCheckItem.TotalFilmNum,
|
||||||
|
// OKFilmNum = chCheckItem.OKFilmNum,
|
||||||
|
// };
|
||||||
|
|
||||||
var projectCqmsData = new Project_HJGLData_HJGL()
|
// Project_HJGLData_HJGLService.AddProject_HJGLData_HJGL(projectCqmsData);
|
||||||
{
|
//}
|
||||||
Id = SQLHelper.GetNewID(),
|
|
||||||
ProjectId = projectid,
|
|
||||||
UnitId = thisUnitId,
|
|
||||||
CollCropCode = baseUnit.CollCropCode,
|
|
||||||
UnitName = baseUnit.UnitName,
|
|
||||||
ReportDate = DateTime.Now.Date,
|
|
||||||
WelderNum = welderCount,
|
|
||||||
TotalDineNum = Convert.ToInt32(dineInfo.TotalDineNum),
|
|
||||||
CompleteDineNum = Convert.ToInt32(dineInfo.CompleteDineNum),
|
|
||||||
TotalFilmNum = chCheckItem.TotalFilmNum,
|
|
||||||
OKFilmNum = chCheckItem.OKFilmNum,
|
|
||||||
};
|
|
||||||
|
|
||||||
Project_HJGLData_HJGLService.AddProject_HJGLData_HJGL(projectCqmsData);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
if (IsReportByToday())
|
if (IsReportByToday())
|
||||||
|
@ -451,6 +523,7 @@ namespace BLL
|
||||||
{
|
{
|
||||||
return await Task.Run(GetDineInfo);
|
return await Task.Run(GetDineInfo);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 获取焊接检查信息
|
/// 获取焊接检查信息
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
@ -479,5 +552,25 @@ namespace BLL
|
||||||
{
|
{
|
||||||
return await Task.Run(GetCHCheckItem);
|
return await Task.Run(GetCHCheckItem);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 获取项目焊接信息
|
||||||
|
/// </summary>
|
||||||
|
/// <returns></returns>
|
||||||
|
public static List<Project_HJGLData_HJGL> GetProjectHJGLData()
|
||||||
|
{
|
||||||
|
var result = (from x in Funs.DB.Project_HJGLData_HJGL
|
||||||
|
where BeUnderConstructionList.Contains(x.ProjectId) && x.ReportDate < DateTime.Now.AddDays(1).Date && x.ReportDate >= DateTime.Now.Date
|
||||||
|
select x).ToList();
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
/// <summary>
|
||||||
|
/// 获取项目焊接信息(异步)
|
||||||
|
/// </summary>
|
||||||
|
/// <returns></returns>
|
||||||
|
public static async Task<List<Project_HJGLData_HJGL>> GetProjectHJGLDataAsync()
|
||||||
|
{
|
||||||
|
return await Task.Run(GetProjectHJGLData);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -1809,7 +1809,7 @@ namespace BLL
|
||||||
join y in Funs.DB.QualityAudit_PersonQuality on x.PersonId equals y.PersonId
|
join y in Funs.DB.QualityAudit_PersonQuality on x.PersonId equals y.PersonId
|
||||||
join m in Funs.DB.Base_WorkPost on p.WorkPostId equals m.WorkPostId into mGroup
|
join m in Funs.DB.Base_WorkPost on p.WorkPostId equals m.WorkPostId into mGroup
|
||||||
from m in mGroup.DefaultIfEmpty()
|
from m in mGroup.DefaultIfEmpty()
|
||||||
where BeUnderConstructionList.Contains(p.ProjectId) && p.IsUsed == true && m.PostType == Const.PostType_2 && (x.LimitDate == null || x.LimitDate < DateTime.Now)
|
where BeUnderConstructionList.Contains(p.ProjectId) && p.IsUsed == true && m.PostType == Const.PostType_2 && (x.LimitDate == null || x.LimitDate > DateTime.Now)
|
||||||
select new Model.OfSafetySupervisorsOutput
|
select new Model.OfSafetySupervisorsOutput
|
||||||
{
|
{
|
||||||
ProjectId = p.ProjectId,
|
ProjectId = p.ProjectId,
|
||||||
|
|
|
@ -320,6 +320,27 @@ namespace BLL
|
||||||
public static int GetTotalDineNum(string projectid)
|
public static int GetTotalDineNum(string projectid)
|
||||||
{
|
{
|
||||||
int result = 0;
|
int result = 0;
|
||||||
|
var getD1 = from x in Funs.DB.HJGL_FL_TotalQuantity
|
||||||
|
where x.ProjectId == projectid
|
||||||
|
select x;
|
||||||
|
if (getD1.Count() > 0)
|
||||||
|
{
|
||||||
|
foreach (var item in getD1)
|
||||||
|
{
|
||||||
|
result += Funs.GetNewIntOrZero(item.TotalWeldQuantity.Split('.')[0]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
var getD2 = (from x in Funs.DB.HJGL_FL_Data
|
||||||
|
where x.ProjectId == projectid
|
||||||
|
orderby x.CompileDate descending
|
||||||
|
select x).FirstOrDefault();
|
||||||
|
if (getD2 != null)
|
||||||
|
{
|
||||||
|
result = Funs.GetNewIntOrZero(getD2.TotalWeldQuantity.Split('.')[0]);
|
||||||
|
}
|
||||||
|
}
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
@ -329,6 +350,27 @@ namespace BLL
|
||||||
public static int GetCompleteDineNum(string projectid)
|
public static int GetCompleteDineNum(string projectid)
|
||||||
{
|
{
|
||||||
int result = 0;
|
int result = 0;
|
||||||
|
var getD1 = from x in Funs.DB.HJGL_FL_TotalQuantity
|
||||||
|
where x.ProjectId == projectid
|
||||||
|
select x;
|
||||||
|
if (getD1.Count() > 0)
|
||||||
|
{
|
||||||
|
foreach (var item in getD1)
|
||||||
|
{
|
||||||
|
result += Funs.GetNewIntOrZero(item.TotalCompleted.Split('.')[0]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
var getD2 = (from x in Funs.DB.HJGL_FL_Data
|
||||||
|
where x.ProjectId == projectid
|
||||||
|
orderby x.CompileDate descending
|
||||||
|
select x).FirstOrDefault();
|
||||||
|
if (getD2 != null)
|
||||||
|
{
|
||||||
|
result = Funs.GetNewIntOrZero(getD2.TotalCompleted.Split('.')[0]);
|
||||||
|
}
|
||||||
|
}
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
@ -337,10 +379,20 @@ namespace BLL
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
public static int GetTotalFilmNum(string projectid)
|
public static int GetTotalFilmNum(string projectid)
|
||||||
{
|
{
|
||||||
int result = Convert.ToInt32((from x in Funs.DB.CH_CheckItem
|
//int result = Convert.ToInt32((from x in Funs.DB.CH_CheckItem
|
||||||
join y in Funs.DB.CH_Check on x.CHT_CheckID equals y.CHT_CheckID
|
// join y in Funs.DB.CH_Check on x.CHT_CheckID equals y.CHT_CheckID
|
||||||
where y.ProjectId == projectid
|
// where y.ProjectId == projectid
|
||||||
select x.CHT_TotalFilm).ToList().Sum());
|
// select x.CHT_TotalFilm).ToList().Sum());
|
||||||
|
|
||||||
|
int result = 0;
|
||||||
|
var getD2 = (from x in Funs.DB.HJGL_FL_Data
|
||||||
|
where x.ProjectId == projectid
|
||||||
|
orderby x.CompileDate descending
|
||||||
|
select x).FirstOrDefault();
|
||||||
|
if (getD2 != null)
|
||||||
|
{
|
||||||
|
result = Funs.GetNewIntOrZero(getD2.OneTimeFilmAmount.Split('.')[0]);
|
||||||
|
}
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
@ -349,10 +401,19 @@ namespace BLL
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
public static int GetOKFilmNum(string projectid)
|
public static int GetOKFilmNum(string projectid)
|
||||||
{
|
{
|
||||||
int result = Convert.ToInt32((from x in Funs.DB.CH_CheckItem
|
//int result = Convert.ToInt32((from x in Funs.DB.CH_CheckItem
|
||||||
join y in Funs.DB.CH_Check on x.CHT_CheckID equals y.CHT_CheckID
|
// join y in Funs.DB.CH_Check on x.CHT_CheckID equals y.CHT_CheckID
|
||||||
where y.ProjectId == projectid
|
// where y.ProjectId == projectid
|
||||||
select x.CHT_PassFilm).ToList().Sum());
|
// select x.CHT_PassFilm).ToList().Sum());
|
||||||
|
int result = 0;
|
||||||
|
var getD2 = (from x in Funs.DB.HJGL_FL_Data
|
||||||
|
where x.ProjectId == projectid
|
||||||
|
orderby x.CompileDate descending
|
||||||
|
select x).FirstOrDefault();
|
||||||
|
if (getD2 != null)
|
||||||
|
{
|
||||||
|
result = Funs.GetNewIntOrZero(getD2.OneTimeFilmQualifiedAmount.Split('.')[0]);
|
||||||
|
}
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1504,7 +1504,7 @@ namespace BLL
|
||||||
{
|
{
|
||||||
var result = (from x in Funs.DB.Solution_LargerHazard
|
var result = (from x in Funs.DB.Solution_LargerHazard
|
||||||
where x.ProjectId == projectid && x.IsSuperLargerHazard == false && x.RecordTime > Const.DtmarkTime
|
where x.ProjectId == projectid && x.IsSuperLargerHazard == false && x.RecordTime > Const.DtmarkTime
|
||||||
select x.OperativesNum).ToList().Sum(x => x.Value);
|
select x).ToList().Sum(x => x.OperativesNum ?? 0);
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1567,7 +1567,7 @@ namespace BLL
|
||||||
{
|
{
|
||||||
var result =
|
var result =
|
||||||
(from x in Funs.DB.Solution_LargerHazard
|
(from x in Funs.DB.Solution_LargerHazard
|
||||||
where x.ProjectId == projectid && x.IsSuperLargerHazard == true && x.RecordTime > Const.DtmarkTime
|
where x.ProjectId == projectid && x.IsSuperLargerHazard == true && x.OperativesNum != null && x.RecordTime > Const.DtmarkTime
|
||||||
select x.OperativesNum).ToList().Sum(x => x.Value);
|
select x.OperativesNum).ToList().Sum(x => x.Value);
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<_PublishTargetUrl>G:\发布\五环WebApi</_PublishTargetUrl>
|
<_PublishTargetUrl>G:\发布\五环WebApi</_PublishTargetUrl>
|
||||||
<History>True|2025-06-20T03:24:58.4099232Z||;True|2025-06-19T16:42:45.2358810+08:00||;True|2025-06-16T19:28:10.6447738+08:00||;True|2025-06-12T11:00:02.3559090+08:00||;True|2025-06-12T10:40:29.0324520+08:00||;True|2025-06-04T23:24:01.0324973+08:00||;True|2025-06-04T18:39:41.7304136+08:00||;True|2025-06-04T11:23:17.3803405+08:00||;True|2025-06-04T11:04:32.4212196+08:00||;True|2025-05-26T19:19:09.7246357+08:00||;True|2025-05-26T19:16:39.1283077+08:00||;True|2025-05-26T19:09:24.1561616+08:00||;True|2025-04-07T16:11:44.5172315+08:00||;True|2025-04-02T18:10:22.8695984+08:00||;True|2025-04-02T17:59:51.2978116+08:00||;True|2025-04-02T17:50:55.8630437+08:00||;True|2025-04-02T17:49:22.5114405+08:00||;True|2025-04-02T17:47:11.0650205+08:00||;True|2025-04-02T17:39:09.8576853+08:00||;True|2025-04-02T17:38:15.3079030+08:00||;True|2025-04-02T17:22:03.6735964+08:00||;True|2025-04-02T17:19:04.4220913+08:00||;True|2025-04-02T17:17:14.0244636+08:00||;True|2025-04-02T17:11:09.6583011+08:00||;True|2025-04-02T17:07:23.6330597+08:00||;True|2025-04-02T16:58:45.4070649+08:00||;True|2025-04-02T16:50:20.5907511+08:00||;True|2025-04-02T16:44:18.5351224+08:00||;True|2025-04-02T16:31:11.1297141+08:00||;True|2025-04-02T16:18:43.1126995+08:00||;True|2025-04-02T14:50:42.5384021+08:00||;True|2025-04-01T10:53:08.9403414+08:00||;True|2025-04-01T10:52:08.7646389+08:00||;True|2025-04-01T09:52:56.3095742+08:00||;True|2025-03-13T16:44:25.3220313+08:00||;True|2025-03-13T15:31:10.3223071+08:00||;True|2025-03-13T10:58:17.1401575+08:00||;True|2025-01-23T23:10:37.9664637+08:00||;True|2024-09-24T09:51:10.8028974+08:00||;True|2024-09-20T17:30:59.6144803+08:00||;True|2024-09-20T15:28:40.2547949+08:00||;True|2024-09-19T16:30:51.3047517+08:00||;True|2024-09-19T15:53:23.2431713+08:00||;True|2024-09-19T15:48:55.0571748+08:00||;True|2024-09-19T15:06:29.5748482+08:00||;True|2024-09-19T14:55:42.1477578+08:00||;True|2024-09-19T10:07:53.8666329+08:00||;True|2024-09-03T16:26:17.4985546+08:00||;True|2024-07-17T10:29:15.9472548+08:00||;</History>
|
<History>True|2025-06-25T15:22:39.7267591Z||;True|2025-06-25T23:19:33.2378458+08:00||;True|2025-06-25T22:18:16.2863303+08:00||;True|2025-06-25T22:10:29.2540175+08:00||;True|2025-06-25T22:00:58.5212166+08:00||;True|2025-06-25T22:00:31.2531214+08:00||;True|2025-06-25T18:33:01.5770030+08:00||;True|2025-06-25T17:47:33.7779622+08:00||;True|2025-06-25T17:40:26.9905954+08:00||;True|2025-06-20T11:24:58.4099232+08:00||;True|2025-06-19T16:42:45.2358810+08:00||;True|2025-06-16T19:28:10.6447738+08:00||;True|2025-06-12T11:00:02.3559090+08:00||;True|2025-06-12T10:40:29.0324520+08:00||;True|2025-06-04T23:24:01.0324973+08:00||;True|2025-06-04T18:39:41.7304136+08:00||;True|2025-06-04T11:23:17.3803405+08:00||;True|2025-06-04T11:04:32.4212196+08:00||;True|2025-05-26T19:19:09.7246357+08:00||;True|2025-05-26T19:16:39.1283077+08:00||;True|2025-05-26T19:09:24.1561616+08:00||;True|2025-04-07T16:11:44.5172315+08:00||;True|2025-04-02T18:10:22.8695984+08:00||;True|2025-04-02T17:59:51.2978116+08:00||;True|2025-04-02T17:50:55.8630437+08:00||;True|2025-04-02T17:49:22.5114405+08:00||;True|2025-04-02T17:47:11.0650205+08:00||;True|2025-04-02T17:39:09.8576853+08:00||;True|2025-04-02T17:38:15.3079030+08:00||;True|2025-04-02T17:22:03.6735964+08:00||;True|2025-04-02T17:19:04.4220913+08:00||;True|2025-04-02T17:17:14.0244636+08:00||;True|2025-04-02T17:11:09.6583011+08:00||;True|2025-04-02T17:07:23.6330597+08:00||;True|2025-04-02T16:58:45.4070649+08:00||;True|2025-04-02T16:50:20.5907511+08:00||;True|2025-04-02T16:44:18.5351224+08:00||;True|2025-04-02T16:31:11.1297141+08:00||;True|2025-04-02T16:18:43.1126995+08:00||;True|2025-04-02T14:50:42.5384021+08:00||;True|2025-04-01T10:53:08.9403414+08:00||;True|2025-04-01T10:52:08.7646389+08:00||;True|2025-04-01T09:52:56.3095742+08:00||;True|2025-03-13T16:44:25.3220313+08:00||;True|2025-03-13T15:31:10.3223071+08:00||;True|2025-03-13T10:58:17.1401575+08:00||;True|2025-01-23T23:10:37.9664637+08:00||;True|2024-09-24T09:51:10.8028974+08:00||;True|2024-09-20T17:30:59.6144803+08:00||;True|2024-09-20T15:28:40.2547949+08:00||;True|2024-09-19T16:30:51.3047517+08:00||;True|2024-09-19T15:53:23.2431713+08:00||;True|2024-09-19T15:48:55.0571748+08:00||;True|2024-09-19T15:06:29.5748482+08:00||;True|2024-09-19T14:55:42.1477578+08:00||;True|2024-09-19T10:07:53.8666329+08:00||;True|2024-09-03T16:26:17.4985546+08:00||;True|2024-07-17T10:29:15.9472548+08:00||;</History>
|
||||||
<LastFailureDetails />
|
<LastFailureDetails />
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
@ -86,22 +86,22 @@
|
||||||
<publishTime>10/28/2024 14:02:50</publishTime>
|
<publishTime>10/28/2024 14:02:50</publishTime>
|
||||||
</File>
|
</File>
|
||||||
<File Include="bin/App_global.asax.compiled">
|
<File Include="bin/App_global.asax.compiled">
|
||||||
<publishTime>06/20/2025 11:24:56</publishTime>
|
<publishTime>06/25/2025 23:40:39</publishTime>
|
||||||
</File>
|
</File>
|
||||||
<File Include="bin/App_global.asax.dll">
|
<File Include="bin/App_global.asax.dll">
|
||||||
<publishTime>06/20/2025 11:24:56</publishTime>
|
<publishTime>06/25/2025 23:40:39</publishTime>
|
||||||
</File>
|
</File>
|
||||||
<File Include="bin/Aspose.Words.dll">
|
<File Include="bin/Aspose.Words.dll">
|
||||||
<publishTime>12/06/2024 20:13:58</publishTime>
|
<publishTime>12/06/2024 20:13:58</publishTime>
|
||||||
</File>
|
</File>
|
||||||
<File Include="bin/BLL.dll">
|
<File Include="bin/BLL.dll">
|
||||||
<publishTime>06/20/2025 11:24:35</publishTime>
|
<publishTime>06/25/2025 23:40:29</publishTime>
|
||||||
</File>
|
</File>
|
||||||
<File Include="bin/BLL.dll.config">
|
<File Include="bin/BLL.dll.config">
|
||||||
<publishTime>12/26/2024 09:46:52</publishTime>
|
<publishTime>12/26/2024 09:46:52</publishTime>
|
||||||
</File>
|
</File>
|
||||||
<File Include="bin/BLL.pdb">
|
<File Include="bin/BLL.pdb">
|
||||||
<publishTime>06/20/2025 11:24:35</publishTime>
|
<publishTime>06/25/2025 23:40:29</publishTime>
|
||||||
</File>
|
</File>
|
||||||
<File Include="bin/BouncyCastle.Crypto.dll">
|
<File Include="bin/BouncyCastle.Crypto.dll">
|
||||||
<publishTime>12/18/2020 05:32:28</publishTime>
|
<publishTime>12/18/2020 05:32:28</publishTime>
|
||||||
|
@ -128,10 +128,10 @@
|
||||||
<publishTime>07/25/2012 19:48:56</publishTime>
|
<publishTime>07/25/2012 19:48:56</publishTime>
|
||||||
</File>
|
</File>
|
||||||
<File Include="bin/Model.dll">
|
<File Include="bin/Model.dll">
|
||||||
<publishTime>06/20/2025 11:24:28</publishTime>
|
<publishTime>06/25/2025 17:39:58</publishTime>
|
||||||
</File>
|
</File>
|
||||||
<File Include="bin/Model.pdb">
|
<File Include="bin/Model.pdb">
|
||||||
<publishTime>06/20/2025 11:24:28</publishTime>
|
<publishTime>06/25/2025 17:39:58</publishTime>
|
||||||
</File>
|
</File>
|
||||||
<File Include="bin/netstandard.dll">
|
<File Include="bin/netstandard.dll">
|
||||||
<publishTime>07/04/2024 14:13:01</publishTime>
|
<publishTime>07/04/2024 14:13:01</publishTime>
|
||||||
|
@ -389,13 +389,13 @@
|
||||||
<publishTime>02/09/2013 00:42:28</publishTime>
|
<publishTime>02/09/2013 00:42:28</publishTime>
|
||||||
</File>
|
</File>
|
||||||
<File Include="bin/WebAPI.dll">
|
<File Include="bin/WebAPI.dll">
|
||||||
<publishTime>06/20/2025 11:24:38</publishTime>
|
<publishTime>06/25/2025 23:40:30</publishTime>
|
||||||
</File>
|
</File>
|
||||||
<File Include="bin/WebAPI.pdb">
|
<File Include="bin/WebAPI.pdb">
|
||||||
<publishTime>06/20/2025 11:24:38</publishTime>
|
<publishTime>06/25/2025 23:40:30</publishTime>
|
||||||
</File>
|
</File>
|
||||||
<File Include="bin/WebAPI.xml">
|
<File Include="bin/WebAPI.xml">
|
||||||
<publishTime>06/20/2025 11:24:38</publishTime>
|
<publishTime>06/25/2025 23:40:30</publishTime>
|
||||||
</File>
|
</File>
|
||||||
<File Include="bin/WebGrease.dll">
|
<File Include="bin/WebGrease.dll">
|
||||||
<publishTime>01/23/2014 21:57:34</publishTime>
|
<publishTime>01/23/2014 21:57:34</publishTime>
|
||||||
|
@ -479,7 +479,7 @@
|
||||||
<publishTime>10/28/2024 14:02:50</publishTime>
|
<publishTime>10/28/2024 14:02:50</publishTime>
|
||||||
</File>
|
</File>
|
||||||
<File Include="PrecompiledApp.config">
|
<File Include="PrecompiledApp.config">
|
||||||
<publishTime>06/20/2025 11:24:39</publishTime>
|
<publishTime>06/25/2025 23:40:32</publishTime>
|
||||||
</File>
|
</File>
|
||||||
<File Include="Scripts/bootstrap.js">
|
<File Include="Scripts/bootstrap.js">
|
||||||
<publishTime>10/28/2024 14:02:50</publishTime>
|
<publishTime>10/28/2024 14:02:50</publishTime>
|
||||||
|
|
Loading…
Reference in New Issue