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

增加企业展示

Browse Source
This commit is contained in:
李超
2023-06-10 10:55:18 +08:00
parent 1c8c630c21
commit 1836f816cf
69 changed files with 91 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/DataShow/WorkingHours.aspx.cs
+7 -6
View File
@@ -25,6 +25,7 @@ namespace FineUIPro.Web.DataShow
BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
// 绑定表格t
BindGrid();
this.Panel1.Title = "工时数据（" + BLL.UnitService.GetUnitNameByUnitId(BLL.CommonService.GetThisUnitId()) + "）";
}
}
@@ -170,7 +171,7 @@ namespace FineUIPro.Web.DataShow
var datetime2 = Funs.GetNewDateTime(this.txtStartTime.Text);
var getD1 = from x in Funs.DB.SitePerson_DayReport
join y in Funs.DB.Base_Project on x.ProjectId equals y.ProjectId
where y.ProjectState == Const.ProjectState_1
where y.ProjectState == Const.ProjectState_1 && x.ProjectId == projectId.ToString()
select x;
if (datetime1.HasValue)
{
@@ -206,11 +207,11 @@ namespace FineUIPro.Web.DataShow
var datetime2 = Funs.GetNewDateTime(this.txtStartTime.Text);
var getD1 = from x in Funs.DB.Accident_AccidentHandle
join y in Funs.DB.Base_Project on x.ProjectId equals y.ProjectId
where y.ProjectState == Const.ProjectState_1
where y.ProjectState == Const.ProjectState_1 && x.ProjectId == projectId.ToString()
select x;
var getD2 = from x in Funs.DB.Accident_AccidentReport
join y in Funs.DB.Base_Project on x.ProjectId equals y.ProjectId
where y.ProjectState == Const.ProjectState_1
where y.ProjectState == Const.ProjectState_1 && x.ProjectId == projectId.ToString()
select x;
if (datetime1.HasValue)
{
@@ -248,16 +249,16 @@ namespace FineUIPro.Web.DataShow
var datetime2 = Funs.GetNewDateTime(this.txtStartTime.Text);
var getC1 = from x in Funs.DB.SitePerson_DayReport
join y in Funs.DB.Base_Project on x.ProjectId equals y.ProjectId
where y.ProjectState == Const.ProjectState_1
where y.ProjectState == Const.ProjectState_1 && x.ProjectId == projectId.ToString()
select x;
var getD1 = from x in Funs.DB.Accident_AccidentHandle
join y in Funs.DB.Base_Project on x.ProjectId equals y.ProjectId
where y.ProjectState == Const.ProjectState_1
where y.ProjectState == Const.ProjectState_1 && x.ProjectId == projectId.ToString()
select x;
var getD2 = from x in Funs.DB.Accident_AccidentReport
join y in Funs.DB.Base_Project on x.ProjectId equals y.ProjectId
where y.ProjectState == Const.ProjectState_1
where y.ProjectState == Const.ProjectState_1 && x.ProjectId == projectId.ToString()
select x;
if (datetime1.HasValue)