lpf
/
CNCEC_SUBQHSE_WUHUAN
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交代码

This commit is contained in:
高飞 2024-12-25 09:24:30 +08:00
parent 9494edc1eb
commit 47ec23c977
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
SGGL/BLL/ProjectData/ProjectService.cs
View File

@ -141,6 +141,7 @@
Progress = project.Progress, Progress = project.Progress,
ProjType = project.ProjType, ProjType = project.ProjType,
ProjPhase = project.ProjPhase, ProjPhase = project.ProjPhase,
MasterSysId = project.MasterSysId,
}; };
db.Base_Project.InsertOnSubmit(newProject); db.Base_Project.InsertOnSubmit(newProject);
db.SubmitChanges(); db.SubmitChanges();
@ -191,6 +192,7 @@
newProject.Progress = project.Progress; newProject.Progress = project.Progress;
newProject.ProjType = project.ProjType; newProject.ProjType = project.ProjType;
newProject.ProjPhase = project.ProjPhase; newProject.ProjPhase = project.ProjPhase;
newProject.MasterSysId = project.MasterSysId;
db.SubmitChanges(); db.SubmitChanges();
HSEDataCollectService.ProjectHSEDataCollectSubmission(newProject); HSEDataCollectService.ProjectHSEDataCollectSubmission(newProject);
} }
@ -261,14 +263,15 @@
select x).ToList(); select x).ToList();
return list; return list;
} }
else { else
{
var list = (from x in Funs.DB.Base_Project var list = (from x in Funs.DB.Base_Project
where pids.Contains(x.ProjectId) where pids.Contains(x.ProjectId)
orderby x.ProjectCode descending orderby x.ProjectCode descending
select x).ToList(); select x).ToList();
return list; return list;
} }
} }
@ -327,7 +330,7 @@
/// 获取userId参与项目下拉框 /// 获取userId参与项目下拉框
/// </summary> /// </summary>
/// <returns></returns> /// <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) if (userId == Const.sysglyId || userId == Const.hfnbdId || userId == Const.sedinId)
{ {
@ -345,7 +348,7 @@
if (!string.IsNullOrEmpty(urlType)) 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 return (from x in Funs.DB.Base_Project
where x.ProjectState == state where x.ProjectState == state
@ -356,12 +359,13 @@
{ {
return (from x in Funs.DB.Base_Project return (from x in Funs.DB.Base_Project
join y in Funs.DB.Project_ProjectUser on x.ProjectId equals y.ProjectId 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 orderby x.ProjectCode descending
select x).Distinct().ToList(); select x).Distinct().ToList();
} }
} }
else { else
{
if (getRoleP != null) if (getRoleP != null)
{ {
return (from x in Funs.DB.Base_Project return (from x in Funs.DB.Base_Project
@ -482,7 +486,7 @@
/// <param name="dropName"></param> /// <param name="dropName"></param>
/// <param name="userId"></param> /// <param name="userId"></param>
/// <param name="isShowPlease"></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.DataValueField = "ProjectId";
dropName.DataTextField = "ProjectName"; dropName.DataTextField = "ProjectName";
@ -706,7 +710,8 @@
#region 加载公司级别项目 #region 加载公司级别项目
public static List<Model.Base_Project> GetUnEndProjectByUserIdDropDownList(string projectState, 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 IQueryable<Model.Base_Project> projects = (from x in Funs.DB.Base_Project
where x.ProjectState == projectState where x.ProjectState == projectState
orderby x.ProjectCode descending orderby x.ProjectCode descending