20250115 共检通知单修改

SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNoticeEdit.aspx.cs

@@ -59,6 +59,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl
                 this.drpUnitWorkId.DataSource = q;
                 this.drpUnitWorkId.DataBind();
                 Funs.FineUIPleaseSelect(this.drpUnitWorkId);//单位工程
+
                 Funs.FineUIPleaseSelect(this.drpChirldUnitWorkId);//子单位工程
                 Funs.FineUIPleaseSelect(this.drpBranch);//分部工程
                 Funs.FineUIPleaseSelect(this.drpChildBranch);//子分部工程

SGGL/FineUIPro.Web/CQMS/ProcessControl/ShowUnitWork.aspx.cs

@@ -71,20 +71,49 @@ namespace FineUIPro.Web.CQMS.ProcessControl
             this.trWBS.EnableIcons = true;
             this.trWBS.AutoScroll = true;
             this.trWBS.EnableSingleClickExpand = true;
-            var unitWorks = from x in Funs.DB.WBS_UnitWork where x.ProjectId == this.CurrUser.LoginProjectId && (x.SuperUnitWork == null || x.SuperUnitWork == "0") orderby x.UnitWorkCode select x;
+            if (this.CurrUser.UserId == BLL.Const.hfnbdId)//测试账号用
-            foreach (var q in unitWorks)
             {
-                TreeNode newNode = new TreeNode();
+                var unitWorks = from x in Funs.DB.WBS_UnitWork
-                newNode.Text = q.UnitWorkName;
+                                join y in Funs.DB.WBS_DivisionDivide on x.UnitWorkId equals y.UnitWorkId
-                newNode.NodeID = q.UnitWorkId;
+                                where x.ProjectId == this.CurrUser.LoginProjectId 
-                newNode.CommandName = "UnitWork";
+                                && (x.SuperUnitWork == null || x.SuperUnitWork == "0")
-                newNode.EnableExpandEvent = true;
+                                orderby x.UnitWorkCode select new
-                newNode.EnableClickEvent = true;
+                                {
-                this.trWBS.Nodes.Add(newNode);
+                                    x.UnitWorkId,
-                TreeNode emptyNode = new TreeNode();
+                                    x.UnitWorkName
-                emptyNode.Text = "";
+                                };
-                emptyNode.NodeID = "";
+                foreach (var q in unitWorks.Distinct())
-                newNode.Nodes.Add(emptyNode);
+                {
+                    TreeNode newNode = new TreeNode();
+                    newNode.Text = q.UnitWorkName;
+                    newNode.NodeID = q.UnitWorkId;
+                    newNode.CommandName = "UnitWork";
+                    newNode.EnableExpandEvent = true;
+                    newNode.EnableClickEvent = true;
+                    this.trWBS.Nodes.Add(newNode);
+                    TreeNode emptyNode = new TreeNode();
+                    emptyNode.Text = "";
+                    emptyNode.NodeID = "";
+                    newNode.Nodes.Add(emptyNode);
+                }
+            }
+            else
+            {
+                var unitWorks = from x in Funs.DB.WBS_UnitWork where x.ProjectId == this.CurrUser.LoginProjectId && (x.SuperUnitWork == null || x.SuperUnitWork == "0") orderby x.UnitWorkCode select x;
+                foreach (var q in unitWorks)
+                {
+                    TreeNode newNode = new TreeNode();
+                    newNode.Text = q.UnitWorkName;
+                    newNode.NodeID = q.UnitWorkId;
+                    newNode.CommandName = "UnitWork";
+                    newNode.EnableExpandEvent = true;
+                    newNode.EnableClickEvent = true;
+                    this.trWBS.Nodes.Add(newNode);
+                    TreeNode emptyNode = new TreeNode();
+                    emptyNode.Text = "";
+                    emptyNode.NodeID = "";
+                    newNode.Nodes.Add(emptyNode);
+                }
             }
         }
         #endregion
@@ -102,64 +131,174 @@ namespace FineUIPro.Web.CQMS.ProcessControl
             if (e.Node.CommandName == "UnitWork")   //展开工程类型
             {
                 string cnProfessionalId = Request.Params["CNPrefessionalId"];
-                var divisions = (from x in db.WBS_DivisionProject
+                if (this.CurrUser.UserId == BLL.Const.hfnbdId)
-                                 where x.CNProfessionalId == cnProfessionalId && x.ProjectId == this.CurrUser.LoginProjectId && x.SuperDivisionId == null && x.UnitWorkId == e.NodeID && x.IsSelected == true
-                                 orderby x.SortIndex
-                                 select x).ToList();
-                Model.Base_CNProfessional cNProfessional = new Model.Base_CNProfessional();
-                if (divisions.Count() == 0 && cnProfessionalId == BLL.Const.CNProfessionalCVId)
                 {
-                    cNProfessional = (from x in db.Base_CNProfessional where x.CNProfessionalId == BLL.Const.CNProfessionalConstructId orderby x.SortIndex select x).FirstOrDefault();
+                    string professionalName = string.Empty;
+                    var pointCropping = from x in db.Control_PointCropping where x.ControlId == cnProfessionalId select x;
+                    if (pointCropping.FirstOrDefault(x => x.DetectionItems.Contains("设备")) != null)
+                    {
+                        professionalName = "设备";
+                    }
+                    else
+                    {
+                        professionalName = pointCropping.FirstOrDefault().DetectionItems;
+                    }
+                    var divisions = (from x in db.WBS_DivisionProject
+                                     join y in db.Base_CNProfessional on x.CNProfessionalId equals y.CNProfessionalId
+                                     where y.ProfessionalName == professionalName
+                                     && x.ProjectId == this.CurrUser.LoginProjectId
+                                     && x.SuperDivisionId == null
+                                     && x.UnitWorkId == e.NodeID
+                                     && x.IsSelected == true
+                                     orderby x.SortIndex
+                                     select x).ToList();
+                    //}
+                    //if (this.CurrUser.UserId == BLL.Const.hfnbdId)//测试阶段，仅hfnbd账号使用
+                    //{
+                    //Model.Control_PointCropping pc = new Model.Control_PointCropping();
+                    Model.Base_CNProfessional cNProfessional = new Model.Base_CNProfessional();
+                    var pc = Funs.DB.Control_PointCropping.FirstOrDefault(x => (x.ParentId == null || x.ParentId == "") && x.DetectionItems == "土建");
+                    if (divisions.Count() == 0 && pc != null)
+                    {
+                        cNProfessional = (from x in db.Base_CNProfessional where x.ProfessionalName == "土建" orderby x.SortIndex select x).FirstOrDefault();
+                        //pc = (from x in db.Control_PointCropping where (x.ParentId == null || x.ParentId == "") && x.ControlId == "E9AC9563-E338-48B7-867D-488222AD0557" orderby x.OperateTime select x).FirstOrDefault();
+                    }
+                    else
+                    {
+                        cNProfessional = (from x in db.Base_CNProfessional
+                                          where x.ProfessionalName.Contains(professionalName)
+                                          orderby x.SortIndex
+                                          select x).FirstOrDefault();
+                        //pc = (from x in db.Control_PointCropping where (x.ParentId == null || x.ParentId == "") && x.ControlId == cnProfessionalId orderby x.OperateTime select x).FirstOrDefault();
+                    }
+                    if (pc != null)
+                    {
+                        TreeNode newNode = new TreeNode();
+                        newNode.Text = cNProfessional.ProfessionalName;
+                        newNode.NodeID = cNProfessional.CNProfessionalId + "|" + e.NodeID;
+                        newNode.CommandName = "CNProfessional";
+                        newNode.EnableExpandEvent = true;
+                        newNode.EnableClickEvent = true;
+                        newNode.EnableExpandEvent = true;
+                        e.Node.Nodes.Add(newNode);
+                        TreeNode tempNode = new TreeNode();
+                        tempNode.NodeID = "";
+                        tempNode.Text = "";
+                        newNode.Nodes.Add(tempNode);
+                    }
+
                 }
                 else
                 {
-                    cNProfessional = (from x in db.Base_CNProfessional where x.CNProfessionalId == cnProfessionalId orderby x.SortIndex select x).FirstOrDefault();
+                    var divisions = (from x in db.WBS_DivisionProject
-                }
+                                     where x.CNProfessionalId == cnProfessionalId
-                if (cNProfessional != null)
+    && x.ProjectId == this.CurrUser.LoginProjectId
-                {
+    && x.SuperDivisionId == null
-                    TreeNode newNode = new TreeNode();
+    && x.UnitWorkId == e.NodeID
-                    newNode.Text = cNProfessional.ProfessionalName;
+    && x.IsSelected == true
-                    newNode.NodeID = cNProfessional.CNProfessionalId + "|" + e.NodeID;
+                                     orderby x.SortIndex
-                    newNode.CommandName = "CNProfessional";
+                                     select x).ToList();
-                    newNode.EnableExpandEvent = true;
+                    Model.Base_CNProfessional cNProfessional = new Model.Base_CNProfessional();
-                    newNode.EnableClickEvent = true;
+                    if (divisions.Count() == 0 && cnProfessionalId == BLL.Const.CNProfessionalCVId)
-                    newNode.EnableExpandEvent = true;
+                    {
-                    e.Node.Nodes.Add(newNode);
+                        cNProfessional = (from x in db.Base_CNProfessional where x.CNProfessionalId == BLL.Const.CNProfessionalConstructId orderby x.SortIndex select x).FirstOrDefault();
-                    TreeNode tempNode = new TreeNode();
+                    }
-                    tempNode.NodeID = "";
+                    else
-                    tempNode.Text = "";
+                    {
-                    newNode.Nodes.Add(tempNode);
+                        cNProfessional = (from x in db.Base_CNProfessional where x.CNProfessionalId == cnProfessionalId orderby x.SortIndex select x).FirstOrDefault();
+                    }
+                    if (cNProfessional != null)
+                    {
+                        TreeNode newNode = new TreeNode();
+                        newNode.Text = cNProfessional.ProfessionalName;
+                        newNode.NodeID = cNProfessional.CNProfessionalId + "|" + e.NodeID;
+                        newNode.CommandName = "CNProfessional";
+                        newNode.EnableExpandEvent = true;
+                        newNode.EnableClickEvent = true;
+                        newNode.EnableExpandEvent = true;
+                        e.Node.Nodes.Add(newNode);
+                        TreeNode tempNode = new TreeNode();
+                        tempNode.NodeID = "";
+                        tempNode.Text = "";
+                        newNode.Nodes.Add(tempNode);
+                    }
                 }
             }
             else if (e.Node.CommandName == "CNProfessional")   //展开专业
             {
                 string unitWorkId = e.Node.ParentNode.NodeID;
                 string cNProfessionalId = Request.Params["CNPrefessionalId"];
-                var divisions = (from x in db.WBS_DivisionProject
+                if (this.CurrUser.UserId == BLL.Const.hfnbdId)
-                                 where x.CNProfessionalId == cNProfessionalId && x.ProjectId == this.CurrUser.LoginProjectId && x.SuperDivisionId == null && x.UnitWorkId == unitWorkId && x.IsSelected == true
-                                 orderby x.SortIndex
-                                 select x).ToList();
-                foreach (var q in divisions)
                 {
-                    TreeNode newNode = new TreeNode();
+                    string professionalName = string.Empty;
-                    newNode.Text = q.DivisionName;
+                    var pointCropping = from x in db.Control_PointCropping where x.ControlId == cNProfessionalId select x;
-                    newNode.NodeID = q.DivisionProjectId;
+                    if (pointCropping.FirstOrDefault(x => x.DetectionItems.Contains("设备")) != null)
-                    newNode.CommandName = "DivisionProject";
-                    newNode.EnableExpandEvent = true;
-                    newNode.EnableClickEvent = true;
-                    newNode.EnableExpandEvent = true;
-                    e.Node.Nodes.Add(newNode);
-                    var list = (from x in Funs.DB.WBS_DivisionProject
-                                where x.SuperDivisionId == q.DivisionProjectId && x.ProjectId == this.CurrUser.LoginProjectId
-                                 && x.IsSelected == true
-                                orderby x.SortIndex
-                                select x).ToList();
-                    if (list.Count > 0)
                     {
-                        TreeNode tempNode = new TreeNode();
+                        professionalName = "设备";
-                        tempNode.NodeID = "";
+                    }
-                        tempNode.Text = "";
+                    else
-                        newNode.Nodes.Add(tempNode);
+                    {
+                        professionalName = pointCropping.FirstOrDefault().DetectionItems;
+                    }
+                    var divisions = (from x in db.WBS_DivisionProject
+                                     join y in db.Base_CNProfessional on x.CNProfessionalId equals y.CNProfessionalId
+                                     where y.ProfessionalName.Contains(professionalName) && x.ProjectId == this.CurrUser.LoginProjectId && x.SuperDivisionId == null && x.UnitWorkId == unitWorkId && x.IsSelected == true
+                                     orderby x.SortIndex
+                                     select x).ToList();
+
+                    foreach (var q in divisions)
+                    {
+                        TreeNode newNode = new TreeNode();
+                        newNode.Text = q.DivisionName;
+                        newNode.NodeID = q.DivisionProjectId;
+                        newNode.CommandName = "DivisionProject";
+                        newNode.EnableExpandEvent = true;
+                        newNode.EnableClickEvent = true;
+                        newNode.EnableExpandEvent = true;
+                        e.Node.Nodes.Add(newNode);
+                        var list = (from x in Funs.DB.WBS_DivisionProject
+                                    where x.SuperDivisionId == q.DivisionProjectId && x.ProjectId == this.CurrUser.LoginProjectId
+                                     && x.IsSelected == true
+                                    orderby x.SortIndex
+                                    select x).ToList();
+                        if (list.Count > 0)
+                        {
+                            TreeNode tempNode = new TreeNode();
+                            tempNode.NodeID = "";
+                            tempNode.Text = "";
+                            newNode.Nodes.Add(tempNode);
+                        }
+                    }
+                }
+                else
+                {
+                    var divisions = (from x in db.WBS_DivisionProject
+                                     where x.CNProfessionalId==cNProfessionalId && x.ProjectId == this.CurrUser.LoginProjectId && x.SuperDivisionId == null && x.UnitWorkId == unitWorkId && x.IsSelected == true
+                                     orderby x.SortIndex
+                                     select x).ToList();
+
+                    foreach (var q in divisions)
+                    {
+                        TreeNode newNode = new TreeNode();
+                        newNode.Text = q.DivisionName;
+                        newNode.NodeID = q.DivisionProjectId;
+                        newNode.CommandName = "DivisionProject";
+                        newNode.EnableExpandEvent = true;
+                        newNode.EnableClickEvent = true;
+                        newNode.EnableExpandEvent = true;
+                        e.Node.Nodes.Add(newNode);
+                        var list = (from x in Funs.DB.WBS_DivisionProject
+                                    where x.SuperDivisionId == q.DivisionProjectId && x.ProjectId == this.CurrUser.LoginProjectId
+                                     && x.IsSelected == true
+                                    orderby x.SortIndex
+                                    select x).ToList();
+                        if (list.Count > 0)
+                        {
+                            TreeNode tempNode = new TreeNode();
+                            tempNode.NodeID = "";
+                            tempNode.Text = "";
+                            newNode.Nodes.Add(tempNode);
+                        }
                     }
                 }
             }

SGGL/FineUIPro.Web/Web.config

@@ -11,7 +11,7 @@
   <FineUIPro DebugMode="true" Theme="Cupertino"/>
   <appSettings>
     <!--连接字符串-->
-    <add key="ConnectionString" value="Server=.\MSSQLSERVER01;Database=SGGLDB_WH;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Connect Timeout=1200"/>
+    <add key="ConnectionString" value="Server=.\SQL2012;Database=SGGLDB_WH;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Connect Timeout=1200"/>
     <!--<add key="ConnectionString" value="Server=.\MSSQLSERVER01;Database=SGGLDB_WH;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Connect Timeout=1200"/>-->
     <!--系统名称-->
     <add key="SystemName" value="智慧施工管理信息系统V1.0"/>

SGGL/WebAPI/WebAPI.csproj.user

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
     <UseIISExpress>true</UseIISExpress>
     <Use64BitIISExpress />
     <IISExpressSSLPort />