lpf/SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

代码无效引用清理，试压包资料界面看板修改

Browse Source
This commit is contained in:
李鹏飞
2025-10-10 14:33:21 +08:00
parent 87fb529521
commit 55b798135c
933 changed files with 5897 additions and 7541 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/DataShow/Check.aspx.cs
+4 -8
View File
@@ -1,12 +1,8 @@
using Aspose.Words;
using BLL;
using BLL;
using System;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.IO;
using System.Linq;
using System.Text;
namespace FineUIPro.Web.DataShow
{
@@ -255,10 +251,10 @@ namespace FineUIPro.Web.DataShow
Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning);
return;
}
if (this.rbCom.SelectedValue == "1"|| this.rbCom.SelectedValue == "2" || this.rbCom.SelectedValue == "3")
if (this.rbCom.SelectedValue == "1" || this.rbCom.SelectedValue == "2" || this.rbCom.SelectedValue == "3")
{
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("../ZHGL/Supervise/SuperviseCheckReportEdit.aspx?SuperviseCheckReportId={0}&type=-1", Grid1.SelectedRowID, "查看 - ")));
}
}
else if (this.rbCom.SelectedValue == "4")
{
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("../HSSE/Check/ProjectLeaderCheckView.aspx?ProjectLeaderCheckId={0}", Grid1.SelectedRowID, "查看 - ")));
@@ -273,7 +269,7 @@ namespace FineUIPro.Web.DataShow
}
}
#endregion
/// <summary>
///
/// </summary>
SGGL/FineUIPro.Web/DataShow/CompanyPerson.aspx.cs
+1 -2
View File
@@ -3,7 +3,6 @@ using System;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.Linq;
namespace FineUIPro.Web.DataShow
{
@@ -31,7 +30,7 @@ namespace FineUIPro.Web.DataShow
/// </summary>
private void BindGrid()
{
string strSql = @"SELECT Person.PersonId,Unit.UnitName, Person.PersonName,case Person.Sex when '1' then '男' else '女' end as SexStr,Person.IdentityCard,WorkPost.WorkPostName,Person.Telephone
FROM Person_Persons AS Person
LEFT JOIN Base_Unit AS Unit ON Unit.UnitId=Person.UnitId
SGGL/FineUIPro.Web/DataShow/ConstructionEquipment.aspx.cs
+2 -3
View File
@@ -1,5 +1,4 @@
using BLL;
using Model;
using System;
using System.Collections.Generic;
using System.Data;
@@ -174,9 +173,9 @@ namespace FineUIPro.Web.DataShow
{
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("../HSSE/InApproveManager/GeneralEquipmentInView.aspx?EquipmentInId={0}", getGEQ.GeneralEquipmentInId, "查看 - ")));
}
}
}
}
#endregion
SGGL/FineUIPro.Web/DataShow/Emergency.aspx.cs
+3 -4
View File
@@ -3,7 +3,6 @@ using System;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.Linq;
namespace FineUIPro.Web.DataShow
{
@@ -124,8 +123,8 @@ namespace FineUIPro.Web.DataShow
this.Grid1.Columns[1].Hidden = true;
}
}
#endregion
#endregion
#region 表排序、分页、关闭窗口
/// <summary>
@@ -189,7 +188,7 @@ namespace FineUIPro.Web.DataShow
{
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("../HSSE/Emergency/EmergencyListView.aspx?EmergencyListId={0}", Grid1.SelectedRowID, "查看 - ")));
}
}
#endregion
SGGL/FineUIPro.Web/DataShow/Environmental.aspx.cs
+1 -1
View File
@@ -169,7 +169,7 @@ namespace FineUIPro.Web.DataShow
{
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("../ZHGL/Environmental/ArchitectureReportSave.aspx?ArchitectureReportId={0}&type=-1", Grid1.SelectedRowID, "查看 - ")));
}
}
#endregion
SGGL/FineUIPro.Web/DataShow/HJGLDefect.aspx.cs
+1 -1
View File
@@ -37,7 +37,7 @@ namespace FineUIPro.Web.DataShow
FROM HJGL_Batch_NDEItem AS Item
LEFT JOIN HJGL_Batch_NDE AS Checks ON Item.NDEID =Checks.NDEID
LEFT JOIN Base_Project AS Project ON Checks.ProjectId =Project.ProjectId
WHERE IsCNCECShow=1 ";
WHERE IsCNCECShow=1 ";
List<SqlParameter> listStr = new List<SqlParameter>();
if (this.drpProject.SelectedValue != Const._Null)
SGGL/FineUIPro.Web/DataShow/HJGLWelder.aspx.cs
+3 -4
View File
@@ -3,7 +3,6 @@ using System;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.Linq;
namespace FineUIPro.Web.DataShow
{
@@ -31,7 +30,7 @@ namespace FineUIPro.Web.DataShow
/// 绑定数据
/// </summary>
private void BindGrid()
{
{
string strSql = @"SELECT Welder.SitePersonId as WED_ID,Welder.ProjectId,Project.ProjectCode,Project.ProjectName,Welder.UnitId AS WED_Unit,Unit.UnitName
,Welder.WelderCode as WED_WorkCode,Welder.PersonName
FROM SitePerson_Person AS Welder
@@ -39,9 +38,9 @@ namespace FineUIPro.Web.DataShow
LEFT JOIN Base_Unit AS Unit ON Unit.UnitId = Welder.UnitId
LEFT JOIN ProjectData_TeamGroup AS TeamGroup ON TeamGroup.TeamGroupId = Welder.TeamGroupId
WHERE IsCNCECShow=1 AND Welder.WorkPostId=@WorkPostId AND Welder.ProjectId IS NOT NULL";
List<SqlParameter> listStr = new List<SqlParameter>();
List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@WorkPostId", Const.WorkPost_Welder));
if (this.drpProject.SelectedValue !=Const._Null)
if (this.drpProject.SelectedValue != Const._Null)
{
strSql += " AND Welder.ProjectId = @ProjectId";
listStr.Add(new SqlParameter("@ProjectId", this.drpProject.SelectedValue));
SGGL/FineUIPro.Web/DataShow/HJGLWelding.aspx.cs
+5 -5
View File
@@ -28,7 +28,7 @@ namespace FineUIPro.Web.DataShow
}
}
/// <summary>
/// 绑定数据
/// </summary>
@@ -57,7 +57,7 @@ namespace FineUIPro.Web.DataShow
// cpara += " AND c.RegisterDate <=" + this.txtEndTime.Text;
//}
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
Grid1.RecordCount = tb.Rows.Count;
@@ -167,7 +167,7 @@ namespace FineUIPro.Web.DataShow
{
var getD1 = from x in Funs.DB.HJGL_WeldJoint
where x.ProjectId == projectId.ToString()
select x;
select x;
if (getD1.Count() > 0)
{
cout1 = getD1.Sum(x => x.Size ?? 0);
@@ -190,7 +190,7 @@ namespace FineUIPro.Web.DataShow
var datetime2 = Funs.GetNewDateTime(this.txtStartTime.Text);
var getD1 = from x in Funs.DB.HJGL_WeldJoint
join y in Funs.DB.HJGL_WeldingDaily on x.WeldingDailyId equals y.WeldingDailyId
where x.ProjectId == projectId.ToString()
where x.ProjectId == projectId.ToString()
select new { x.Size, y.WeldingDate };
if (datetime1.HasValue)
{
@@ -203,7 +203,7 @@ namespace FineUIPro.Web.DataShow
if (getD1.Count() > 0)
{
cout1 += getD1.Sum(x => x.Size ?? 0);
}
}
}
return cout1;
}
SGGL/FineUIPro.Web/DataShow/HJGLWeldingItem.aspx.cs
+2 -2
View File
@@ -19,7 +19,7 @@ namespace FineUIPro.Web.DataShow
if (!IsPostBack)
{
string projectId = Request.Params["projectId"];
this.txtProject.Text=ProjectService.GetProjectNameByProjectId(projectId);
this.txtProject.Text = ProjectService.GetProjectNameByProjectId(projectId);
Funs.DropDownPageSize(this.ddlPageSize);
btnClose.OnClientClick = ActiveWindow.GetHideReference();
ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
@@ -35,7 +35,7 @@ namespace FineUIPro.Web.DataShow
{
var datetime1 = Funs.GetNewDateTime(this.txtStartTime.Text);
var datetime2 = Funs.GetNewDateTime(this.txtStartTime.Text);
var View_HJGL_WeldJoint =from x in Funs.DB.View_HJGL_WeldJoint where x.ProjectId == Request.Params["projectId"] select x;
var View_HJGL_WeldJoint = from x in Funs.DB.View_HJGL_WeldJoint where x.ProjectId == Request.Params["projectId"] select x;
if (datetime1.HasValue)
{
View_HJGL_WeldJoint = View_HJGL_WeldJoint.Where(x => x.WeldingDateD >= datetime1.Value);
SGGL/FineUIPro.Web/DataShow/HiddenRectification.aspx.cs
+8 -8
View File
@@ -74,7 +74,7 @@ namespace FineUIPro.Web.DataShow
/// </summary>
private void OutputSummaryData()
{
string rate = "0%";
unCount = allCount - okCount;
if (allCount > 0)
@@ -86,7 +86,7 @@ namespace FineUIPro.Web.DataShow
{ "ProjectName", "合计" },
{ "Count1", allCount.ToString() },
{ "Count2", okCount.ToString() },
{ "Count3", unCount.ToString() },
{ "Count3", unCount.ToString() },
{ "Count4", rate}
};
Grid1.SummaryData = summary;
@@ -174,7 +174,7 @@ namespace FineUIPro.Web.DataShow
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("HiddenRectificationItem.aspx?projectId={0}", Grid1.SelectedRowID, "查看 - ")));
}
#endregion
protected void btnView_Click(object sender, EventArgs e)
{
@@ -193,7 +193,7 @@ namespace FineUIPro.Web.DataShow
{
var datetime1 = Funs.GetNewDateTime(this.txtStartTime.Text);
var datetime2 = Funs.GetNewDateTime(this.txtStartTime.Text);
var getT = Funs.DB.HSSE_Hazard_HazardRegister.Where(x => x.States != "4");
var getT = Funs.DB.HSSE_Hazard_HazardRegister.Where(x => x.States != "4");
if (datetime1.HasValue)
{
getT = getT.Where(x => x.RegisterDate >= datetime1);
@@ -245,7 +245,7 @@ namespace FineUIPro.Web.DataShow
{
getT = getT.Where(x => x.HazardValue != "3");
}
okCount = getT.Count();
if (okCount > 0)
@@ -264,7 +264,7 @@ namespace FineUIPro.Web.DataShow
{
var datetime1 = Funs.GetNewDateTime(this.txtStartTime.Text);
var datetime2 = Funs.GetNewDateTime(this.txtStartTime.Text);
var getT = Funs.DB.HSSE_Hazard_HazardRegister.Where(x => x.ProjectId == projectId.ToString() && x.States != "3" && x.States != "4");
var getT = Funs.DB.HSSE_Hazard_HazardRegister.Where(x => x.ProjectId == projectId.ToString() && x.States != "3" && x.States != "4");
if (datetime1.HasValue)
{
getT = getT.Where(x => x.RegisterDate >= datetime1);
@@ -288,12 +288,12 @@ namespace FineUIPro.Web.DataShow
protected string Count4(object projectId)
{
string rate=string.Empty;
string rate = string.Empty;
if (projectId != null)
{
var datetime1 = Funs.GetNewDateTime(this.txtStartTime.Text);
var datetime2 = Funs.GetNewDateTime(this.txtStartTime.Text);
var getALL= Funs.DB.HSSE_Hazard_HazardRegister.Where(x => x.ProjectId == projectId.ToString() && x.States != "4");
var getALL = Funs.DB.HSSE_Hazard_HazardRegister.Where(x => x.ProjectId == projectId.ToString() && x.States != "4");
if (this.rbType.SelectedValue == "0")
{
getALL = getALL.Where(x => x.HazardValue == "3");
SGGL/FineUIPro.Web/DataShow/HiddenRectificationItem.aspx.cs
+2 -3
View File
@@ -3,7 +3,6 @@ using System;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.Linq;
namespace FineUIPro.Web.DataShow
{
@@ -21,7 +20,7 @@ namespace FineUIPro.Web.DataShow
if (!IsPostBack)
{
string projectId = Request.Params["projectId"];
this.txtProject.Text=ProjectService.GetProjectNameByProjectId(projectId);
this.txtProject.Text = ProjectService.GetProjectNameByProjectId(projectId);
Funs.DropDownPageSize(this.ddlPageSize);
btnClose.OnClientClick = ActiveWindow.GetHideReference();
ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
@@ -81,7 +80,7 @@ namespace FineUIPro.Web.DataShow
}
if (this.rbType.SelectedValue == "0")
{
strSql += " AND HazardValue =@HazardValue";
strSql += " AND HazardValue =@HazardValue";
}
else
{
SGGL/FineUIPro.Web/DataShow/LargeEngineering.aspx.cs
+6 -6
View File
@@ -33,7 +33,7 @@ namespace FineUIPro.Web.DataShow
}
}
public static List<Model.Solution_LargerHazard> LargerHazard = new List<Model.Solution_LargerHazard>();
public static List<Model.Solution_LargerHazard> LargerHazard = new List<Model.Solution_LargerHazard>();
/// <summary>
/// 绑定数据
@@ -161,7 +161,7 @@ namespace FineUIPro.Web.DataShow
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("LargeEngineeringItem.aspx?projectId={0}", Grid1.SelectedRowID, "查看 - ")));
}
#endregion
/// <summary>
///
/// </summary>
@@ -180,8 +180,8 @@ namespace FineUIPro.Web.DataShow
/// <returns></returns>
protected int Count1(object projectId)
{
int cout1 = 0;
allCount1= LargerHazard.Where(x => x.IsSuperLargerHazard == false || !x.IsSuperLargerHazard.HasValue ).Count();
int cout1 = 0;
allCount1 = LargerHazard.Where(x => x.IsSuperLargerHazard == false || !x.IsSuperLargerHazard.HasValue).Count();
if (projectId != null)
{
cout1 = LargerHazard.Where(x => x.ProjectId == projectId.ToString() && (x.IsSuperLargerHazard == false || !x.IsSuperLargerHazard.HasValue)).Count();
@@ -228,7 +228,7 @@ namespace FineUIPro.Web.DataShow
protected int Count4(object projectId)
{
int cout1 = 0;
allCount4 = LargerHazard.Where(x => x.States == Const.State_1).Count();
allCount4 = LargerHazard.Where(x => x.States == Const.State_1).Count();
if (projectId != null)
{
cout1 = LargerHazard.Where(x => x.ProjectId == projectId.ToString() && x.States == Const.State_1).Count();
@@ -248,7 +248,7 @@ namespace FineUIPro.Web.DataShow
allCount5 = LargerHazard.Sum(x => x.TrainPersonNum ?? 0);
if (projectId != null)
{
cout1 = LargerHazard.Where(x => x.ProjectId == projectId.ToString()).Sum(x=>x.TrainPersonNum ?? 0);
cout1 = LargerHazard.Where(x => x.ProjectId == projectId.ToString()).Sum(x => x.TrainPersonNum ?? 0);
}
return cout1;
}
SGGL/FineUIPro.Web/DataShow/LargeEngineeringItem.aspx.cs
+2 -2
View File
@@ -21,8 +21,8 @@ namespace FineUIPro.Web.DataShow
{
btnClose.OnClientClick = ActiveWindow.GetHideReference();
string projectId = Request.Params["projectId"];
this.txtProject.Text=ProjectService.GetProjectNameByProjectId(projectId);
Funs.DropDownPageSize(this.ddlPageSize);
this.txtProject.Text = ProjectService.GetProjectNameByProjectId(projectId);
Funs.DropDownPageSize(this.ddlPageSize);
ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
// 绑定表格t
BindGrid();
SGGL/FineUIPro.Web/DataShow/License.aspx.cs
+1 -3
View File
@@ -1,10 +1,8 @@
using BLL;
using Model;
using System;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.Linq;
namespace FineUIPro.Web.DataShow
{
@@ -41,7 +39,7 @@ namespace FineUIPro.Web.DataShow
,V.CompileMan,V.CompileDate,V.States
FROM View_License_LicenseManager AS V
WHERE IsCNCECShow=1 ";
if (this.rbType.SelectedValue=="2")
if (this.rbType.SelectedValue == "2")
{
strSql += " AND V.States = @WorkStates";
listStr.Add(new SqlParameter("@WorkStates", Const.State_2));
SGGL/FineUIPro.Web/DataShow/Meeting.aspx.cs
+4 -8
View File
@@ -1,12 +1,8 @@
using Aspose.Words;
using BLL;
using BLL;
using System;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.IO;
using System.Linq;
using System.Text;
namespace FineUIPro.Web.DataShow
{
@@ -43,7 +39,7 @@ namespace FineUIPro.Web.DataShow
,MeetingHostMan AS HostMan,Meeting.AttentPersonNum,Meeting.AttentPerson
FROM Meeting_CompanySafetyMeeting AS Meeting
where 1=1 ";
List<SqlParameter> listStr = new List<SqlParameter>();
List<SqlParameter> listStr = new List<SqlParameter>();
if (!string.IsNullOrEmpty(this.txtStartTime.Text))
{
strSql += " AND Meeting.CompanySafetyMeetingDate >=@StartTime";
@@ -54,7 +50,7 @@ namespace FineUIPro.Web.DataShow
strSql += " AND Meeting.CompanySafetyMeetingDate <=@EndTime";
listStr.Add(new SqlParameter("@EndTime", this.txtEndTime.Text));
}
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
Grid1.RecordCount = tb.Rows.Count;
@@ -275,7 +271,7 @@ namespace FineUIPro.Web.DataShow
}
}
#endregion
/// <summary>
///
/// </summary>
SGGL/FineUIPro.Web/DataShow/Project.aspx.cs
+5 -10
View File
@@ -1,13 +1,8 @@
using BLL;
using Model;
using Newtonsoft.Json.Linq;
using NPOI.SS.Formula.Functions;
using System;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.Linq;
using System.Windows.Forms;
namespace FineUIPro.Web.DataShow
{
@@ -40,8 +35,8 @@ namespace FineUIPro.Web.DataShow
FROM Base_Project AS Project LEFT JOIN Base_Unit as unit on unit.UnitId = Project.UnitId
LEFT JOIN Base_ProjectType AS ProjectType ON Project.ProjectType = ProjectType.ProjectTypeId
WHERE IsCNCECShow=1 ";
List<SqlParameter> listStr = new List<SqlParameter>();
List<SqlParameter> listStr = new List<SqlParameter>();
if (this.ckState.SelectedValue != "0")
{
if (this.ckState.SelectedValue == "1")
@@ -54,12 +49,12 @@ namespace FineUIPro.Web.DataShow
listStr.Add(new SqlParameter("@states", this.ckState.SelectedValue));
}
}
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
Grid1.RecordCount = tb.Rows.Count;
Grid1.DataSource = this.GetPagedDataTable(Grid1, tb);
Grid1.DataBind();
Grid1.DataBind();
}
#endregion
@@ -119,7 +114,7 @@ namespace FineUIPro.Web.DataShow
#endregion
#region 项目经理
/// <summary>
/// 施工经理
/// </summary>
SGGL/FineUIPro.Web/DataShow/ProjectDivision.aspx.cs
+1 -3
View File
@@ -1,10 +1,8 @@
using BLL;
using FineUIPro.Web.BaseInfo;
using System;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.Linq;
namespace FineUIPro.Web.DataShow
{
@@ -42,7 +40,7 @@ namespace FineUIPro.Web.DataShow
,(SELECT COUNT(*) FROM WBS_ControlItemProject AS D WHERE D.ProjectId =P.ProjectId ) AS count4
,(SELECT COUNT(*) FROM WBS_ControlItemAndCycle AS E WHERE E.ProjectId =P.ProjectId ) AS count5
FROM Base_Project AS P
WHERE P.IsCNCECShow=1 ";
WHERE P.IsCNCECShow=1 ";
List<SqlParameter> listStr = new List<SqlParameter>();
if (this.drpProject.SelectedValue != Const._Null)
{
SGGL/FineUIPro.Web/DataShow/ProjectPerson.aspx.cs
+2 -2
View File
@@ -31,7 +31,7 @@ namespace FineUIPro.Web.DataShow
/// 绑定数据
/// </summary>
private void BindGrid()
{
{
string strSql = @"SELECT Person.SitePersonId,Person.ProjectId,Project.ProjectCode,Project.ProjectName,Unit.UnitId,Unit.UnitId,Unit.UnitName,
Person.PersonName,Person.PersonId,Person.IdentityCard,Persons.Sex,Person.WorkPostId,WorkPost.WorkPostName,Persons.Telephone
,(CASE WHEN Persons.Sex=2 THEN '女' WHEN Sex=1 THEN '男' ELSE '' END) AS SexStr
@@ -42,7 +42,7 @@ namespace FineUIPro.Web.DataShow
LEFT JOIN Base_WorkPost AS WorkPost ON Person.WorkPostId =WorkPost.WorkPostId
WHERE IsCNCECShow=1 AND States=1 AND InTime <=GETDATE() AND (OutTime IS NULL OR OutTime > GETDATE()) ";
List<SqlParameter> listStr = new List<SqlParameter>();
if (this.drpProject.SelectedValue !=Const._Null)
if (this.drpProject.SelectedValue != Const._Null)
{
strSql += " AND Person.ProjectId = @ProjectId";
listStr.Add(new SqlParameter("@ProjectId", this.drpProject.SelectedValue));
SGGL/FineUIPro.Web/DataShow/QualityAcceptance.aspx.cs
+1 -2
View File
@@ -1,5 +1,4 @@
using BLL;
using FineUIPro.Web.BaseInfo;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
@@ -239,7 +238,7 @@ namespace FineUIPro.Web.DataShow
summary.Add("ProjectName", "合计：");
summary.Add("Count1", Count1.ToString());
summary.Add("Count2", Count2.ToString());
summary.Add("Count3", (Count1- Count2).ToString());
summary.Add("Count3", (Count1 - Count2).ToString());
summary.Add("Count4", Math.Round(Count2 * 1.0 / Count1 * 100, 2).ToString());
Grid1.SummaryData = summary;
}
SGGL/FineUIPro.Web/DataShow/QualityControlPoint.aspx.cs
+3 -4
View File
@@ -1,5 +1,4 @@
using BLL;
using FineUIPro.Web.BaseInfo;
using System;
using System.Collections.Generic;
using System.Data;
@@ -58,7 +57,7 @@ namespace FineUIPro.Web.DataShow
// cpara += " AND c.RegisterDate <=" + this.txtEndTime.Text;
//}
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
Grid1.RecordCount = tb.Rows.Count;
@@ -163,7 +162,7 @@ namespace FineUIPro.Web.DataShow
int cout1 = 0;
if (projectId != null)
{
cout1= getcount(projectId.ToString(), "B");
cout1 = getcount(projectId.ToString(), "B");
}
return cout1;
}
@@ -190,7 +189,7 @@ namespace FineUIPro.Web.DataShow
/// <returns></returns>
private int getcount(string projectId, string level)
{
int count = 0;
int count = 0;
count = getDataLists.Where(x => x.ProjectId == projectId && x.ControlPoint.Contains(level)).Count();
return count;
SGGL/FineUIPro.Web/DataShow/QualityInstruments.aspx.cs
+7 -7
View File
@@ -28,7 +28,7 @@ namespace FineUIPro.Web.DataShow
}
}
/// <summary>
/// 绑定数据
/// </summary>
@@ -57,7 +57,7 @@ namespace FineUIPro.Web.DataShow
// cpara += " AND c.RegisterDate <=" + this.txtEndTime.Text;
//}
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
Grid1.RecordCount = tb.Rows.Count;
@@ -148,7 +148,7 @@ namespace FineUIPro.Web.DataShow
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("QualityInstrumentsItem.aspx?projectId={0}", Grid1.SelectedRowID, "查看 - ")));
}
#endregion
protected void btnView_Click(object sender, EventArgs e)
{
@@ -169,8 +169,8 @@ namespace FineUIPro.Web.DataShow
var datetime1 = Funs.GetNewDateTime(this.txtStartTime.Text);
var datetime2 = Funs.GetNewDateTime(this.txtStartTime.Text);
var getD1 = from x in Funs.DB.Comprehensive_InspectionMachine
where x.ProjectId == projectId.ToString() && x.IsOnSite == true && x.InspectionType.Contains("计量")
select x;
where x.ProjectId == projectId.ToString() && x.IsOnSite == true && x.InspectionType.Contains("计量")
select x;
if (datetime1.HasValue)
{
getD1 = getD1.Where(x => x.CompileDate >= datetime1);
@@ -199,7 +199,7 @@ namespace FineUIPro.Web.DataShow
var datetime2 = Funs.GetNewDateTime(this.txtStartTime.Text);
var getD1 = from x in Funs.DB.Comprehensive_InspectionMachine
where x.ProjectId == projectId.ToString() && x.IsOnSite == true && x.InspectionType.Contains("计量") && x.IsCheckOK == true
select x;
select x;
if (datetime1.HasValue)
{
getD1 = getD1.Where(x => x.CompileDate >= datetime1);
@@ -208,7 +208,7 @@ namespace FineUIPro.Web.DataShow
{
getD1 = getD1.Where(x => x.CompileDate <= datetime2);
}
cout1 = getD1.Count();
}
return cout1;
SGGL/FineUIPro.Web/DataShow/QualityInstrumentsItem.aspx.cs
+2 -2
View File
@@ -21,7 +21,7 @@ namespace FineUIPro.Web.DataShow
if (!IsPostBack)
{
string projectId = Request.Params["projectId"];
this.txtProject.Text=ProjectService.GetProjectNameByProjectId(projectId);
this.txtProject.Text = ProjectService.GetProjectNameByProjectId(projectId);
Funs.DropDownPageSize(this.ddlPageSize);
btnClose.OnClientClick = ActiveWindow.GetHideReference();
ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
@@ -56,7 +56,7 @@ namespace FineUIPro.Web.DataShow
strSql += " AND C.InspectionDate <= @EndTime";
listStr.Add(new SqlParameter("@EndTime", this.txtEndTime.Text.Trim()));
}
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
SGGL/FineUIPro.Web/DataShow/QualityPerson.aspx.cs
+7 -7
View File
@@ -20,7 +20,7 @@ namespace FineUIPro.Web.DataShow
if (!IsPostBack)
{
Funs.DropDownPageSize(this.ddlPageSize);
ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
BLL.ProjectService.InitCNCECShowProjectDropDownList(this.drpProject, true);
// 绑定表格t
@@ -28,7 +28,7 @@ namespace FineUIPro.Web.DataShow
}
}
/// <summary>
/// 绑定数据
/// </summary>
@@ -42,7 +42,7 @@ namespace FineUIPro.Web.DataShow
FROM Person_Persons AS Person
LEFT JOIN Base_Unit AS Unit ON Unit.UnitId=Person.UnitId
LEFT JOIN Base_WorkPost AS WorkPost ON Person.WorkPostId=WorkPost.WorkPostId WHERE 1=1 ";
string UnitId =Const.UnitId_SEDIN;
string UnitId = Const.UnitId_SEDIN;
if (this.rbCom.SelectedValue == "1")
{
strSql += " AND Person.UnitId = @UnitId";
@@ -62,7 +62,7 @@ namespace FineUIPro.Web.DataShow
LEFT JOIN Base_Project AS Project ON Project.ProjectId=Person.ProjectId
LEFT JOIN Base_Unit AS Unit ON Unit.UnitId=Person.UnitId
LEFT JOIN Base_WorkPost AS WorkPost ON Person.WorkPostId=WorkPost.WorkPostId WHERE WorkPost.IsCQMS=1 AND IsCNCECShow=1 ";
if (this.drpProject.SelectedValue != Const._Null)
if (this.drpProject.SelectedValue != Const._Null)
{
strSql += " AND Person.ProjectId = @ProjectId";
listStr.Add(new SqlParameter("@ProjectId", this.drpProject.SelectedValue));
@@ -90,9 +90,9 @@ namespace FineUIPro.Web.DataShow
{
this.drpProject.Hidden = false;
}
else
{
this.drpProject.Hidden = true;
else
{
this.drpProject.Hidden = true;
}
this.BindGrid();
}
SGGL/FineUIPro.Web/DataShow/QualityProblem.aspx.cs
+1 -1
View File
@@ -174,7 +174,7 @@ namespace FineUIPro.Web.DataShow
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("QualityProblemItem.aspx?projectId={0}", Grid1.SelectedRowID, "查看 - ")));
}
#endregion
protected void btnView_Click(object sender, EventArgs e)
{
SGGL/FineUIPro.Web/DataShow/QualityProblemItem.aspx.cs
+2 -3
View File
@@ -3,7 +3,6 @@ using System;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.Linq;
namespace FineUIPro.Web.DataShow
{
@@ -21,7 +20,7 @@ namespace FineUIPro.Web.DataShow
if (!IsPostBack)
{
string projectId = Request.Params["projectId"];
this.txtProject.Text=ProjectService.GetProjectNameByProjectId(projectId);
this.txtProject.Text = ProjectService.GetProjectNameByProjectId(projectId);
Funs.DropDownPageSize(this.ddlPageSize);
btnClose.OnClientClick = ActiveWindow.GetHideReference();
ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
@@ -147,7 +146,7 @@ namespace FineUIPro.Web.DataShow
protected string ConvertImgUrlByImage(object registrationId)
{
string url = string.Empty;
if (registrationId != null)
{
IList<Model.AttachFile> sourlist = AttachFileService.Getfilelist(registrationId.ToString() + "r", BLL.Const.CheckListMenuId);
SGGL/FineUIPro.Web/DataShow/QualityTraining.aspx.cs
+4 -7
View File
@@ -1,12 +1,9 @@
using Aspose.Words;
using BLL;
using BLL;
using System;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.IO;
using System.Linq;
using System.Text;
namespace FineUIPro.Web.DataShow
{
@@ -31,7 +28,7 @@ namespace FineUIPro.Web.DataShow
}
}
/// <summary>
/// 绑定数据
/// </summary>
@@ -60,7 +57,7 @@ namespace FineUIPro.Web.DataShow
// cpara += " AND c.RegisterDate <=" + this.txtEndTime.Text;
//}
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
Grid1.RecordCount = tb.Rows.Count;
@@ -157,7 +154,7 @@ namespace FineUIPro.Web.DataShow
}
}
#endregion
protected void btnView_Click(object sender, EventArgs e)
{
SGGL/FineUIPro.Web/DataShow/QualityTrainingItem1.aspx.cs
+2 -3
View File
@@ -3,7 +3,6 @@ using System;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.Linq;
namespace FineUIPro.Web.DataShow
{
@@ -21,7 +20,7 @@ namespace FineUIPro.Web.DataShow
if (!IsPostBack)
{
string projectId = Request.Params["projectId"];
this.txtProject.Text=ProjectService.GetProjectNameByProjectId(projectId);
this.txtProject.Text = ProjectService.GetProjectNameByProjectId(projectId);
Funs.DropDownPageSize(this.ddlPageSize);
btnClose.OnClientClick = ActiveWindow.GetHideReference();
ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
@@ -58,7 +57,7 @@ namespace FineUIPro.Web.DataShow
strSql += " AND C.CompileDate <= @EndTime";
listStr.Add(new SqlParameter("@EndTime", this.txtEndTime.Text.Trim()));
}
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
SGGL/FineUIPro.Web/DataShow/QualityTrainingItem2.aspx.cs
+2 -3
View File
@@ -3,7 +3,6 @@ using System;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.Linq;
namespace FineUIPro.Web.DataShow
{
@@ -21,7 +20,7 @@ namespace FineUIPro.Web.DataShow
if (!IsPostBack)
{
string projectId = Request.Params["projectId"];
this.txtProject.Text=ProjectService.GetProjectNameByProjectId(projectId);
this.txtProject.Text = ProjectService.GetProjectNameByProjectId(projectId);
Funs.DropDownPageSize(this.ddlPageSize);
btnClose.OnClientClick = ActiveWindow.GetHideReference();
ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
@@ -54,7 +53,7 @@ namespace FineUIPro.Web.DataShow
strSql += " AND C.DetailsDate <= @EndTime";
listStr.Add(new SqlParameter("@EndTime", this.txtEndTime.Text.Trim()));
}
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
SGGL/FineUIPro.Web/DataShow/SecurityRisk.aspx.cs
+7 -8
View File
@@ -1,6 +1,5 @@
using BLL;
using Newtonsoft.Json.Linq;
using NPOI.SS.Formula.Functions;
using System;
using System.Collections.Generic;
using System.Data;
@@ -47,7 +46,7 @@ namespace FineUIPro.Web.DataShow
strSql += " AND projectId = @projectId";
listStr.Add(new SqlParameter("@projectId", this.drpProject.SelectedValue));
}
//if (!string.IsNullOrEmpty(this.txtStartTime.Text))
//{
// strSql += " AND h.RegisterDate >=@StartTime";
@@ -153,7 +152,7 @@ namespace FineUIPro.Web.DataShow
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("SecurityRiskItem.aspx?projectId={0}", Grid1.SelectedRowID, "查看 - ")));
}
#endregion
/// <summary>
///
/// </summary>
@@ -190,7 +189,7 @@ namespace FineUIPro.Web.DataShow
int cout4 = 0;
if (projectId != null)
{
cout4 = getcount(projectId.ToString(),2);
cout4 = getcount(projectId.ToString(), 2);
}
return cout4;
}
@@ -228,13 +227,13 @@ namespace FineUIPro.Web.DataShow
/// <returns></returns>
private int getcount(string projectId, int level)
{
int count = 0;
int count = 0;
var getlevel = Funs.DB.Base_RiskLevel.FirstOrDefault(x => x.RiskLevel == level);
if (getlevel != null)
{
count = (from x in Funs.DB.Hazard_HazardSelectedItem
join y in Funs.DB.Hazard_HazardList on x.HazardListId equals y.HazardListId
where y.ProjectId == projectId && (x.HazardLevel == getlevel.RiskLevelId || x.HazardLevel == level.ToString()) && y.States == Const.State_2
join y in Funs.DB.Hazard_HazardList on x.HazardListId equals y.HazardListId
where y.ProjectId == projectId && (x.HazardLevel == getlevel.RiskLevelId || x.HazardLevel == level.ToString()) && y.States == Const.State_2
&& y.CompileDate.Value.Year >= 2023
select x).Count();
}
@@ -242,7 +241,7 @@ namespace FineUIPro.Web.DataShow
{
count = (from x in Funs.DB.Hazard_HazardSelectedItem
join y in Funs.DB.Hazard_HazardList on x.HazardListId equals y.HazardListId
where y.ProjectId == projectId && x.HazardLevel == level.ToString() && y.States == Const.State_2
where y.ProjectId == projectId && x.HazardLevel == level.ToString() && y.States == Const.State_2
&& y.CompileDate.Value.Year >= 2023
select x).Count();
}
SGGL/FineUIPro.Web/DataShow/SecurityRiskItem.aspx.cs
+1 -1
View File
@@ -20,7 +20,7 @@ namespace FineUIPro.Web.DataShow
if (!IsPostBack)
{
string projectId = Request.Params["projectId"];
this.txtProject.Text=ProjectService.GetProjectNameByProjectId(projectId);
this.txtProject.Text = ProjectService.GetProjectNameByProjectId(projectId);
Funs.DropDownPageSize(this.ddlPageSize);
btnClose.OnClientClick = ActiveWindow.GetHideReference();
ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
SGGL/FineUIPro.Web/DataShow/WorkingHoursItem.aspx.cs
+2 -2
View File
@@ -21,7 +21,7 @@ namespace FineUIPro.Web.DataShow
if (!IsPostBack)
{
string projectId = Request.Params["projectId"];
this.txtProject.Text=ProjectService.GetProjectNameByProjectId(projectId);
this.txtProject.Text = ProjectService.GetProjectNameByProjectId(projectId);
Funs.DropDownPageSize(this.ddlPageSize);
btnClose.OnClientClick = ActiveWindow.GetHideReference();
ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
@@ -50,7 +50,7 @@ namespace FineUIPro.Web.DataShow
strSql += " AND CompileDate <= @EndTime";
listStr.Add(new SqlParameter("@EndTime", this.txtEndTime.Text.Trim()));
}
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);