2023-11-11

This commit is contained in:
2023-11-11 16:02:42 +08:00
parent b2ffd4b8d0
commit 48dd589a7f
66 changed files with 2334 additions and 1232 deletions
+3 -7
View File
@@ -1,12 +1,8 @@
using BLL;
using FineUIPro.Web.BaseInfo;
using Model;
using System;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.Linq;
using static NPOI.HSSF.Util.HSSFColor;
namespace FineUIPro.Web.DataShow
{
@@ -27,7 +23,7 @@ namespace FineUIPro.Web.DataShow
BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
// 绑定表格t
BindGrid();
this.Panel1.Title = "事故事件数据(" + BLL.UnitService.GetUnitNameByUnitId(BLL.Const.UnitId_CD) + "";
this.Panel1.Title = "事故事件数据(" + BLL.UnitService.GetUnitNameByUnitId(BLL.CommonService.GetThisUnitId()) + "";
}
}
@@ -50,7 +46,7 @@ namespace FineUIPro.Web.DataShow
LEFT JOIN Base_Project AS Project ON Record.ProjectId = Project.ProjectId
LEFT JOIN SitePerson_Person AS Person ON Person.PersonId = Record.PersonId
LEFT JOIN Base_Unit AS Unit ON Unit.UnitId = Person.UnitId
WHERE (Project.ProjectState2 is null or Project.ProjectState2 !=9) ";
WHERE Record.AccidentDate>'2023-01-01' ";
if (rbType.SelectedValue == "0")
{
@@ -67,7 +63,7 @@ namespace FineUIPro.Web.DataShow
LEFT JOIN Sys_Const AS AccidentType ON AccidentType.ConstValue = Record.AccidentTypeId AND GroupId='AccidentReportRegistration'
LEFT JOIN Base_Project AS Project ON Record.ProjectId = Project.ProjectId
LEFT JOIN Base_Unit AS Unit ON Unit.UnitId = Record.UnitId
WHERE (Project.ProjectState2 is null or Project.ProjectState2 !=9) ";
WHERE Record.AccidentDate>'2023-01-01' ";
if (rbType.SelectedValue == "2")
{
strSql += " AND Record.AccidentDegree ='1'";