合并最新
This commit is contained in:
@@ -37,16 +37,6 @@ namespace FineUIPro.Web.HSSE.Check
|
||||
if (!IsPostBack)
|
||||
{
|
||||
Funs.DropDownPageSize(this.ddlPageSize);
|
||||
ListItem[] item = new ListItem[5];
|
||||
item[0] = new ListItem("请选择", "-1");
|
||||
item[1] = new ListItem("专项检查", "0");
|
||||
item[2] = new ListItem("安全周检", "1");
|
||||
item[3] = new ListItem("安全月检", "2");
|
||||
item[4] = new ListItem("节前节后安全检查", "3");
|
||||
this.drpType.DataValueField = "Value";
|
||||
this.drpType.DataTextField = "Text";
|
||||
this.drpType.DataSource = item;
|
||||
this.drpType.DataBind();
|
||||
this.ProjectId = this.CurrUser.LoginProjectId;
|
||||
if (!string.IsNullOrEmpty(Request.Params["projectId"]) && Request.Params["projectId"] != this.ProjectId)
|
||||
{
|
||||
@@ -67,13 +57,8 @@ namespace FineUIPro.Web.HSSE.Check
|
||||
/// </summary>
|
||||
private void BindGrid()
|
||||
{
|
||||
string strSql = @"SELECT 0 [index], CheckSpecial.CheckSpecialId,CodeRecords.Code AS CheckSpecialCode,"
|
||||
+ @" CASE WHEN CheckSpecial.CheckType ='0' THEN CheckItemSet.CheckItemName else '联合' end CheckItemName ,CheckSpecial.CheckTime,
|
||||
(CASE WHEN CheckSpecial.CheckType ='1' THEN '安全周检'
|
||||
WHEN CheckSpecial.CheckType ='2' THEN '安全月检'
|
||||
WHEN CheckSpecial.CheckType ='3' THEN '节前节后安全检查'
|
||||
WHEN CheckSpecial.CheckType ='0' THEN '专项检查'
|
||||
ELSE '专项检查' END) AS CheckTypeName"
|
||||
string strSql = @"SELECT CheckSpecial.CheckSpecialId,CodeRecords.Code AS CheckSpecialCode,"
|
||||
+ @" CheckItemSet.CheckItemName,CheckSpecial.CheckTime,(CASE WHEN CheckSpecial.CheckType ='1' THEN '联合检查' ELSE '专项检查' END) AS CheckTypeName"
|
||||
+ @" ,(CASE WHEN CheckSpecial.States='2' THEN '已完成' WHEN CheckSpecial.States='1' THEN '待整改' ELSE '待提交' END) AS StatesName"
|
||||
+ @" FROM Check_CheckSpecial AS CheckSpecial "
|
||||
+ @" LEFT JOIN Sys_CodeRecords AS CodeRecords ON CheckSpecial.CheckSpecialId=CodeRecords.DataId "
|
||||
@@ -87,20 +72,23 @@ namespace FineUIPro.Web.HSSE.Check
|
||||
strSql += " AND CheckSpecial.States = @States";
|
||||
listStr.Add(new SqlParameter("@States", this.rbStates.SelectedValue));
|
||||
}
|
||||
if (this.drpType.SelectedValue != "-1")
|
||||
if (this.rbType.SelectedValue != "-1")
|
||||
{
|
||||
|
||||
strSql += " AND CheckSpecial.CheckType = @CheckType";
|
||||
listStr.Add(new SqlParameter("@CheckType", this.drpType.SelectedValue));
|
||||
|
||||
}
|
||||
if (this.drpSupCheckItemSet.SelectedValue != BLL.Const._Null)
|
||||
{
|
||||
if (drpSupCheckItemSet.SelectedValue != "0"&& drpSupCheckItemSet.SelectedValue != "-1")
|
||||
if (this.rbType.SelectedValue == "1")
|
||||
{
|
||||
strSql += " AND CheckSpecial.CheckItemSetId = @CheckItemSetId";
|
||||
listStr.Add(new SqlParameter("@CheckItemSetId", this.drpSupCheckItemSet.SelectedValue));
|
||||
strSql += " AND CheckSpecial.CheckType = @CheckType";
|
||||
listStr.Add(new SqlParameter("@CheckType", this.rbType.SelectedValue));
|
||||
}
|
||||
else
|
||||
{
|
||||
strSql += " AND (CheckSpecial.CheckType = @CheckType OR CheckSpecial.CheckType IS NULL) ";
|
||||
listStr.Add(new SqlParameter("@CheckType", this.rbType.SelectedValue));
|
||||
}
|
||||
}
|
||||
if (this.drpSupCheckItemSet.SelectedValue!=BLL.Const._Null)
|
||||
{
|
||||
strSql += " AND CheckSpecial.CheckItemSetId = @CheckItemSetId";
|
||||
listStr.Add(new SqlParameter("@CheckItemSetId", this.drpSupCheckItemSet.SelectedValue ));
|
||||
}
|
||||
if (!string.IsNullOrEmpty(this.txtStartTime.Text.Trim()))
|
||||
{
|
||||
@@ -115,13 +103,7 @@ namespace FineUIPro.Web.HSSE.Check
|
||||
|
||||
SqlParameter[] parameter = listStr.ToArray();
|
||||
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
|
||||
if (tb != null)
|
||||
{
|
||||
foreach (DataRow row in tb.Rows)
|
||||
{
|
||||
row["index"] = int.Parse(System.Text.RegularExpressions.Regex.Replace(row["CheckSpecialCode"].ToString(), @"[^0-9]+", ""));
|
||||
}
|
||||
}
|
||||
|
||||
Grid1.RecordCount = tb.Rows.Count;
|
||||
var table = this.GetPagedDataTable(Grid1, tb);
|
||||
|
||||
@@ -315,32 +297,8 @@ namespace FineUIPro.Web.HSSE.Check
|
||||
this.BindGrid();
|
||||
}
|
||||
|
||||
protected void drpType_SelectedIndexChanged(object sender, EventArgs e)
|
||||
{
|
||||
drpSupCheckItemSet.Items.Clear();
|
||||
if (drpType.SelectedValue == "0")
|
||||
{
|
||||
Technique_CheckItemSetService.InitCheckItemSetDropDownList(this.drpSupCheckItemSet, "2", "0", true);
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
ListItem[] item = new ListItem[2];
|
||||
item[0] = new ListItem("请选择", "-1");
|
||||
item[1] = new ListItem("联合", "0");
|
||||
this.drpSupCheckItemSet.DataValueField = "Value";
|
||||
this.drpSupCheckItemSet.DataTextField = "Text";
|
||||
this.drpSupCheckItemSet.DataSource = item;
|
||||
this.drpSupCheckItemSet.DataBind();
|
||||
|
||||
}
|
||||
this.drpSupCheckItemSet.SelectedIndex = 0;
|
||||
this.BindGrid();
|
||||
}
|
||||
|
||||
protected void drpSupCheckItemSet_SelectedIndexChanged(object sender, EventArgs e)
|
||||
{
|
||||
|
||||
{
|
||||
this.BindGrid();
|
||||
}
|
||||
|
||||
@@ -509,7 +467,7 @@ namespace FineUIPro.Web.HSSE.Check
|
||||
builder.CellFormat.HorizontalMerge = Aspose.Words.Tables.CellMerge.First;
|
||||
builder.CellFormat.VerticalAlignment = Aspose.Words.Tables.CellVerticalAlignment.Center;//垂直居中对齐
|
||||
builder.ParagraphFormat.Alignment = ParagraphAlignment.Center;//水平居中对齐
|
||||
builder.CellFormat.Width = 120;
|
||||
builder.CellFormat.Width = 60;
|
||||
builder.Write(string.IsNullOrEmpty(detail.UnitName) ? "" : detail.UnitName);
|
||||
//问题描述
|
||||
builder.InsertCell();
|
||||
@@ -517,7 +475,7 @@ namespace FineUIPro.Web.HSSE.Check
|
||||
builder.CellFormat.HorizontalMerge = Aspose.Words.Tables.CellMerge.First;
|
||||
builder.CellFormat.VerticalAlignment = Aspose.Words.Tables.CellVerticalAlignment.Center;//垂直居中对齐
|
||||
builder.ParagraphFormat.Alignment = ParagraphAlignment.Center;//水平居中对齐
|
||||
builder.CellFormat.Width = 40;
|
||||
builder.CellFormat.Width = 140;
|
||||
builder.Write(string.IsNullOrEmpty(detail.Unqualified) ? "" : detail.Unqualified);
|
||||
//问题类型
|
||||
builder.InsertCell();
|
||||
@@ -525,7 +483,7 @@ namespace FineUIPro.Web.HSSE.Check
|
||||
builder.CellFormat.HorizontalMerge = Aspose.Words.Tables.CellMerge.First;
|
||||
builder.CellFormat.VerticalAlignment = Aspose.Words.Tables.CellVerticalAlignment.Center;//垂直居中对齐
|
||||
builder.ParagraphFormat.Alignment = ParagraphAlignment.Center;//水平居中对齐
|
||||
builder.CellFormat.Width = 100;
|
||||
builder.CellFormat.Width = 60;
|
||||
builder.Write(string.IsNullOrEmpty(detail.CheckItemName)?"": detail.CheckItemName);
|
||||
|
||||
//处理结果
|
||||
@@ -543,7 +501,7 @@ namespace FineUIPro.Web.HSSE.Check
|
||||
builder.CellFormat.VerticalAlignment = Aspose.Words.Tables.CellVerticalAlignment.Center;//垂直居中对齐
|
||||
builder.ParagraphFormat.Alignment = ParagraphAlignment.Center;//水平居中对齐
|
||||
builder.CellFormat.Width = 50;
|
||||
builder.Write(string.IsNullOrEmpty(detail.RiskLevel) ? "" : detail.RiskLevel);
|
||||
builder.Write(string.IsNullOrEmpty(detail.HiddenHazardTypeName) ? "" : detail.HiddenHazardTypeName);
|
||||
builder.EndRow();
|
||||
num++;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user