1

2026-06-17 18:37:50 +08:00
parent 2736e8ad89
commit 75d7c48ff2
22 changed files with 286 additions and 10 deletions
@@ -19,6 +19,8 @@ namespace BLL
            using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
            {
                var query = from x in db.HJGL_WeldJoint
+                            join p in db.Base_Project on x.ProjectId equals p.ProjectId into projects
+                            from p in projects.DefaultIfEmpty()
                            join g in db.Base_GrooveType on x.GrooveTypeId equals g.GrooveTypeId into grooveTypes
                            from g in grooveTypes.DefaultIfEmpty()
                            where x.WeldJointId == weldJointId
@@ -29,6 +31,7 @@ namespace BLL
                                PipelineId = x.PipelineId,
                                PipelineCode = x.PipelineCode,
                                ProjectId = x.ProjectId,
+                                ProjectName = p == null ? string.Empty : p.ProjectName,
                                GrooveTypeId = x.GrooveTypeId,
                                GrooveTypeCode = g == null ? string.Empty : g.GrooveTypeCode,
                                GrooveTypeName = g == null ? string.Empty : g.GrooveTypeName,