pu看板修改
This commit is contained in:
parent
f67d7129ae
commit
a15b0e8871
Binary file not shown.
|
|
@ -0,0 +1,59 @@
|
|||
{
|
||||
"Version": 1,
|
||||
"WorkspaceRootPath": "D:\\\u6570\u636E\\\u8BFA\u5FC5\u8FBE\\\u6210\u8FBE\\test\\sggl_cd\\",
|
||||
"Documents": [],
|
||||
"DocumentGroupContainers": [
|
||||
{
|
||||
"Orientation": 0,
|
||||
"VerticalTabListWidth": 256,
|
||||
"DocumentGroups": [
|
||||
{
|
||||
"DockedWidth": 386,
|
||||
"SelectedChildIndex": -1,
|
||||
"Children": [
|
||||
{
|
||||
"$type": "Bookmark",
|
||||
"Name": "ST:0:0:{e506b91c-c606-466a-90a9-123d1d1e12b3}"
|
||||
},
|
||||
{
|
||||
"$type": "Bookmark",
|
||||
"Name": "ST:130:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
|
||||
},
|
||||
{
|
||||
"$type": "Bookmark",
|
||||
"Name": "ST:132:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
|
||||
},
|
||||
{
|
||||
"$type": "Bookmark",
|
||||
"Name": "ST:133:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
|
||||
},
|
||||
{
|
||||
"$type": "Bookmark",
|
||||
"Name": "ST:134:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
|
||||
},
|
||||
{
|
||||
"$type": "Bookmark",
|
||||
"Name": "ST:1:0:{f2bd8fb8-fc94-3dae-a733-fd993c73cc87}"
|
||||
},
|
||||
{
|
||||
"$type": "Bookmark",
|
||||
"Name": "ST:131:0:{1fc202d4-d401-403c-9834-5b218574bb67}"
|
||||
},
|
||||
{
|
||||
"$type": "Bookmark",
|
||||
"Name": "ST:129:0:{13b12e3e-c1b4-4539-9371-4fe9a0d523fc}"
|
||||
},
|
||||
{
|
||||
"$type": "Bookmark",
|
||||
"Name": "ST:2:0:{f2bd8fb8-fc94-3dae-a733-fd993c73cc87}"
|
||||
},
|
||||
{
|
||||
"$type": "Bookmark",
|
||||
"Name": "ST:3:0:{f2bd8fb8-fc94-3dae-a733-fd993c73cc87}"
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
@ -71,7 +71,13 @@ namespace BLL
|
|||
}
|
||||
}
|
||||
projectDataItem.location = item.ProjectAddress ?? "";
|
||||
projectDataItem.safehours = Project_HSSEData_HSSEService.GetSafeWorkingHour(item.ProjectId).ToString() ?? "";
|
||||
|
||||
var safehoursData = (from x in Funs.DB.HSSE_MonthReportItem
|
||||
join y in Funs.DB.HSSE_MonthReport on x.MonthReportId equals y.MonthReportId
|
||||
// where ("成达公司HSE管理人数" == x.ReportItem || "分包商HSE管理人数" == x.ReportItem) && y.Years == DateTime.Now.Year && y.ProjectId==CurrUser.LoginProjectId
|
||||
where ("安全生产人工时数" == x.ReportItem) && y.Years == DateTime.Now.Year && y.ProjectId == item.ProjectId
|
||||
select x.YearTotal).Sum();
|
||||
projectDataItem.safehours = safehoursData.ToString() ?? "";
|
||||
projectDataItem.losshours = Project_HSSEData_HSSEService.GetLostWorkingHour(item.ProjectId).ToString() ?? "";
|
||||
List<Model.Comprehensive_NCRManagement> NondestructiveTestList = (from x in db.Comprehensive_NCRManagement
|
||||
where x.ProjectId == item.ProjectId && (x.IssuedDate ==null || x.IssuedDate >DateTime.Now) select x).ToList();
|
||||
|
|
@ -93,6 +99,36 @@ namespace BLL
|
|||
projectDataItem.onsiteworkers = (ProjectTotal1.Value + ProjectTotal2.Value).ToString();//项目现场总人数
|
||||
}
|
||||
|
||||
// 获取当前月份
|
||||
int currentMonth = DateTime.Now.Month;
|
||||
int currentYear = DateTime.Now.Year;
|
||||
int ProjectTotal3Value = 0;
|
||||
int ProjectTotal4Value = 0;
|
||||
projectDataItem.onsiteperson = "";
|
||||
projectDataItem.maxperson = "";
|
||||
var ProjectTotal3 = (from x in Funs.DB.HSSE_MonthReportItem
|
||||
join y in Funs.DB.HSSE_MonthReport on x.MonthReportId equals y.MonthReportId
|
||||
where ("成达公司现场人数" == x.ReportItem)&& y.Years == currentYear && y.ProjectId == item.ProjectId
|
||||
select x).FirstOrDefault();
|
||||
if (ProjectTotal3 !=null)
|
||||
{
|
||||
ProjectTotal3Value = int.Parse((ProjectTotal3.GetType().GetProperty("Month" + currentMonth)?.GetValue(ProjectTotal3, null).ToString() ?? "0") );
|
||||
projectDataItem.onsiteperson = ProjectTotal3Value.ToString() ?? ""; // 本月现场人数
|
||||
}
|
||||
|
||||
var ProjectTotal4 = (from x in Funs.DB.HSSE_MonthReportItem
|
||||
join y in Funs.DB.HSSE_MonthReport on x.MonthReportId equals y.MonthReportId
|
||||
where ("成达公司HSE管理人数" == x.ReportItem) && y.Years == currentYear && y.ProjectId == item.ProjectId
|
||||
select x).FirstOrDefault();
|
||||
if (ProjectTotal4 != null)
|
||||
{
|
||||
ProjectTotal4Value = int.Parse((ProjectTotal4.GetType().GetProperty("Month" + currentMonth)?.GetValue(ProjectTotal4, null).ToString() ?? "0"));
|
||||
projectDataItem.maxperson = (ProjectTotal4Value + ProjectTotal3Value).ToString() ?? ""; //现场高峰人数
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
var getHazards = from x in Funs.DB.Hazard_HazardSelectedItem
|
||||
join y in Funs.DB.Base_RiskLevel on x.HazardLevel equals y.RiskLevelId
|
||||
where x.ProjectId == item.ProjectId && x.IsStart == true
|
||||
|
|
@ -130,6 +166,7 @@ namespace BLL
|
|||
IRestResponse response = client.Execute(request);
|
||||
APICommonService.SaveSysHttpLog("CDPU", Baseurl, "Header :" + response.Headers + "| Body :" + response.Content, "Response|" + request.Method.ToString());
|
||||
return response.Content;
|
||||
//return null;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -75,5 +75,13 @@ namespace Model
|
|||
/// 施工项目数量
|
||||
/// </summary>
|
||||
public string constructionnum { get; set; }
|
||||
/// <summary>
|
||||
/// 本月现场人数
|
||||
/// </summary>
|
||||
public string onsiteperson { get; set; }
|
||||
/// <summary>
|
||||
/// 现场高峰人数
|
||||
/// </summary>
|
||||
public string maxperson { get; set; }
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue