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-27 14:03:53 +08:00
parent a6276caeba
commit a556ea9f08
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
APT.MicroApi/APT.SK.WebApi/Controllers/Api/BasicLibraryController.cs
View File

@ -985,7 +985,7 @@ namespace APT.SK.WebApi.Controllers
{ {
if (item2 != null && !string.IsNullOrEmpty(item2.MEASURES_NAME)) 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.MINE_NAME = item.MINE_NAME + temp;
item.MEASURE = item.MEASURE + temp; item.MEASURE = item.MEASURE + temp;
var conListTemp = ""; var conListTemp = "";
@ -995,7 +995,7 @@ namespace APT.SK.WebApi.Controllers
{ {
if (con != null && con.Nav_Contents != null) 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; conListTemp = conListTemp + conTemp;
} }
} }

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

@ -54,6 +54,7 @@ namespace APT.SK.WebApi.Controllers.Api
pageFilter.Include.Add("Nav_ContentsBasics.Nav_Law"); pageFilter.Include.Add("Nav_ContentsBasics.Nav_Law");
pageFilter.SelectField.Add("Nav_ListCheckQuestion.NUM"); pageFilter.SelectField.Add("Nav_ListCheckQuestion.NUM");
pageFilter.SelectField.Add("Nav_ListCheckQuestion.DESCREPTION"); pageFilter.SelectField.Add("Nav_ListCheckQuestion.DESCREPTION");
pageFilter.SelectField.Add("Nav_ListCheckQuestion.QUESTION_LEVEL");
pageFilter.SelectField.Add("Nav_ListCheckQuestion.DEMAND"); pageFilter.SelectField.Add("Nav_ListCheckQuestion.DEMAND");
pageFilter.SelectField.Add("Nav_ContentsBasics.Nav_Law.NAME"); pageFilter.SelectField.Add("Nav_ContentsBasics.Nav_Law.NAME");
var result = GetOrderPageEntities<T_SK_CHECK_CONTENTS>(null, pageFilter); var result = GetOrderPageEntities<T_SK_CHECK_CONTENTS>(null, pageFilter);
@ -67,11 +68,11 @@ 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;
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; 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; item.DEMAND = item.DEMAND + tempM;
} }
} }
@ -112,6 +113,7 @@ namespace APT.SK.WebApi.Controllers.Api
} }
} }
var entity = this.GetEntity<T_SK_CHECK_CONTENTS>(null,filter); var entity = this.GetEntity<T_SK_CHECK_CONTENTS>(null,filter);
entity.Nav_ListCheckQuestion = entity.Nav_ListCheckQuestion?.OrderBy(t => t.NUM).ToList();
return entity; return entity;
}); });