diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/BasicLibraryController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/BasicLibraryController.cs index fd2f145..73a595d 100644 --- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/BasicLibraryController.cs +++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/BasicLibraryController.cs @@ -985,7 +985,7 @@ namespace APT.SK.WebApi.Controllers { if (item2 != null && !string.IsNullOrEmpty(item2.MEASURES_NAME)) { - var temp = item2.NUM + "*" + item2.MEASURES_NAME; + var temp = item2.NUM + "*" + item2.MEASURES_NAME+"。"; item.MINE_NAME = item.MINE_NAME + temp; item.MEASURE = item.MEASURE + temp; var conListTemp = ""; @@ -995,7 +995,7 @@ namespace APT.SK.WebApi.Controllers { if (con != null && con.Nav_Contents != null) { - var conTemp = item2.NUM +"."+con.NUM + "*"+con.Nav_Contents?.CHECKCONTENT; + var conTemp = item2.NUM +"."+con.NUM + "*"+con.Nav_Contents?.CHECKCONTENT +"?"; conListTemp = conListTemp + conTemp; } } diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/CheckContentsController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/CheckContentsController.cs index 58505d4..3cf590a 100644 --- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/CheckContentsController.cs +++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/CheckContentsController.cs @@ -54,6 +54,7 @@ namespace APT.SK.WebApi.Controllers.Api pageFilter.Include.Add("Nav_ContentsBasics.Nav_Law"); pageFilter.SelectField.Add("Nav_ListCheckQuestion.NUM"); pageFilter.SelectField.Add("Nav_ListCheckQuestion.DESCREPTION"); + pageFilter.SelectField.Add("Nav_ListCheckQuestion.QUESTION_LEVEL"); pageFilter.SelectField.Add("Nav_ListCheckQuestion.DEMAND"); pageFilter.SelectField.Add("Nav_ContentsBasics.Nav_Law.NAME"); var result = GetOrderPageEntities(null, pageFilter); @@ -67,11 +68,11 @@ namespace APT.SK.WebApi.Controllers.Api { 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; - var tempL = item2.NUM + "*" + item2.QUESTION_LEVEL.GetDescription(); + var tempL = item2.NUM + "*" + item2.QUESTION_LEVEL.GetDescription() +"。"; item.QUESTION_LEVEL_SHOW = item.QUESTION_LEVEL_SHOW + tempL; - var tempM = item2.NUM + "*" + item2.DEMAND; + var tempM = item2.NUM + "*" + item2.DEMAND + "。"; item.DEMAND = item.DEMAND + tempM; } } @@ -112,6 +113,7 @@ namespace APT.SK.WebApi.Controllers.Api } } var entity = this.GetEntity(null,filter); + entity.Nav_ListCheckQuestion = entity.Nav_ListCheckQuestion?.OrderBy(t => t.NUM).ToList(); return entity; });