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

2023-04-28

This commit is contained in:
李超 2023-04-28 17:26:38 +08:00
parent 5b740e7bda
commit 9a94d0a844
7 changed files with 150 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
SGGL/BLL/Common/PrinterDocService.cs
View File

@ -1453,14 +1453,11 @@
sb.Append("<tr style=\"height: 35px\">");
if (!string.IsNullOrEmpty(getTestRecord.Signature))
{
sb.AppendFormat("<td align=\"left\" style=\"width:25%; \"><img width='100' height='100' src='" + (Funs.SGGLUrl + getTestRecord.Signature).Replace('\\', '/') + "'></img></td> ");
sb.AppendFormat("<td align=\"left\" style=\"width:25%; \"><img width='91' height='30' src='" + (Funs.SGGLUrl + getTestRecord.Signature).Replace('\\', '/') + "'></img></td> ");
}
else
{
sb.AppendFormat("<td align=\"left\" style=\"width:25%; \"><img width='100' height='100' src='~/res/qiaming.png'></img></td> ");
//sb.AppendFormat("<td align=\"left\" style=\"width:25%; \">{0}</td> ", "姓名：" + testName);
sb.AppendFormat("<td align=\"left\" style=\"width:25%; \">{0}</td> ", "姓名：" + testName);
}
sb.AppendFormat("<td align=\"left\" style=\"width:50%;\">{0}</td> ", "身份证号：" + idCard);
sb.AppendFormat("<td align=\"left\" style=\"width:25%;\">{0}</td> ", "分数：" + (getTestRecord.TestScores ?? 0).ToString());
@ -1503,6 +1500,10 @@
}
sb.AppendFormat("<td align=\"left\" style=\"width:100%; \">{0}</td> ", str);
sb.Append("</tr>");
sb.Append("<tr style=\"height: 30px\">");
sb.AppendFormat("<td align=\"right\" style=\"width:100%; \">正确答案：{0}</td> ", item.AnswerItems);
sb.Append("</tr>");
num++;
}

5
SGGL/BLL/HSSE/HiddenInspection/HSSE_Hazard_HazardRegisterService.cs
View File

@ -20,7 +20,10 @@ namespace BLL
{
return Funs.DB.HSSE_Hazard_HazardRegister.FirstOrDefault(x => x.HazardRegisterId == hazardRegisterId);
}
public static Model.HSSE_Hazard_HazardRegister GetHazardRegisterByCheckItemDetailId(string hazardRegisterId)
{
return Funs.DB.HSSE_Hazard_HazardRegister.FirstOrDefault(x => x.CheckItemDetailId == hazardRegisterId);
}
/// <summary>
/// 获取项目风险列表
/// </summary>

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

@ -154,9 +154,14 @@
<f:RenderField Width="90px" ColumnID="CheckManName" DataField="CheckManName" SortField="CheckManName"
FieldType="String" HeaderText="检查人" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="90px" ColumnID="StatesStr" DataField="StatesStr" SortField="StatesStr"
FieldType="String" HeaderText="状态" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:TemplateField ColumnID="State" Width="120px" HeaderText="状态" HeaderTextAlign="Center"
TextAlign="Left">
<ItemTemplate>
<asp:Label ID="Label1" runat="server" Text='<%# ConverState(Eval("HazardRegisterId")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:RenderField Width="90px" ColumnID="Risk_LevelName" DataField="Risk_LevelName" SortField="Risk_LevelName"
FieldType="String" HeaderText="级别" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>

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

@ -1,4 +1,5 @@
using BLL;
using NPOI.SS.Formula.Functions;
using System;
using System.Collections.Generic;
using System.Configuration;
@ -48,20 +49,20 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
List<Model.HandleStep> handleSteps = new List<Model.HandleStep>();
Model.HandleStep handleStep1 = new Model.HandleStep();
handleStep1.Id = "1";
handleStep1.Name = "待整改";
handleStep1.Name = "未整改";
handleSteps.Add(handleStep1);
Model.HandleStep handleStep2 = new Model.HandleStep();
handleStep2.Id = "2";
handleStep2.Name = "已整改-待复查验收";
handleStep2.Name = "按时整改";
handleSteps.Add(handleStep2);
Model.HandleStep handleStep3 = new Model.HandleStep();
handleStep3.Id = "3";
handleStep3.Name = "已闭环";
handleStep3.Name = "超期整改";
handleSteps.Add(handleStep3);
//Model.HandleStep handleStep4 = new Model.HandleStep();
//handleStep4.Id = "4";
//handleStep4.Name = "已作废";
//handleSteps.Add(handleStep4);
Model.HandleStep handleStep4 = new Model.HandleStep();
handleStep4.Id = "4";
handleStep4.Name = "超期未整改";
handleSteps.Add(handleStep4);
this.drpStates.DataSource = handleSteps; ;
this.drpStates.DataBind();
Funs.FineUIPleaseSelect(this.drpStates,"按状态");
@ -158,8 +159,25 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
}
if (this.drpStates.SelectedValue != BLL.Const._Null)
{
strSql += " AND States LIKE @States";
listStr.Add(new SqlParameter("@States", "%" + this.drpStates.SelectedValue + "%"));
if (this.drpStates.SelectedValue == "1")
{
strSql += " AND States = '1' and RectificationPeriod > getdate()";
}
else if (this.drpStates.SelectedValue == "2")
{
strSql += " AND States in( '2','3') and RectificationPeriod > RectificationTime";
}
else if (this.drpStates.SelectedValue == "3")
{
strSql += " AND States in( '2','3') and RectificationPeriod < RectificationTime";
}
else if (this.drpStates.SelectedValue == "4")
{
strSql += " AND States ='1' and RectificationPeriod < getdate()";
}
}
if (!CommonService.IsMainUnitOrAdmin(this.CurrUser.UserId))
{
@ -613,6 +631,40 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
}
return url;
}
protected string ConverState(object registrationId)
{
string state = string.Empty;
if (registrationId != null)
{
Model.View_Hazard_HazardRegister registration = (from x in Funs.DB.View_Hazard_HazardRegister where x.HazardRegisterId == registrationId.ToString() select x).FirstOrDefault();
if (registration != null)
{
if (registration.States == "1" && registration.RectificationPeriod.Value > DateTime.Now)
{
state += "未整改";
}
else if ((registration.States == "2" || registration.States == "3")&& registration.RectificationPeriod.Value>registration.RectificationTime.Value)
{
state += "按时整改";
}
else if ((registration.States == "2" || registration.States == "3") && registration.RectificationPeriod.Value < registration.RectificationTime.Value)
{
state += "超期整改";
}
else if (registration.States =="1" && registration. RectificationPeriod.Value <DateTime.Now)
{
state += "超期未整改";
}
}
}
return state;
}
#endregion
#region 导出按钮

15
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>
/// form1 控件。
@ -237,6 +239,15 @@ namespace FineUIPro.Web.HSSE.HiddenInspection {
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label2;
/// <summary>
/// Label1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label1;
/// <summary>
/// ToolbarSeparator1 控件。
/// </summary>

1
SGGL/FineUIPro.Web/common/Menu_HSSE.xml
View File

@ -44,6 +44,7 @@
</TreeNode>
<TreeNode id="467A0CB9-737D-4451-965E-869EBC3A4BD6" Text="HSE检查" NavigateUrl=""><TreeNode id="2FC8AA2A-F421-4174-A05E-2711167AF141" Text="安全巡检" NavigateUrl="HSSE/HiddenInspection/HiddenRectificationList.aspx"></TreeNode>
<TreeNode id="1B08048F-93ED-4E84-AE65-DB7917EA2DFB" Text="专项检查" NavigateUrl="HSSE/Check/CheckSpecial.aspx"></TreeNode>
<TreeNode id="C7481FEE-EA92-44B8-99F6-C5CA6BBDCFF5" Text="专项检查记录" NavigateUrl="HSSE/Check/CheckSpecialRecord.aspx"></TreeNode>
<TreeNode id="C198EBA8-9E23-4654-92E1-09C61105C522" Text="综合检查" NavigateUrl="HSSE/Check/CheckColligation.aspx"></TreeNode>
<TreeNode id="80F786CB-E8CA-44AD-A08C-8E4D12BFDCA1" Text="总部检查" NavigateUrl="HSSE/Check/OfficeCheck.aspx"></TreeNode>
<TreeNode id="7B272C3F-39D2-496D-A87C-E2C89A20E4EF" Text="HSE巡检统计(图表)" NavigateUrl="HSSE/HiddenInspection/RiskAnalysisChart.aspx"></TreeNode>

18
SGGL/Model/Model.cs
View File

@ -375214,6 +375214,8 @@ namespace Model
private string _DataType;
private string _RiskLevel;
private string _UnitName;
private string _HandleStepStr;
@ -375500,6 +375502,22 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RiskLevel", DbType="VarChar(50)")]
public string RiskLevel
{
get
{
return this._RiskLevel;
}
set
{
if ((this._RiskLevel != value))
{
this._RiskLevel = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitName", DbType="NVarChar(200)")]
public string UnitName
{