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

校正人工时及统计修改

This commit is contained in:
高飞 2023-09-04 16:20:02 +08:00
parent a9148f6d78
commit 02e9796323
7 changed files with 243 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DataBase/版本日志/SGGLDB_WH_2023-09-04.sql Normal file
View File

@ -0,0 +1,2 @@
update Inspection_SummaryMb set MenuP='WBS裁剪',MenuC='WBS裁剪' WHERE MenuP='WBS数据'
GO

4
SGGL/BLL/OpenService/GetDataService.cs
View File

@ -272,8 +272,8 @@ namespace BLL
{ {
try try
{ {
DateTime dateS = DateTime.Now.AddMonths(-6); DateTime dateS = DateTime.Now.AddMonths(-12);
dateS = Funs.GetNewDateTimeOrNow(DateTime.Now.AddMonths(-6).Year + "-" + DateTime.Now.AddMonths(-6).Month + "-01"); dateS = Funs.GetNewDateTimeOrNow(DateTime.Now.AddMonths(-12).Year + "-" + DateTime.Now.AddMonths(-12).Month + "-01");
var getNums = from x in db.SitePerson_PersonInOutNumber var getNums = from x in db.SitePerson_PersonInOutNumber
where x.ProjectId == projectId && x.InOutDate >= dateS where x.ProjectId == projectId && x.InOutDate >= dateS
orderby x.InOutDate orderby x.InOutDate

8
SGGL/FineUIPro.Web/ZHGL/InspectionSummary/InspectionSummary.aspx
View File

@ -18,7 +18,7 @@
ClicksToEdit="2" DataIDField="InspectionSummaryId" AllowSorting="true" SortField="SortId" ClicksToEdit="2" DataIDField="InspectionSummaryId" AllowSorting="true" SortField="SortId"
SortDirection="DESC" EnableColumnLines="true" SortDirection="DESC" EnableColumnLines="true"
AllowPaging="true" IsDatabasePaging="true" PageSize="10" IsFluid="true" AllowPaging="true" IsDatabasePaging="true" PageSize="10" IsFluid="true"
EnableRowDoubleClickEvent="true"> EnableRowDoubleClickEvent="true" AllowColumnLocking="true">
<Toolbars> <Toolbars>
<f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left"> <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
<Items> <Items>
@ -49,14 +49,14 @@
</Toolbars> </Toolbars>
<Columns> <Columns>
<f:RenderField Width="100px" ColumnID="SNumber" DataField="SNumber" SortField="SNumber" <f:RenderField Width="100px" ColumnID="SNumber" DataField="SNumber" SortField="SNumber"
FieldType="String" HeaderText="序号" TextAlign="Left" HeaderTextAlign="Center" ID="SNumber" ShowToolTip="true"> FieldType="String" HeaderText="序号" TextAlign="Left" HeaderTextAlign="Center" ID="SNumber" ShowToolTip="true" Locked="true">
</f:RenderField> </f:RenderField>
<f:RenderField Width="150px" ColumnID="ModuleName" DataField="ModuleName" <f:RenderField Width="150px" ColumnID="ModuleName" DataField="ModuleName"
FieldType="String" HeaderText="模块" TextAlign="Left" HeaderTextAlign="Center"> FieldType="String" HeaderText="模块" TextAlign="Left" HeaderTextAlign="Center" Locked="true">
</f:RenderField> </f:RenderField>
<f:GroupField Width="200px" HeaderText="功能菜单" TextAlign="Center" > <f:GroupField Width="200px" HeaderText="功能菜单" TextAlign="Center" Locked="true">
<Columns> <Columns>
<f:BoundField Width="100px" ColumnID="MenuP" DataField="MenuP" HeaderText="菜单" /> <f:BoundField Width="100px" ColumnID="MenuP" DataField="MenuP" HeaderText="菜单" />
<f:BoundField Width="100px" DataField="MenuC" ColumnID="MenuC" HeaderText="说明" /> <f:BoundField Width="100px" DataField="MenuC" ColumnID="MenuC" HeaderText="说明" />

9
SGGL/FineUIPro.Web/ZHGL/InspectionSummary/InspectionSummary.aspx.cs
View File

@ -443,7 +443,14 @@ namespace FineUIPro.Web.ZHGL.InspectionSummary
model.CompileDateMonth = this.drpCompileDateMonth.Text.Trim(); model.CompileDateMonth = this.drpCompileDateMonth.Text.Trim();
model.InspectionSummaryId = Guid.NewGuid().ToString(); model.InspectionSummaryId = Guid.NewGuid().ToString();
model.InspectionSummaryMbId = "10"; model.InspectionSummaryMbId = "10";
model.SummeryResult = listWbs.Where(x => x.ProjectId == pid).ToList().Count.ToString(); var WbsCount = listWbs.Where(x => x.ProjectId == pid).ToList().Count;
if (WbsCount > 0)
{
model.SummeryResult = "已裁剪";
}
else {
model.SummeryResult = "未裁剪";
}
allList.Add(model); allList.Add(model);
//综合管理 //综合管理

70
SGGL/FineUIPro.Web/common/mainProject2.aspx
View File

@ -19,6 +19,35 @@
body.f-body { body.f-body {
padding: 0px; padding: 0px;
} }
/*头部按钮样式*/
.bgbtn_dbsx{
display: inline-block;
position: absolute;
width: 5%;
height: 4%;
left: 79%;
top: 51px;
background: green !important;
border: none !important;
padding: 0 !important;
}
.bgbtn_gjsx{
display: inline-block;
position: absolute;
width: 5%;
height: 4%;
left: 72%;
top: 51px;
background: red !important;
border: none !important;
padding: 0 !important;
}
.div_border {
border: 1px solid #00FFFF;
}
</style> </style>
<body> <body>
<form id="form1" runat="server" style="background-color:#000231"> <form id="form1" runat="server" style="background-color:#000231">
@ -253,15 +282,15 @@
<div class="y_box_label y_image_default">工作台面</div> <div class="y_box_label y_image_default">工作台面</div>
<div class="y_box_main"> <div class="y_box_main">
<div class="zyp"> <div class="zyp">
<div class="zyp_box"> <div class="zyp_box" style="cursor:pointer;" runat="server" onclick="showGztm(0)" id="div_Gzgjsx">
<div class="zyp_label">关键事项</div> <div class="zyp_label">关键事项</div>
<div class="zyp_number" id="div_gjsx" runat="server">0</div> <div class="zyp_number" id="div_gjsx" runat="server">0</div>
</div> </div>
<div class="zyp_box"> <div class="zyp_box div_border" style="cursor:pointer" runat="server" onclick="showGztm(1)" id="div_Gzdbsx">
<div class="zyp_label">待办事项</div> <div class="zyp_label">待办事项</div>
<div class="zyp_number" id="div_dbsx" runat="server">0</div> <div class="zyp_number" id="div_dbsx" runat="server">0</div>
</div> </div>
<div class="zyp_box"> <div class="zyp_box" style="cursor:pointer" runat="server" onclick="showGztm(2)" id="div_Gzgrlc">
<div class="zyp_label">个人流程</div> <div class="zyp_label">个人流程</div>
<div class="zyp_number" id="div_grlc" runat="server">0</div> <div class="zyp_number" id="div_grlc" runat="server">0</div>
</div> </div>
@ -270,7 +299,11 @@
<div class="zyp_number" id="div_ybrw" runat="server">0</div> <div class="zyp_number" id="div_ybrw" runat="server">0</div>
</div> </div>
</div> </div>
<div class="zyp-lis" runat="server" id="div_dbsxlist"> <div class="zyp-lis" id="div_gjsxlist" runat="server" style="display:none">
</div>
<div class="zyp-lis" id="div_dbsxlist" runat="server">
</div> </div>
</div> </div>
@ -358,6 +391,7 @@
<script src="lib/echarts.min.js"></script> <script src="lib/echarts.min.js"></script>
<script> <script>
function clOnclick(objval) { function clOnclick(objval) {
if (objval == 0) { if (objval == 0) {
$("#span_gdcl").addClass("y_tab-action") $("#span_gdcl").addClass("y_tab-action")
@ -375,6 +409,34 @@
</script> </script>
<script> <script>
//点击切换台面
function showGztm(objval) {
//关键事项
if (objval == 0) {
$("#div_gjsxlist").show();
$("#div_dbsxlist").hide();
document.getElementById("div_Gzgjsx").className += " div_border";
$("#div_Gzdbsx").removeClass("div_border");
$("#div_Gzgrlc").removeClass("div_border");
} else if (objval == 1) {
//待办事项
$("#div_dbsxlist").show();
$("#div_gjsxlist").hide();
document.getElementById("div_Gzdbsx").className += " div_border";
$("#div_Gzgjsx").removeClass("div_border");
$("#div_Gzgrlc").removeClass("div_border");
} else if (objval == 2) {
//个人流程
$("#div_dbsxlist").show();
$("#div_gjsxlist").hide();
document.getElementById("div_Gzgrlc").className += " div_border";
$("#div_Gzgjsx").removeClass("div_border");
$("#div_Gzdbsx").removeClass("div_border");
}
}
function reloadGrid(param) { function reloadGrid(param) {
__doPostBack(null, 'ReloadGrid$' + param); __doPostBack(null, 'ReloadGrid$' + param);
} }

173
SGGL/FineUIPro.Web/common/mainProject2.aspx.cs
View File

@ -28,6 +28,7 @@ namespace FineUIPro.Web.common
{ {
ViewState["ProjectId"] = value; ViewState["ProjectId"] = value;
} }
} }
/// <summary> /// <summary>
/// 页面加载 /// 页面加载
@ -41,14 +42,14 @@ namespace FineUIPro.Web.common
ProjectId = CurrUser.LoginProjectId; ProjectId = CurrUser.LoginProjectId;
Model.SGGLDB db = Funs.DB; Model.SGGLDB db = Funs.DB;
//安全人工时 //安全人工时
int wHours = db.SitePerson_PersonInOutNumber.Where(x=> x.ProjectId == ProjectId).Max(x => x.WorkHours ) ?? 0; int wHours = db.SitePerson_PersonInOutNumber.Where(x => x.ProjectId == ProjectId).Max(x => x.WorkHours) ?? 0;
this.divSafeWorkTime.InnerHtml = wHours.ToString(); this.divSafeWorkTime.InnerHtml = wHours.ToString();
//本月安全人工时 //本月安全人工时
int wHoursMonth = 0; int wHoursMonth = 0;
DateTime? sDate = Funs.GetNewDateTime(DateTime.Now.Year.ToString()+"-"+ DateTime.Now.Month.ToString()); DateTime? sDate = Funs.GetNewDateTime(DateTime.Now.Year.ToString() + "-" + DateTime.Now.Month.ToString());
var dayReports = BLL.SitePerson_MonthReportService.getMonthReports(this.ProjectId, sDate); var dayReports = BLL.SitePerson_MonthReportService.getMonthReports(this.ProjectId, sDate);
if (dayReports.Count>0) if (dayReports.Count > 0)
{ {
wHoursMonth = Convert.ToInt32(dayReports[0].DayWorkTime); wHoursMonth = Convert.ToInt32(dayReports[0].DayWorkTime);
} }
@ -60,11 +61,11 @@ namespace FineUIPro.Web.common
//安全管理人员 //安全管理人员
var allSum = from x in Funs.DB.SitePerson_Person var allSum = from x in Funs.DB.SitePerson_Person
where x.IsUsed == true && x.ProjectId==ProjectId where x.IsUsed == true && x.ProjectId == ProjectId
select x; select x;
var glAllPerson = from x in allSum var glAllPerson = from x in allSum
join y in Funs.DB.Base_WorkPost on x.WorkPostId equals y.WorkPostId join y in Funs.DB.Base_WorkPost on x.WorkPostId equals y.WorkPostId
where (y.PostType == "1" || y.PostType == "4") && x.ProjectId==ProjectId //一般管理岗位和特种管理人员 where (y.PostType == "1" || y.PostType == "4") && x.ProjectId == ProjectId //一般管理岗位和特种管理人员
select x; select x;
this.divSafeManagePersonNum.InnerHtml = glAllPerson.Count().ToString(); this.divSafeManagePersonNum.InnerHtml = glAllPerson.Count().ToString();
@ -97,7 +98,7 @@ namespace FineUIPro.Web.common
//施工审批量 //施工审批量
int sgspl = Funs.DB.Solution_CQMSConstructSolution.Where(x => x.ProjectId == ProjectId && x.State == "1").Count(); int sgspl = Funs.DB.Solution_CQMSConstructSolution.Where(x => x.ProjectId == ProjectId && x.State == "1").Count();
div_sgfaSpl.InnerHtml = sgspl.ToString() ; div_sgfaSpl.InnerHtml = sgspl.ToString();
//质量共检 //质量共检
getZlgj(); getZlgj();
@ -115,6 +116,7 @@ namespace FineUIPro.Web.common
getProjectSitePerson(); getProjectSitePerson();
//工作台面 //工作台面
getGjsx();
getGztm(); getGztm();
//材料到货 //材料到货
@ -127,7 +129,7 @@ namespace FineUIPro.Web.common
{ {
int AllCount = 0; int AllCount = 0;
int MCount = 0; int MCount = 0;
var getallin = APIPageDataService.getPersonNum(ProjectId,DateTime.Now); var getallin = APIPageDataService.getPersonNum(ProjectId, DateTime.Now);
AllCount = getallin.Count(); AllCount = getallin.Count();
if (AllCount > 0) if (AllCount > 0)
{ {
@ -152,13 +154,13 @@ namespace FineUIPro.Web.common
private void getProjectSitePerson() private void getProjectSitePerson()
{ {
var list = Funs.DB.Base_Project.Where(x => (x.ProjectState == Const.ProjectState_1 || x.ProjectState == null) && x.Progress != null var list = Funs.DB.Base_Project.Where(x => (x.ProjectState == Const.ProjectState_1 || x.ProjectState == null) && x.Progress != null
&& x.ProjectId==ProjectId).ToList(); && x.ProjectId == ProjectId).ToList();
foreach (var item in list) foreach (var item in list)
{ {
ProjectPersonMc += "'" + item.ShortName + "',"; ProjectPersonMc += "'" + item.ShortName + "',";
ProjectPersonCount += "'" + APIPageDataService.getPersonNum(item.ProjectId, DateTime.Now).Count() + "',"; ProjectPersonCount += "'" + APIPageDataService.getPersonNum(item.ProjectId, DateTime.Now).Count() + "',";
} }
if (!string.IsNullOrEmpty(ProjectPersonMc)&& !string.IsNullOrEmpty(ProjectPersonCount)) if (!string.IsNullOrEmpty(ProjectPersonMc) && !string.IsNullOrEmpty(ProjectPersonCount))
{ {
ProjectPersonMc = ProjectPersonMc.TrimEnd(','); ProjectPersonMc = ProjectPersonMc.TrimEnd(',');
ProjectPersonCount = ProjectPersonCount.TrimEnd(','); ProjectPersonCount = ProjectPersonCount.TrimEnd(',');
@ -179,7 +181,7 @@ namespace FineUIPro.Web.common
/// 获取隐患整改闭环项 /// 获取隐患整改闭环项
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
public int GetGeneralClosedNum() public int GetGeneralClosedNum()
{ {
int result = (from x in Funs.DB.HSSE_Hazard_HazardRegister int result = (from x in Funs.DB.HSSE_Hazard_HazardRegister
where x.States == "3" && x.ProjectId == ProjectId where x.States == "3" && x.ProjectId == ProjectId
@ -190,7 +192,7 @@ namespace FineUIPro.Web.common
/// 获取隐患未整改完成项 /// 获取隐患未整改完成项
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
public int GetGeneralNotClosedNum() public int GetGeneralNotClosedNum()
{ {
int result = (from x in Funs.DB.HSSE_Hazard_HazardRegister int result = (from x in Funs.DB.HSSE_Hazard_HazardRegister
where x.States != "3" && x.ProjectId == ProjectId where x.States != "3" && x.ProjectId == ProjectId
@ -230,7 +232,7 @@ namespace FineUIPro.Web.common
if (project != null) if (project != null)
{ {
spanProjectName = "<span title='" + project.ShortName + "'>" + project.ShortName + "</span>"; spanProjectName = "<span title='" + project.ShortName + "'>" + project.ShortName + "</span>";
spanRemark= "<span title='" + project.Remark + "'>" + project.Remark + "</span>"; spanRemark = "<span title='" + project.Remark + "'>" + project.Remark + "</span>";
divProjectNameTitle = project.ProjectName; divProjectNameTitle = project.ProjectName;
if (!string.IsNullOrEmpty(project.ProjectAddress)) if (!string.IsNullOrEmpty(project.ProjectAddress))
{ {
@ -345,7 +347,7 @@ namespace FineUIPro.Web.common
int allCount = 0; int allCount = 0;
var getPersonQualitys = from x in Funs.DB.QualityAudit_PersonQuality var getPersonQualitys = from x in Funs.DB.QualityAudit_PersonQuality
join y in Funs.DB.SitePerson_Person on x.PersonId equals y.PersonId join y in Funs.DB.SitePerson_Person on x.PersonId equals y.PersonId
where x.LimitDate.HasValue && x.LimitDate < DateTime.Now && y.ProjectId==ProjectId where x.LimitDate.HasValue && x.LimitDate < DateTime.Now && y.ProjectId == ProjectId
select x; select x;
//// 预警人数 //// 预警人数
allCount = getPersonQualitys.Count(); allCount = getPersonQualitys.Count();
@ -356,12 +358,12 @@ namespace FineUIPro.Web.common
/// 机械预警 /// 机械预警
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
protected int GetJxyjNum() protected int GetJxyjNum()
{ {
int result = 0; int result = 0;
//机具报验的到期提醒和过期提醒记录数加一起 //机具报验的到期提醒和过期提醒记录数加一起
//机具报验的到期提醒数 //机具报验的到期提醒数
var num1 = Funs.DB.Comprehensive_InspectionMachine.Where(x => x.IsOnSite == true && DateTime.Now < x.NextTestDate && x.ProjectId==ProjectId var num1 = Funs.DB.Comprehensive_InspectionMachine.Where(x => x.IsOnSite == true && DateTime.Now < x.NextTestDate && x.ProjectId == ProjectId
&& ((DateTime)x.NextTestDate).AddDays(-15) < DateTime.Now).Count(); && ((DateTime)x.NextTestDate).AddDays(-15) < DateTime.Now).Count();
//过期提醒记录数 //过期提醒记录数
var num2 = Funs.DB.Comprehensive_InspectionMachine.Where(x => x.IsOnSite == true && x.NextTestDate < DateTime.Now && x.ProjectId == ProjectId).Count(); var num2 = Funs.DB.Comprehensive_InspectionMachine.Where(x => x.IsOnSite == true && x.NextTestDate < DateTime.Now && x.ProjectId == ProjectId).Count();
@ -455,8 +457,9 @@ namespace FineUIPro.Web.common
/// 动火作业许可证 /// 动火作业许可证
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
protected int getWrokCount0() { protected int getWrokCount0()
var result = Funs.DB.View_License_LicenseManager.Where(x => x.ProjectId == ProjectId&&x.LicenseTypeName== "动火作业许可证").ToList().Count; {
var result = Funs.DB.View_License_LicenseManager.Where(x => x.ProjectId == ProjectId && x.LicenseTypeName == "动火作业许可证").ToList().Count;
return result; return result;
} }
@ -492,7 +495,7 @@ namespace FineUIPro.Web.common
protected void getZlwt() protected void getZlwt()
{ {
zlallNumber = (from x in Funs.DB.Check_CheckControl zlallNumber = (from x in Funs.DB.Check_CheckControl
where x.CheckDate <= DateTime.Now && x.ProjectId==ProjectId where x.CheckDate <= DateTime.Now && x.ProjectId == ProjectId
select x).Count().ToString(); select x).Count().ToString();
var num2 = (from x in Funs.DB.Check_CheckControl var num2 = (from x in Funs.DB.Check_CheckControl
where x.CheckDate <= DateTime.Now && x.State == "7" && x.ProjectId == ProjectId where x.CheckDate <= DateTime.Now && x.State == "7" && x.ProjectId == ProjectId
@ -536,7 +539,8 @@ namespace FineUIPro.Web.common
zlgjzgl = zgl.ToString(); zlgjzgl = zgl.ToString();
zggjzglDataValue = (100 - (100.0 * num2 / (num2 + num3))).ToString(); zggjzglDataValue = (100 - (100.0 * num2 / (num2 + num3))).ToString();
} }
else { else
{
zlgjzgl = zgl.ToString(); zlgjzgl = zgl.ToString();
zggjzglDataValue = "0"; zggjzglDataValue = "0";
} }
@ -565,7 +569,7 @@ namespace FineUIPro.Web.common
join z in db.HJGL_Batch_PointBatchItem on y.PointBatchItemId equals z.PointBatchItemId join z in db.HJGL_Batch_PointBatchItem on y.PointBatchItemId equals z.PointBatchItemId
join a in db.HJGL_Batch_NDE on x.NDEID equals a.NDEID join a in db.HJGL_Batch_NDE on x.NDEID equals a.NDEID
where z.PointDate != null && z.PointState == "1" && y.RepairRecordId == null where z.PointDate != null && z.PointState == "1" && y.RepairRecordId == null
&& a.ProjectId ==ProjectId && a.ProjectId == ProjectId
select x.NDEItemID).Count(); select x.NDEItemID).Count();
//一次检测返修焊口数 //一次检测返修焊口数
int oneCheckRepairJotNum = (from x in db.HJGL_Batch_NDEItem int oneCheckRepairJotNum = (from x in db.HJGL_Batch_NDEItem
@ -573,7 +577,7 @@ namespace FineUIPro.Web.common
join z in db.HJGL_Batch_PointBatchItem on y.PointBatchItemId equals z.PointBatchItemId join z in db.HJGL_Batch_PointBatchItem on y.PointBatchItemId equals z.PointBatchItemId
join a in db.HJGL_Batch_NDE on x.NDEID equals a.NDEID join a in db.HJGL_Batch_NDE on x.NDEID equals a.NDEID
where z.PointDate != null && z.PointState == "1" && y.RepairRecordId == null && x.CheckResult == "2" where z.PointDate != null && z.PointState == "1" && y.RepairRecordId == null && x.CheckResult == "2"
&& a.ProjectId ==ProjectId && a.ProjectId == ProjectId
select x.NDEItemID).Count(); select x.NDEItemID).Count();
if (oneCheckJotNum > 0) if (oneCheckJotNum > 0)
{ {
@ -799,29 +803,35 @@ namespace FineUIPro.Web.common
#endregion #endregion
#region 作业许可列表 #region 作业许可列表
protected string getLicenseManager() { protected string getLicenseManager()
{
string returnHtml = ""; string returnHtml = "";
var list = Funs.DB.View_License_LicenseManager.Where(x => x.ProjectId == ProjectId).ToList(); var list = Funs.DB.View_License_LicenseManager.Where(x => x.ProjectId == ProjectId).ToList();
foreach (var item in list) foreach (var item in list)
{ {
var gfx = "风险作业"; var gfx = "风险作业";
if (item.IsHighRisk!=true) if (item.IsHighRisk != true)
{ {
gfx = "非高风险"; gfx = "非高风险";
} }
var shortUnitname = Funs.DB.Base_Unit.Where(x => x.UnitId == item.UnitId).FirstOrDefault().ShortUnitName; var shortUnitname = Funs.DB.Base_Unit.Where(x => x.UnitId == item.UnitId).FirstOrDefault().ShortUnitName;
returnHtml+= "<div class=\"li\">"+item.LicenseManagerCode+"-"+shortUnitname + "-"+item.WorkAreaName+"-"+ gfx+"-"+item.LicenseTypeName returnHtml += "<div class=\"li\">" + item.LicenseManagerCode + "-" + shortUnitname + "-" + item.WorkAreaName + "-" + gfx + "-" + item.LicenseTypeName
+"</div>"; + "</div>";
} }
return returnHtml; return returnHtml;
} }
#endregion #endregion
#region 工作台面 #region 工作台面
protected void getGztm() {
div_dbsxlist.InnerHtml = ""; protected void getGztm()
//关键事项 {
string strSql = @"SELECT GJSXID AS DataId //div_dbsxlist.InnerHtml = "";
string returnDbHtml = "<div></div>";
if (!string.IsNullOrEmpty(ProjectId))
{
//关键事项
string strSql = @"SELECT GJSXID AS DataId
,'0BEA2126-7A48-40EB-8E21-99148E91A22B' AS MenuId ,'0BEA2126-7A48-40EB-8E21-99148E91A22B' AS MenuId
,'关键事项待处理' AS MenuName ,'关键事项待处理' AS MenuName
,GJSX.Detail AS Content ,GJSX.Detail AS Content
@ -837,26 +847,80 @@ namespace FineUIPro.Web.common
and (select count(*) from GJSX_Process process where process.UserId=@userId and process.GJSXID=GJSX.GJSXID)>0) and (select count(*) from GJSX_Process process where process.UserId=@userId and process.GJSXID=GJSX.GJSXID)>0)
or (GJSX.User_Acceptance like '%'+@userId+'%' and (select count(*) from GJSX_detail detail where detail.GJSXID=GJSX.GJSXID)=(select count(*) from GJSX_Process process where process.GJSXID=GJSX.GJSXID)) or (GJSX.User_Acceptance like '%'+@userId+'%' and (select count(*) from GJSX_detail detail where detail.GJSXID=GJSX.GJSXID)=(select count(*) from GJSX_Process process where process.GJSXID=GJSX.GJSXID))
)"; )";
List<SqlParameter> listStr = new List<SqlParameter>(); List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@userId", CurrUser.UserId)); listStr.Add(new SqlParameter("@userId", CurrUser.UserId));
listStr.Add(new SqlParameter("@projectId", ProjectId)); listStr.Add(new SqlParameter("@projectId", ProjectId));
SqlParameter[] parameter = listStr.ToArray(); SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
var Gjsxcount = tb.Rows.Count; var Gjsxcount = tb.Rows.Count;
div_gjsx.InnerHtml = Gjsxcount.ToString() ; div_gjsx.InnerHtml = Gjsxcount.ToString();
var getDataList = Funs.DB.Sp_Project_GetToDoItems(this.CurrUser.LoginProjectId, this.CurrUser.UserId).ToList(); var getDataList = Funs.DB.Sp_Project_GetToDoItems(this.CurrUser.LoginProjectId, this.CurrUser.UserId).ToList();
//待办事项、个人流程 //待办事项、个人流程
div_dbsx.InnerHtml= getDataList.Count().ToString(); div_dbsx.InnerHtml = getDataList.Count().ToString();
div_grlc.InnerHtml = getDataList.Count().ToString(); div_grlc.InnerHtml = getDataList.Count().ToString();
string returnHtml = ""; foreach (var item in getDataList)
foreach (var item in getDataList) {
{ returnDbHtml += "<div class=\"li\" style=\"cursor:pointer\" onclick=\"returnWindows(\"" + item.PCUrl + "\")\"><span>" + item.MenuName + "</span><span>" + item.Content + "</span><span>" +
returnHtml += "<div class=\"li\" style='cursor:pointer' onclick=\"returnWindows('" + item.PCUrl + "')\"><span>"+ item.MenuName + "</span><span>" + item.Content+"</span><span>"+ item.DataTime.ToString().Replace('/', '-').Split(' ')[0] + "</span></div>";
item.DataTime.ToString().Replace('/','-').Split(' ')[0] + "</span></div>"; }
} }
div_dbsxlist.InnerHtml = returnHtml; else {
returnDbHtml = "<div></div>";
}
this.div_dbsxlist.InnerHtml = returnDbHtml;
}
/// <summary>
/// 加载关键事项
/// </summary>
protected void getGjsx()
{
string returnDbHtml = "<div></div>";
////关键事项
if (!string.IsNullOrEmpty(ProjectId))
{
string strSql = @"SELECT GJSXID AS DataId
,'0BEA2126-7A48-40EB-8E21-99148E91A22B' AS MenuId
,'关键事项待处理' AS MenuName
,GJSX.Detail AS Content
,users.UserId
,users.UserName
,GJSX.CreateDate AS DataTime
,CONVERT(varchar(100),GJSX.CreateDate, 23) AS DataTimeStr
,'../PZHGL/GJSX/GJSXListEdit.aspx?ToDo=ToDo&EditType=Edit&ID='+GJSXID AS PCUrl
FROM GJSX
LEFT JOIN Sys_User AS users ON users.UserId =@userId
WHERE GJSX.ProjectId=@projectId AND
GJSX.State != 0 AND (((select count(*) from GJSX_detail detail where detail.Progress_user=@userId and detail.GJSXID=GJSX.GJSXID)=0
and (select count(*) from GJSX_Process process where process.UserId=@userId and process.GJSXID=GJSX.GJSXID)>0)
or (GJSX.User_Acceptance like '%'+@userId+'%' and (select count(*) from GJSX_detail detail where detail.GJSXID=GJSX.GJSXID)=(select count(*) from GJSX_Process process where process.GJSXID=GJSX.GJSXID))
)";
List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@userId", CurrUser.UserId));
listStr.Add(new SqlParameter("@projectId", ProjectId));
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
for (int i = 0; i < tb.Rows.Count; i++)
{
returnDbHtml += "<div class=\"li\" style=\"cursor:pointer\" " +
"onclick=\"returnWindows(\"" + tb.Rows[i]["PCUrl"] + "\")\"><span>" + tb.Rows[i]["MenuName"] + "</span><span>" + tb.Rows[i]["Content"] + "</span><span>" +
tb.Rows[i]["DataTime"].ToString().Replace('/', '-').Split(' ')[0] + "</span></div>";
}
}
else
{
returnDbHtml = "<div></div>";
}
this.div_gjsxlist.InnerHtml = returnDbHtml;
} }
#endregion #endregion
@ -868,6 +932,7 @@ namespace FineUIPro.Web.common
protected void Window1_Close(object sender, WindowCloseEventArgs e) protected void Window1_Close(object sender, WindowCloseEventArgs e)
{ {
getGztm(); getGztm();
getGjsx();
} }
@ -895,23 +960,23 @@ namespace FineUIPro.Web.common
{ {
//管道材料 //管道材料
var pid = BLL.ProjectService.GetCLProjectCodeByProjectId(ProjectId).ToString(); var pid = BLL.ProjectService.GetCLProjectCodeByProjectId(ProjectId).ToString();
var list = Funs.DB.CLGL_PipelineMaterialSumList.Where(x => x.Type == "M" && x.ProjectId== pid); var list = Funs.DB.CLGL_PipelineMaterialSumList.Where(x => x.Type == "M" && x.ProjectId == pid);
foreach (var item in list) foreach (var item in list)
{ {
gdclHtml += "<div class=\"tr\">"; gdclHtml += "<div class=\"tr\">";
gdclHtml += "<span class=\"r-line\" style=\"width: .7875rem; \">"+item.C1+"</span>"; gdclHtml += "<span class=\"r-line\" style=\"width: .7875rem; \">" + item.C1 + "</span>";
gdclHtml += "<span class=\"r-line\" style=\"width: .8375rem; \">" + (string.IsNullOrEmpty(item.C2)?"0": item.C2) + "</span>"; gdclHtml += "<span class=\"r-line\" style=\"width: .8375rem; \">" + (string.IsNullOrEmpty(item.C2) ? "0" : item.C2) + "</span>";
gdclHtml += "<span class=\"r-line\" style=\"width: .7875rem; \">" + (string.IsNullOrEmpty(item.C4) ? "0" : item.C4) + "</span>"; gdclHtml += "<span class=\"r-line\" style=\"width: .7875rem; \">" + (string.IsNullOrEmpty(item.C4) ? "0" : item.C4) + "</span>";
gdclHtml += "<span class=\"r-line\" style=\"width: .7875rem; \">" + (string.IsNullOrEmpty(item.C5) ? "0%" : item.C5) + "</span>"; gdclHtml += "<span class=\"r-line\" style=\"width: .7875rem; \">" + (string.IsNullOrEmpty(item.C5) ? "0%" : item.C5) + "</span>";
gdclHtml += "<span class=\"r-line\" style=\"width: .7875rem; \">" + (string.IsNullOrEmpty(item.C6)?"0": item.C6) + "</span>"; gdclHtml += "<span class=\"r-line\" style=\"width: .7875rem; \">" + (string.IsNullOrEmpty(item.C6) ? "0" : item.C6) + "</span>";
gdclHtml += "<span class=\"r-line\" style=\"width: .7875rem; \">" + (string.IsNullOrEmpty(item.C7)?"0%": item.C7) + "</span>"; gdclHtml += "<span class=\"r-line\" style=\"width: .7875rem; \">" + (string.IsNullOrEmpty(item.C7) ? "0%" : item.C7) + "</span>";
gdclHtml += "<span class=\"r-line\" style=\"width: .7875rem; \">" + (string.IsNullOrEmpty(item.C8)?"0": item.C8) + "</span>"; gdclHtml += "<span class=\"r-line\" style=\"width: .7875rem; \">" + (string.IsNullOrEmpty(item.C8) ? "0" : item.C8) + "</span>";
gdclHtml += "<span class=\"r-line\" style=\"width: .7875rem; \">" + (string.IsNullOrEmpty(item.C9) ? "0%" : item.C9) + "</span>"; gdclHtml += "<span class=\"r-line\" style=\"width: .7875rem; \">" + (string.IsNullOrEmpty(item.C9) ? "0%" : item.C9) + "</span>";
gdclHtml += "</div>"; gdclHtml += "</div>";
} }
//设备材料 //设备材料
var SbclList = Funs.DB.CLGL_ContractListSum.Where(x => x.C1 == "设备"&&x.ProjectId==pid); var SbclList = Funs.DB.CLGL_ContractListSum.Where(x => x.C1 == "设备" && x.ProjectId == pid);
foreach (var item in SbclList) foreach (var item in SbclList)
{ {
sbclHtml += "<div class=\"tr\">"; sbclHtml += "<div class=\"tr\">";
@ -935,7 +1000,7 @@ namespace FineUIPro.Web.common
var dhbfb = "0%"; var dhbfb = "0%";
if (SbcllCgl + Sbdhs != 0) if (SbcllCgl + Sbdhs != 0)
{ {
dhbfb = String.Format("{0:N2}", 100.0 * Sbdhs / (Sbdhs + SbcllCgl), 2) + "%"; dhbfb = String.Format("{0:N2}", 100.0 * Sbdhs / (Sbdhs + SbcllCgl), 2) + "%";
} }
sbclHtml += "<span class=\"r-line\" style=\"width: .9875rem; \">" + dhbfb + "</span>"; sbclHtml += "<span class=\"r-line\" style=\"width: .9875rem; \">" + dhbfb + "</span>";

36
SGGL/FineUIPro.Web/common/mainProject2.aspx.designer.cs generated
View File

@ -158,6 +158,15 @@ namespace FineUIPro.Web.common
/// </remarks> /// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl div_sgfaSpl; protected global::System.Web.UI.HtmlControls.HtmlGenericControl div_sgfaSpl;
/// <summary>
/// div_Gzgjsx 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl div_Gzgjsx;
/// <summary> /// <summary>
/// div_gjsx 控件。 /// div_gjsx 控件。
/// </summary> /// </summary>
@ -167,6 +176,15 @@ namespace FineUIPro.Web.common
/// </remarks> /// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl div_gjsx; protected global::System.Web.UI.HtmlControls.HtmlGenericControl div_gjsx;
/// <summary>
/// div_Gzdbsx 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl div_Gzdbsx;
/// <summary> /// <summary>
/// div_dbsx 控件。 /// div_dbsx 控件。
/// </summary> /// </summary>
@ -176,6 +194,15 @@ namespace FineUIPro.Web.common
/// </remarks> /// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl div_dbsx; protected global::System.Web.UI.HtmlControls.HtmlGenericControl div_dbsx;
/// <summary>
/// div_Gzgrlc 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl div_Gzgrlc;
/// <summary> /// <summary>
/// div_grlc 控件。 /// div_grlc 控件。
/// </summary> /// </summary>
@ -194,6 +221,15 @@ namespace FineUIPro.Web.common
/// </remarks> /// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl div_ybrw; protected global::System.Web.UI.HtmlControls.HtmlGenericControl div_ybrw;
/// <summary>
/// div_gjsxlist 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl div_gjsxlist;
/// <summary> /// <summary>
/// div_dbsxlist 控件。 /// div_dbsxlist 控件。
/// </summary> /// </summary>