葛恒：奖惩

2026-03-16 20:12:55 +08:00
parent 13364fcbf7
commit ab33ffa365
53 changed files with 6455 additions and 1032 deletions
@@ -151,6 +151,8 @@
                MasterSysId = project.MasterSysId,
                SubjectUnit = project.SubjectUnit,
                SubjectProject = project.SubjectProject,
+                SubjectUnitApiUrl = project.SubjectUnitApiUrl,
+                SubjectUnitWebUrl = project.SubjectUnitWebUrl,
            };
            db.Base_Project.InsertOnSubmit(newProject);
            db.SubmitChanges();
@@ -207,9 +209,11 @@
                newProject.Progress = project.Progress;
                newProject.ProjType = project.ProjType;
                newProject.ProjPhase = project.ProjPhase;
-                newProject.MasterSysId = project.MasterSysId; 
+                newProject.MasterSysId = project.MasterSysId;
                newProject.SubjectUnit = project.SubjectUnit;
                newProject.SubjectProject = project.SubjectProject;
+                newProject.SubjectUnitApiUrl = project.SubjectUnitApiUrl;
+                newProject.SubjectUnitWebUrl = project.SubjectUnitWebUrl;
                db.SubmitChanges();
                HSEDataCollectService.ProjectHSEDataCollectSubmission(newProject);
            }
@@ -286,15 +290,15 @@
                {
                    result = result.Where(e => pids.Contains(e.ProjectId)).ToList();
                    return result;
-                } 
+                }
            }
            else
            {

-                var list = (from x in Funs.DB.Base_Project 
-                    where x.ProjectState == Const.ProjectState_1 || x.ProjectState == null
+                var list = (from x in Funs.DB.Base_Project
+                            where x.ProjectState == Const.ProjectState_1 || x.ProjectState == null
                            orderby x.ProjectCode descending
-                    select x).ToList();
+                            select x).ToList();
                var policy = new CacheItemPolicy
                {
                    AbsoluteExpiration = DateTimeOffset.Now.AddMinutes(Const.CacheMinutes),
@@ -309,8 +313,8 @@
                {
                    var result = list.Where(e => pids.Contains(e.ProjectId)).ToList();
                    return result;
-                } 
-            }  
+                }
+            }
        }


@@ -22,6 +22,29 @@ namespace BLL
            return Funs.DB.ProjectData_TeamGroup.FirstOrDefault(e => e.TeamGroupId == teamGroupId);
        }

+        #region 根据班组ID得到班组名称
+        /// <summary>
+        /// 根据班组ID得到班组名称
+        /// </summary>
+        /// <param name="TeamGroupId"></param>
+        /// <returns></returns>
+        public static string getTeamGroupNameById(string TeamGroupId)
+        {
+            string TeamGroupName = string.Empty;
+            if (!string.IsNullOrEmpty(TeamGroupId))
+            {
+                var q = GetTeamGroupById(TeamGroupId);
+                if (q != null)
+                {
+                    TeamGroupName = q.TeamGroupName;
+                }
+            }
+
+            return TeamGroupName;
+        }
+        #endregion
+
+
        /// <summary>
        /// 添加班组信息
        /// </summary>