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

数据治理

Browse Source
This commit is contained in:
夏菊
2026-07-20 15:43:27 +08:00
parent 28fc3247f5
commit 2ce12bd85a
26 changed files with 2787 additions and 466 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/ProjectData/MasterProjectData.aspx.cs
+53 -2
View File
@@ -88,6 +88,13 @@ namespace FineUIPro.Web.ProjectData
Reason = use != null ? use.Reason : "",
//Situation = use != null ? use.Situation : "",
//Remark = use != null ? use.Remark : "",
HandleMan = use != null ? use.HandleMan : "",
//HandleManName = use != null ? use.HandleManName : "",
//HandleState = use != null ? use.HandleState != null ? int.Parse(use.HandleState) : -1 : -1,
//0：不通过、1：通过，-1：未审核
HandleState = use != null && use.HandleMan != null ? use.HandleState != null ? int.Parse(use.HandleState) : -1 : -2,
//HandleStateStr = use != null ? use.HandleMan != null ? $"{use.HandleManName}[{(int.Parse(use.HandleState) == 1 ? "通过" : int.Parse(use.HandleState) == 0 ? "不通过" : "未审核")}]{()}" : "" : "",
HandleStr = ConvertHandleStr(use),
}).ToList();
string startDate = this.txtStartTime.Text.Trim();
@@ -134,6 +141,9 @@ namespace FineUIPro.Web.ProjectData
Reason = "",
//Situation = use != null ? use.Situation : "",
//Remark = use != null ? use.Remark : "",
HandleMan = "",
HandleState = -2,
HandleStr = ""
});
}
@@ -141,6 +151,23 @@ namespace FineUIPro.Web.ProjectData
string proCode = this.txtProCode.Text.Trim();
string projectName = this.txtProjectName.Text.Trim();
string projectCode = this.txtProjectCode.Text.Trim();
//0：不通过、1：通过，-1：未审核
int auditWait = int.Parse(this.rblAuditWait.SelectedValue);
if (auditWait == 1)
{//已审核
list = list.Where(x => x.HandleState == 1 || x.HandleState == 0).ToList();
}
else if (auditWait == 2)
{//待审核
list = list.Where(x => x.HandleState == -1 && !string.IsNullOrWhiteSpace(x.HandleMan)).ToList();
}
else if (auditWait == 3)
{//待本人审核
list = list.Where(x => x.HandleState == -1 && !string.IsNullOrWhiteSpace(x.HandleMan) && x.HandleMan == this.CurrUser.UserId).ToList();
}
int relate = int.Parse(this.rblIsRelate.SelectedValue);
if (!string.IsNullOrEmpty(proName))
@@ -215,6 +242,30 @@ namespace FineUIPro.Web.ProjectData
Grid1.SummaryData = summary;
}
/// <summary>
/// 审核信息
/// </summary>
/// <param name="use"></param>
/// <returns></returns>
protected string ConvertHandleStr(Project_MasterDataUsage use)
{
string result = string.Empty;
if (use != null && !string.IsNullOrWhiteSpace(use.HandleManName))
{
//result = $"{use.HandleManName}；{(int.Parse(use.HandleState) == 1 ? "通过" : int.Parse(use.HandleState) == 0 ? "不通过" : "未审核")}；{(use.HandleState != null ? ((DateTime)use.HandleDate).ToString("yyyy-MM-dd HH:mm") : "")}";
if (use.HandleState != null)
{
result = $"{use.HandleManName}；{(int.Parse(use.HandleState) == 1 ? "通过" : int.Parse(use.HandleState) == 0 ? "不通过" : "未审核")}；{(use.HandleState != null ? ((DateTime)use.HandleDate).ToString("yyyy-MM-dd HH:mm") : "")}";
}
else
{
result = $"{use.HandleManName}；未审核";
}
}
return result;
}
/// <summary>
/// 合同额（亿）
/// </summary>
@@ -286,7 +337,7 @@ namespace FineUIPro.Web.ProjectData
string startDate = obj[13].ToString().Trim();
string lblState = (Grid1.SelectedRow.FindControl("lblState") as AspNet.Label).Text.Trim();
if (!string.IsNullOrWhiteSpace(pro_id))
if (!string.IsNullOrWhiteSpace(pro_id) && string.IsNullOrWhiteSpace(projectId))
{
var masterUsage = Funs.DB.Project_MasterDataUsage.Where(x => x.Pro_id == pro_id).FirstOrDefault();
if (masterUsage != null)
@@ -425,7 +476,7 @@ namespace FineUIPro.Web.ProjectData
ProjectId = x.ProjectId,
ReportDate = x.ReportDate,
//DataMetricsSum = (x.JoinConstructionPersonNum ?? 0) + (x.GeneralClosedNum ?? 0) + (x.GeneralNotClosedNum ?? 0) + (x.SafeWorkingHour ?? 0)
DataMetricsSum = (x.JoinConstructionPersonNum ?? 0) + (x.GeneralClosedNum ?? 0) + (x.GeneralNotClosedNum ?? 0) + (x.SafeWorkingHour ?? 0) + (x.LicensesNum ?? 0)
DataMetricsSum = (x.JoinConstructionPersonNum ?? 0) + (x.GeneralClosedNum ?? 0) + (x.GeneralNotClosedNum ?? 0) + (x.SafeWorkingHour ?? 0) + (x.LicensesNum ?? 0)
+ (x.SpecialTrainNum ?? 0) + (x.SpecialOperationTrainNum ?? 0) + (x.ProjectSafetyLeadingGroupMeetingNum ?? 0) + (x.ProjectSafetyMeetingNum ?? 0)
+ (x.GeneralRiskNum ?? 0) + (x.LowRiskNum ?? 0) + (x.MediumRiskNum ?? 0) + (x.HighRiskNum ?? 0)
+ (x.TrainPersonNum ?? 0) + (x.SuperTrainPersonNum ?? 0) + (x.OperativesNum ?? 0) + (x.SuperOperativesNum ?? 0) + (x.ProjectDrillPersonNum ?? 0)