zhanghj/ChengDa_English
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

20231024

Browse Source
This commit is contained in:
李超
2023-10-24 10:48:05 +08:00
parent 4abb69942e
commit bfb4cdc428
12 changed files with 961 additions and 821 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/common/Menu_CQMS.xml
+3 -3
View File
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<Tree>
<TreeNode id="F8E57293-0BD8-435E-AA08-3B1DC2858CB6" Text="质量策划" NavigateUrl="">
<TreeNode id="063601B5-EF75-418B-90E8-4255C0DB06D7" Text="公司/部门质量管理规定" NavigateUrl="CQMS/ZLCH/Zlgltx.aspx">
</TreeNode>
<TreeNode id="68A54450-557C-4C33-9121-797C15AF1047" Text="开工报告" NavigateUrl="PZHGL/StartWorkReport.aspx">
</TreeNode>
<TreeNode id="F8E57293-0BD8-435E-AA08-3B1DC2858CB6" Text="质量策划" NavigateUrl=""><TreeNode id="063601B5-EF75-418B-90E8-4255C0DB06D7" Text="公司/部门质量管理规定" NavigateUrl="CQMS/ZLCH/Zlgltx.aspx"></TreeNode>
<TreeNode id="AC145EE1-4E5C-4CEF-A85A-AAC331A041DB" Text="质量管理实施计划" NavigateUrl="CQMS/ZLCH/Zlssjh.aspx"></TreeNode>
<TreeNode id="098307DA-C53D-4EDB-8587-339CD782031F" Text="质量管理规定/程序文件" NavigateUrl="CQMS/ZLCH/Zlglgd.aspx"></TreeNode>
</TreeNode>
SGGL/FineUIPro.Web/common/Menu_PZHGL.xml
+3 -3
View File
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<Tree>
<TreeNode id="68A54450-557C-4C33-9121-797C15AF1047" Text="开工报告" NavigateUrl="PZHGL/StartWorkReport.aspx">
</TreeNode>
<TreeNode id="8DE7DF6C-979E-48A7-80F7-55287726685F" Text="施工策划" NavigateUrl=""><TreeNode id="67CEE910-DDFB-4E69-B4B7-DA29B9F43E1D" Text="公司/部门施工管理规定" NavigateUrl="PZHGL/SGCH/GsBmGlgd.aspx"></TreeNode>
<TreeNode id="8DE7DF6C-979E-48A7-80F7-55287726685F" Text="施工策划" NavigateUrl="">
<TreeNode id="67CEE910-DDFB-4E69-B4B7-DA29B9F43E1D" Text="公司/部门施工管理规定" NavigateUrl="PZHGL/SGCH/GsBmGlgd.aspx">
</TreeNode>
<TreeNode id="90217D8E-D2AC-4B8D-A1A7-A27317890408" Text="项目施工管理规定" NavigateUrl="PZHGL/SGCH/XmsgGlgd.aspx"></TreeNode>
<TreeNode id="971D3B85-9ECE-4325-BB84-AE9CF7577476" Text="分包策划" NavigateUrl="PZHGL/SGCH/Fbch.aspx"></TreeNode>
<TreeNode id="DC14E545-F8B5-40C1-A604-73A8DA8741CC" Text="人力动员策划" NavigateUrl="PZHGL/SGCH/Rldych.aspx"></TreeNode>
SGGL/FineUIPro.Web/common/mainProject.aspx.cs
+28 -24
View File
@@ -70,30 +70,34 @@ namespace FineUIPro.Web.common
private void getPersonWorkTime()
{
this.divSafeWorkTime.InnerHtml = "0000000000";
//var ProjectTotal = (from x in Funs.DB.HSSE_MonthReportItem
//join y in Funs.DB.HSSE_MonthReport on x.MonthReportId equals y.MonthReportId
//where y.ProjectId == this.ProjectId && "安全生产人工时数" == x.ReportItem
// select x.YearTotal).Sum();
decimal sumMonthCount = 0;
var getMonts = Funs.DB.SeDin_MonthReport.Where(x => x.ProjectId == this.ProjectId).OrderBy(x => x.ReporMonth);
var getmax = getMonts.FirstOrDefault();
if (getMonts.Count() > 0)
{
foreach (var item in getMonts)
{
decimal monthCount = 0;
var getItem = Funs.DB.SeDin_MonthReport2.FirstOrDefault(x => x.MonthReportId == item.MonthReportId);
if (getItem != null && getItem.MonthWorkTime.HasValue)
{
monthCount = getItem.MonthWorkTime ?? 0;
sumMonthCount += monthCount;
if (sumMonthCount < getItem.ProjectWorkTime)
{
sumMonthCount = getItem.ProjectWorkTime ?? 0;
}
}
}
}
var ProjectTotal = (from x in Funs.DB.HSSE_MonthReportItem
join y in Funs.DB.HSSE_MonthReport on x.MonthReportId equals y.MonthReportId
where y.ProjectId == this.ProjectId && "安全生产人工时数" == x.ReportItem
select x.YearTotal).Sum();
decimal sumMonthCount = 0;
if (ProjectTotal.HasValue)
{
sumMonthCount = ProjectTotal.Value;
}
//var getMonts = Funs.DB.SeDin_MonthReport.Where(x => x.ProjectId == this.ProjectId).OrderBy(x => x.ReporMonth);
//var getmax = getMonts.FirstOrDefault();
//if (getMonts.Count() > 0)
//{
// foreach (var item in getMonts)
// {
// decimal monthCount = 0;
// var getItem = Funs.DB.SeDin_MonthReport2.FirstOrDefault(x => x.MonthReportId == item.MonthReportId);
// if (getItem != null && getItem.MonthWorkTime.HasValue)
// {
// monthCount = getItem.MonthWorkTime ?? 0;
// sumMonthCount += monthCount;
// if (sumMonthCount < getItem.ProjectWorkTime)
// {
// sumMonthCount = getItem.ProjectWorkTime ?? 0;
// }
// }
// }
//}
if (sumMonthCount>0)
{