diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/BasicLibraryController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/BasicLibraryController.cs index 5aa3a00..b7f0b06 100644 --- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/BasicLibraryController.cs +++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/BasicLibraryController.cs @@ -2258,9 +2258,26 @@ namespace APT.SK.WebApi.Controllers { Msg = Msg + "第" + (i + 3) + "行管控层级格式不确,请修改" + controlLevel + ";"; } + if (!string.IsNullOrEmpty(dtSource.Rows[i][10].ToString().Trim())) + { + var lists = dtSource.Rows[i][10].ToString().Trim().Split("。").ToList(); + if (lists != null && lists.Any()) + { + foreach (var item in lists) + { + if (!string.IsNullOrEmpty(item)) + { + if (!item.Contains("*")) + { + Msg = Msg + "第" + (i + 3) + "行管控措施" + item + "格式不正确,请检查修改;"; + } + } + } + } + } if (!string.IsNullOrEmpty(dtSource.Rows[i][11].ToString().Trim())) { - var lists = dtSource.Rows[i][11].ToString().Trim().Split("。").ToList(); + var lists = dtSource.Rows[i][11].ToString().Trim().Split("?").ToList(); if (lists != null && lists.Any()) { foreach (var item in lists) @@ -2285,11 +2302,7 @@ namespace APT.SK.WebApi.Controllers } else { - var conFirst = checkCons.FirstOrDefault(t => t.CHECKCONTENT == con); - if (conFirst == null) - { - Msg = Msg + "第" + (i + 3) + "行检查内容" + con + "不存在,请先到系统管理维护;"; - } + Msg = Msg + "第" + (i + 3) + "行检查内容" + con + "格式不正确,请检查修改;"; } } } @@ -2380,14 +2393,14 @@ namespace APT.SK.WebApi.Controllers con.MEASURES_NAME = name; libDetList.Add(con); } - else - { - T_SK_BASIC_LIBRARY_DETAIL con = new T_SK_BASIC_LIBRARY_DETAIL(); - con.ORG_ID = orgId; - con.BASIC_LIBRARY_ID = lib.ID; - con.MEASURES_NAME = item; - libDetList.Add(con); - } + //else + //{ + // T_SK_BASIC_LIBRARY_DETAIL con = new T_SK_BASIC_LIBRARY_DETAIL(); + // con.ORG_ID = orgId; + // con.BASIC_LIBRARY_ID = lib.ID; + // con.MEASURES_NAME = item; + // libDetList.Add(con); + //} } } } @@ -2415,7 +2428,7 @@ namespace APT.SK.WebApi.Controllers T_SK_BASIC_LIBRARY_DETAIL_CONTENT con = new T_SK_BASIC_LIBRARY_DETAIL_CONTENT(); con.ORG_ID = orgId; con.BASIC_LIBRARY_DETAIL_ID = detFirst.ID; - con.NUM = numTemp; + con.NUM = int.Parse(num.Split(".")[1]); con.CHECK_CONTENT = name; con.CHECK_CONTENTS_ID = conFirst.ID; con.CHECK_STANDARD = conFirst.CHECK_STANDARD; @@ -2444,6 +2457,7 @@ namespace APT.SK.WebApi.Controllers hi.CHECK_QUESTION_ID = hid.ID; hi.HIDDEN_LEVEL = hid.QUESTION_LEVEL; hi.RECTIFICATION_MEASURES = hid.DEMAND; + hi.NUM = hid.NUM; libHidList.Add(hi); } }