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

合并穿透

Browse Source
This commit is contained in:
李超
2023-06-07 10:21:16 +08:00
parent 5e48a4ad91
commit 857a427be6
26 changed files with 231 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/DataShow/Accident.aspx.cs
+1 -6
View File
@@ -53,12 +53,7 @@ namespace FineUIPro.Web.DataShow
if (rbType.SelectedValue == "0")
{
strSql += " AND AccidentType.AccidentTypeName LIKE @values";
listStr.Add(new SqlParameter("@values", "% 未遂%"));
}
else
{
strSql += " AND '未遂' NOT IN (AccidentType.AccidentTypeName)";
strSql += " AND Record.IsAttempt='1'";
}
}
else
SGGL/FineUIPro.Web/DataShow/Check.aspx.cs
+5 -1
View File
@@ -1,8 +1,12 @@
using BLL;
using Aspose.Words;
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
{
SGGL/FineUIPro.Web/DataShow/CompanyPerson.aspx.cs
+5 -4
View File
@@ -26,7 +26,7 @@ namespace FineUIPro.Web.DataShow
}
}
/// <summary>
/// <summary>
/// 绑定数据
/// </summary>
private void BindGrid()
@@ -37,16 +37,17 @@ namespace FineUIPro.Web.DataShow
+ @" 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 ";
List<SqlParameter> listStr = new List<SqlParameter>();
string UnitId = CommonService.GetThisUnitId();
if (this.rbCom.SelectedValue == "0")
{
strSql += " AND Person.UnitId = @UnitId";
strSql += " AND Person.UnitId = @UnitId";
listStr.Add(new SqlParameter("@UnitId", UnitId));
}
else
{
strSql += " AND Person.UnitId != @UnitId";
listStr.Add(new SqlParameter("@UnitId", UnitId));
}
listStr.Add(new SqlParameter("@UnitId", Const.UnitId_CD));
if (rbType.SelectedValue == "0")
{
strSql += " AND Person.WorkPostId = @WorkPostId";
SGGL/FineUIPro.Web/DataShow/HJGLDefect.aspx.cs
+1 -1
View File
@@ -35,7 +35,7 @@ namespace FineUIPro.Web.DataShow
/// </summary>
private void BindGrid()
{
string strSql = @"SELECT Project.ProjectId,Project.ProjectName,Defects_Definition,COUNT(Item.CHT_CheckItemID) AS Counts
string strSql = @"SELECT NEWID() AS ID,Project.ProjectId,Project.ProjectName,Defects_Definition,COUNT(Item.CHT_CheckItemID) AS Counts
FROM CH_CheckItem AS Item
LEFT JOIN CH_Check AS Checks ON Item.CHT_CheckID =Checks.CHT_CheckID
LEFT JOIN Base_Project AS Project ON Checks.ProjectId =Project.ProjectId
SGGL/FineUIPro.Web/DataShow/HJGLWelding.aspx.cs
+1 -1
View File
@@ -34,7 +34,7 @@ namespace FineUIPro.Web.DataShow
/// </summary>
private void BindGrid()
{
string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1";
string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1 and (isDelete IS NULL OR isDelete =0) ";
List<SqlParameter> listStr = new List<SqlParameter>();
string cpara = string.Empty;
if (this.drpProject.SelectedValue != Const._Null)
SGGL/FineUIPro.Web/DataShow/HiddenRectification.aspx
+1 -1
View File
@@ -37,7 +37,7 @@
<f:RadioButtonList runat="server" ID="rbType" Width="200px" Label="级别" LabelWidth="50px"
AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
<f:RadioItem Text="重大" Value="0" />
<f:RadioItem Text="一般" Value="1" Selected="true"/>
<f:RadioItem Text="一般" Value="1" Selected="true" />
</f:RadioButtonList>
<f:ToolbarFill runat="server"></f:ToolbarFill>
<f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="closeNow();">
SGGL/FineUIPro.Web/DataShow/HiddenRectification.aspx.cs
+1 -1
View File
@@ -33,7 +33,7 @@ namespace FineUIPro.Web.DataShow
/// </summary>
private void BindGrid()
{
string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1";
string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1 and (isDelete IS NULL OR isDelete =0) ";
List<SqlParameter> listStr = new List<SqlParameter>();
string cpara = string.Empty;
if (this.drpProject.SelectedValue != Const._Null)
SGGL/FineUIPro.Web/DataShow/HiddenRectificationItem.aspx.cs
+19 -5
View File
@@ -1,10 +1,13 @@
using BLL;
using Aspose.Words;
using BLL;
using Org.BouncyCastle.Asn1.Ocsp;
using System;
using System.Collections.Generic;
using System.Configuration;
using System.Data;
using System.Data.SqlClient;
using System.IO;
using System.Linq;
using System.Text;
namespace FineUIPro.Web.DataShow
{
@@ -153,12 +156,18 @@ namespace FineUIPro.Web.DataShow
protected string ConvertImageUrlByImage(object registrationId)
{
string url = string.Empty;
string httpUrl = string.Empty;
var sysSet6 = (from x in Funs.DB.Sys_Set where x.SetName == "程序访问地址" select x).ToList().FirstOrDefault();
if (sysSet6 != null)
{
httpUrl = sysSet6.SetValue;
}
if (registrationId != null)
{
var registration = BLL.HSSE_Hazard_HazardRegisterService.GetHazardRegisterByHazardRegisterId(registrationId.ToString());
if (registration != null)
{
url = BLL.UploadAttachmentService.ShowImage(ConfigurationManager.AppSettings["SGGLUrl"], registration.ImageUrl);
url = BLL.UploadAttachmentService.ShowImage(httpUrl, registration.ImageUrl);
}
}
return url;
@@ -173,16 +182,21 @@ namespace FineUIPro.Web.DataShow
protected string ConvertImgUrlByImage(object registrationId)
{
string url = string.Empty;
string httpUrl = string.Empty;
var sysSet6 = (from x in Funs.DB.Sys_Set where x.SetName == "程序访问地址" select x).ToList().FirstOrDefault();
if (sysSet6 != null)
{
httpUrl = sysSet6.SetValue;
}
if (registrationId != null)
{
var registration = BLL.HSSE_Hazard_HazardRegisterService.GetHazardRegisterByHazardRegisterId(registrationId.ToString());
if (registration != null)
{
url = BLL.UploadAttachmentService.ShowImage(ConfigurationManager.AppSettings["SGGLUrl"], registration.RectificationImageUrl);
url = BLL.UploadAttachmentService.ShowImage(httpUrl, registration.RectificationImageUrl);
}
}
return url;
}
}
}
SGGL/FineUIPro.Web/DataShow/LargeEngineering.aspx.cs
+1 -1
View File
@@ -43,7 +43,7 @@ namespace FineUIPro.Web.DataShow
/// </summary>
private void BindGrid()
{
string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1";
string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1 and (isDelete IS NULL OR isDelete =0) ";
List<SqlParameter> listStr = new List<SqlParameter>();
string cpara = string.Empty;
if (this.drpProject.SelectedValue != Const._Null)
SGGL/FineUIPro.Web/DataShow/LargeEngineeringItem.aspx.cs
+6 -1
View File
@@ -1,8 +1,13 @@
using BLL;
using Aspose.Words;
using BLL;
using Org.BouncyCastle.Asn1.Ocsp;
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
{
SGGL/FineUIPro.Web/DataShow/Project.aspx.cs
+2 -2
View File
@@ -32,12 +32,12 @@ namespace FineUIPro.Web.DataShow
private void BindGrid()
{
string strSql = "SELECT Project.ProjectId,Project.ProjectCode,Project.ProjectName,unit.UnitName,Project.StartDate,Project.EndDate,Project.ProjectAddress,ShortName, ConstructionMoney,"
+ @" (CASE WHEN ProjectState='" + BLL.Const.ProjectState_2 + "' THEN '暂停中' WHEN ProjectState='" + BLL.Const.ProjectState_3 + "' THEN '已完工' ELSE '施工中' END) AS ProjectStateName,Project.ProjectState"
+ @" (CASE WHEN ProjectState='" + BLL.Const.ProjectState_2 + "' THEN '暂停中' WHEN ProjectState='" + BLL.Const.ProjectState_3 + "' THEN '已完工' ELSE '施工中' END) AS ProjectStateName,Project.ProjectState,(case ProjectAttribute when 'GONGCHENG' then '工程' when 'SHIYE' then '实业' else '' end) as ProjectAttributeName"
+ @" ,ProjectMoney,DATEDIFF(DAY,Project.StartDate,GETDATE()) AS DayCount,ProjectType.ProjectTypeName AS ProjectTypeName,sysConst.ConstText as ProjectStateName2"
+ @" 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"
+ @" LEFT JOIN Sys_Const AS sysConst ON Project.ProjectState2 =sysConst.ConstValue AND sysConst.GroupId= '" + BLL.ConstValue.GroupId_ProjectState + "' "
+ @" WHERE 1=1";
+ @" WHERE (ProjectAttribute='GONGCHENG' OR ProjectAttribute IS NULL ) and (Project.isDelete IS NULL OR Project.isDelete =0) ";
List<SqlParameter> listStr = new List<SqlParameter>();
if (this.ckState.SelectedValue != "0")
SGGL/FineUIPro.Web/DataShow/QualityControlPoint.aspx.cs
+1 -1
View File
@@ -35,7 +35,7 @@ namespace FineUIPro.Web.DataShow
/// </summary>
private void BindGrid()
{
string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1";
string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1 and (isDelete IS NULL OR isDelete =0)";
List<SqlParameter> listStr = new List<SqlParameter>();
string cpara = string.Empty;
if (this.drpProject.SelectedValue != Const._Null)
SGGL/FineUIPro.Web/DataShow/QualityInstruments.aspx.cs
+1 -1
View File
@@ -34,7 +34,7 @@ namespace FineUIPro.Web.DataShow
/// </summary>
private void BindGrid()
{
string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1";
string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1 and (isDelete IS NULL OR isDelete =0)";
List<SqlParameter> listStr = new List<SqlParameter>();
string cpara = string.Empty;
if (this.drpProject.SelectedValue != Const._Null)
SGGL/FineUIPro.Web/DataShow/QualityPerson.aspx.cs
+2 -2
View File
@@ -42,7 +42,7 @@ namespace FineUIPro.Web.DataShow
+ @" FROM Person_CompanyBranchPerson 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 WorkPost.IsCQMS=1 ";
string UnitId = CommonService.GetThisUnitId();
if (this.rbCom.SelectedValue == "1")
{
strSql += " AND Person.UnitId = @UnitId";
@@ -51,7 +51,7 @@ namespace FineUIPro.Web.DataShow
{
strSql += " AND Person.UnitId != @UnitId";
}
listStr.Add(new SqlParameter("@UnitId", Const.UnitId_CD));
listStr.Add(new SqlParameter("@UnitId", UnitId));
this.Grid1.Columns[1].Hidden = true;
}
else
SGGL/FineUIPro.Web/DataShow/QualityProblem.aspx
+5 -5
View File
@@ -34,8 +34,8 @@
<f:DatePicker ID="txtEndTime" runat="server" AutoPostBack="true" OnTextChanged="TextBox_TextChanged"
Width="130px">
</f:DatePicker>
<f:ToolbarFill runat="server"></f:ToolbarFill>
<f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="closeNow();">
<f:ToolbarFill runat="server"></f:ToolbarFill>
<f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="closeNow();">
</f:Button>
</Items>
</f:Toolbar>
@@ -52,8 +52,8 @@
</f:RenderField>
<f:RenderField Width="350px" ColumnID="ProjectName" DataField="ProjectName" FieldType="String" HeaderText="项目名称" TextAlign="Left"
HeaderTextAlign="Center">
</f:RenderField>
<f:TemplateField ColumnID="Count1" Width="120px" HeaderText="问题数量" HeaderTextAlign="Center" TextAlign="Right">
</f:RenderField>
<f:TemplateField ColumnID="Count1" Width="120px" HeaderText="问题数量" HeaderTextAlign="Center" TextAlign="Right">
<ItemTemplate>
<asp:Label ID="Label2" runat="server" Text='<%# Count1(Eval("ProjectId")) %>'></asp:Label>
</ItemTemplate>
@@ -91,7 +91,7 @@
</f:Panel>
<f:Window ID="Window1" Title="详情" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="false" runat="server" IsModal="true" OnClose="Window1_Close"
Width="1200px" Height="620px" Maximized="true">
Width="1200px" Height="620px" Maximized="true">
</f:Window>
<f:Menu ID="Menu1" runat="server">
<Items>
SGGL/FineUIPro.Web/DataShow/QualityProblem.aspx.cs
+5 -5
View File
@@ -33,7 +33,7 @@ namespace FineUIPro.Web.DataShow
/// </summary>
private void BindGrid()
{
string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1";
string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1 and (isDelete IS NULL OR isDelete =0)";
List<SqlParameter> listStr = new List<SqlParameter>();
string cpara = string.Empty;
if (this.drpProject.SelectedValue != Const._Null)
@@ -166,7 +166,7 @@ namespace FineUIPro.Web.DataShow
{
var datetime1 = Funs.GetNewDateTime(this.txtStartTime.Text);
var datetime2 = Funs.GetNewDateTime(this.txtStartTime.Text);
var getT = Funs.DB.Check_CheckControl.Where(x => x.ProjectId == projectId.ToString() );
var getT = Funs.DB.Check_CheckControl.Where(x => x.ProjectId == projectId.ToString());
if (datetime1.HasValue)
{
getT = getT.Where(x => x.CheckDate >= datetime1);
@@ -175,7 +175,7 @@ namespace FineUIPro.Web.DataShow
{
getT = getT.Where(x => x.CheckDate <= datetime2);
}
cout1 = getT.Count();
}
return cout1;
@@ -197,7 +197,7 @@ namespace FineUIPro.Web.DataShow
{
getT = getT.Where(x => x.CheckDate <= datetime2);
}
cout1 = getT.Count();
}
return cout1;
@@ -232,7 +232,7 @@ namespace FineUIPro.Web.DataShow
var datetime1 = Funs.GetNewDateTime(this.txtStartTime.Text);
var datetime2 = Funs.GetNewDateTime(this.txtStartTime.Text);
var getALL = Funs.DB.Check_CheckControl.Where(x => x.ProjectId == projectId.ToString());
if (datetime1.HasValue)
{
getALL = getALL.Where(x => x.CheckDate >= datetime1);
SGGL/FineUIPro.Web/DataShow/QualityProblemItem.aspx.cs
+5 -1
View File
@@ -1,9 +1,13 @@
using BLL;
using Aspose.Words;
using BLL;
using Org.BouncyCastle.Asn1.Ocsp;
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
{
SGGL/FineUIPro.Web/DataShow/QualityTraining.aspx.cs
+1 -1
View File
@@ -34,7 +34,7 @@ namespace FineUIPro.Web.DataShow
/// </summary>
private void BindGrid()
{
string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1";
string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1 and (isDelete IS NULL OR isDelete =0)";
List<SqlParameter> listStr = new List<SqlParameter>();
string cpara = string.Empty;
if (this.drpProject.SelectedValue != Const._Null)
SGGL/FineUIPro.Web/DataShow/SecurityRisk.aspx.cs
+1 -1
View File
@@ -35,7 +35,7 @@ namespace FineUIPro.Web.DataShow
/// </summary>
private void BindGrid()
{
string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1";
string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1 and (isDelete IS NULL OR isDelete =0)";
List<SqlParameter> listStr = new List<SqlParameter>();
string cpara = string.Empty;
if (this.drpProject.SelectedValue != Const._Null)
SGGL/FineUIPro.Web/DataShow/SecurityRiskItem.aspx.cs
+8 -1
View File
@@ -1,8 +1,15 @@
using BLL;
using Aspose.Words;
using BLL;
using FineUIPro.Web.BaseInfo;
using Model;
using Org.BouncyCastle.Asn1.Ocsp;
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
{
SGGL/FineUIPro.Web/DataShow/WorkingHours.aspx.cs
+1 -1
View File
@@ -34,7 +34,7 @@ namespace FineUIPro.Web.DataShow
/// </summary>
private void BindGrid()
{
string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1";
string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1 and (isDelete IS NULL OR isDelete =0)";
List<SqlParameter> listStr = new List<SqlParameter>();
string cpara = string.Empty;
if (this.drpProject.SelectedValue != Const._Null)