diff --git a/SGGL/FineUIPro.Web/HJGL/PointTrust/PointBatch.aspx.cs b/SGGL/FineUIPro.Web/HJGL/PointTrust/PointBatch.aspx.cs index aa9b6ba6..61842a18 100644 --- a/SGGL/FineUIPro.Web/HJGL/PointTrust/PointBatch.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/PointTrust/PointBatch.aspx.cs @@ -547,11 +547,14 @@ namespace FineUIPro.Web.HJGL.PointTrust string rateId = this.tvControlItem.SelectedNode.ParentNode.NodeID.Split('|')[0]; string detectionType = this.tvControlItem.SelectedNode.ParentNode.ParentNode.NodeID.Split('|')[0]; this.lbTotalJointNum.Label = "本单位工程检测比例为" + rateStr + "的焊口总数"; - int totalJointNum = (from x in db.HJGL_WeldJoint - join y in db.HJGL_Pipeline on x.PipelineId equals y.PipelineId - where y.DetectionRateId == rateId && y.UnitWorkId == unitWorkId && y.DetectionType == detectionType - select x).Count(); - this.lbTotalJointNum.Text = totalJointNum.ToString(); + var totalJoint = from x in db.HJGL_WeldJoint + join y in db.HJGL_Pipeline on x.PipelineId equals y.PipelineId + where y.DetectionRateId == rateId && y.UnitWorkId == unitWorkId && y.DetectionType == detectionType + select x; + int totalJointNum = totalJoint.Count(); + int weldJointNum = totalJoint.Where(x => x.WeldingDailyId != null).Count(); + int notWeldJointNum = totalJoint.Where(x => x.WeldingDailyId == null).Count(); + this.lbTotalJointNum.Text = totalJointNum.ToString() + ", 已焊:" + weldJointNum.ToString() + ", 未焊:" + notWeldJointNum.ToString(); Model.Base_DetectionRate rate = BLL.Base_DetectionRateService.GetDetectionRateByDetectionRateId(rateId); if (rate != null) {