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
+6 -10
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
{
@@ -28,7 +24,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()) + "";
}
}
@@ -43,7 +39,7 @@ namespace FineUIPro.Web.DataShow
+ @" FROM dbo.Supervise_SuperviseCheckReport AS S"
+ @" LEFT JOIN dbo.Base_Project AS P ON P.ProjectId=S.ProjectId"
+ @" LEFT JOIN dbo.Base_Unit AS U ON U.UnitId=S.UnitId"
+ @" WHERE (P.ProjectState2 is null or P.ProjectState2 !=9) ";
+ @" WHERE S.CheckDate >'2023-01-01' ";
List<SqlParameter> listStr = new List<SqlParameter>();
strSql += " AND S.CheckType= @CheckType";
listStr.Add(new SqlParameter("@CheckType", this.rbCom.SelectedValue));
@@ -75,7 +71,7 @@ namespace FineUIPro.Web.DataShow
,CheckTeam= STUFF((SELECT ',' + UserName FROM dbo.Sys_User where PATINDEX('%,' + RTRIM(UserId) + ',%',',' +C.LeaderIds + ',')>0 FOR XML PATH('')), 1, 1,'')
from Check_ProjectLeaderCheck AS C
LEFT JOIN Base_Project AS P ON C.ProjectId =P.ProjectId
where (P.ProjectState2 is null or P.ProjectState2 !=9) ";
where 1=1 ";
List<SqlParameter> listStr = new List<SqlParameter>();
if (this.drpProject.SelectedValue != Const._Null)
{
@@ -109,7 +105,7 @@ namespace FineUIPro.Web.DataShow
LEFT JOIN Base_Project AS P ON C.ProjectId =P.ProjectId
LEFT JOIN Sys_User AS U ON C.CheckManId=U.UserId
LEFT JOIN Base_Unit AS Ut ON C.ResponsibleUnit=Ut.UnitId
where (P.ProjectState2 is null or P.ProjectState2 !=9) ";
where 1=1 ";
List<SqlParameter> listStr = new List<SqlParameter>();
if (this.drpProject.SelectedValue != Const._Null)
{
@@ -142,7 +138,7 @@ namespace FineUIPro.Web.DataShow
,UnitName= STUFF((SELECT ',' + UnitName FROM dbo.Base_Unit where PATINDEX('%,' + RTRIM(UnitId) + ',%',',' +(C.PartInUnits) + ',')>0 FOR XML PATH('')), 1, 1,'')
from Check_CheckSpecial AS C
LEFT JOIN Base_Project AS P ON C.ProjectId =P.ProjectId
where (P.ProjectState2 is null or P.ProjectState2 !=9) ";
where 1=1 ";
List<SqlParameter> listStr = new List<SqlParameter>();
if (this.drpProject.SelectedValue != Const._Null)
{