gaofei/SGGL_HBAZ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

危险源管理模块接入真实数据库：新增危大/超危工程、风险控制清单、安全验收、安全巡检、临时用电管理（含前端页面、BLL/API服务、WebAPI控制器、Model项、SQL脚本与接口文档）

Browse Source 
排除 CreateModel.bat（含明文sa密码与本地服务器名，未入库）
This commit is contained in:
杨家亮
2026-08-24 11:07:59 +08:00
parent 4925a6c4b0
commit 55944d732a
323 changed files with 9806 additions and 922 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/CQMS/Check/CheckFineList.aspx.cs
+2 -5
View File
@@ -466,7 +466,6 @@ namespace FineUIPro.Web.CQMS.Check
Bookmark bookmarkWorkArea = doc.Range.Bookmarks["WorkArea"];
if (bookmarkWorkArea != null)
{
string option = "";
var unitWork = UnitWorkService.GetUnitWorkByUnitWorkId(checkControl.UnitWorkId);
if (unitWork != null)
{
@@ -724,7 +723,7 @@ namespace FineUIPro.Web.CQMS.Check
if (bookmarkSendDate != null)
{
if (checks.CheckDate.HasValue != null)
if (checks.CheckDate.HasValue)
{
bookmarkSendDate.Text = checks.CheckDate.Value.ToString("yyyy年MM月dd日");
@@ -751,7 +750,6 @@ namespace FineUIPro.Web.CQMS.Check
Bookmark bookmarkWorkArea = doc.Range.Bookmarks["UnitWork"];
if (bookmarkWorkArea != null)
{
string option = "";
var unitWork = UnitWorkService.GetUnitWorkByUnitWorkId(checks.UnitWorkId);
if (unitWork != null)
{
@@ -761,7 +759,6 @@ namespace FineUIPro.Web.CQMS.Check
Bookmark bookmarkProblemType = doc.Range.Bookmarks["QuestionType"];
if (bookmarkProblemType != null)
{
string option = "";
var questionType = QualityQuestionTypeService.GetQualityQuestionType(checks.QuestionType);
if (questionType != null)
{
@@ -792,7 +789,7 @@ namespace FineUIPro.Web.CQMS.Check
if (bookmarkCheckDate != null)
{
if (checks.CheckDate.HasValue != null)
if (checks.CheckDate.HasValue)
{
bookmarkCheckDate.Text = checks.CheckDate.Value.ToString("yyyy年MM月dd日");
SGGL/FineUIPro.Web/CQMS/Check/CheckFineListEdit.aspx.cs
-1
View File
@@ -279,7 +279,6 @@ namespace FineUIPro.Web.CQMS.Check
Bookmark bookmarkWorkArea = doc.Range.Bookmarks["WorkArea"];
if (bookmarkWorkArea != null)
{
string option = "";
var unitWork = UnitWorkService.GetUnitWorkByUnitWorkId(checkControl.UnitWorkId);
if (unitWork != null)
{
SGGL/FineUIPro.Web/CQMS/Check/CheckList.aspx.cs
+3 -7
View File
@@ -244,7 +244,7 @@ namespace FineUIPro.Web.CQMS.Check
/// </summary>
/// <param name="grid"></param>
/// <returns></returns>
public static string GetGridTableHtml(Grid grid)
public new static string GetGridTableHtml(Grid grid)
{
StringBuilder sb = new StringBuilder();
sb.Append("<meta http-equiv=\"content-type\" content=\"application/excel; charset=UTF-8\"/>");
@@ -793,7 +793,6 @@ namespace FineUIPro.Web.CQMS.Check
Bookmark bookmarkWorkArea = doc.Range.Bookmarks["WorkArea"];
if (bookmarkWorkArea != null)
{
string option = "";
var unitWork = UnitWorkService.GetUnitWorkByUnitWorkId(checks.UnitWorkId);
if (unitWork != null)
{
@@ -803,7 +802,6 @@ namespace FineUIPro.Web.CQMS.Check
Bookmark bookmarkProblemType = doc.Range.Bookmarks["ProblemType"];
if (bookmarkProblemType != null)
{
string option = "";
var questionType = QualityQuestionTypeService.GetQualityQuestionType(checks.QuestionType);
if (questionType != null)
{
@@ -1066,7 +1064,7 @@ namespace FineUIPro.Web.CQMS.Check
if (bookmarkSendDate != null)
{
if (checks.CheckDate.HasValue != null)
if (checks.CheckDate.HasValue)
{
bookmarkSendDate.Text = checks.CheckDate.Value.ToString("yyyy年MM月dd日");
@@ -1095,7 +1093,6 @@ namespace FineUIPro.Web.CQMS.Check
Bookmark bookmarkWorkArea = doc.Range.Bookmarks["UnitWork"];
if (bookmarkWorkArea != null)
{
string option = "";
var unitWork = UnitWorkService.GetUnitWorkByUnitWorkId(checks.UnitWorkId);
if (unitWork != null)
{
@@ -1105,7 +1102,6 @@ namespace FineUIPro.Web.CQMS.Check
Bookmark bookmarkProblemType = doc.Range.Bookmarks["QuestionType"];
if (bookmarkProblemType != null)
{
string option = "";
var questionType = QualityQuestionTypeService.GetQualityQuestionType(checks.QuestionType);
if (questionType != null)
{
@@ -1136,7 +1132,7 @@ namespace FineUIPro.Web.CQMS.Check
if (bookmarkCheckDate != null)
{
if (checks.CheckDate.HasValue != null)
if (checks.CheckDate.HasValue)
{
bookmarkCheckDate.Text = checks.CheckDate.Value.ToString("yyyy年MM月dd日");
SGGL/FineUIPro.Web/CQMS/Check/JointCheckUnitStatistics.aspx.cs
+1 -1
View File
@@ -132,7 +132,7 @@ namespace FineUIPro.Web.CQMS.Check {
/// </summary>
/// <param name="grid"></param>
/// <returns></returns>
private string GetGridTableHtml(Grid grid)
private new string GetGridTableHtml(Grid grid)
{
StringBuilder sb = new StringBuilder();
sb.Append("<meta http-equiv=\"content-type\" content=\"application/excel; charset=UTF-8\"/>");
SGGL/FineUIPro.Web/CQMS/Check/SpecialCheckIn.aspx.cs
+2 -2
View File
@@ -200,7 +200,7 @@ namespace FineUIPro.Web.CQMS.WBS
specialDataIn.CheckTime = DateTime.Parse(pds.Rows[i][2].ToString().Trim());
}
catch (Exception e)
catch (Exception)
{
result += "第" + (i + 2).ToString() + "行," + "检查日期" + "," + "格式错误！" + "|";
}
@@ -304,7 +304,7 @@ namespace FineUIPro.Web.CQMS.WBS
specialDataIn.LimitedTime = DateTime.Parse(pds.Rows[i][15].ToString().Trim());
}
catch (Exception e)
catch (Exception)
{
result += "第" + (i + 2).ToString() + "行," + "现时日期" + "," + "格式错误！" + "|";
}
SGGL/FineUIPro.Web/CQMS/Check/SpecialCheckList.aspx.cs
+2 -6
View File
@@ -682,7 +682,6 @@ namespace FineUIPro.Web.CQMS.Check
Bookmark bookmarkWorkArea = doc.Range.Bookmarks["WorkArea"];
if (bookmarkWorkArea != null)
{
string option = "";
var unitWork = UnitWorkService.GetUnitWorkByUnitWorkId(checks.UnitWorkId);
if (unitWork != null)
{
@@ -692,7 +691,6 @@ namespace FineUIPro.Web.CQMS.Check
Bookmark bookmarkProblemType = doc.Range.Bookmarks["ProblemType"];
if (bookmarkProblemType != null)
{
string option = "";
var questionType = QualityQuestionTypeService.GetQualityQuestionType(checks.QuestionType);
if (questionType != null)
{
@@ -955,7 +953,7 @@ namespace FineUIPro.Web.CQMS.Check
if (bookmarkSendDate != null)
{
if (checks.CheckDate.HasValue != null)
if (checks.CheckDate.HasValue)
{
bookmarkSendDate.Text = checks.CheckDate.Value.ToString("yyyy年MM月dd日");
@@ -984,7 +982,6 @@ namespace FineUIPro.Web.CQMS.Check
Bookmark bookmarkWorkArea = doc.Range.Bookmarks["UnitWork"];
if (bookmarkWorkArea != null)
{
string option = "";
var unitWork = UnitWorkService.GetUnitWorkByUnitWorkId(checks.UnitWorkId);
if (unitWork != null)
{
@@ -994,7 +991,6 @@ namespace FineUIPro.Web.CQMS.Check
Bookmark bookmarkProblemType = doc.Range.Bookmarks["QuestionType"];
if (bookmarkProblemType != null)
{
string option = "";
var questionType = QualityQuestionTypeService.GetQualityQuestionType(checks.QuestionType);
if (questionType != null)
{
@@ -1025,7 +1021,7 @@ namespace FineUIPro.Web.CQMS.Check
if (bookmarkCheckDate != null)
{
if (checks.CheckDate.HasValue != null)
if (checks.CheckDate.HasValue)
{
bookmarkCheckDate.Text = checks.CheckDate.Value.ToString("yyyy年MM月dd日");
SGGL/FineUIPro.Web/CQMS/ConstructionLog/ConstructionLog.aspx.cs
+1 -1
View File
@@ -1604,7 +1604,7 @@ namespace FineUIPro.Web.CQMS.ConstructionLog
picture.Resize();
}
}
catch (Exception ex)
catch (Exception)
{
}
SGGL/FineUIPro.Web/CQMS/Foreign/ControlPointCheck.aspx.cs
+1 -1
View File
@@ -268,7 +268,7 @@ namespace FineUIPro.Web.CQMS.Foreign
/// </summary>
/// <param name="grid"></param>
/// <returns></returns>
private string GetGridTableHtml(Grid grid)
private new string GetGridTableHtml(Grid grid)
{
StringBuilder sb = new StringBuilder();
sb.Append("<meta http-equiv=\"content-type\" content=\"application/excel; charset=UTF-8\"/>");
SGGL/FineUIPro.Web/CQMS/Foreign/ForeignWBSOut.aspx.cs
+1 -1
View File
@@ -75,7 +75,7 @@ namespace FineUIPro.Web.CQMS.Foreign
/// </summary>
/// <param name="grid"></param>
/// <returns></returns>
private string GetGridTableHtml(Grid grid)
private new string GetGridTableHtml(Grid grid)
{
StringBuilder sb = new StringBuilder();
sb.Append("<meta http-equiv=\"content-type\" content=\"application/excel; charset=UTF-8\"/>");
SGGL/FineUIPro.Web/CQMS/Foreign/ITPList.aspx.cs
+1 -1
View File
@@ -237,7 +237,7 @@ namespace FineUIPro.Web.CQMS.Foreign
/// </summary>
/// <param name="grid"></param>
/// <returns></returns>
private string GetGridTableHtml(Grid grid)
private new string GetGridTableHtml(Grid grid)
{
StringBuilder sb = new StringBuilder();
sb.Append("<meta http-equiv=\"content-type\" content=\"application/excel; charset=UTF-8\"/>");
SGGL/FineUIPro.Web/CQMS/Foreign/ITPListProject.aspx.cs
+1 -1
View File
@@ -285,7 +285,7 @@ namespace FineUIPro.Web.CQMS.Foreign
/// </summary>
/// <param name="grid"></param>
/// <returns></returns>
private string GetGridTableHtml(Grid grid)
private new string GetGridTableHtml(Grid grid)
{
StringBuilder sb = new StringBuilder();
sb.Append("<meta http-equiv=\"content-type\" content=\"application/excel; charset=UTF-8\"/>");
SGGL/FineUIPro.Web/CQMS/Information/CostReportEdit.aspx.cs
-1
View File
@@ -214,7 +214,6 @@ namespace FineUIPro.Web.CQMS.Information
private void OutputSummaryData()
{
decimal totalPlanCost = 0;
int i = 0;
JArray mergedData = Grid1.GetMergedData();
if (mergedData.Count > 0)
{
SGGL/FineUIPro.Web/CQMS/ManageReport/CheckStatisc.aspx.cs
+1 -1
View File
@@ -412,7 +412,7 @@ namespace FineUIPro.Web.CQMS.ManageReport
/// </summary>
/// <param name="grid"></param>
/// <returns></returns>
private string GetGridTableHtml(Grid grid)
private new string GetGridTableHtml(Grid grid)
{
StringBuilder sb = new StringBuilder();
sb.Append("<meta http-equiv=\"content-type\" content=\"application/excel; charset=UTF-8\"/>");
SGGL/FineUIPro.Web/CQMS/ManageReport/DesignChangeStatisc.aspx.cs
+1 -1
View File
@@ -214,7 +214,7 @@ namespace FineUIPro.Web.CQMS.ManageReport
/// </summary>
/// <param name="grid"></param>
/// <returns></returns>
private string GetGridTableHtml(Grid grid)
private new string GetGridTableHtml(Grid grid)
{
StringBuilder sb = new StringBuilder();
sb.Append("<meta http-equiv=\"content-type\" content=\"application/excel; charset=UTF-8\"/>");
SGGL/FineUIPro.Web/CQMS/ManageReport/HJGLStatisc.aspx.cs
+1 -1
View File
@@ -161,7 +161,7 @@ namespace FineUIPro.Web.CQMS.ManageReport
/// </summary>
/// <param name="grid"></param>
/// <returns></returns>
private string GetGridTableHtml(Grid grid)
private new string GetGridTableHtml(Grid grid)
{
StringBuilder sb = new StringBuilder();
sb.Append("<meta http-equiv=\"content-type\" content=\"application/excel; charset=UTF-8\"/>");
SGGL/FineUIPro.Web/CQMS/ManageReport/NCRStatisc.aspx.cs
+1 -1
View File
@@ -170,7 +170,7 @@ namespace FineUIPro.Web.CQMS.ManageReport
/// </summary>
/// <param name="grid"></param>
/// <returns></returns>
private string GetGridTableHtml(Grid grid)
private new string GetGridTableHtml(Grid grid)
{
StringBuilder sb = new StringBuilder();
sb.Append("<meta http-equiv=\"content-type\" content=\"application/excel; charset=UTF-8\"/>");
SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNoticeEdit.aspx.cs
-2
View File
@@ -187,7 +187,6 @@ namespace FineUIPro.Web.CQMS.ProcessControl
}
protected void btnSubmit_Click(object sender, EventArgs e)
{
bool changeAudit = true;
if (this.drpUnit.SelectedValue == BLL.Const._Null)
{
Alert.ShowInTop("请先选择施工分包商！", MessageBoxIcon.Warning);
@@ -262,7 +261,6 @@ namespace FineUIPro.Web.CQMS.ProcessControl
}
if (oldInspectionManagement.AuditMan != inspectionManagement.AuditMan)
{
changeAudit = true;
inspectionManagement.Status = "2";
}
SGGL/FineUIPro.Web/CQMS/Solution/ConstructSolution.aspx.cs
+1 -1
View File
@@ -748,7 +748,7 @@ namespace FineUIPro.Web.CQMS.Solution
/// </summary>
/// <param name="grid"></param>
/// <returns></returns>
public static string GetGridTableHtml(Grid grid)
public new static string GetGridTableHtml(Grid grid)
{
StringBuilder sb = new StringBuilder();
sb.Append("<meta http-equiv=\"content-type\" content=\"application/excel; charset=UTF-8\"/>");
SGGL/FineUIPro.Web/CQMS/Solution/EditConstructSolution.aspx.cs
+1 -1
View File
@@ -1595,7 +1595,7 @@ namespace FineUIPro.Web.CQMS.Solution
var ID = gvApprove.DataKeys[rowIndex][0];
var approve = Funs.DB.Solution_CQMSConstructSolutionApprove.Where(x => x.ConstructSolutionApproveId == ID).FirstOrDefault();
var approve = Funs.DB.Solution_CQMSConstructSolutionApprove.Where(x => x.ConstructSolutionApproveId == (string)ID).FirstOrDefault();
if (approve != null)
{
approve.ApproveDate = null;
SGGL/FineUIPro.Web/CQMS/WBS/ProjectQuality.aspx.cs
-4
View File
@@ -14,10 +14,6 @@ namespace FineUIPro.Web.CQMS.WBS
public partial class ProjectQuality : PageBase
{
#region 定义变量
/// <summary>
/// 上传预设的虚拟路径
/// </summary>
private string initPath = Const.ExcelUrl;
#endregion
protected void Page_Load(object sender, EventArgs e)
SGGL/FineUIPro.Web/CQMS/WBS/WBSIn.aspx.cs
-1
View File
@@ -117,7 +117,6 @@ namespace FineUIPro.Web.CQMS.WBS
// 第二步：创建新数据行
NPOI.SS.UserModel.ISheet sheet = workbook.GetSheet("Sheet1");
NPOI.SS.UserModel.IRow row1 = sheet.CreateRow(1);
NPOI.SS.UserModel.ICell cell2;
// 添加测试数据
//cell2 = row1.CreateCell(14);
//cell2.CellStyle = cellStyle0;