lpf/CNCEC_SUBQHSE_WUHUAN
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

施工人力

Browse Source
This commit is contained in:
geh
2025-12-01 10:24:34 +08:00
parent da23e72a7f
commit 07b7d8426a
11 changed files with 561 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/JDGL/SGManPower/ManPowerWorkGrid.aspx.cs
+63 -136
View File
@@ -39,13 +39,13 @@ namespace FineUIPro.Web.JDGL.SGManPower
// 添加隐藏列来存储额外的ID信息
GridTable.Columns.Add("UnitId");
GridTable.Columns.Add("UnitWorkId");
GridTable.Columns.Add("WorkAreaId");
GridTable.Columns.Add("WorkPostId");
ListItem[] list = new ListItem[5];
list[0] = new ListItem("序号", "SerialNumber");
list[1] = new ListItem("单位", "UnitName");
list[2] = new ListItem("装置", "UnitWorkName");
list[2] = new ListItem("装置", "WorkAreaName");
list[3] = new ListItem("岗位", "WorkPostName");
list[4] = new ListItem("累计", "TotalCount");
@@ -160,14 +160,14 @@ namespace FineUIPro.Web.JDGL.SGManPower
{
GridTable.Columns.Add("Id");
GridTable.Columns.Add("UnitId");
GridTable.Columns.Add("UnitWorkId");
GridTable.Columns.Add("WorkAreaId");
GridTable.Columns.Add("WorkPostId");
// 添加动态日期列（这部分已经在InitGrid中定义了）
ListItem[] list = new ListItem[5];
list[0] = new ListItem("序号", "SerialNumber");
list[1] = new ListItem("单位", "UnitName");
list[2] = new ListItem("装置", "UnitWorkName");
list[2] = new ListItem("装置", "WorkAreaName");
list[3] = new ListItem("岗位", "WorkPostName");
list[4] = new ListItem("累计", "TotalCount");
foreach (var item in list)
@@ -183,89 +183,69 @@ namespace FineUIPro.Web.JDGL.SGManPower
GridTable.Rows.Clear();
}
// 使用原生SQL查询来提高性能，直接在数据库层面进行分组统计
string strSql = @"
SELECT e.UnitId, e.PostId, e.RecordDate, p.WorkAreaId as UnitWorkId
FROM T_d_EmployInOutRecord e INNER JOIN SitePerson_Person p ON e.IDCardNo = p.IdentityCard AND e.ProjectId = p.ProjectId
WHERE e.PostId IS NOT NULL AND e.PostId != ''
AND e.ProjectId = @ProjectId
AND e.RecordDate >= @StartDate
AND e.RecordDate <= @EndDate";
var parameters = new List<System.Data.SqlClient.SqlParameter>
{
new System.Data.SqlClient.SqlParameter("@ProjectId", this.CurrUser.LoginProjectId),
new System.Data.SqlClient.SqlParameter("@StartDate", Convert.ToDateTime(StartTime)),
new System.Data.SqlClient.SqlParameter("@EndDate", Convert.ToDateTime(EndTime))
};
if (UnitId != Const._Null)
{
strSql += " AND e.UnitId = @UnitId";
parameters.Add(new System.Data.SqlClient.SqlParameter("@UnitId", UnitId));
}
if (drpWorkPost.SelectedValue != Const._Null)
{
strSql += " AND e.PostId = @PostId";
parameters.Add(new System.Data.SqlClient.SqlParameter("@PostId", drpWorkPost.SelectedValue));
}
// 执行查询获取分组数据
var dt = SQLHelper.GetDataTableRunText(strSql, parameters.ToArray());
var getData = Funs.DB.SitePerson_Checking_Statistics.Where(x =>
x.ProjectId == this.CurrUser.LoginProjectId && x.IntoOutTime >= Convert.ToDateTime(StartTime) && x.IntoOutTime <= Convert.ToDateTime(EndTime));
DataTable dt = this.LINQToDataTable(getData.ToList());
// 创建一个新的DataTable来存储处理后的数据
DataTable processedDt = dt.Clone();
foreach (System.Data.DataRow row in dt.Rows)
{
string ids = row["UnitWorkId"] != DBNull.Value ? row["UnitWorkId"].ToString() : string.Empty;
if (!string.IsNullOrEmpty(ids))
{
string[] unitWorkIdArray = ids.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
foreach (string unitWorkId in unitWorkIdArray)
{
// 往processedDt里面添加数据，每个UnitWorkId一行
DataRow newRow = processedDt.NewRow();
newRow["UnitId"] = row["UnitId"];
newRow["PostId"] = row["PostId"];
newRow["RecordDate"] = row["RecordDate"];
newRow["UnitWorkId"] = unitWorkId.Trim();
processedDt.Rows.Add(newRow);
}
}
else
{
// string ids = row["WorkAreaId"] != DBNull.Value ? row["WorkAreaId"].ToString() : string.Empty;
// string names = row["WorkAreaName"] != DBNull.Value ? row["WorkAreaName"].ToString() : string.Empty;
// if (!string.IsNullOrEmpty(names))
// {
// string[] unitWorkNameArray = names.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
// string[] unitWorkIdArray = ids.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
// for (var i = 0; i < unitWorkNameArray.Length; i++)
// {
// // 往processedDt里面添加数据，每个UnitWorkId一行
// DataRow newRow = processedDt.NewRow();
// newRow["UnitId"] = row["UnitId"];
// newRow["UnitName"] = row["UnitName"];
// newRow["WorkPostId"] = row["WorkPostId"];
// newRow["WorkPostName"] = row["WorkPostName"];
// newRow["IntoOutTime"] = row["IntoOutTime"] ?? DBNull.Value;
// newRow["WorkAreaId"] = unitWorkIdArray[i].Trim();
// newRow["WorkAreaName"] = unitWorkNameArray[i].Trim();
// newRow["num"] = row["num"] != DBNull.Value ? Convert.ToInt32(row["num"]) : 0;
// processedDt.Rows.Add(newRow);
// }
// }
// else
// {
DataRow newRow = processedDt.NewRow();
newRow["UnitId"] = row["UnitId"];
newRow["PostId"] = row["PostId"];
newRow["RecordDate"] = row["RecordDate"];
newRow["UnitWorkId"] = string.Empty;
newRow["UnitName"] = row["UnitName"];
newRow["WorkPostId"] = row["WorkPostId"];
newRow["WorkPostName"] = row["WorkPostName"];
newRow["IntoOutTime"] = row["IntoOutTime"] ?? DBNull.Value;
newRow["WorkAreaId"] = row["WorkAreaId"];
newRow["WorkAreaName"] = row["WorkAreaName"];
newRow["num"] = row["num"] != DBNull.Value ? Convert.ToInt32(row["num"]) : 0;
processedDt.Rows.Add(newRow);
}
// }
}
//针对dt中的数据进行分组
var data = processedDt.AsEnumerable()
.GroupBy(row => new {
UnitId = row["UnitId"],
PostId = row["PostId"],
UnitWorkId = row["UnitWorkId"],
RecordDate = row["RecordDate"]
}).Select(group => new
.Select(row => new
{
UnitId = group.Key.UnitId,
PostId = group.Key.PostId,
UnitWorkId = group.Key.UnitWorkId,
RecordDate = group.Key.RecordDate,
RecordCount = group.Count()
UnitId = row["UnitId"],
UnitName = row["UnitName"],
WorkPostId = row["WorkPostId"],
WorkPostName = row["WorkPostName"],
WorkAreaId = row["WorkAreaId"],
WorkAreaName = row["WorkAreaName"],
IntoOutTime = row["IntoOutTime"],
num = row["num"],
}).ToList();
var data1 = data;
// 如果选择了特定的装置进行筛选
if (drpUnitWork.SelectedValue != Const._Null)
{
data1 = data.Where(x => x.UnitWorkId.ToString() == drpUnitWork.SelectedValue).ToList();
data1 = data.Where(x => x.WorkAreaId.ToString() == drpUnitWork.SelectedValue).ToList();
}
// 将数据转换为更易处理的格式
@@ -273,23 +253,26 @@ namespace FineUIPro.Web.JDGL.SGManPower
var groupedDict = new Dictionary<string, dynamic>();
foreach (var item in data1)
{
string key = $"{item.UnitId}_{item.PostId}_{item.UnitWorkId}";
DateTime recordDate = Convert.ToDateTime(item.RecordDate);
int count = Convert.ToInt32(item.RecordCount);
string key = $"{item.UnitId}_{item.WorkPostId}_{item.WorkAreaId}";
DateTime IntoOutTime = Convert.ToDateTime(item.IntoOutTime);
int count = Convert.ToInt32(item.num);
if (!groupedDict.ContainsKey(key))
{
dynamic group = new System.Dynamic.ExpandoObject();
group.UnitId = item.UnitId;
group.PostId = item.PostId;
group.UnitWorkId = item.UnitWorkId;
group.UnitName = item.UnitName;
group.WorkPostId = item.WorkPostId;
group.WorkPostName = item.WorkPostName;
group.WorkAreaId = item.WorkAreaId;
group.WorkAreaName = item.WorkAreaName;
group.DailyCounts = new Dictionary<DateTime, int>();
group.TotalCount = 0;
groupedDict[key] = group;
groupedData.Add(group);
}
groupedDict[key].DailyCounts[recordDate] = count;
groupedDict[key].DailyCounts[IntoOutTime] = count;
groupedDict[key].TotalCount += count;
}
@@ -298,47 +281,6 @@ namespace FineUIPro.Web.JDGL.SGManPower
// 分页处理
var pagedData = groupedData.Skip(Grid1.PageSize * Grid1.PageIndex).Take(Grid1.PageSize).ToList();
// 只获取当前页需要的单位和岗位信息，避免加载全部数据
var unitIds = pagedData.Where(x => x.UnitId != null).Select(x => x.UnitId.ToString()).Distinct().ToList();
var postIds = pagedData.Where(x => x.PostId != null).Select(x => x.PostId.ToString()).Distinct().ToList();
var unitWorkIds = pagedData.Where(x => x.UnitWorkId != null).Select(x => x.UnitWorkId.ToString()).Distinct().ToList();
var units = new Dictionary<string, string>();
var workPosts = new Dictionary<string, string>();
var unitWorks = new Dictionary<string, string>();
if (unitIds.Any())
{
var unitQuery = from u in Funs.DB.Base_Unit
where unitIds.Contains(u.UnitId)
select new { u.UnitId, u.UnitName };
foreach (var u in unitQuery)
{
units[u.UnitId] = u.UnitName;
}
}
if (postIds.Any())
{
var postQuery = from p in Funs.DB.Base_WorkPost
where postIds.Contains(p.WorkPostId)
select new { p.WorkPostId, p.WorkPostName };
foreach (var p in postQuery)
{
workPosts[p.WorkPostId] = p.WorkPostName;
}
}
if (unitWorkIds.Any())
{
var unitWorkQuery = from p in Funs.DB.WBS_UnitWork
where unitWorkIds.Contains(p.UnitWorkId)
select new { p.UnitWorkId, p.UnitWorkName };
foreach (var p in unitWorkQuery)
{
unitWorks[p.UnitWorkId] = p.UnitWorkName;
}
}
foreach (var group in pagedData)
{
DataRow row = GridTable.NewRow();
@@ -348,31 +290,16 @@ namespace FineUIPro.Web.JDGL.SGManPower
row["SerialNumber"] = GridTable.Rows.Count + 1; // 序号
// 单位信息
string unitName = "";
if (group.UnitId != null && units.ContainsKey(group.UnitId.ToString()))
{
unitName = units[group.UnitId.ToString()];
}
row["UnitName"] = unitName;
row["UnitName"] = group.UnitName ?? "";
row["UnitId"] = group.UnitId ?? (object)DBNull.Value;
// 装置信息
string unitWorkName = "";
if (group.UnitWorkId != null && unitWorks.ContainsKey(group.UnitWorkId.ToString()))
{
unitWorkName = unitWorks[group.UnitWorkId.ToString()];
}
row["UnitWorkName"] = unitWorkName;
row["UnitWorkId"] = group.UnitWorkId ?? (object)DBNull.Value;
row["WorkAreaName"] = group.WorkAreaName ?? "";
row["WorkAreaId"] = group.WorkAreaId ?? (object)DBNull.Value;
// 岗位信息
string workPostName = "";
if (group.PostId != null && workPosts.ContainsKey(group.PostId.ToString()))
{
workPostName = workPosts[group.PostId.ToString()];
}
row["WorkPostName"] = workPostName;
row["WorkPostId"] = group.PostId ?? (object)DBNull.Value;
row["WorkPostName"] = group.WorkPostName ?? "";
row["WorkPostId"] = group.WorkPostId ?? (object)DBNull.Value;
// 每日数量填充
foreach (var kvp in group.DailyCounts)
@@ -531,7 +458,7 @@ namespace FineUIPro.Web.JDGL.SGManPower
// 添加装置参数（如果已选择）
if (drpUnitWork.SelectedValue != Const._Null && !string.IsNullOrEmpty(drpUnitWork.SelectedValue))
{
urlParams += "&UnitWorkId=" + drpUnitWork.SelectedValue;
urlParams += "&WorkAreaId=" + drpUnitWork.SelectedValue;
}
PageContext.RegisterStartupScript(