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

首页数据只显示本年份修改

Browse Source
This commit is contained in:
李超
2024-01-03 14:12:27 +08:00
parent e8877811ef
commit f590c95d94
6 changed files with 291 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/HSSE/HiddenInspection/RiskAnalysisChart.aspx.cs
+236 -87
View File
@@ -73,7 +73,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
}
if (!string.IsNullOrEmpty(this.txtEndRectificationTime.Text.Trim()))
{
strSql += " and CheckTime <'" + DateTime.Parse( this.txtEndRectificationTime.Text.Trim()).AddDays(1).ToString("yyyy-MM-dd") + "' ";
strSql += " and CheckTime <'" + DateTime.Parse(this.txtEndRectificationTime.Text.Trim()).AddDays(1).ToString("yyyy-MM-dd") + "' ";
}
if (drpUnit.SelectedValue != BLL.Const._Null)
@@ -156,56 +156,205 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
},
data: " + series3 + @"
}]";
string strSql1 = @" select r.RegisterTypesId,t.RegisterTypesName,
string strSql1 = @" select r.RegisterTypesId,t.RegisterTypesName,
count(*) as allnum,
Sum(case when States= 1 or States is null then 1 else 0 end) as todo,
Sum(case when States= 3 or States =2 then 1 else 0 end) as finish
from HSSE_Hazard_HazardRegister r left join HSSE_Hazard_HazardRegisterTypes t on r.RegisterTypesId=t.RegisterTypesId
where ProjectId=@ProjectId and States != '4' and ProblemTypes = '1'
";
if (!string.IsNullOrEmpty(this.txtStartRectificationTime.Text.Trim()))
{
strSql1 += " and CheckTime >='" + this.txtStartRectificationTime.Text.Trim() + "' ";
}
if (!string.IsNullOrEmpty(this.txtEndRectificationTime.Text.Trim()))
{
strSql1 += " and CheckTime <'" + DateTime.Parse(this.txtEndRectificationTime.Text.Trim()).AddDays(1).ToString("yyyy-MM-dd") + "' ";
}
if (!string.IsNullOrEmpty(this.txtStartRectificationTime.Text.Trim()))
{
strSql1 += " and CheckTime >='" + this.txtStartRectificationTime.Text.Trim() + "' ";
}
if (!string.IsNullOrEmpty(this.txtEndRectificationTime.Text.Trim()))
{
strSql1 += " and CheckTime <'" + DateTime.Parse(this.txtEndRectificationTime.Text.Trim()).AddDays(1).ToString("yyyy-MM-dd") + "' ";
}
if (drpUnit.SelectedValue != BLL.Const._Null)
{
strSql1 += " and r.ResponsibleUnit='" + drpUnit.SelectedValue + "' ";
}
if (drpRegisterTypes.SelectedValue != BLL.Const._Null)
{
strSql1 += " and r.RegisterTypesId='" + drpRegisterTypes.SelectedValue + "' ";
}
strSql1 += " group by r.RegisterTypesId,t.RegisterTypesName ";
List<SqlParameter> listStr1 = new List<SqlParameter>();
listStr1.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
if (drpUnit.SelectedValue != BLL.Const._Null)
{
strSql1 += " and r.ResponsibleUnit='" + drpUnit.SelectedValue + "' ";
}
if (drpRegisterTypes.SelectedValue != BLL.Const._Null)
{
strSql1 += " and r.RegisterTypesId='" + drpRegisterTypes.SelectedValue + "' ";
}
strSql1 += " group by r.RegisterTypesId,t.RegisterTypesName ";
List<SqlParameter> listStr1 = new List<SqlParameter>();
listStr1.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
SqlParameter[] parameter1 = listStr1.ToArray();
DataTable tb1 = SQLHelper.GetDataTableRunText(strSql1, parameter1);
if (tb1 != null)
{
xPieAxis = "[";
seriesPie = "[";
foreach (DataRow dr in tb1.Rows)
{
xPieAxis += " '" + dr["RegisterTypesName"].ToString() + "' ,";
seriesPie += " { name:'" + dr["RegisterTypesName"].ToString() + "', value:" + dr["allnum"].ToString() + "} ,";
SqlParameter[] parameter1 = listStr1.ToArray();
DataTable tb1 = SQLHelper.GetDataTableRunText(strSql1, parameter1);
if (tb1 != null)
{
xPieAxis = "[";
seriesPie = "[";
}
xPieAxis=xPieAxis.TrimEnd(',');
seriesPie=seriesPie.TrimEnd(',');
xPieAxis += "]";
seriesPie += "]";
}
}
else
foreach (DataRow dr in tb1.Rows)
{
xPieAxis += " '" + dr["RegisterTypesName"].ToString() + "' ,";
seriesPie += " { name:'" + dr["RegisterTypesName"].ToString() + "', value:" + dr["allnum"].ToString() + "} ,";
}
xPieAxis = xPieAxis.TrimEnd(',');
seriesPie = seriesPie.TrimEnd(',');
xPieAxis += "]";
seriesPie += "]";
}
}
else if (this.rblState.SelectedValue == "2")
{
string strSql = @" select a.CheckManId,b.UserName,
count(*) as allnum,
Sum(case when States= 1 or States is null then 1 else 0 end) as todo,
Sum(case when States= 3 or States =2 then 1 else 0 end) as finish
from HSSE_Hazard_HazardRegister a left join Sys_User b on a.CheckManId = b.UserId
where a.ProjectId=@ProjectId and States != '4' and ProblemTypes = '1'
";
if (!string.IsNullOrEmpty(this.txtStartRectificationTime.Text.Trim()))
{
strSql += " and CheckTime >='" + this.txtStartRectificationTime.Text.Trim() + "' ";
}
if (!string.IsNullOrEmpty(this.txtEndRectificationTime.Text.Trim()))
{
strSql += " and CheckTime <'" + DateTime.Parse(this.txtEndRectificationTime.Text.Trim()).AddDays(1).ToString("yyyy-MM-dd") + "' ";
}
if (drpUnit.SelectedValue != BLL.Const._Null)
{
strSql += " and a.ResponsibleUnit='" + drpUnit.SelectedValue + "' ";
}
if (drpRegisterTypes.SelectedValue != BLL.Const._Null)
{
strSql += " and a.RegisterTypesId='" + drpRegisterTypes.SelectedValue + "' ";
}
strSql += " group by a.CheckManId,b.UserName ";
List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
legend = "[\"全部\", \"待整改\", \"已整改\"]";
xAxis = "[";
string series1 = "[";
string series2 = "[";
string series3 = "[";
foreach (DataRow dr in tb.Rows)
{
xAxis += "\"" + dr["UserName"].ToString() + "\",";
series1 += "" + dr["allnum"].ToString() + ",";
series2 += "" + dr["todo"].ToString() + ",";
series3 += "" + dr["finish"].ToString() + ",";
}
xAxis = xAxis.TrimEnd(',');
xAxis += "]";
series1 = series1.TrimEnd(',');
series1 += "]";
series2 = series2.TrimEnd(',');
series2 += "]";
series3 = series3.TrimEnd(',');
series3 += "]";
series = @"[{
name: '全部',
type: 'bar',
label: {
show: true,
position: 'top'
},
barWidth: 20,
barGap:'5%',
emphasis: {
focus: 'series'
},
data: " + series1 + @"
},
{
name: '待整改',
type: 'bar',
barWidth: 20,
barGap:'5%',
label: {
show: true,
position: 'top'
},
emphasis: {
focus: 'series'
},
data: " + series2 + @"
},
{
name: '已整改',
type: 'bar',
barWidth: 20,
barGap:'5%',
label: {
show: true,
position: 'top'
},
emphasis: {
focus: 'series'
},
data: " + series3 + @"
}]";
string strSql1 = @" select r.RegisterTypesId,t.RegisterTypesName,
count(*) as allnum,
Sum(case when States= 1 or States is null then 1 else 0 end) as todo,
Sum(case when States= 3 or States =2 then 1 else 0 end) as finish
from HSSE_Hazard_HazardRegister r left join HSSE_Hazard_HazardRegisterTypes t on r.RegisterTypesId=t.RegisterTypesId
where ProjectId=@ProjectId and States != '4' and ProblemTypes = '1'
";
if (!string.IsNullOrEmpty(this.txtStartRectificationTime.Text.Trim()))
{
strSql1 += " and CheckTime >='" + this.txtStartRectificationTime.Text.Trim() + "' ";
}
if (!string.IsNullOrEmpty(this.txtEndRectificationTime.Text.Trim()))
{
strSql1 += " and CheckTime <'" + DateTime.Parse(this.txtEndRectificationTime.Text.Trim()).AddDays(1).ToString("yyyy-MM-dd") + "' ";
}
if (drpUnit.SelectedValue != BLL.Const._Null)
{
strSql1 += " and r.ResponsibleUnit='" + drpUnit.SelectedValue + "' ";
}
if (drpRegisterTypes.SelectedValue != BLL.Const._Null)
{
strSql1 += " and r.RegisterTypesId='" + drpRegisterTypes.SelectedValue + "' ";
}
strSql1 += " group by r.RegisterTypesId,t.RegisterTypesName ";
List<SqlParameter> listStr1 = new List<SqlParameter>();
listStr1.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
SqlParameter[] parameter1 = listStr1.ToArray();
DataTable tb1 = SQLHelper.GetDataTableRunText(strSql1, parameter1);
if (tb1 != null)
{
xPieAxis = "[";
seriesPie = "[";
foreach (DataRow dr in tb1.Rows)
{
xPieAxis += " '" + dr["RegisterTypesName"].ToString() + "' ,";
seriesPie += " { name:'" + dr["RegisterTypesName"].ToString() + "', value:" + dr["allnum"].ToString() + "} ,";
}
xPieAxis = xPieAxis.TrimEnd(',');
seriesPie = seriesPie.TrimEnd(',');
xPieAxis += "]";
seriesPie += "]";
}
}
else
{
string strSql = @" select u.UnitId,u.unitName,r.RegisterTypesId,t.RegisterTypesName,
count(*) as allnum,
@@ -254,14 +403,14 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
Dictionary<string, string> temp = null;
if (!data.ContainsKey(dr["unitName"].ToString()))
{
data.Add(dr["unitName"].ToString(), new Dictionary<string,string>());
data.Add(dr["unitName"].ToString(), new Dictionary<string, string>());
}
temp = data[dr["unitName"].ToString()];
if (!temp.ContainsKey(dr["RegisterTypesName"].ToString()))
{
temp.Add(dr["RegisterTypesName"].ToString(),"0");
temp.Add(dr["RegisterTypesName"].ToString(), "0");
}
temp[dr["RegisterTypesName"].ToString()]=dr["allnum"].ToString();
temp[dr["RegisterTypesName"].ToString()] = dr["allnum"].ToString();
}
foreach (string types in xdic)
@@ -295,7 +444,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
}
series += @"{
name: '"+ unit + @"[全部]',
name: '" + unit + @"[全部]',
type: 'bar',
stack: '全部',
barWidth: 10,
@@ -309,11 +458,11 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
data: [" + tempseries.TrimEnd(',') + @"]
},";
}
data = new Dictionary<string, Dictionary<string, string>>();
data = new Dictionary<string, Dictionary<string, string>>();
foreach (DataRow dr in tb.Rows)
{
xdic.Add(dr["RegisterTypesName"].ToString());
Dictionary<string,string> temp = null;
Dictionary<string, string> temp = null;
if (!data.ContainsKey(dr["unitName"].ToString()))
{
data.Add(dr["unitName"].ToString(), new Dictionary<string, string>());
@@ -323,7 +472,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
{
temp.Add(dr["RegisterTypesName"].ToString(), "0");
}
temp[dr["RegisterTypesName"].ToString()]=dr["todo"].ToString();
temp[dr["RegisterTypesName"].ToString()] = dr["todo"].ToString();
}
foreach (string unit in data.Keys)
{
@@ -369,7 +518,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
{
temp.Add(dr["RegisterTypesName"].ToString(), "0");
}
temp[dr["RegisterTypesName"].ToString()]=dr["finish"].ToString();
temp[dr["RegisterTypesName"].ToString()] = dr["finish"].ToString();
}
foreach (string unit in data.Keys)
{
@@ -407,56 +556,56 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
string strSql1 = @" select r.RegisterTypesId,t.RegisterTypesName,
string strSql1 = @" select r.RegisterTypesId,t.RegisterTypesName,
count(*) as allnum,
Sum(case when States= 1 or States is null then 1 else 0 end) as todo,
Sum(case when States= 3 or States =2 then 1 else 0 end) as finish
from HSSE_Hazard_HazardRegister r left join HSSE_Hazard_HazardRegisterTypes t on r.RegisterTypesId=t.RegisterTypesId
where ProjectId=@ProjectId and States != '4' and ProblemTypes = '1'
";
if (!string.IsNullOrEmpty(this.txtStartRectificationTime.Text.Trim()))
{
strSql1 += " and CheckTime >='" + this.txtStartRectificationTime.Text.Trim() + "' ";
}
if (!string.IsNullOrEmpty(this.txtEndRectificationTime.Text.Trim()))
{
strSql1 += " and CheckTime <'" + DateTime.Parse(this.txtEndRectificationTime.Text.Trim()).AddDays(1).ToString("yyyy-MM-dd") + "' ";
}
if (!string.IsNullOrEmpty(this.txtStartRectificationTime.Text.Trim()))
{
strSql1 += " and CheckTime >='" + this.txtStartRectificationTime.Text.Trim() + "' ";
}
if (!string.IsNullOrEmpty(this.txtEndRectificationTime.Text.Trim()))
{
strSql1 += " and CheckTime <'" + DateTime.Parse(this.txtEndRectificationTime.Text.Trim()).AddDays(1).ToString("yyyy-MM-dd") + "' ";
}
if (drpUnit.SelectedValue != BLL.Const._Null)
{
strSql1 += " and r.ResponsibleUnit='" + drpUnit.SelectedValue + "' ";
}
if (drpRegisterTypes.SelectedValue != BLL.Const._Null)
{
strSql1 += " and r.RegisterTypesId='" + drpRegisterTypes.SelectedValue + "' ";
}
strSql1 += " group by r.RegisterTypesId,t.RegisterTypesName ";
List<SqlParameter> listStr1 = new List<SqlParameter>();
listStr1.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
if (drpUnit.SelectedValue != BLL.Const._Null)
{
strSql1 += " and r.ResponsibleUnit='" + drpUnit.SelectedValue + "' ";
}
if (drpRegisterTypes.SelectedValue != BLL.Const._Null)
{
strSql1 += " and r.RegisterTypesId='" + drpRegisterTypes.SelectedValue + "' ";
}
strSql1 += " group by r.RegisterTypesId,t.RegisterTypesName ";
List<SqlParameter> listStr1 = new List<SqlParameter>();
listStr1.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
SqlParameter[] parameter1 = listStr1.ToArray();
DataTable tb1 = SQLHelper.GetDataTableRunText(strSql1, parameter1);
if (tb1 != null)
{
xPieAxis = "[";
seriesPie = "[";
SqlParameter[] parameter1 = listStr1.ToArray();
DataTable tb1 = SQLHelper.GetDataTableRunText(strSql1, parameter1);
if (tb1 != null)
{
xPieAxis = "[";
seriesPie = "[";
foreach (DataRow dr in tb1.Rows)
{
xPieAxis += " '" + dr["RegisterTypesName"].ToString() + "' ,";
seriesPie += " { name:'" + dr["RegisterTypesName"].ToString() + "', value:" + dr["allnum"].ToString() + "} ,";
foreach (DataRow dr in tb1.Rows)
{
xPieAxis += " '" + dr["RegisterTypesName"].ToString() + "' ,";
seriesPie += " { name:'" + dr["RegisterTypesName"].ToString() + "', value:" + dr["allnum"].ToString() + "} ,";
}
xPieAxis = xPieAxis.TrimEnd(',');
seriesPie = seriesPie.TrimEnd(',');
xPieAxis += "]";
seriesPie += "]";
}
}
xPieAxis = xPieAxis.TrimEnd(',');
seriesPie = seriesPie.TrimEnd(',');
xPieAxis += "]";
seriesPie += "]";
}
}
}
// this.ChartAccidentTime.CreateChart(BLL.ChartControlService.GetDataSourceChart(dtTime, "单位巡检分析", this.drpChartType.SelectedValue, 1130, 450, this.ckbShow.Checked));
//#endregion