危险源管理模块接入真实数据库:新增危大/超危工程、风险控制清单、安全验收、安全巡检、临时用电管理(含前端页面、BLL/API服务、WebAPI控制器、Model项、SQL脚本与接口文档)
排除 CreateModel.bat(含明文sa密码与本地服务器名,未入库)
This commit is contained in:
@@ -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日");
|
||||
|
||||
|
||||
Reference in New Issue
Block a user