From 47ec23c97701ff55db3675b7e58d4069cf6100e4 Mon Sep 17 00:00:00 2001
From: gaofei1985 <181547018@qq.com>
Date: Wed, 25 Dec 2024 09:24:30 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SGGL/BLL/ProjectData/ProjectService.cs | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/SGGL/BLL/ProjectData/ProjectService.cs b/SGGL/BLL/ProjectData/ProjectService.cs
index d0a95b6f..3edb8d1f 100644
--- a/SGGL/BLL/ProjectData/ProjectService.cs
+++ b/SGGL/BLL/ProjectData/ProjectService.cs
@@ -141,6 +141,7 @@
                 Progress = project.Progress,
                 ProjType = project.ProjType,
                 ProjPhase = project.ProjPhase,
+                MasterSysId = project.MasterSysId,
             };
             db.Base_Project.InsertOnSubmit(newProject);
             db.SubmitChanges();
@@ -191,6 +192,7 @@
                 newProject.Progress = project.Progress;
                 newProject.ProjType = project.ProjType;
                 newProject.ProjPhase = project.ProjPhase;
+                newProject.MasterSysId = project.MasterSysId;
                 db.SubmitChanges();
                 HSEDataCollectService.ProjectHSEDataCollectSubmission(newProject);
             }
@@ -261,14 +263,15 @@
                             select x).ToList();
                 return list;
             }
-            else {
+            else
+            {
                 var list = (from x in Funs.DB.Base_Project
                             where pids.Contains(x.ProjectId)
                             orderby x.ProjectCode descending
                             select x).ToList();
                 return list;
             }
-          
+
         }
 
 
@@ -327,7 +330,7 @@
         /// 获取userId参与项目下拉框
         /// </summary>
         /// <returns></returns>
-        public static List<Model.Base_Project> GetProjectByUserIdStateDropDownList(string userId, string state,string urlType="")
+        public static List<Model.Base_Project> GetProjectByUserIdStateDropDownList(string userId, string state, string urlType = "")
         {
             if (userId == Const.sysglyId || userId == Const.hfnbdId || userId == Const.sedinId)
             {
@@ -345,7 +348,7 @@
                 if (!string.IsNullOrEmpty(urlType))
                 {
                     //五环的能看所有项目，否则只能看项目用户中有自己或者所属单位是自己单位的
-                    if (getRoleP != null && getUser.UnitId== Const.UnitId_CWCEC)
+                    if (getRoleP != null && getUser.UnitId == Const.UnitId_CWCEC)
                     {
                         return (from x in Funs.DB.Base_Project
                                 where x.ProjectState == state
@@ -356,12 +359,13 @@
                     {
                         return (from x in Funs.DB.Base_Project
                                 join y in Funs.DB.Project_ProjectUser on x.ProjectId equals y.ProjectId
-                                where ( (y.UserId == userId && y.IsPost == true)|| x.UnitId== getUser.UnitId) && x.ProjectState == state
+                                where ((y.UserId == userId && y.IsPost == true) || x.UnitId == getUser.UnitId) && x.ProjectState == state
                                 orderby x.ProjectCode descending
                                 select x).Distinct().ToList();
                     }
                 }
-                else { 
+                else
+                {
                     if (getRoleP != null)
                     {
                         return (from x in Funs.DB.Base_Project
@@ -482,7 +486,7 @@
         /// <param name="dropName"></param>
         /// <param name="userId"></param>
         /// <param name="isShowPlease"></param>
-        public static void InitProjectShortNameByStateDropDownList(FineUIPro.DropDownList dropName, string userId, string state, bool isShowPlease,string urlType="")
+        public static void InitProjectShortNameByStateDropDownList(FineUIPro.DropDownList dropName, string userId, string state, bool isShowPlease, string urlType = "")
         {
             dropName.DataValueField = "ProjectId";
             dropName.DataTextField = "ProjectName";
@@ -706,7 +710,8 @@
 
         #region 加载公司级别项目
         public static List<Model.Base_Project> GetUnEndProjectByUserIdDropDownList(string projectState,
-            string projectName = null, string projectCode = null) {
+            string projectName = null, string projectCode = null)
+        {
             IQueryable<Model.Base_Project> projects = (from x in Funs.DB.Base_Project
                                                        where x.ProjectState == projectState
                                                        orderby x.ProjectCode descending