lpf/SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

代码无效引用清理，试压包资料界面看板修改

Browse Source
This commit is contained in:
李鹏飞
2025-10-10 14:33:21 +08:00
parent 87fb529521
commit 55b798135c
933 changed files with 5897 additions and 7541 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/DigData/CQMSDataCollect.aspx.cs
+3 -3
View File
@@ -115,7 +115,7 @@ namespace FineUIPro.Web.DigData
row[16] = item.Month12;
if (item.SortIndex == 8)
{
if (sum5 > 0 && (sum5- sum6) > 0)
if (sum5 > 0 && (sum5 - sum6) > 0)
{
row[17] = ((sum5 - sum6) / sum5 * 100).ToString("0.##") + "%";
}
@@ -359,8 +359,8 @@ namespace FineUIPro.Web.DigData
{
int year = Funs.GetNewInt(this.drpYear.SelectedValue) ?? DateTime.Now.Year;
var getCheck_CheckMonths = from x in Funs.DB.Check_CheckMonth
where x.Months.Value.Year == year
orderby x.Months
where x.Months.Value.Year == year
orderby x.Months
select x;
if (getCheck_CheckMonths.Count() > 0)
{
SGGL/FineUIPro.Web/DigData/CQMSDataDW.aspx.cs
+3 -5
View File
@@ -1,7 +1,5 @@
using BLL;
using Newtonsoft.Json.Linq;
using System;
using System.Linq;
using System.Text;
namespace FineUIPro.Web.DigData
@@ -33,11 +31,11 @@ namespace FineUIPro.Web.DigData
/// </summary>
private void BindGrid()
{
var getData =CQMSDataDWService.getDataDWList( this.drpProject.SelectedValue,
Funs.GetNewDateTime(this.txtStartTime.Text), Funs.GetNewDateTime(this.txtEndTime.Text),this.Grid1);
var getData = CQMSDataDWService.getDataDWList(this.drpProject.SelectedValue,
Funs.GetNewDateTime(this.txtStartTime.Text), Funs.GetNewDateTime(this.txtEndTime.Text), this.Grid1);
Grid1.RecordCount = CQMSDataDWService.count;
Grid1.DataSource = getData;
Grid1.DataBind();
Grid1.DataBind();
}
/// <summary>
SGGL/FineUIPro.Web/DigData/HSEDataDW.aspx.cs
+4 -4
View File
@@ -33,8 +33,8 @@ namespace FineUIPro.Web.DigData
/// </summary>
private void BindGrid()
{
var getData = HSEDataDWService.getDataDWList( this.drpProject.SelectedValue,
Funs.GetNewDateTime(this.txtStartTime.Text), Funs.GetNewDateTime(this.txtEndTime.Text),this.Grid1);
var getData = HSEDataDWService.getDataDWList(this.drpProject.SelectedValue,
Funs.GetNewDateTime(this.txtStartTime.Text), Funs.GetNewDateTime(this.txtEndTime.Text), this.Grid1);
Grid1.RecordCount = HSEDataDWService.count;
Grid1.DataSource = getData;
Grid1.DataBind();
@@ -44,7 +44,7 @@ namespace FineUIPro.Web.DigData
/// <summary>
/// 计算合计
/// </summary>
private void OutputSummaryData( )
private void OutputSummaryData()
{
int aCount1 = 0, aCount2 = 0, aCount3 = 0;
for (int i = 0; i < Grid1.Rows.Count(); i++)
@@ -53,7 +53,7 @@ namespace FineUIPro.Web.DigData
aCount2 += Funs.GetNewIntOrZero(Grid1.Rows[i].Values[4].ToString());
aCount3 += Funs.GetNewIntOrZero(Grid1.Rows[i].Values[5].ToString());
}
JObject summary = new JObject
{
{ "ProjectName", "合计" },
SGGL/FineUIPro.Web/DigData/HTGLDataDW.aspx.cs
+2 -4
View File
@@ -1,7 +1,5 @@
using BLL;
using Newtonsoft.Json.Linq;
using System;
using System.Linq;
using System.Text;
namespace FineUIPro.Web.DigData
@@ -33,7 +31,7 @@ namespace FineUIPro.Web.DigData
/// </summary>
private void BindGrid()
{
var getData = HTGLDataDWService.getDataDWList( this.drpProject.SelectedValue,this.Grid1);
var getData = HTGLDataDWService.getDataDWList(this.drpProject.SelectedValue, this.Grid1);
Grid1.RecordCount = HTGLDataDWService.count;
Grid1.DataSource = getData;
Grid1.DataBind();
@@ -50,7 +48,7 @@ namespace FineUIPro.Web.DigData
// {
// aCount1 += Funs.GetNewIntOrZero(Grid1.Rows[i].Values[3].ToString());
// }
// JObject summary = new JObject
// {
// { "ProjectName", "合计" },
SGGL/FineUIPro.Web/DigData/JDGLDataDW.aspx.cs
+2 -4
View File
@@ -1,7 +1,5 @@
using BLL;
using Newtonsoft.Json.Linq;
using System;
using System.Linq;
using System.Text;
namespace FineUIPro.Web.DigData
@@ -33,8 +31,8 @@ namespace FineUIPro.Web.DigData
/// </summary>
private void BindGrid()
{
var getData = JDGLDataDWService.getDataDWList( this.drpProject.SelectedValue,
Funs.GetNewDateTime(this.txtStartTime.Text), Funs.GetNewDateTime(this.txtEndTime.Text),this.Grid1);
var getData = JDGLDataDWService.getDataDWList(this.drpProject.SelectedValue,
Funs.GetNewDateTime(this.txtStartTime.Text), Funs.GetNewDateTime(this.txtEndTime.Text), this.Grid1);
Grid1.RecordCount = JDGLDataDWService.count;
Grid1.DataSource = getData;
Grid1.DataBind();
SGGL/FineUIPro.Web/DigData/ProjectDataDW.aspx.cs
+4 -7
View File
@@ -1,9 +1,6 @@
using BLL;
using FineUIPro.Web.HJGL.WeldingReport;
using Model;
using System;
using System.Data;
using System.Data.SqlTypes;
using System.Linq;
namespace FineUIPro.Web.DigData
@@ -129,11 +126,11 @@ namespace FineUIPro.Web.DigData
if (getContractTrack.Count() > 0)
{
estimatedAmount = getContractTrack.Sum(x => x.EstimatedAmount ?? 0);
}
this.lbEstimatedAmount.Text= estimatedAmount.ToString();
this.lbTotalProfit.Text = estimatedAmount > 0 ? Math.Round(contractAmount / estimatedAmount ).ToString() + "%" : "0%";
}
this.lbEstimatedAmount.Text = estimatedAmount.ToString();
this.lbTotalProfit.Text = estimatedAmount > 0 ? Math.Round(contractAmount / estimatedAmount).ToString() + "%" : "0%";
}
SGGL/FineUIPro.Web/DigData/ProjectWBSAnalysis.aspx.cs
+4 -8
View File
@@ -1,17 +1,13 @@
using BLL;
using FineUIPro.Web.CQMS.WBS;
using System;
using System.Collections.Generic;
using System.Data;
using System.Linq;
namespace FineUIPro.Web.DigData
{
public partial class ProjectWBSAnalysis : PageBase
{
{
/// <summary>
/// 项目ID
/// </summary>
/// 项目ID
/// </summary>
public string ProjectId
{
get
@@ -51,7 +47,7 @@ namespace FineUIPro.Web.DigData
/// 绑定数据Grid1
/// </summary>
private void BindGrid()
{
{
var getData = ProjectWBSAnalysisService.getDataDWList(this.ProjectId, this.hdWorkPackageCode.Text, this.Grid1);
Grid1.RecordCount = ProjectWBSAnalysisService.count;
Grid1.DataSource = getData;
SGGL/FineUIPro.Web/DigData/ProjectWBSDW.aspx.cs
+20 -20
View File
@@ -33,7 +33,7 @@ namespace FineUIPro.Web.DigData
{
this.ProjectId = this.CurrUser.LoginProjectId;
////权限按钮方法
// this.ucTree.WorkPackageCode = this.WorkPackageCode;
// this.ucTree.WorkPackageCode = this.WorkPackageCode;
this.ucTree.ProjectId = this.ProjectId;
//this.btnNew.OnClientClick = Window1.GetShowReference("ShowProjectWBSPackage.aspx") + "return false;";
}
@@ -41,7 +41,7 @@ namespace FineUIPro.Web.DigData
protected void changeTree(object sender, EventArgs e)
{
this.hdWorkPackageId.Text = this.ucTree.WorkPackageId;
this.hdWorkPackageId.Text = this.ucTree.WorkPackageId;
initControlItem();
}
@@ -65,13 +65,13 @@ namespace FineUIPro.Web.DigData
/// </summary>
protected void initControlItem()
{
var getControlItem = from x in Funs.DB.WBS_ControlItemAndCycle
where x.WorkPackageId == this.hdWorkPackageId.Text
var getControlItem = from x in Funs.DB.WBS_ControlItemAndCycle
where x.WorkPackageId == this.hdWorkPackageId.Text
select x;
cblControlItem.DataValueField = "ControlItemAndCycleId";
cblControlItem.DataTextField = "ControlItemContent";
cblControlItem.DataSource = getControlItem;
cblControlItem.DataBind();
cblControlItem.DataBind();
SetData();
}
@@ -103,11 +103,11 @@ namespace FineUIPro.Web.DigData
if (item == "HSSE")
{
this.gpHSSE.Hidden = false;
var getLargerHazardListItem =from x in Funs.DB.Solution_LargerHazardListItem
join y in Funs.DB.Solution_LargerHazardList on x.LargerHazardListId equals y.LargerHazardListId
where y.ProjectId == this.ProjectId && x.WorkPackageId.Contains(workPackageId)
&& y.States == Const.State_1
select x;
var getLargerHazardListItem = from x in Funs.DB.Solution_LargerHazardListItem
join y in Funs.DB.Solution_LargerHazardList on x.LargerHazardListId equals y.LargerHazardListId
where y.ProjectId == this.ProjectId && x.WorkPackageId.Contains(workPackageId)
&& y.States == Const.State_1
select x;
if (!string.IsNullOrEmpty(controlItemAndCycleId))
{
getLargerHazardListItem = getLargerHazardListItem.Where(x => x.WorkPackageId.Contains(controlItemAndCycleId));
@@ -133,7 +133,7 @@ namespace FineUIPro.Web.DigData
{
getHazardRegister = getHazardRegister.Where(x => x.WorkPackageId.Contains(controlItemAndCycleId));
}
this.lbHSEProblemCount.Text= getHazardRegister.Count().ToString();
this.lbHSEProblemCount.Text = getHazardRegister.Count().ToString();
}
if (item == "CQMS")
@@ -141,20 +141,20 @@ namespace FineUIPro.Web.DigData
this.gpCQMS.Hidden = false;
//// 实体验收 资料验收
var getSpotCheckDetail = from x in Funs.DB.Check_SpotCheckDetail
join y in Funs.DB.Check_SpotCheck on x.SpotCheckCode equals y.SpotCheckCode
where y.ProjectId == this.ProjectId && x.WorkPackageId.Contains(workPackageId)
&& y.State == "8"
select x;
join y in Funs.DB.Check_SpotCheck on x.SpotCheckCode equals y.SpotCheckCode
where y.ProjectId == this.ProjectId && x.WorkPackageId.Contains(workPackageId)
&& y.State == "8"
select x;
if (!string.IsNullOrEmpty(controlItemAndCycleId))
{
getSpotCheckDetail = getSpotCheckDetail.Where(x => x.WorkPackageId.Contains(controlItemAndCycleId));
}
int all = getSpotCheckDetail.Count();
// this.lbSpotCheck1.Text = all.ToString();
int onesOKCount = getSpotCheckDetail.Where(x => x.IsOnesOK == true).Count(); //一次合格
// this.lbSpotCheck2.Text= okCount.ToString();
// this.lbSpotCheck1.Text = all.ToString();
int onesOKCount = getSpotCheckDetail.Where(x => x.IsOnesOK == true).Count(); //一次合格
// this.lbSpotCheck2.Text= okCount.ToString();
this.lbSpotCheckRate.Text= all > 0 ? Math.Round(onesOKCount * 100.0 / (all * 1.0)).ToString()+"%" : "0%";
this.lbSpotCheckRate.Text = all > 0 ? Math.Round(onesOKCount * 100.0 / (all * 1.0)).ToString() + "%" : "0%";
/// 资料验收合格项目
var getOKSpotCheckDetail = getSpotCheckDetail.Where(x => x.IsOK == true);
@@ -163,7 +163,7 @@ namespace FineUIPro.Web.DigData
this.lbSpotCheckDataRate.Text = okYSCount > 0 ? Math.Round(okDateCount * 100.0 / (okYSCount * 1.0)).ToString() + "%" : "0%";
var getCheck_CheckControl = from x in Funs.DB.Check_CheckControl
where x.ProjectId == this.ProjectId && x.WorkPackageId.Contains(workPackageId)
where x.ProjectId == this.ProjectId && x.WorkPackageId.Contains(workPackageId)
select x;
if (!string.IsNullOrEmpty(controlItemAndCycleId))
{
SGGL/FineUIPro.Web/DigData/ShowProjectWBS.aspx.cs
+8 -9
View File
@@ -2,7 +2,6 @@
using System;
using System.Data;
using System.Linq;
using System.Text;
namespace FineUIPro.Web.DigData
{
@@ -41,7 +40,7 @@ namespace FineUIPro.Web.DigData
////加载树
SetSubUnitProjectTree(this.trWBS);
}
}
@@ -90,7 +89,7 @@ namespace FineUIPro.Web.DigData
/// <param name="sender"></param>
/// <param name="e"></param>
protected void trWBS_NodeExpand(object sender, TreeNodeEventArgs e)
{
{
e.Node.Nodes.Clear();
if (e.Node.CommandName == "ProjectType") //展开工程类型
{
@@ -106,11 +105,11 @@ namespace FineUIPro.Web.DigData
newNode.Text = trUnitWorkItem.UnitWorkCode + "-" + trUnitWorkItem.UnitWorkName;
newNode.NodeID = trUnitWorkItem.UnitWorkId;
newNode.CommandName = "UnitWork";
newNode.EnableExpandEvent = true;
newNode.EnableClickEvent = true;
e.Node.Nodes.Add(newNode);
if (BLL.WorkPackageService.GetWorkPackages1ByUnitWorkId(trUnitWorkItem.UnitWorkId.ToString()) != null)
{
TreeNode temp = new TreeNode();
@@ -155,7 +154,7 @@ namespace FineUIPro.Web.DigData
newNode.Text = workPackage.PackageContent;
newNode.NodeID = workPackage.WorkPackageId;
newNode.CommandName = "WorkPackage";
newNode.ToolTip="["+ workPackage.InitWorkPackageCode+"]";
newNode.ToolTip = "[" + workPackage.InitWorkPackageCode + "]";
newNode.EnableExpandEvent = true;
newNode.EnableClickEvent = true;
e.Node.Nodes.Add(newNode);
@@ -185,7 +184,7 @@ namespace FineUIPro.Web.DigData
{
///Type1|0a1e39d1-693d-4b5f-a2f5-870dda8b9ff2|c0f20302-88e6-4415-9a86-06be5730c420[67]|c76e251e-d690-4d0e-959b-3b618701f6ff[6701]&建筑工程|083-全场管廊|框架/管廊|地基与基础
///返回 树 父节点ID+[初始WBS主键]+"|" +节点ID+[初始WBS主键]+"&"+树父节点名称+"|"+ 节点名称
string selectValues = getSelectIds(this.trWBS.SelectedNode, this.trWBS.SelectedNodeID+this.trWBS.SelectedNode.ToolTip) + "&" + getSelectNames(this.trWBS.SelectedNode, this.trWBS.SelectedNode.Text);
string selectValues = getSelectIds(this.trWBS.SelectedNode, this.trWBS.SelectedNodeID + this.trWBS.SelectedNode.ToolTip) + "&" + getSelectNames(this.trWBS.SelectedNode, this.trWBS.SelectedNode.Text);
if (!string.IsNullOrEmpty(selectValues))
{
PageContext.RegisterStartupScript(ActiveWindow.GetWriteBackValueReference(selectValues) + ActiveWindow.GetHidePostBackReference());
@@ -203,7 +202,7 @@ namespace FineUIPro.Web.DigData
/// <param name="node"></param>
/// <param name="id"></param>
/// <returns></returns>
private string getSelectIds(TreeNode node,string id)
private string getSelectIds(TreeNode node, string id)
{
if (node.ParentNode != null)
{
@@ -232,7 +231,7 @@ namespace FineUIPro.Web.DigData
{
if (node.ParentNode.NodeID == "1" || node.ParentNode.NodeID == "2")
{
name = node.ParentNode.Text + "|" + name;
name = node.ParentNode.Text + "|" + name;
}
else
{
SGGL/FineUIPro.Web/DigData/ShowProjectWBSPackage.aspx.cs
+5 -7
View File
@@ -1,17 +1,15 @@
using BLL;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.Linq;
using AspNet = System.Web.UI.WebControls;
namespace FineUIPro.Web.DigData
{
public partial class ShowProjectWBSPackage : PageBase
{
/// <summary>
///
/// </summary>
@@ -91,7 +89,7 @@ namespace FineUIPro.Web.DigData
if (e.Node.CommandName == "ProjectType") //展开工程类型
{
var trUnitWork = from x in Funs.DB.WBS_UnitWork
where x.ProjectId == this.ProjectId && x.SuperUnitWork == null && x.ProjectType == e.Node.NodeID
where x.ProjectId == this.ProjectId && x.SuperUnitWork == null && x.ProjectType == e.Node.NodeID
select x;
trUnitWork = trUnitWork.OrderBy(x => x.UnitWorkCode);
if (trUnitWork.Count() > 0)
@@ -181,7 +179,7 @@ namespace FineUIPro.Web.DigData
}
}
#endregion
#region Tree点击事件
/// <summary>
/// Tree点击事件
@@ -235,7 +233,7 @@ namespace FineUIPro.Web.DigData
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
Grid1.RecordCount = tb.Rows.Count;
Grid1.RecordCount = tb.Rows.Count;
var table = this.GetPagedDataTable(Grid1, tb);
Grid1.DataSource = table;
Grid1.DataBind();
@@ -259,7 +257,7 @@ namespace FineUIPro.Web.DigData
var getC = Funs.DB.WBS_ControlItemAndCycle.FirstOrDefault(x => x.ControlItemAndCycleId == this.Grid1.SelectedRowID);
if (getC != null)
{
selectValues = getSelectIds(this.trWBS.SelectedNode, this.trWBS.SelectedNodeID + this.trWBS.SelectedNode.ToolTip) + "&" + getSelectNames(this.trWBS.SelectedNode, this.trWBS.SelectedNode.Text) + getC .ControlItemContent+ "$" + this.Grid1.SelectedRowID;
selectValues = getSelectIds(this.trWBS.SelectedNode, this.trWBS.SelectedNodeID + this.trWBS.SelectedNode.ToolTip) + "&" + getSelectNames(this.trWBS.SelectedNode, this.trWBS.SelectedNode.Text) + getC.ControlItemContent + "$" + this.Grid1.SelectedRowID;
}
PageContext.RegisterStartupScript(ActiveWindow.GetWriteBackValueReference(selectValues) + ActiveWindow.GetHidePostBackReference());
}
SGGL/FineUIPro.Web/DigData/WBSAnalysis.aspx.cs
+3 -7
View File
@@ -1,14 +1,10 @@
using BLL;
using FineUIPro.Web.CQMS.WBS;
using System;
using System.Collections.Generic;
using System.Data;
using System.Linq;
namespace FineUIPro.Web.DigData
{
public partial class WBSAnalysis : PageBase
{
{
/// <summary>
/// 加载页面
/// </summary>
@@ -17,7 +13,7 @@ namespace FineUIPro.Web.DigData
protected void Page_Load(object sender, EventArgs e)
{
if (!IsPostBack)
{
{
this.ucTree.IsShowLevel = false;
BindGrid();
}
@@ -34,7 +30,7 @@ namespace FineUIPro.Web.DigData
/// 绑定数据Grid1
/// </summary>
private void BindGrid()
{
{
var getData = WBSAnalysisService.getDataDWList(this.hdWorkPackageCode.Text, this.Grid1);
Grid1.RecordCount = WBSAnalysisService.count;
Grid1.DataSource = getData;
SGGL/FineUIPro.Web/DigData/WBSDW.aspx.cs
+14 -15
View File
@@ -1,5 +1,4 @@
using BLL;
using FineUIPro.Web.CQMS.WBS;
using System;
using System.Data;
using System.Linq;
@@ -7,7 +6,7 @@ using System.Linq;
namespace FineUIPro.Web.DigData
{
public partial class WBSDW : PageBase
{
{
/// <summary>
/// 加载页面
/// </summary>
@@ -16,13 +15,13 @@ namespace FineUIPro.Web.DigData
protected void Page_Load(object sender, EventArgs e)
{
if (!IsPostBack)
{
{
}
}
protected void changeTree(object sender, EventArgs e)
{
this.hdWorkPackageCode.Text = this.ucTree.WorkPackageCode;
this.hdWorkPackageCode.Text = this.ucTree.WorkPackageCode;
initControlItem();
}
@@ -42,8 +41,8 @@ namespace FineUIPro.Web.DigData
/// </summary>
protected void initControlItem()
{
var getControlItem = from x in Funs.DB.WBS_ControlItemInit
where x.WorkPackageCode == this.hdWorkPackageCode.Text
var getControlItem = from x in Funs.DB.WBS_ControlItemInit
where x.WorkPackageCode == this.hdWorkPackageCode.Text
select x;
cblControlItem.DataValueField = "ControlItemCode";
cblControlItem.DataTextField = "ControlItemContent";
@@ -75,7 +74,7 @@ namespace FineUIPro.Web.DigData
}
else
{
workPackageId="["+ workPackageId + "]";
workPackageId = "[" + workPackageId + "]";
}
if (!string.IsNullOrEmpty(workPackageId))
{
@@ -106,30 +105,30 @@ namespace FineUIPro.Web.DigData
this.lbAccident.Text = getAccidentPersonRecord.Count().ToString();
var getHazardRegister = from x in Funs.DB.HSSE_Hazard_HazardRegister
where x.WorkPackageId.Contains(workPackageId) && x.States != null && x.States != "4" && x.States != "0"
where x.WorkPackageId.Contains(workPackageId) && x.States != null && x.States != "4" && x.States != "0"
select x;
if (!string.IsNullOrEmpty(controlItemAndCycleId))
{
getHazardRegister = getHazardRegister.Where(x => x.WorkPackageId.Contains(controlItemAndCycleId));
}
this.lbHazardRegisterCount.Text= getHazardRegister.Count().ToString();
this.lbHazardRegisterCount.Text = getHazardRegister.Count().ToString();
}
if (item == "CQMS")
{
this.gpCQMS.Hidden = false;
//// 实体验收 资料验收
var getSpotCheckDetail = from x in Funs.DB.Check_SpotCheckDetail
join y in Funs.DB.Check_SpotCheck on x.SpotCheckCode equals y.SpotCheckCode
where x.WorkPackageId.Contains(workPackageId) && y.State == "8"
select x;
join y in Funs.DB.Check_SpotCheck on x.SpotCheckCode equals y.SpotCheckCode
where x.WorkPackageId.Contains(workPackageId) && y.State == "8"
select x;
if (!string.IsNullOrEmpty(controlItemAndCycleId))
{
getSpotCheckDetail = getSpotCheckDetail.Where(x => x.WorkPackageId.Contains(controlItemAndCycleId));
}
int all = getSpotCheckDetail.Count();
// this.lbSpotCheck1.Text = all.ToString();
// this.lbSpotCheck1.Text = all.ToString();
int onesOKCount = getSpotCheckDetail.Where(x => x.IsOnesOK == true).Count();
/// this.lbSpotCheck2.Text = okCount.ToString();
/// this.lbSpotCheck2.Text = okCount.ToString();
this.lbSpotCheckRate.Text = all > 0 ? Math.Round(onesOKCount * 100.0 / (all * 1.0)).ToString() + "%" : "0%";
/// 资料验收合格项目
@@ -140,7 +139,7 @@ namespace FineUIPro.Web.DigData
//// 质量检查问题整改率
var getCheck_CheckControl = from x in Funs.DB.Check_CheckControl
where x.WorkPackageId.Contains(workPackageId)
where x.WorkPackageId.Contains(workPackageId)
select x;
if (!string.IsNullOrEmpty(controlItemAndCycleId))
{