diff --git a/DataBase/版本日志/SUBQHSE_V2026-06-02-xiaj.sql b/DataBase/版本日志/SUBQHSE_V2026-06-02-xiaj.sql
new file mode 100644
index 00000000..f137dc19
--- /dev/null
+++ b/DataBase/版本日志/SUBQHSE_V2026-06-02-xiaj.sql
@@ -0,0 +1,13 @@
+
+
+
+
+--PMPϵͳݲֶ
+IF NOT EXISTS (SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'PMP_Project' AND COLUMN_NAME = 'stProjectStepName')
+BEGIN
+ ALTER TABLE PMP_Project ADD stProjectTypeName nvarchar(200);
+ ALTER TABLE PMP_Project ADD stProjectStepName nvarchar(200);
+END
+GO
+
+
diff --git a/SGGL/BLL/PMP/PMPDataService.cs b/SGGL/BLL/PMP/PMPDataService.cs
index 05366aae..6f69b173 100644
--- a/SGGL/BLL/PMP/PMPDataService.cs
+++ b/SGGL/BLL/PMP/PMPDataService.cs
@@ -160,6 +160,8 @@ namespace BLL
newItem.ProjStepZxnoName = item.projStepZxnoName;
newItem.StProjectTypeVals = item.stProjectTypeVals;
newItem.StProjectStepVals = item.stProjectStepVals;
+ newItem.StProjectStepName = item.stProjectStepName;
+ newItem.StProjectTypeName = item.stProjectTypeName;
newItem.ProjStepZxnoVals = item.projStepZxnoVals;
newItem.StProjectPropertyVals = item.stProjectPropertyVals;
newItem.RemarkA = item.remarkA;
diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReport/NCRStatisc.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ManageReport/NCRStatisc.aspx.cs
index 9e8af5f4..591a7b8f 100644
--- a/SGGL/FineUIPro.Web/CQMS/ManageReport/NCRStatisc.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/ManageReport/NCRStatisc.aspx.cs
@@ -79,8 +79,12 @@ namespace FineUIPro.Web.CQMS.ManageReport
NCRStatisc.Num = i;
NCRStatisc.WorkName = BLL.UnitService.getUnitNamesUnitIds(item);
NCRStatisc.CheckNum = managementList.Count();
- NCRStatisc.OKNum = managementList.Count(x => x.Status == "3");
- NCRStatisc.NotOKNum = managementList.Count(x => x.Status != "3");
+ //NCRStatisc.OKNum = managementList.Count(x => x.Status == "3");
+ //NCRStatisc.NotOKNum = managementList.Count(x => x.Status != "3");
+ //int okNum = managementList.Where(x => x.ImplementationFrontState.Trim().Equals("已闭合")).Count();
+ int okNum = managementList.Where(x => x.ImplementationFrontState == "已闭合").Count();
+ NCRStatisc.OKNum = okNum;
+ NCRStatisc.NotOKNum = managementList.Count() - okNum;
NCRStatisc.Remark = "";
if (NCRStatisc.CheckNum != 0)//被除数不能为零
{
diff --git a/SGGL/FineUIPro.Web/ProjectData/MasterProjectData.aspx b/SGGL/FineUIPro.Web/ProjectData/MasterProjectData.aspx
index 043d0d9b..736be566 100644
--- a/SGGL/FineUIPro.Web/ProjectData/MasterProjectData.aspx
+++ b/SGGL/FineUIPro.Web/ProjectData/MasterProjectData.aspx
@@ -17,7 +17,23 @@
font-weight: bold !important;
color: red !important;
}
-
+
+ .ThreeMonthPause {
+ /*background-color: darkgray;*/
+ background-color: blueviolet;
+ }
+ .MonthPause {
+ /*background-color: darkgray;*/
+ background-color: red;
+ }
+ .WeekPause {
+ /*background-color: darkgray;*/
+ background-color: deeppink;
+ }
+ .DayPause {
+ /*background-color: darkgray;*/
+ background-color: hotpink;
+ }
.Pause {
/*background-color: darkgray;*/
background-color: red;
@@ -173,9 +189,9 @@
+ EnableTextSelection="True">
@@ -224,9 +240,25 @@
-
-
+ --%>
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/SGGL/FineUIPro.Web/ProjectData/MasterProjectData.aspx.cs b/SGGL/FineUIPro.Web/ProjectData/MasterProjectData.aspx.cs
index f9946647..ea72515b 100644
--- a/SGGL/FineUIPro.Web/ProjectData/MasterProjectData.aspx.cs
+++ b/SGGL/FineUIPro.Web/ProjectData/MasterProjectData.aspx.cs
@@ -300,7 +300,7 @@ namespace FineUIPro.Web.ProjectData
model.Id = useId;
model.Pro_id = pro_id;
model.Pro_code = pro_code;
- model.Pro_name = pro_name.Replace("·", "").Replace("&", "").Replace("#", "").Replace(";", "");
+ model.Pro_name = pro_name.Replace("·", ".").Replace("×", "/").Replace("&", "").Replace("#", "").Replace(";", "");
model.Is_relate = !string.IsNullOrWhiteSpace(projectId);
model.Is_use = !string.IsNullOrWhiteSpace(projectId);
model.Projectid = projectId;
@@ -413,37 +413,63 @@ namespace FineUIPro.Web.ProjectData
}
var dateNow = DateTime.Now.Date;//现在
- var dateMonthAgo = dateNow.AddMonths(-1);//一个月前
+ var dateDays = dateNow.AddDays(-3);//三天前
+ var dateWeek = dateNow.AddDays(-7);//一周前
+ var dateMonth = dateNow.AddMonths(-1);//一个月前
+ var dateThreeMonth = dateNow.AddMonths(-3);//三个月前
var datas = (from x in db.Project_HSSEData_HSSE
- where x.ReportDate == dateNow || x.ReportDate == dateMonthAgo
+ where x.ReportDate == dateNow || x.ReportDate == dateDays || x.ReportDate == dateWeek || x.ReportDate == dateMonth || x.ReportDate == dateThreeMonth
select new QHSEProjectHSSEData
{
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)
+ DataMetricsSum = (x.JoinConstructionPersonNum ?? 0) + (x.GeneralClosedNum ?? 0) + (x.GeneralNotClosedNum ?? 0) + (x.SafeWorkingHour ?? 0) + (x.LicensesNum ?? 0) + (x.SpecialTrainNum ?? 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)
}).ToList();
foreach (var pro in getProjects)
{
- string result = "正常";
+ string threeMonResult = "";
+ string monResult = "";
+ string dayResult = "";
+ string weekResult = "";
var nowData = datas.Where(x => x.ProjectId == pro.ProjectId && x.ReportDate == dateNow).FirstOrDefault();
- var monthAgoData = datas.Where(x => x.ProjectId == pro.ProjectId && x.ReportDate == dateMonthAgo).FirstOrDefault();
- if (nowData != null && monthAgoData != null)
+ var daysData = datas.Where(x => x.ProjectId == pro.ProjectId && x.ReportDate == dateDays).FirstOrDefault();
+ var weekData = datas.Where(x => x.ProjectId == pro.ProjectId && x.ReportDate == dateWeek).FirstOrDefault();
+ var monthData = datas.Where(x => x.ProjectId == pro.ProjectId && x.ReportDate == dateMonth).FirstOrDefault();
+ var threeMonthData = datas.Where(x => x.ProjectId == pro.ProjectId && x.ReportDate == dateThreeMonth).FirstOrDefault();
+ if (nowData != null && daysData != null)
{//两个时间点都有指标数据
- if (nowData.DataMetricsSum == monthAgoData.DataMetricsSum)
+ if (nowData.DataMetricsSum == daysData.DataMetricsSum)
{
- result = "异常";
+ dayResult = "数据无变化";
+ }
+ }
+ if (nowData != null && weekData != null)
+ {//两个时间点都有指标数据
+ if (nowData.DataMetricsSum == weekData.DataMetricsSum)
+ {
+ weekResult = "数据无变化";
+ }
+ }
+ if (nowData != null && monthData != null)
+ {//两个时间点都有指标数据
+ if (nowData.DataMetricsSum == monthData.DataMetricsSum)
+ {
+ monResult = "数据无变化";
+ }
+ }
+ if (nowData != null && threeMonthData != null)
+ {//两个时间点都有指标数据
+ if (nowData.DataMetricsSum == threeMonthData.DataMetricsSum)
+ {
+ threeMonResult = "数据无变化";
}
}
- //else if (nowData != null)
- //{//现在有指标数据，一个月前没有
- // result = "正常";
- //}
- //else if (monthAgoData != null)
- //{//现在没有指标数据，一个月前有
- // result = "正常";
- //}
list.Add(new QHSEProjectDataInfo
{
@@ -454,7 +480,10 @@ namespace FineUIPro.Web.ProjectData
StartDate = pro.StartDate,
EndDate = pro.EndDate,
ProjectState = pro.ProjectState,
- Usage = result
+ UsageDays = dayResult,
+ UsageWeek = weekResult,
+ UsageMonth = monResult,
+ UsageThreeMonth = threeMonResult,
});
}
@@ -464,19 +493,39 @@ namespace FineUIPro.Web.ProjectData
Grid2.DataSource = table;
Grid2.DataBind();
- int exNum = 0;
+ int exDayNum = 0;
+ int exWeekNum = 0;
+ int exMonNum = 0;
+ int exThreeMonNum = 0;
int allQhseNum = 0;
- //int allQhseNum = list.Count();
try
{
for (int i = 0; i < Grid2.Rows.Count; i++)
{
allQhseNum++;
- var usage = table.Rows[i]["Usage"].ToString().Trim();
- if (usage == "异常")
+ var usageDays = table.Rows[i]["UsageDays"].ToString().Trim();
+ var usageWeek = table.Rows[i]["UsageWeek"].ToString().Trim();
+ var usageMonth = table.Rows[i]["UsageMonth"].ToString().Trim();
+ var usageThreeMonth = table.Rows[i]["UsageThreeMonth"].ToString().Trim();
+ if (usageDays == "数据无变化")
{
- Grid2.Rows[i].RowCssClass = "Pause";
- exNum++;
+ Grid2.Rows[i].RowCssClass = "DayPause";
+ exDayNum++;
+ }
+ if (usageWeek == "数据无变化")
+ {
+ Grid2.Rows[i].RowCssClass = "WeekPause";
+ exWeekNum++;
+ }
+ if (usageMonth == "数据无变化")
+ {
+ Grid2.Rows[i].RowCssClass = "MonthPause";
+ exMonNum++;
+ }
+ if (usageThreeMonth == "数据无变化")
+ {
+ Grid2.Rows[i].RowCssClass = "ThreeMonthPause";
+ exThreeMonNum++;
}
}
}
@@ -485,8 +534,12 @@ namespace FineUIPro.Web.ProjectData
JObject summary = new JObject();
summary.Add("tfNumber", "合计");
- summary.Add("ProjectCode", allQhseNum);
- summary.Add("Usage", $"异常：{exNum}");
+ summary.Add("Abbreviation", allQhseNum);
+ summary.Add("StartDate", "数据无变化");
+ summary.Add("UsageDays", exDayNum);
+ summary.Add("UsageWeek", exWeekNum);
+ summary.Add("UsageMonth", exMonNum);
+ summary.Add("UsageThreeMonth", exThreeMonNum);
Grid2.SummaryData = summary;
}
diff --git a/SGGL/FineUIPro.Web/ProjectData/MasterProjectDataUsage.aspx b/SGGL/FineUIPro.Web/ProjectData/MasterProjectDataUsage.aspx
index e1ce5274..3b112ae8 100644
--- a/SGGL/FineUIPro.Web/ProjectData/MasterProjectDataUsage.aspx
+++ b/SGGL/FineUIPro.Web/ProjectData/MasterProjectDataUsage.aspx
@@ -32,38 +32,38 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
<%--
@@ -74,23 +74,24 @@
--%>
-
+
+
-
+
-
+
<%--
--%>
-
+
<%--
@@ -105,32 +106,32 @@
--%>
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
+
-
+
-
+
-
-
+
+
-
+
-
-
+
+
-
+
-
+
-
+
diff --git a/SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx b/SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx
index e5e691d7..632abdb2 100644
--- a/SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx
+++ b/SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx
@@ -55,9 +55,10 @@
-
+ <%----%>
-
+
+
diff --git a/SGGL/Model/APIItem/CNCEC/Ads_pms_pro_info_build.cs b/SGGL/Model/APIItem/CNCEC/Ads_pms_pro_info_build.cs
index e0a91f1e..5ff0050a 100644
--- a/SGGL/Model/APIItem/CNCEC/Ads_pms_pro_info_build.cs
+++ b/SGGL/Model/APIItem/CNCEC/Ads_pms_pro_info_build.cs
@@ -185,9 +185,21 @@ namespace Model
#endregion
///
- /// 使用情况
+ /// 使用情况（近三天）
///
- public string Usage { get; set; }
+ public string UsageDays { get; set; }
+ ///
+ /// 使用情况（近一周）
+ ///
+ public string UsageWeek { get; set; }
+ ///
+ /// 使用情况（近一月）
+ ///
+ public string UsageMonth { get; set; }
+ ///
+ /// 使用情况（近三个月）
+ ///
+ public string UsageThreeMonth { get; set; }
}
diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs
index 7ad8004d..6d65ee2e 100644
--- a/SGGL/Model/Model.cs
+++ b/SGGL/Model/Model.cs
@@ -297770,6 +297770,10 @@ namespace Model
private string _StLocationName;
+ private string _StProjectStepName;
+
+ private string _StProjectTypeName;
+
#region 可扩展性方法定义
partial void OnLoaded();
partial void OnValidate(System.Data.Linq.ChangeAction action);
@@ -297842,6 +297846,10 @@ namespace Model
partial void OnPlanEndDateChanged();
partial void OnStLocationNameChanging(string value);
partial void OnStLocationNameChanged();
+ partial void OnStProjectStepNameChanging(string value);
+ partial void OnStProjectStepNameChanged();
+ partial void OnStProjectTypeNameChanging(string value);
+ partial void OnStProjectTypeNameChanged();
#endregion
public PMP_Project()
@@ -298529,6 +298537,46 @@ namespace Model
}
}
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Name="stProjectStepName", Storage="_StProjectStepName", DbType="NVarChar(200)")]
+ public string StProjectStepName
+ {
+ get
+ {
+ return this._StProjectStepName;
+ }
+ set
+ {
+ if ((this._StProjectStepName != value))
+ {
+ this.OnStProjectStepNameChanging(value);
+ this.SendPropertyChanging();
+ this._StProjectStepName = value;
+ this.SendPropertyChanged("StProjectStepName");
+ this.OnStProjectStepNameChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Name="stProjectTypeName", Storage="_StProjectTypeName", DbType="NVarChar(200)")]
+ public string StProjectTypeName
+ {
+ get
+ {
+ return this._StProjectTypeName;
+ }
+ set
+ {
+ if ((this._StProjectTypeName != value))
+ {
+ this.OnStProjectTypeNameChanging(value);
+ this.SendPropertyChanging();
+ this._StProjectTypeName = value;
+ this.SendPropertyChanged("StProjectTypeName");
+ this.OnStProjectTypeNameChanged();
+ }
+ }
+ }
+
public event PropertyChangingEventHandler PropertyChanging;
public event PropertyChangedEventHandler PropertyChanged;
diff --git a/SGGL/Model/PMP/PMPProject.cs b/SGGL/Model/PMP/PMPProject.cs
index fb8e64d6..5f333b30 100644
--- a/SGGL/Model/PMP/PMPProject.cs
+++ b/SGGL/Model/PMP/PMPProject.cs
@@ -173,10 +173,20 @@ namespace Model
[JsonProperty("stProjectTypeVals")]
public string stProjectTypeVals { get; set; }
///
+ /// 项目类型一级名称
+ ///
+ [JsonProperty("stProjectTypeName")]
+ public string stProjectTypeName { get; set; }
+ ///
/// 项目类型二级
///
[JsonProperty("stProjectStepVals")]
public string stProjectStepVals { get; set; }
+ ///
+ /// 项目类型二级名称
+ ///
+ [JsonProperty("stProjectStepName")]
+ public string stProjectStepName { get; set; }
/////
///// 项目阶段名称【控制软件项目阶段】
/////