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

Compare commits

base: wyw:b34bcc6313dc2712654c19eaddea8300616badd6
Branches Tags
wyw:master
..
compare: wyw:624ff25360a05f666949231f390e61ce89187b1d
Branches Tags
wyw:master

2 Commits
b34bcc6313 ... 624ff25360

Author SHA1 Message Date
wyw
624ff25360 Merge branch 'master' of http://121.41.2.71:3000/wyw/mh_jy_safe 2026-04-08 17:06:27 +08:00
wyw
0172b55fa2 去除试题 岗位： 
安全意识调查 获取试题
培训教育 获取试题
课件
 2026-04-08 17:05:54 +08:00
3 changed files with 11 additions and 14 deletions
Show Stats Expand all files Collapse all files

9
APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/1SESafeSurveyController.cs
View File

@ -168,10 +168,9 @@ namespace APT.SC.WebApi.Controllers.Api.SE
allUserPostIdS.Add(current?.Nav_Person.POST_ID); allUserPostIdS.Add(current?.Nav_Person.POST_ID);
} }
var testFilter = new BaseFilter(entity.ORG_ID); var testFilter = new BaseFilter(entity.ORG_ID);
testFilter.Include = new string[] { "Nav_Points", "Nav_Posts" }; testFilter.Include = new string[] { "Nav_Points" };//, "Nav_Posts"
var allTests = GetEntities<T_SE_TEST>(st => st.Nav_Points.Any(pt => pointIDS.Contains(pt.POINT_ID.Value)) var allTests = GetEntities<T_SE_TEST>(st => st.Nav_Points.Any(pt => pointIDS.Contains(pt.POINT_ID.Value)), testFilter).ToList();// && (st.Nav_Posts.Any(pt => allUserPostIdS.Contains(pt.POST_ID)) || !st.Nav_Posts.Any())
&& (st.Nav_Posts.Any(pt => allUserPostIdS.Contains(pt.POST_ID)) || !st.Nav_Posts.Any()), testFilter).ToList();
var errorMsg = ""; var errorMsg = "";
foreach (var testPoint in pointIDS) foreach (var testPoint in pointIDS)
{ {
@ -261,9 +260,7 @@ namespace APT.SC.WebApi.Controllers.Api.SE
private void CreateTestList(List<T_SE_TEST> allTests, List<Guid> ret, List<Guid> pointIDS, Guid? allUserPostIdS, int type, int count) private void CreateTestList(List<T_SE_TEST> allTests, List<Guid> ret, List<Guid> pointIDS, Guid? allUserPostIdS, int type, int count)
{ {
var tests = allTests.Where(t => t.TYPE == (SETestTypeEnum)type && var tests = allTests.Where(t => t.TYPE == (SETestTypeEnum)type &&
t.Nav_Points.Any(pt => pointIDS.Contains(pt.POINT_ID.Value)) && t.Nav_Points.Any(pt => pointIDS.Contains(pt.POINT_ID.Value))).OrderBy(t => Guid.NewGuid()).Take(count);// &&(t.Nav_Posts.Any(pt => allUserPostIdS == pt.POST_ID) || !t.Nav_Posts.Any())
(t.Nav_Posts.Any(pt => allUserPostIdS == pt.POST_ID) || !t.Nav_Posts.Any())
).OrderBy(t => Guid.NewGuid()).Take(count);
if (tests != null) if (tests != null)
{ {
if (tests.Count() < count) if (tests.Count() < count)

12
APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/6SETrainRecordController.cs
View File

@ -830,7 +830,7 @@ namespace APT.SC.WebApi.Controllers.Api.SE
var pointIDS = ListTrainContent.Select(t => t.POINT_ID).ToList(); var pointIDS = ListTrainContent.Select(t => t.POINT_ID).ToList();
var testFilter = new BaseFilter(record.ORG_ID); var testFilter = new BaseFilter(record.ORG_ID);
testFilter.Include = new string[] { "Nav_Points", "Nav_Posts" };//岗位也得进去加以限制 testFilter.Include = new string[] { "Nav_Points" };//, "Nav_Posts" 岗位也得进去加以限制
//根据 培训名称 全字 匹配 如果有题库 再判断 知识点 //根据 培训名称 全字 匹配 如果有题库 再判断 知识点
//如果没匹配到题目 只匹配知识点 //如果没匹配到题目 只匹配知识点
@ -841,11 +841,11 @@ namespace APT.SC.WebApi.Controllers.Api.SE
} }
LoginPostID = login.Nav_Person?.POST_ID; LoginPostID = login.Nav_Person?.POST_ID;
bool isNameRule = false; bool isNameRule = false;
var allTests = GetEntities<T_SE_TEST>(st => st.Nav_Points.Any(pt => pointIDS.Contains(pt.POINT_ID.Value)) && (LoginPostID == null || st.Nav_Posts.Count() < 1 || st.Nav_Posts.Any(e => e.POST_ID.HasValue && e.POST_ID.Value == LoginPostID.Value)), testFilter).ToList(); var allTests = GetEntities<T_SE_TEST>(st => st.Nav_Points.Any(pt => pointIDS.Contains(pt.POINT_ID.Value)), testFilter).ToList();// && (LoginPostID == null || st.Nav_Posts.Count() < 1 || st.Nav_Posts.Any(e => e.POST_ID.HasValue && e.POST_ID.Value == LoginPostID.Value))
if (allTests == null || allTests.Count() == 0) if (allTests == null || allTests.Count() == 0)
{ {
isNameRule = true; isNameRule = true;
allTests = GetEntities<T_SE_TEST>(st => st.TRAINNAME == Notify.NAME && (LoginPostID == null || st.Nav_Posts.Count() < 1 || st.Nav_Posts.Any(e => e.POST_ID.HasValue && e.POST_ID.Value == LoginPostID.Value)), testFilter).ToList(); allTests = GetEntities<T_SE_TEST>(st => st.TRAINNAME == Notify.NAME, testFilter).ToList();// && (LoginPostID == null || st.Nav_Posts.Count() < 1 || st.Nav_Posts.Any(e => e.POST_ID.HasValue && e.POST_ID.Value == LoginPostID.Value))
} }
var errorMsg = ""; var errorMsg = "";
@ -1048,7 +1048,7 @@ namespace APT.SC.WebApi.Controllers.Api.SE
} }
var pointIDS = record.Nav_Notify.Nav_TrainContentList.Select(t => t.POINT_ID).ToList(); var pointIDS = record.Nav_Notify.Nav_TrainContentList.Select(t => t.POINT_ID).ToList();
var testFilter = new BaseFilter(filter.GetOrgId()); var testFilter = new BaseFilter(filter.GetOrgId());
testFilter.Include = new string[] { "Nav_Points", "Nav_Posts" };//岗位也得进去加以限制 testFilter.Include = new string[] { "Nav_Points" };//, "Nav_Posts"岗位也得进去加以限制
//根据 培训名称 全字 匹配 如果有题库 再判断 知识点 //根据 培训名称 全字 匹配 如果有题库 再判断 知识点
//如果没匹配到题目 只匹配知识点 //如果没匹配到题目 只匹配知识点
@ -1062,11 +1062,11 @@ namespace APT.SC.WebApi.Controllers.Api.SE
// isNameRule = false; // isNameRule = false;
// allTests = GetEntities<T_SE_TEST>(st => st.Nav_Points.Any(pt => pointIDS.Contains(pt.POINT_ID.Value)) && (LoginPostID == null || st.Nav_Posts.Count() < 1 || st.Nav_Posts.Any(e => e.POST_ID.HasValue && e.POST_ID.Value == LoginPostID.Value)), testFilter).ToList(); // allTests = GetEntities<T_SE_TEST>(st => st.Nav_Points.Any(pt => pointIDS.Contains(pt.POINT_ID.Value)) && (LoginPostID == null || st.Nav_Posts.Count() < 1 || st.Nav_Posts.Any(e => e.POST_ID.HasValue && e.POST_ID.Value == LoginPostID.Value)), testFilter).ToList();
//} //}
var allTests = GetEntities<T_SE_TEST>(st => st.Nav_Points.Any(pt => pointIDS.Contains(pt.POINT_ID.Value)) && (LoginPostID == null || st.Nav_Posts.Count() < 1 || st.Nav_Posts.Any(e => e.POST_ID.HasValue && e.POST_ID.Value == LoginPostID.Value)), testFilter).ToList(); var allTests = GetEntities<T_SE_TEST>(st => st.Nav_Points.Any(pt => pointIDS.Contains(pt.POINT_ID.Value)), testFilter).ToList();//&& (LoginPostID == null || st.Nav_Posts.Count() < 1 || st.Nav_Posts.Any(e => e.POST_ID.HasValue && e.POST_ID.Value == LoginPostID.Value))
if (allTests == null || allTests.Count() == 0) if (allTests == null || allTests.Count() == 0)
{ {
isNameRule = true; isNameRule = true;
allTests = GetEntities<T_SE_TEST>(st => st.TRAINNAME == record.Nav_Notify.NAME && (LoginPostID == null || st.Nav_Posts.Count() < 1 || st.Nav_Posts.Any(e => e.POST_ID.HasValue && e.POST_ID.Value == LoginPostID.Value)), testFilter).ToList(); allTests = GetEntities<T_SE_TEST>(st => st.TRAINNAME == record.Nav_Notify.NAME, testFilter).ToList();//&& (LoginPostID == null || st.Nav_Posts.Count() < 1 || st.Nav_Posts.Any(e => e.POST_ID.HasValue && e.POST_ID.Value == LoginPostID.Value))
} }
var errorMsg = ""; var errorMsg = "";

4
APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/SECoursewearlibrary.cs
View File

@ -178,11 +178,11 @@ namespace APT.SE.WebApi.Controllers.Api
if (item.Nav_Test != null) if (item.Nav_Test != null)
{ {
if (item.Nav_Test.Nav_Points != null && item.Nav_Test.Nav_Points.Count > 0) if (item.Nav_Test.Nav_Points != null && item.Nav_Test.Nav_Points.Count > 0)
listTPost.AddRange(item.Nav_Test.Nav_Posts); listTPoint.AddRange(item.Nav_Test.Nav_Points);
// item.Nav_Test.Nav_Posts = null; // item.Nav_Test.Nav_Posts = null;
//} //}
if (item.Nav_Test.Nav_Posts != null && item.Nav_Test.Nav_Posts.Count > 0) if (item.Nav_Test.Nav_Posts != null && item.Nav_Test.Nav_Posts.Count > 0)
listTPoint.AddRange(item.Nav_Test.Nav_Points); listTPost.AddRange(item.Nav_Test.Nav_Posts);
// item.Nav_Test.Nav_Points = null; // item.Nav_Test.Nav_Points = null;
//} //}
listT.Add(item.Nav_Test); listT.Add(item.Nav_Test);