2、五环，预试车管理，生成工作包检查表和检查表会签逻辑优化；

3、五环，项目级补充待办
2025-01-08 14:51:16 +08:00
parent f7396815a0
commit f002af50a7
17 changed files with 732 additions and 59 deletions
@@ -78,7 +78,8 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
        /// </summary>
        public void BindGrid(int isPass = -1)
        {
-            var term = Funs.DB.PreRun_SubInspectTerm.FirstOrDefault(x => x.SubInspectId == this.SubInspectId);
+            var db = Funs.DB;
+            var term = db.PreRun_SubInspectTerm.FirstOrDefault(x => x.SubInspectId == this.SubInspectId);
            if (term != null)
            {
                lblIsUnifyWanderAbout.Text = term.IsUnifyWanderAbout == 1 ? "是" : "否";
@@ -87,8 +88,32 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
            }
            //获取子系统
            var data = new List<ConfirmIsPass>();
-            var list = Funs.DB.PreRun_SubInspectTermItem.Where(x => x.SubInspectId == this.SubInspectId).OrderBy(x => x.Sort).ToList();
-            if (list.Count > 0)
+            //var list = Funs.DB.PreRun_SubInspectTermItem.Where(x => x.SubInspectId == this.SubInspectId).OrderBy(x => x.Sort).ToList();
+            var list = (from x in db.PreRun_SubInspectTermItem
+                        join y in db.Sys_User on x.InspectedUser equals y.UserId
+                        where x.SubInspectId == this.SubInspectId
+                        select new
+                        {
+                            x.TermItemId,
+                            x.SubItemId,
+                            x.SubInspectId,
+                            x.WorkInspectName,
+                            x.InspectionResults,
+                            x.InspectionIllustrate,
+                            x.SubcontractorIsPass,
+                            x.SubcontractorRemark,
+                            x.ContractorIsPass,
+                            x.ContractorRemark,
+                            x.SupervisionIsPass,
+                            x.SupervisionRemark,
+                            x.OwnerIsPass,
+                            x.OwnerRemark,
+                            x.Sort,
+                            InspectedUserName = y.UserName
+                        }
+                        ).OrderBy(z => z.Sort).ToList();
+
+            if (list.Count() > 0)
            {
                foreach (var item in list)
                {
@@ -97,6 +122,8 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
                    model.SubItemId = item.SubItemId;
                    model.SubInspectId = item.SubInspectId;
                    model.WorkInspectName = item.WorkInspectName;
+                    model.InspectedUserName = item.InspectedUserName;
+                    model.InspectionResults = item.InspectionResults;
                    model.ConfirmType = this.ConfirmType;
                    model.InspectionIllustrate = item.InspectionIllustrate;
                    model.ConfirmTypeName = this.ConfirmTypeName;
@@ -127,6 +154,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
            Grid1.DataSource = data;
            Grid1.DataBind();
            titleName.Title = this.ConfirmType == 1 ? "分包商确认签字" : this.ConfirmType == 2 ? "承包商确认签字" : this.ConfirmType == 3 ? "监理确认签字" : this.ConfirmType == 4 ? "业主确认签字" : "";
+
        }

        /// <summary>
@@ -139,6 +167,29 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
            BindGrid();
        }

+        /// <summary>
+        /// 检测结果
+        /// </summary>
+        /// <returns></returns>
+        public string Results(object value)
+        {
+            var result = string.Empty;
+
+            if (value != null)
+            {
+                var intVal = int.Parse(value.ToString());
+                if (intVal == 1)
+                {
+                    result = "通过";
+                }
+                else if (intVal == 0)
+                {
+                    result = "未通过";
+                }
+            }
+
+            return result;
+        }
        #endregion

        #region 按钮和事件
@@ -765,6 +816,9 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
            /// 确认类型名称
            /// </summary>
            public string ConfirmTypeName { get; set; }
+            public string InspectedUserName { get; set; }
+
+            public int? InspectionResults { get; set; }
            /// <summary>
            /// 是否通过
            /// </summary>