报表管理：职业健康危害因素清单

SGGL/BLL/API/HSSE/APITestRecordService.cs

@@ -1,10 +1,11 @@
-using System;
+using EmitMapper;
+using EmitMapper.MappingConfiguration;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using System.Text.RegularExpressions;
 using System.Threading.Tasks;
-using EmitMapper;
-using EmitMapper.MappingConfiguration;
 
 namespace BLL
 {
@@ -503,7 +504,8 @@ namespace BLL
             using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
             {
                 var getDataLists = (from x in db.Training_TestRecord
-                                    join y in db.Training_TestPlan on x.TestPlanId equals y.TestPlanId
+                                    join y in db.Training_TestPlan on x.TestPlanId equals y.TestPlanId into yGroup
+                                    from y in yGroup.DefaultIfEmpty()
                                     where x.ProjectId == projectId && x.TestManId == personId && x.TestStartTime.HasValue
                                     orderby x.TestStartTime descending
                                     select new Model.TestRecordItem