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

20240805 单位工程设置修改

Browse Source
This commit is contained in:
毕文静
2024-08-05 16:16:22 +08:00
parent 6feffba060
commit 83340dd172
26 changed files with 652 additions and 921 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/BLL/ProjectData/UnitWorkService.cs
+9 -9
View File
@@ -245,7 +245,7 @@ namespace BLL
/// <returns></returns>
public static ListItem[] GetUnitWorkList(string projectId)
{
List<Model.WBS_UnitWork> q = (from x in Funs.DB.WBS_UnitWork where x.ProjectId == projectId && x.SuperUnitWork == null orderby x.UnitWorkCode select x).ToList();
List<Model.WBS_UnitWork> q = (from x in Funs.DB.WBS_UnitWork where x.ProjectId == projectId && (x.SuperUnitWork == null || x.SuperUnitWork == "0") orderby x.UnitWorkCode select x).ToList();
ListItem[] item = new ListItem[q.Count()];
for (int i = 0; i < q.Count(); i++)
{
@@ -278,11 +278,11 @@ namespace BLL
/// <returns></returns>
public static List<Model.WBS_UnitWork> GetUnitWorkLists(string projectId)
{
return (from x in Funs.DB.WBS_UnitWork where x.ProjectId == projectId && x.SuperUnitWork == null orderby x.UnitWorkCode select x).ToList();
return (from x in Funs.DB.WBS_UnitWork where x.ProjectId == projectId && (x.SuperUnitWork == null || x.SuperUnitWork == "0") orderby x.UnitWorkCode select x).ToList();
}
public static ListItem[] GetUnitWork(string projectId)
{
List<Model.WBS_UnitWork> q = (from x in Funs.DB.WBS_UnitWork where x.ProjectId == projectId && x.SuperUnitWork == null orderby x.UnitWorkCode select x).ToList();
List<Model.WBS_UnitWork> q = (from x in Funs.DB.WBS_UnitWork where x.ProjectId == projectId && (x.SuperUnitWork == null || x.SuperUnitWork == "0") orderby x.UnitWorkCode select x).ToList();
ListItem[] item = new ListItem[q.Count()];
for (int i = 0; i < q.Count(); i++)
{
@@ -292,7 +292,7 @@ namespace BLL
}
public static ListItem[] GetUnitWork2(string projectId)
{
List<Model.WBS_UnitWork> q = (from x in Funs.DB.WBS_UnitWork where x.ProjectId == projectId && x.SuperUnitWork == null orderby x.UnitWorkCode select x).ToList();
List<Model.WBS_UnitWork> q = (from x in Funs.DB.WBS_UnitWork where x.ProjectId == projectId && (x.SuperUnitWork == null || x.SuperUnitWork == "0") orderby x.UnitWorkCode select x).ToList();
ListItem[] item = new ListItem[q.Count()];
for (int i = 0; i < q.Count(); i++)
{
@@ -390,7 +390,7 @@ namespace BLL
public static List<Model.WBS_UnitWork> GetUnitWorkListByPid(string projectId)
{
Model.SGGLDB db = Funs.DB;
List<Model.WBS_UnitWork> q = (from x in db.WBS_UnitWork where x.ProjectId == projectId && x.SuperUnitWork == null orderby x.UnitWorkCode select x).ToList();
List<Model.WBS_UnitWork> q = (from x in db.WBS_UnitWork where x.ProjectId == projectId && (x.SuperUnitWork == null||x.SuperUnitWork=="0") orderby x.UnitWorkCode select x).ToList();
return q;
}
public static Model.WBS_UnitWork getUnitWorkByUnitWorkId(string UnitWorkId)
@@ -412,7 +412,7 @@ namespace BLL
/// <returns></returns>
public static ListItem[] GetUnitWorkListByProjectType(string projectId, string projectType)
{
List<Model.WBS_UnitWork> q = (from x in Funs.DB.WBS_UnitWork where x.ProjectId == projectId && x.SuperUnitWork == null && x.ProjectType == projectType orderby x.UnitWorkCode select x).ToList();
List<Model.WBS_UnitWork> q = (from x in Funs.DB.WBS_UnitWork where x.ProjectId == projectId && (x.SuperUnitWork == null||x.SuperUnitWork=="0") && x.ProjectType == projectType orderby x.UnitWorkCode select x).ToList();
ListItem[] item = new ListItem[q.Count()];
for (int i = 0; i < q.Count(); i++)
{
@@ -497,7 +497,7 @@ namespace BLL
public static void InitUnitWorkDropDownList(FineUIPro.DropDownList dropName, string projectId, bool isShowPlease)
{
var unitWorks = from x in Funs.DB.WBS_UnitWork
where x.ProjectId == projectId && x.SuperUnitWork == null
where x.ProjectId == projectId && (x.SuperUnitWork == null || x.SuperUnitWork == "0")
orderby x.UnitWorkCode
select new
{
@@ -524,7 +524,7 @@ namespace BLL
public static void InitUnitWorkNameDropDownList(FineUIPro.DropDownList dropName, string projectId, bool isShowPlease)
{
var unitWorks = from x in Funs.DB.WBS_UnitWork
where x.ProjectId == projectId && x.SuperUnitWork == null
where x.ProjectId == projectId && (x.SuperUnitWork == null || x.SuperUnitWork == "0")
orderby x.UnitWorkCode
select new
{
@@ -550,7 +550,7 @@ namespace BLL
public static string GetUnitWorkALLName(string unitWorkId)
{
string name = string.Empty;
var getu = Funs.DB.WBS_UnitWork.FirstOrDefault(x => x.UnitWorkId == unitWorkId && x.SuperUnitWork == null);
var getu = Funs.DB.WBS_UnitWork.FirstOrDefault(x => x.UnitWorkId == unitWorkId && (x.SuperUnitWork == null || x.SuperUnitWork == "0"));
if (getu != null)
{
if (!string.IsNullOrEmpty(getu.ProjectType))