lpf
/
CNCEC_SUBQHSE_WUHUAN
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交代码

This commit is contained in:
高飞 2025-04-09 19:09:26 +08:00
parent 4618b4947e 62b9d1d0c0
commit 678e16df46
15 changed files with 321 additions and 205 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
DataBase/版本日志/SGGLDB_WH_2025-04-07-xiaj.sql Normal file
View File

@ -0,0 +1,82 @@
ALTER VIEW [dbo].[View_Hazard_HazardRegister]
AS
SELECT Registration.HazardRegisterId,
Registration.HazardCode,
Registration.RegisterDate,
Registration.RegisterDef,
Registration.Rectification,
Registration.Place,
Registration.ResponsibleUnit,
Registration.Observer,
Registration.Risk_Level,
Registration.RectifiedDate,
Registration.ProjectId,
Project.UnitId AS PUnitId,
ProjectUnit.UnitName AS PUnitName,
Registration.states,
Registration.IsEffective,
Registration.ResponsibleMan,
Registration.CheckManId,
Registration.CheckTime,
Registration.RectificationPeriod,
Registration.ImageUrl,
Registration.RectificationImageUrl,
Registration.RectificationTime,
Registration.ConfirmMan,
Registration.ConfirmDate,
Registration.HandleIdea,
Registration.CutPayment,
Registration.ProblemTypes,
Registration.CheckSpecialId,
Registration.CheckItemDetailId,
Registration.SupCheckItemSetId,
Registration.CheckItemSetId,
Registration.SafeSupervisionId,
Registration.SafeSupervisionIsOK,
Project.ProjectName,
Registration.CheckCycle,
ISNULL(WorkArea.UnitWorkName,'') AS WorkAreaName,
Unit.UnitName as ResponsibilityUnitName,
User1.UserName AS ResponsibilityManName,
ISNULL(User1.Telephone,'') AS ResponsibilityManTel,
User2.UserName AS CheckManName,
ISNULL(User2.Telephone,'') AS CheckManTel,
User2.UnitId AS SendUnitId,
User3.UserName AS ConfirmManName,
ISNULL(User3.Telephone,'') AS ConfirmManTel,
User4.UserName AS ResponsibilityManName2,
ISNULL(User4.Telephone,'') AS ResponsibilityMan2Tel,
(CASE WHEN Registration.states='1' and (Registration.SafeSupervisionIsOK is null OR Registration.SafeSupervisionIsOK=0) THEN '´ýÕû¸Ä'
WHEN Registration.states='1' and Registration.SafeSupervisionIsOK=1 THEN 'ºÏ¸ñ'
WHEN Registration.states='2' THEN 'ÒÑÕû¸Ä-´ý¸´²éÑéÊÕ'
WHEN Registration.states='3' THEN 'Òѱջ·'
ELSE 'ÒÑ×÷·Ï' END ) AS StatesStr,
(CASE WHEN Registration.states='3' THEN 'ÒÑÕû¸Ä' ELSE 'δÕû¸Ä' END ) AS ConfirmStr,
RegisterTypes.RegisterTypesId,
RegisterTypes.RegisterTypesName,
Registration.DIC_ID,
Registration.CCManIds,
CCManNames = STUFF(( SELECT ',' + UserName FROM Sys_User
where PATINDEX('%,' + RTRIM(Sys_User.UserId) + ',%',',' + Registration.CCManIds + ',')>0
ORDER BY PATINDEX('%,' + RTRIM(Registration.CCManIds) + ',%',',' + Registration.CCManIds + ',')
FOR XML PATH('')), 1, 1,''),
Registration.Requirements,
Registration.Type,
Registration.HiddenType
FROM dbo.HSSE_Hazard_HazardRegister AS Registration
LEFT JOIN dbo.Base_Project AS Project ON Project.ProjectId = Registration.ProjectId
LEFT JOIN dbo.Base_Unit AS ProjectUnit ON Project.UnitId = ProjectUnit.UnitId
LEFT JOIN dbo.WBS_UnitWork AS WorkArea ON WorkArea.UnitWorkId = Registration.Place
LEFT JOIN dbo.HSSE_Hazard_HazardRegisterTypes AS RegisterTypes ON RegisterTypes.RegisterTypesId = Registration.RegisterTypesId
LEFT JOIN dbo.Base_Unit AS Unit ON Unit.UnitId = Registration.ResponsibleUnit
LEFT JOIN dbo.Sys_User AS User1 ON User1.UserId = Registration.ResponsibleMan
LEFT JOIN dbo.Sys_User AS User2 ON User2.UserId = Registration.CheckManId
LEFT JOIN dbo.Sys_User AS User3 ON User3.UserId = Registration.ConfirmMan
LEFT JOIN dbo.Sys_User AS User4 ON User4.UserId = Registration.ResponsibleMan2
GO

2
SGGL/BLL/API/HSSE/APIHazardRegisterService.cs
View File

@ -74,7 +74,7 @@ namespace BLL
HandleIdea = hazardRegister.HandleIdea, HandleIdea = hazardRegister.HandleIdea,
CutPayment = hazardRegister.CutPayment, CutPayment = hazardRegister.CutPayment,
ProblemTypes = hazardRegister.ProblemTypes, ProblemTypes = hazardRegister.ProblemTypes,
RegisterTypesId = hazardRegister.RegisterTypesId, //RegisterTypesId = hazardRegister.RegisterTypesId,
CheckCycle = hazardRegister.CheckCycle, CheckCycle = hazardRegister.CheckCycle,
SafeSupervisionIsOK = hazardRegister.SafeSupervisionIsOK, SafeSupervisionIsOK = hazardRegister.SafeSupervisionIsOK,
IsWx = "Y", IsWx = "Y",

2
SGGL/BLL/ZHGL/RealName/RealNameMonitorService.cs
View File

@ -60,7 +60,7 @@ namespace BLL
AutoReset = true AutoReset = true
}; };
messageTimer.Elapsed += new ElapsedEventHandler(UpdateSitePerson); messageTimer.Elapsed += new ElapsedEventHandler(UpdateSitePerson);
messageTimer.Interval = 1000 * 60 * 60 * 24;// 60分钟 60000 * adTimeJ; messageTimer.Interval = 1000 * 60 * 30;// 60分钟 60000 * adTimeJ;
messageTimer.Start(); messageTimer.Start();
} }

2
SGGL/FineUIPro.Web/FineUIPro.Web.csproj
View File

@ -19815,7 +19815,7 @@
</FlavorProperties> </FlavorProperties>
</VisualStudio> </VisualStudio>
</ProjectExtensions> </ProjectExtensions>
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v15.0\WebApplications\Microsoft.WebApplication.targets" /> <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v17.0\WebApplications\Microsoft.WebApplication.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it. <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets. Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild"> <Target Name="BeforeBuild">

9
SGGL/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationAdd.aspx
View File

@ -13,7 +13,7 @@
<f:Form ID="SimpleForm1" ShowBorder="false" ShowHeader="false" AutoScroll="true" <f:Form ID="SimpleForm1" ShowBorder="false" ShowHeader="false" AutoScroll="true"
BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right"> BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
<Rows> <Rows>
<f:FormRow> <%-- <f:FormRow>
<Items> <Items>
<f:DropDownList runat="server" EnableSimulateTree="True" Label="检查项" ID="drpRegisterTypes"> <f:DropDownList runat="server" EnableSimulateTree="True" Label="检查项" ID="drpRegisterTypes">
</f:DropDownList> </f:DropDownList>
@ -23,7 +23,7 @@
<f:ListItem Text="重大事故隐患" Value="重大事故隐患" /> <f:ListItem Text="重大事故隐患" Value="重大事故隐患" />
</f:DropDownList> </f:DropDownList>
</Items> </Items>
</f:FormRow> </f:FormRow>--%>
<f:FormRow> <f:FormRow>
<Items> <Items>
<f:DropDownList runat="server" EnableSimulateTree="True" Label="责任单位" ID="drpUnit" <f:DropDownList runat="server" EnableSimulateTree="True" Label="责任单位" ID="drpUnit"
@ -81,6 +81,11 @@
Required="true" EmptyText="--请选择--" AutoSelectFirstItem="false" Required="true" EmptyText="--请选择--" AutoSelectFirstItem="false"
AutoPostBack="true"> AutoPostBack="true">
</f:DropDownList> </f:DropDownList>
<f:DropDownList runat="server" EnableSimulateTree="True" Label="隐患级别" ID="dpRiskLevel">
<f:ListItem Text="一般事故隐患" Value="一般事故隐患" Selected="true" />
<f:ListItem Text="较大事故隐患" Value="较大事故隐患" />
<f:ListItem Text="重大事故隐患" Value="重大事故隐患" />
</f:DropDownList>
</Items> </Items>
</f:FormRow> </f:FormRow>

32
SGGL/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationAdd.aspx.cs
View File

@ -90,19 +90,19 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
UnitWorkService.InitUnitWorkDownList(this.drpWorkArea, this.CurrUser.LoginProjectId, true); UnitWorkService.InitUnitWorkDownList(this.drpWorkArea, this.CurrUser.LoginProjectId, true);
UserService.InitUserProjectIdUnitTypeDropDownList(this.drpResponsibleMan, this.CurrUser.LoginProjectId, Const.ProjectUnitType_2, true); UserService.InitUserProjectIdUnitTypeDropDownList(this.drpResponsibleMan, this.CurrUser.LoginProjectId, Const.ProjectUnitType_2, true);
this.drpRegisterTypes.DataTextField = "RegisterTypesName"; //this.drpRegisterTypes.DataTextField = "RegisterTypesName";
this.drpRegisterTypes.DataValueField = "RegisterTypesId"; //this.drpRegisterTypes.DataValueField = "RegisterTypesId";
if (Type=="1") //if (Type=="1")
{ //{
this.drpRegisterTypes.DataSource = BLL.HSSE_Hazard_HazardRegisterTypesService.GetHazardRegisterTypesList("4"); //安全巡检类型 // this.drpRegisterTypes.DataSource = BLL.HSSE_Hazard_HazardRegisterTypesService.GetHazardRegisterTypesList("4"); //安全巡检类型
} //}
else //else
{ //{
this.drpRegisterTypes.DataSource = BLL.HSSE_Hazard_HazardRegisterTypesService.GetHazardRegisterTypesList("1"); //安全巡检类型 // this.drpRegisterTypes.DataSource = BLL.HSSE_Hazard_HazardRegisterTypesService.GetHazardRegisterTypesList("1"); //安全巡检类型
} //}
this.drpRegisterTypes.DataBind(); //this.drpRegisterTypes.DataBind();
this.HazardRegisterId = Request.Params["HazardRegisterId"]; this.HazardRegisterId = Request.Params["HazardRegisterId"];
//新增初始化 //新增初始化
this.txtCheckManName.Text = this.CurrUser.UserName; this.txtCheckManName.Text = this.CurrUser.UserName;
@ -132,10 +132,10 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
{ {
this.drpWorkArea.SelectedValue = registration.Place; this.drpWorkArea.SelectedValue = registration.Place;
} }
if (!string.IsNullOrEmpty(registration.RegisterTypesId)) //if (!string.IsNullOrEmpty(registration.RegisterTypesId))
{ //{
this.drpRegisterTypes.SelectedValue = registration.RegisterTypesId; // this.drpRegisterTypes.SelectedValue = registration.RegisterTypesId;
} //}
if (!string.IsNullOrEmpty(registration.CheckCycle)) if (!string.IsNullOrEmpty(registration.CheckCycle))
{ {
this.ckType.SelectedValue = registration.CheckCycle; this.ckType.SelectedValue = registration.CheckCycle;
@ -245,7 +245,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
Model.HSSE_Hazard_HazardRegister register = new Model.HSSE_Hazard_HazardRegister(); Model.HSSE_Hazard_HazardRegister register = new Model.HSSE_Hazard_HazardRegister();
register.ProjectId = this.CurrUser.LoginProjectId; register.ProjectId = this.CurrUser.LoginProjectId;
register.ProblemTypes = "1"; //安全隐患问题 register.ProblemTypes = "1"; //安全隐患问题
register.RegisterTypesId = this.drpRegisterTypes.SelectedValue; //register.RegisterTypesId = this.drpRegisterTypes.SelectedValue;
register.CheckCycle = this.ckType.SelectedValue; register.CheckCycle = this.ckType.SelectedValue;
register.Risk_Level = this.dpRiskLevel.SelectedText; register.Risk_Level = this.dpRiskLevel.SelectedText;
register.IsEffective = "1"; register.IsEffective = "1";

27
SGGL/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationAdd.aspx.designer.cs generated
View File

@ -41,24 +41,6 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
/// </remarks> /// </remarks>
protected global::FineUIPro.Form SimpleForm1; protected global::FineUIPro.Form SimpleForm1;
/// <summary>
/// drpRegisterTypes 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpRegisterTypes;
/// <summary>
/// dpRiskLevel 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList dpRiskLevel;
/// <summary> /// <summary>
/// drpUnit 控件。 /// drpUnit 控件。
/// </summary> /// </summary>
@ -167,6 +149,15 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
/// </remarks> /// </remarks>
protected global::FineUIPro.DropDownList drpHiddenType; protected global::FineUIPro.DropDownList drpHiddenType;
/// <summary>
/// dpRiskLevel 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList dpRiskLevel;
/// <summary> /// <summary>
/// Toolbar1 控件。 /// Toolbar1 控件。
/// </summary> /// </summary>

49
SGGL/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationList.aspx
View File

@ -25,9 +25,9 @@
<f:TextBox runat="server" Label="检查人" ID="txtCheckMan" EmptyText="输入查询条件" AutoPostBack="true" <f:TextBox runat="server" Label="检查人" ID="txtCheckMan" EmptyText="输入查询条件" AutoPostBack="true"
OnTextChanged="TextBox_TextChanged" LabelAlign="right" Width="210px" LabelWidth="80px"> OnTextChanged="TextBox_TextChanged" LabelAlign="right" Width="210px" LabelWidth="80px">
</f:TextBox> </f:TextBox>
<f:TextBox runat="server" Label="检查项" ID="txtType" EmptyText="输入查询条件" AutoPostBack="true" <%--<f:TextBox runat="server" Label="检查项" ID="txtType" EmptyText="输入查询条件" AutoPostBack="true"
OnTextChanged="TextBox_TextChanged" LabelAlign="right" Width="210px" LabelWidth="80px"> OnTextChanged="TextBox_TextChanged" LabelAlign="right" Width="210px" LabelWidth="80px">
</f:TextBox> </f:TextBox>--%>
<f:TextBox runat="server" Label="单位工程" ID="txtWorkAreaName" EmptyText="输入查询条件" AutoPostBack="true" <f:TextBox runat="server" Label="单位工程" ID="txtWorkAreaName" EmptyText="输入查询条件" AutoPostBack="true"
OnTextChanged="TextBox_TextChanged" LabelAlign="right" Width="210px" LabelWidth="80px"> OnTextChanged="TextBox_TextChanged" LabelAlign="right" Width="210px" LabelWidth="80px">
</f:TextBox> </f:TextBox>
@ -35,6 +35,15 @@
AutoPostBack="true" OnTextChanged="TextBox_TextChanged" LabelAlign="right" Width="250px" AutoPostBack="true" OnTextChanged="TextBox_TextChanged" LabelAlign="right" Width="250px"
LabelWidth="80px"> LabelWidth="80px">
</f:TextBox> </f:TextBox>
<f:DropDownList ID="drpStates" runat="server" Label="状态" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged"
LabelWidth="70px" LabelAlign="Right" Width="170px">
</f:DropDownList>
<f:DropDownList runat="server" EnableSimulateTree="True" LabelAlign="Right" Label="级别" ID="dpRiskLevel" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
<f:ListItem Text="-请选择-" Value="" />
<f:ListItem Text="一般事故隐患" Value="一般事故隐患" />
<f:ListItem Text="较大事故隐患" Value="较大事故隐患" />
<f:ListItem Text="重大事故隐患" Value="重大事故隐患" />
</f:DropDownList>
</Items> </Items>
</f:Toolbar> </f:Toolbar>
</Toolbars> </Toolbars>
@ -57,15 +66,6 @@
<f:DatePicker ID="txtEndRectificationTime" runat="server" AutoPostBack="true" OnTextChanged="TextBox_TextChanged" <f:DatePicker ID="txtEndRectificationTime" runat="server" AutoPostBack="true" OnTextChanged="TextBox_TextChanged"
Width="130px"> Width="130px">
</f:DatePicker> </f:DatePicker>
<f:DropDownList ID="drpStates" runat="server" Label="状态" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged"
LabelWidth="70px" LabelAlign="Right" Width="170px">
</f:DropDownList>
<f:DropDownList runat="server" EnableSimulateTree="True" LabelAlign="Right" Label="级别" ID="dpRiskLevel" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
<f:ListItem Text="-请选择-" Value="" />
<f:ListItem Text="一般事故隐患" Value="一般事故隐患" />
<f:ListItem Text="较大事故隐患" Value="较大事故隐患" />
<f:ListItem Text="重大事故隐患" Value="重大事故隐患" />
</f:DropDownList>
<f:ToolbarFill ID="ToolbarFill1" runat="server"> <f:ToolbarFill ID="ToolbarFill1" runat="server">
</f:ToolbarFill> </f:ToolbarFill>
<f:HiddenField runat="server" ID="hdRemark"> <f:HiddenField runat="server" ID="hdRemark">
@ -116,6 +116,24 @@
<f:RenderField Width="200px" ColumnID="Requirements" DataField="Requirements" SortField="Requirements" <f:RenderField Width="200px" ColumnID="Requirements" DataField="Requirements" SortField="Requirements"
FieldType="String" HeaderText="整改要求" TextAlign="Left" HeaderTextAlign="Center"> FieldType="String" HeaderText="整改要求" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField> </f:RenderField>
<f:RenderField Width="100px" ColumnID="ConfirmStr" DataField="ConfirmStr" SortField="ConfirmStr"
FieldType="String" HeaderText="复查结果" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField Width="90px" ColumnID="ConfirmDate" DataField="ConfirmDate" SortField="ConfirmDate"
FieldType="String" HeaderText="复查日期" TextAlign="Center" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="90px" ColumnID="ConfirmManName" DataField="ConfirmManName" SortField="ConfirmManName"
FieldType="String" HeaderText="复查人" TextAlign="Center" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="StatesStr" DataField="StatesStr" SortField="StatesStr"
FieldType="String" HeaderText="隐患状态" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="RectificationTime" DataField="RectificationTime"
SortField="RectificationTime" HeaderText="整改时间" TextAlign="Center" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="90px" ColumnID="CheckManName" DataField="CheckManName" SortField="CheckManName"
FieldType="String" HeaderText="检查人" TextAlign="Center" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="120px" ColumnID="Rectification" DataField="Rectification" SortField="Rectification" <f:RenderField Width="120px" ColumnID="Rectification" DataField="Rectification" SortField="Rectification"
FieldType="String" HeaderText="采取措施" TextAlign="Left" HeaderTextAlign="Center"> FieldType="String" HeaderText="采取措施" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField> </f:RenderField>
@ -138,15 +156,6 @@
<asp:Label ID="Label2" runat="server" Text='<%# ConvertImgUrlByImage(Eval("HazardRegisterId")) %>'></asp:Label> <asp:Label ID="Label2" runat="server" Text='<%# ConvertImgUrlByImage(Eval("HazardRegisterId")) %>'></asp:Label>
</ItemTemplate> </ItemTemplate>
</f:TemplateField> </f:TemplateField>
<f:RenderField Width="150px" ColumnID="RectificationTime" DataField="RectificationTime"
SortField="RectificationTime" HeaderText="整改时间" TextAlign="Center" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="90px" ColumnID="CheckManName" DataField="CheckManName" SortField="CheckManName"
FieldType="String" HeaderText="检查人" TextAlign="Center" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="StatesStr" DataField="StatesStr" SortField="StatesStr"
FieldType="String" HeaderText="隐患状态" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<%--<f:TemplateField ColumnID="tfImageUrl" Width="280px" HeaderText="整改前图片" HeaderTextAlign="Center" <%--<f:TemplateField ColumnID="tfImageUrl" Width="280px" HeaderText="整改前图片" HeaderTextAlign="Center"
TextAlign="Left"> TextAlign="Left">
<ItemTemplate> <ItemTemplate>

17
SGGL/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationList.aspx.cs
View File

@ -33,7 +33,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
{ {
get get
{ {
return (string )ViewState["Type"]; return (string)ViewState["Type"];
} }
set set
{ {
@ -90,11 +90,11 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
strSql += " AND CheckManName LIKE @CheckMan"; strSql += " AND CheckManName LIKE @CheckMan";
listStr.Add(new SqlParameter("@CheckMan", "%" + this.txtCheckMan.Text.Trim() + "%")); listStr.Add(new SqlParameter("@CheckMan", "%" + this.txtCheckMan.Text.Trim() + "%"));
} }
if (!string.IsNullOrEmpty(this.txtType.Text.Trim())) //if (!string.IsNullOrEmpty(this.txtType.Text.Trim()))
{ //{
strSql += " AND RegisterTypesName LIKE @Type"; // strSql += " AND RegisterTypesName LIKE @Type";
listStr.Add(new SqlParameter("@Type", "%" + this.txtType.Text.Trim() + "%")); // listStr.Add(new SqlParameter("@Type", "%" + this.txtType.Text.Trim() + "%"));
} //}
if (!string.IsNullOrEmpty(this.txtWorkAreaName.Text.Trim())) if (!string.IsNullOrEmpty(this.txtWorkAreaName.Text.Trim()))
{ {
strSql += " AND WorkAreaName LIKE @WorkAreaName"; strSql += " AND WorkAreaName LIKE @WorkAreaName";
@ -256,7 +256,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
{ {
if (registration.CheckManId == this.CurrUser.UserId) //当前人是检查人，可以在整改前继续编辑 if (registration.CheckManId == this.CurrUser.UserId) //当前人是检查人，可以在整改前继续编辑
{ {
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("HiddenRectificationAdd.aspx?HazardRegisterId={0}&&Type={1}", RegistrationId,Type, "编辑 - "))); PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("HiddenRectificationAdd.aspx?HazardRegisterId={0}&&Type={1}", RegistrationId, Type, "编辑 - ")));
} }
else else
{ {
@ -371,7 +371,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
{ {
if (BLL.CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.HSSE_HiddenRectificationListMenuId, BLL.Const.BtnAdd)) if (BLL.CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.HSSE_HiddenRectificationListMenuId, BLL.Const.BtnAdd))
{ {
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("HiddenRectificationAdd.aspx?Type={0}",Type, "登记 - "))); PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("HiddenRectificationAdd.aspx?Type={0}", Type, "登记 - ")));
} }
else else
{ {
@ -470,6 +470,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
#endregion #endregion
#region 格式化字符串 #region 格式化字符串
/// <summary> /// <summary>
/// 获取整改前图片 /// 获取整改前图片
/// </summary> /// </summary>

51
SGGL/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationList.aspx.designer.cs generated
View File

@ -7,10 +7,12 @@
// </自动生成> // </自动生成>
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
namespace FineUIPro.Web.HSSE.HiddenInspection { namespace FineUIPro.Web.HSSE.HiddenInspection
{
public partial class HiddenRectificationList { public partial class HiddenRectificationList
{
/// <summary> /// <summary>
/// form1 控件。 /// form1 控件。
@ -66,15 +68,6 @@ namespace FineUIPro.Web.HSSE.HiddenInspection {
/// </remarks> /// </remarks>
protected global::FineUIPro.TextBox txtCheckMan; protected global::FineUIPro.TextBox txtCheckMan;
/// <summary>
/// txtType 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtType;
/// <summary> /// <summary>
/// txtWorkAreaName 控件。 /// txtWorkAreaName 控件。
/// </summary> /// </summary>
@ -93,6 +86,24 @@ namespace FineUIPro.Web.HSSE.HiddenInspection {
/// </remarks> /// </remarks>
protected global::FineUIPro.TextBox txtResponsibilityUnitName; protected global::FineUIPro.TextBox txtResponsibilityUnitName;
/// <summary>
/// drpStates 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpStates;
/// <summary>
/// dpRiskLevel 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList dpRiskLevel;
/// <summary> /// <summary>
/// Toolbar2 控件。 /// Toolbar2 控件。
/// </summary> /// </summary>
@ -156,24 +167,6 @@ namespace FineUIPro.Web.HSSE.HiddenInspection {
/// </remarks> /// </remarks>
protected global::FineUIPro.DatePicker txtEndRectificationTime; protected global::FineUIPro.DatePicker txtEndRectificationTime;
/// <summary>
/// drpStates 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpStates;
/// <summary>
/// dpRiskLevel 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList dpRiskLevel;
/// <summary> /// <summary>
/// ToolbarFill1 控件。 /// ToolbarFill1 控件。
/// </summary> /// </summary>

9
SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx
View File

@ -77,6 +77,12 @@
<%--<f:ListItem Value="FWD" Text="FWD"></f:ListItem>--%> <%--<f:ListItem Value="FWD" Text="FWD"></f:ListItem>--%>
<f:ListItem Value="JWD" Text="JWD"></f:ListItem> <f:ListItem Value="JWD" Text="JWD"></f:ListItem>
</f:DropDownList> </f:DropDownList>
<f:DatePicker runat="server" Label="Date Raised" ID="txtStartDate_Raised" LabelAlign="Right" LabelWidth="100px"
Width="220px">
</f:DatePicker>
<f:DatePicker runat="server" Label="Required Date" ID="txtEndRequired_Date" LabelAlign="Right" LabelWidth="110px"
Width="220px">
</f:DatePicker>
<f:ToolbarFill runat="server"></f:ToolbarFill> <f:ToolbarFill runat="server"></f:ToolbarFill>
<f:RadioButtonList ID="rbOutType" Label="导出" runat="server" LabelWidth="50px" Width="180px"> <f:RadioButtonList ID="rbOutType" Label="导出" runat="server" LabelWidth="50px" Width="180px">
<f:RadioItem Text="无图" Value="0" Selected="true" /> <f:RadioItem Text="无图" Value="0" Selected="true" />
@ -101,9 +107,6 @@
<%-- <f:TextBox runat="server" ID="txtPIC" Label="责任人PIC" LabelWidth="90px" LabelAlign="Right" Width="170px"></f:TextBox> --%> <%-- <f:TextBox runat="server" ID="txtPIC" Label="责任人PIC" LabelWidth="90px" LabelAlign="Right" Width="170px"></f:TextBox> --%>
<%-- <f:TextBox runat="server" ID="txtPIC_WUH" Label="责任人-五环/PIC-WUH" LabelWidth="160px" LabelAlign="Right" Width="240px"></f:TextBox> --%> <%-- <f:TextBox runat="server" ID="txtPIC_WUH" Label="责任人-五环/PIC-WUH" LabelWidth="160px" LabelAlign="Right" Width="240px"></f:TextBox> --%>
<f:DatePicker runat="server" Label="Required Date" ID="txtEndRequired_Date" LabelAlign="Right" LabelWidth="110px"
Width="220px">
</f:DatePicker>
</Items> </Items>
</f:Toolbar> </f:Toolbar>
<%--<f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Left"> <%--<f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Left">

5
SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.cs
View File

@ -87,6 +87,11 @@ namespace FineUIPro.Web.Transfer
} }
strSql += ")"; strSql += ")";
} }
if (!string.IsNullOrEmpty(txtStartDate_Raised.Text.Trim()))
{
strSql += " AND Date_Raised = @StartDate_Raised";
listStr.Add(new SqlParameter("@StartDate_Raised", Funs.GetNewDateTime(txtStartDate_Raised.Text.Trim())));
}
//if (!string.IsNullOrEmpty(txtStartDate_Raised.Text.Trim())) //if (!string.IsNullOrEmpty(txtStartDate_Raised.Text.Trim()))
//{ //{
// strSql += " AND Date_Raised >= @StartDate_Raised"; // strSql += " AND Date_Raised >= @StartDate_Raised";

27
SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.designer.cs generated
View File

@ -185,6 +185,24 @@ namespace FineUIPro.Web.Transfer
/// </remarks> /// </remarks>
protected global::FineUIPro.DropDownList ddlPunchType; protected global::FineUIPro.DropDownList ddlPunchType;
/// <summary>
/// txtStartDate_Raised 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtStartDate_Raised;
/// <summary>
/// txtEndRequired_Date 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtEndRequired_Date;
/// <summary> /// <summary>
/// rbOutType 控件。 /// rbOutType 控件。
/// </summary> /// </summary>
@ -248,15 +266,6 @@ namespace FineUIPro.Web.Transfer
/// </remarks> /// </remarks>
protected global::FineUIPro.DropDownList ddlPIC_WUH; protected global::FineUIPro.DropDownList ddlPIC_WUH;
/// <summary>
/// txtEndRequired_Date 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtEndRequired_Date;
/// <summary> /// <summary>
/// lbPhotoesImageUrl 控件。 /// lbPhotoesImageUrl 控件。
/// </summary> /// </summary>

18
SGGL/Model/Model.cs
View File

@ -424423,6 +424423,8 @@ namespace Model
private string _StatesStr; private string _StatesStr;
private string _ConfirmStr;
private string _RegisterTypesId; private string _RegisterTypesId;
private string _RegisterTypesName; private string _RegisterTypesName;
@ -425195,6 +425197,22 @@ namespace Model
} }
} }
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ConfirmStr", DbType="VarChar(6) NOT NULL", CanBeNull=false)]
public string ConfirmStr
{
get
{
return this._ConfirmStr;
}
set
{
if ((this._ConfirmStr != value))
{
this._ConfirmStr = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RegisterTypesId", DbType="NVarChar(50)")] [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RegisterTypesId", DbType="NVarChar(50)")]
public string RegisterTypesId public string RegisterTypesId
{ {

22
SGGL/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
View File

@ -6,7 +6,7 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<_PublishTargetUrl>E:\诺必达合肥\发布\五环WebApi</_PublishTargetUrl> <_PublishTargetUrl>E:\诺必达合肥\发布\五环WebApi</_PublishTargetUrl>
<History>True|2025-04-02T10:10:22.8695984Z||;True|2025-04-02T17:59:51.2978116+08:00||;True|2025-04-02T17:50:55.8630437+08:00||;True|2025-04-02T17:49:22.5114405+08:00||;True|2025-04-02T17:47:11.0650205+08:00||;True|2025-04-02T17:39:09.8576853+08:00||;True|2025-04-02T17:38:15.3079030+08:00||;True|2025-04-02T17:22:03.6735964+08:00||;True|2025-04-02T17:19:04.4220913+08:00||;True|2025-04-02T17:17:14.0244636+08:00||;True|2025-04-02T17:11:09.6583011+08:00||;True|2025-04-02T17:07:23.6330597+08:00||;True|2025-04-02T16:58:45.4070649+08:00||;True|2025-04-02T16:50:20.5907511+08:00||;True|2025-04-02T16:44:18.5351224+08:00||;True|2025-04-02T16:31:11.1297141+08:00||;True|2025-04-02T16:18:43.1126995+08:00||;True|2025-04-02T14:50:42.5384021+08:00||;True|2025-04-01T10:53:08.9403414+08:00||;True|2025-04-01T10:52:08.7646389+08:00||;True|2025-04-01T09:52:56.3095742+08:00||;True|2025-03-13T16:44:25.3220313+08:00||;True|2025-03-13T15:31:10.3223071+08:00||;True|2025-03-13T10:58:17.1401575+08:00||;True|2025-01-23T23:10:37.9664637+08:00||;True|2024-09-24T09:51:10.8028974+08:00||;True|2024-09-20T17:30:59.6144803+08:00||;True|2024-09-20T15:28:40.2547949+08:00||;True|2024-09-19T16:30:51.3047517+08:00||;True|2024-09-19T15:53:23.2431713+08:00||;True|2024-09-19T15:48:55.0571748+08:00||;True|2024-09-19T15:06:29.5748482+08:00||;True|2024-09-19T14:55:42.1477578+08:00||;True|2024-09-19T10:07:53.8666329+08:00||;True|2024-09-03T16:26:17.4985546+08:00||;True|2024-07-17T10:29:15.9472548+08:00||;</History> <History>True|2025-04-07T08:11:44.5172315Z||;True|2025-04-02T18:10:22.8695984+08:00||;True|2025-04-02T17:59:51.2978116+08:00||;True|2025-04-02T17:50:55.8630437+08:00||;True|2025-04-02T17:49:22.5114405+08:00||;True|2025-04-02T17:47:11.0650205+08:00||;True|2025-04-02T17:39:09.8576853+08:00||;True|2025-04-02T17:38:15.3079030+08:00||;True|2025-04-02T17:22:03.6735964+08:00||;True|2025-04-02T17:19:04.4220913+08:00||;True|2025-04-02T17:17:14.0244636+08:00||;True|2025-04-02T17:11:09.6583011+08:00||;True|2025-04-02T17:07:23.6330597+08:00||;True|2025-04-02T16:58:45.4070649+08:00||;True|2025-04-02T16:50:20.5907511+08:00||;True|2025-04-02T16:44:18.5351224+08:00||;True|2025-04-02T16:31:11.1297141+08:00||;True|2025-04-02T16:18:43.1126995+08:00||;True|2025-04-02T14:50:42.5384021+08:00||;True|2025-04-01T10:53:08.9403414+08:00||;True|2025-04-01T10:52:08.7646389+08:00||;True|2025-04-01T09:52:56.3095742+08:00||;True|2025-03-13T16:44:25.3220313+08:00||;True|2025-03-13T15:31:10.3223071+08:00||;True|2025-03-13T10:58:17.1401575+08:00||;True|2025-01-23T23:10:37.9664637+08:00||;True|2024-09-24T09:51:10.8028974+08:00||;True|2024-09-20T17:30:59.6144803+08:00||;True|2024-09-20T15:28:40.2547949+08:00||;True|2024-09-19T16:30:51.3047517+08:00||;True|2024-09-19T15:53:23.2431713+08:00||;True|2024-09-19T15:48:55.0571748+08:00||;True|2024-09-19T15:06:29.5748482+08:00||;True|2024-09-19T14:55:42.1477578+08:00||;True|2024-09-19T10:07:53.8666329+08:00||;True|2024-09-03T16:26:17.4985546+08:00||;True|2024-07-17T10:29:15.9472548+08:00||;</History>
<LastFailureDetails /> <LastFailureDetails />
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
@ -86,22 +86,22 @@
<publishTime>10/28/2024 14:02:50</publishTime> <publishTime>10/28/2024 14:02:50</publishTime>
</File> </File>
<File Include="bin/App_global.asax.compiled"> <File Include="bin/App_global.asax.compiled">
<publishTime>04/02/2025 18:10:21</publishTime> <publishTime>04/07/2025 16:11:41</publishTime>
</File> </File>
<File Include="bin/App_global.asax.dll"> <File Include="bin/App_global.asax.dll">
<publishTime>04/02/2025 18:10:21</publishTime> <publishTime>04/07/2025 16:11:41</publishTime>
</File> </File>
<File Include="bin/Aspose.Words.dll"> <File Include="bin/Aspose.Words.dll">
<publishTime>12/06/2024 20:13:58</publishTime> <publishTime>12/06/2024 20:13:58</publishTime>
</File> </File>
<File Include="bin/BLL.dll"> <File Include="bin/BLL.dll">
<publishTime>04/02/2025 17:59:41</publishTime> <publishTime>04/07/2025 16:11:19</publishTime>
</File> </File>
<File Include="bin/BLL.dll.config"> <File Include="bin/BLL.dll.config">
<publishTime>12/26/2024 09:46:52</publishTime> <publishTime>12/26/2024 09:46:52</publishTime>
</File> </File>
<File Include="bin/BLL.pdb"> <File Include="bin/BLL.pdb">
<publishTime>04/02/2025 17:59:41</publishTime> <publishTime>04/07/2025 16:11:19</publishTime>
</File> </File>
<File Include="bin/BouncyCastle.Crypto.dll"> <File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/18/2020 05:32:28</publishTime> <publishTime>12/18/2020 05:32:28</publishTime>
@ -128,10 +128,10 @@
<publishTime>07/25/2012 19:48:56</publishTime> <publishTime>07/25/2012 19:48:56</publishTime>
</File> </File>
<File Include="bin/Model.dll"> <File Include="bin/Model.dll">
<publishTime>04/02/2025 14:50:15</publishTime> <publishTime>04/07/2025 16:11:13</publishTime>
</File> </File>
<File Include="bin/Model.pdb"> <File Include="bin/Model.pdb">
<publishTime>04/02/2025 14:50:15</publishTime> <publishTime>04/07/2025 16:11:13</publishTime>
</File> </File>
<File Include="bin/netstandard.dll"> <File Include="bin/netstandard.dll">
<publishTime>07/04/2024 14:13:01</publishTime> <publishTime>07/04/2024 14:13:01</publishTime>
@ -389,13 +389,13 @@
<publishTime>02/09/2013 00:42:28</publishTime> <publishTime>02/09/2013 00:42:28</publishTime>
</File> </File>
<File Include="bin/WebAPI.dll"> <File Include="bin/WebAPI.dll">
<publishTime>04/02/2025 18:10:12</publishTime> <publishTime>04/07/2025 16:11:22</publishTime>
</File> </File>
<File Include="bin/WebAPI.pdb"> <File Include="bin/WebAPI.pdb">
<publishTime>04/02/2025 18:10:12</publishTime> <publishTime>04/07/2025 16:11:22</publishTime>
</File> </File>
<File Include="bin/WebAPI.xml"> <File Include="bin/WebAPI.xml">
<publishTime>04/02/2025 18:10:12</publishTime> <publishTime>04/07/2025 16:11:22</publishTime>
</File> </File>
<File Include="bin/WebGrease.dll"> <File Include="bin/WebGrease.dll">
<publishTime>01/23/2014 21:57:34</publishTime> <publishTime>01/23/2014 21:57:34</publishTime>
@ -479,7 +479,7 @@
<publishTime>10/28/2024 14:02:50</publishTime> <publishTime>10/28/2024 14:02:50</publishTime>
</File> </File>
<File Include="PrecompiledApp.config"> <File Include="PrecompiledApp.config">
<publishTime>04/02/2025 18:10:13</publishTime> <publishTime>04/07/2025 16:11:23</publishTime>
</File> </File>
<File Include="Scripts/bootstrap.js"> <File Include="Scripts/bootstrap.js">
<publishTime>10/28/2024 14:02:50</publishTime> <publishTime>10/28/2024 14:02:50</publishTime>