wyw/mh_jy_safe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

检查内容导入

Browse Source
This commit is contained in:
何美荣 2026-03-26 18:28:22 +08:00
parent 8ad73e5bae
commit abd8848fcd
1 changed files with 94 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

105
APT.MicroApi/APT.SK.WebApi/Controllers/Api/CheckContentsController.cs
View File

@ -67,17 +67,18 @@ namespace APT.SK.WebApi.Controllers.Api
{ {
if (item2 != null && !string.IsNullOrEmpty(item2.DESCREPTION) && !string.IsNullOrEmpty(item2.DEMAND)) if (item2 != null && !string.IsNullOrEmpty(item2.DESCREPTION) && !string.IsNullOrEmpty(item2.DEMAND))
{ {
var tempD = item2.NUM + "、" + item2.DESCREPTION; var tempD = item2.NUM + "*" + item2.DESCREPTION;
item.DESCREPTION = item.DESCREPTION + tempD; item.DESCREPTION = item.DESCREPTION + tempD;
item.QUESTION_LEVEL_SHOW = item2.QUESTION_LEVEL.GetDescription(); var tempL = item2.NUM + "*" + item2.QUESTION_LEVEL.GetDescription();
var tempM = item2.NUM + "、" + item2.DEMAND; item.QUESTION_LEVEL_SHOW = item.QUESTION_LEVEL_SHOW + tempL;
var tempM = item2.NUM + "*" + item2.DEMAND;
item.DEMAND = item.DEMAND + tempM; item.DEMAND = item.DEMAND + tempM;
} }
} }
} }
if (item.Nav_ContentsBasics != null && item.Nav_ContentsBasics.Any()) if (item.Nav_ContentsBasics != null && item.Nav_ContentsBasics.Any())
{ {
item.CHECK_BASICS = string.Join(",", item.Nav_ContentsBasics.Select(t=>t.Nav_Law?.NAME)); item.CHECK_BASICS = string.Join("；", item.Nav_ContentsBasics.Select(t=>t.Nav_Law?.NAME));
} }
} }
} }
@ -674,12 +675,89 @@ namespace APT.SK.WebApi.Controllers.Api
} }
} }
} }
var hiddenDes = dtSource.Rows[i][4].ToString().Trim();
if (!string.IsNullOrEmpty(hiddenDes))
{
if (!hiddenDes.Contains("。"))
{
Msg = Msg + "第" + (i + 3) + "行隐患描述格式不正确：1*内容。";
}
if (!hiddenDes.Contains("*"))
{
Msg = Msg + "第" + (i + 3) + "行隐患描述格式不正确：1*内容。";
}
var lists = hiddenDes.Split("。").ToList();
if (lists != null && lists.Any())
{
foreach (var item in lists)
{
if (!string.IsNullOrEmpty(item))
{
if (!item.Contains("*"))
{
Msg = Msg + "第" + (i + 3) + "行隐患描述格式不正确：1*内容。";
}
}
}
}
}
var hiddenLevel = dtSource.Rows[i][5].ToString().Trim(); var hiddenLevel = dtSource.Rows[i][5].ToString().Trim();
if (!string.IsNullOrEmpty(hiddenLevel)) if (!string.IsNullOrEmpty(hiddenLevel))
{ {
if (hiddenLevel != "一般" && hiddenLevel != "重大") if (!hiddenLevel.Contains("。"))
{ {
Msg = Msg + "第" + (i + 3) + "行隐患等级只能填写一般或重大；"; Msg = Msg + "第" + (i + 3) + "行隐患等级格式不正确：1*内容。";
}
if (!hiddenLevel.Contains("*"))
{
Msg = Msg + "第" + (i + 3) + "行隐患等级格式不正确：1*内容。";
}
var lists = hiddenLevel.Split("。").ToList();
if (lists != null && lists.Any())
{
foreach (var item in lists)
{
if (!string.IsNullOrEmpty(item))
{
if (!item.Contains("*"))
{
Msg = Msg + "第" + (i + 3) + "行隐患等级格式不正确：1*内容。";
}
else
{
if (item.Split('*')[1] != "一般" && item.Split('*')[1] != "重大")
{
Msg = Msg + "第" + (i + 3) + "行隐患等级只能填写一般或重大";
}
}
}
}
}
}
var hiddenMes = dtSource.Rows[i][6].ToString().Trim();
if (!string.IsNullOrEmpty(hiddenMes))
{
if (!hiddenMes.Contains("。"))
{
Msg = Msg + "第" + (i + 3) + "行整改措施格式不正确：1*内容。";
}
if (!hiddenMes.Contains("*"))
{
Msg = Msg + "第" + (i + 3) + "行整改措施格式不正确：1*内容。";
}
var lists = hiddenMes.Split("。").ToList();
if (lists != null && lists.Any())
{
foreach (var item in lists)
{
if (!string.IsNullOrEmpty(item))
{
if (!item.Contains("*"))
{
Msg = Msg + "第" + (i + 3) + "行整改措施格式不正确：1*内容。";
}
}
}
} }
} }
} }
@ -696,7 +774,7 @@ namespace APT.SK.WebApi.Controllers.Api
content.CHECK_BASICS = dtSource.Rows[i][2].ToString().Replace("\n", "").Trim(); content.CHECK_BASICS = dtSource.Rows[i][2].ToString().Replace("\n", "").Trim();
content.CHECK_STANDARD = dtSource.Rows[i][3].ToString().Replace("\n", "").Trim(); content.CHECK_STANDARD = dtSource.Rows[i][3].ToString().Replace("\n", "").Trim();
content.DESCREPTION = dtSource.Rows[i][4].ToString().Replace("\n", "").Trim(); content.DESCREPTION = dtSource.Rows[i][4].ToString().Replace("\n", "").Trim();
content.QUESTION_LEVEL = dtSource.Rows[i][5].ToString().Trim() == "重大" ? SKHiddenLevel.Major : SKHiddenLevel.General; content.QUESTION_LEVEL_SHOW = dtSource.Rows[i][5].ToString().Replace("\n", "").Trim();
content.DEMAND = dtSource.Rows[i][6].ToString().Replace("\n", "").Trim(); content.DEMAND = dtSource.Rows[i][6].ToString().Replace("\n", "").Trim();
content.PRODUCTION_UNIT_ID = unit?.ID; content.PRODUCTION_UNIT_ID = unit?.ID;
qustionTemps.Add(content); qustionTemps.Add(content);
@ -709,24 +787,27 @@ namespace APT.SK.WebApi.Controllers.Api
content.ORG_ID = orgId; content.ORG_ID = orgId;
content.PRODUCTION_UNIT_ID = item.PRODUCTION_UNIT_ID; content.PRODUCTION_UNIT_ID = item.PRODUCTION_UNIT_ID;
content.CHECKCONTENT = item.CHECKCONTENT; content.CHECKCONTENT = item.CHECKCONTENT;
content.CHECK_STANDARD = item.CHECK_STANDARD;
contents.Add(content); contents.Add(content);
if (!string.IsNullOrEmpty(item.DESCREPTION) && !string.IsNullOrEmpty(item.DEMAND)) if (!string.IsNullOrEmpty(item.DESCREPTION) && !string.IsNullOrEmpty(item.DEMAND))
{ {
var ques = item.DESCREPTION.Split("。").ToList(); var ques = item.DESCREPTION.Split("。").ToList();
var levels = item.QUESTION_LEVEL_SHOW.Split("。").ToList();
var mess = item.DEMAND.Split("。").ToList(); var mess = item.DEMAND.Split("。").ToList();
if (ques != null && ques.Any()) if (ques != null && ques.Any())
{ {
foreach (var que in ques) foreach (var que in ques)
{ {
var quNum = que.Split("、")[0]; var quNum = que.Split("*")[0];
var mes = mess.FirstOrDefault(t => t.StartsWith(quNum)); var mes = mess.FirstOrDefault(t => t.StartsWith(quNum));
var level = levels.FirstOrDefault(t => t.StartsWith(quNum));
T_SK_CHECK_QUESTION qu = new T_SK_CHECK_QUESTION(); T_SK_CHECK_QUESTION qu = new T_SK_CHECK_QUESTION();
qu.CHECK_CONTENTS_ID = content.ID; qu.CHECK_CONTENTS_ID = content.ID;
qu.ORG_ID = orgId; qu.ORG_ID = orgId;
qu.DESCREPTION = que.Split('、')[1]; qu.DESCREPTION = que.Split('*')[1];
qu.DEMAND = mes.Split("、")[1]; qu.DEMAND = mes.Split("*")[1];
qu.QUESTION_LEVEL = item.QUESTION_LEVEL; qu.QUESTION_LEVEL = level!=null && level.Split("*")[1] =="重大"? SKHiddenLevel.Major: SKHiddenLevel.General;
qu.NUM = int.Parse(que.Split('、')[0]); qu.NUM = int.Parse(que.Split('*')[0]);
qustions.Add(qu); qustions.Add(qu);
} }
} }