代码无效引用清理,试压包资料界面看板修改
This commit is contained in:
@@ -1,8 +1,5 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
using System.Web.UI.WebControls;
|
||||
|
||||
namespace BLL
|
||||
|
||||
@@ -1,8 +1,5 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace BLL
|
||||
{
|
||||
|
||||
@@ -1,8 +1,5 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
using System.Web.UI.WebControls;
|
||||
|
||||
namespace BLL
|
||||
|
||||
@@ -1,8 +1,5 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace BLL
|
||||
{
|
||||
|
||||
@@ -1,10 +1,7 @@
|
||||
using FineUIPro;
|
||||
using System;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using Model;
|
||||
|
||||
|
||||
namespace BLL
|
||||
@@ -29,7 +26,7 @@ namespace BLL
|
||||
(string.IsNullOrEmpty(table.UnitId) || x.UnitId.Contains(table.UnitId)) &&
|
||||
(string.IsNullOrEmpty(table.FillingMan) || x.FillingMan.Contains(table.FillingMan)) &&
|
||||
(string.IsNullOrEmpty(table.DutyPerson) || x.DutyPerson.Contains(table.DutyPerson)) &&
|
||||
(string.IsNullOrEmpty(table.UpState) || x.UpState.Contains(table.UpState))
|
||||
(string.IsNullOrEmpty(table.UpState) || x.UpState.Contains(table.UpState))
|
||||
select x
|
||||
;
|
||||
|
||||
|
||||
@@ -1,10 +1,7 @@
|
||||
using FineUIPro;
|
||||
using System;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using Model;
|
||||
|
||||
|
||||
namespace BLL
|
||||
@@ -31,7 +28,7 @@ namespace BLL
|
||||
(string.IsNullOrEmpty(table.BusinessCategory) || x.BusinessCategory.Contains(table.BusinessCategory)) &&
|
||||
(string.IsNullOrEmpty(table.Throughput_UnitOfMeasurement) || x.Throughput_UnitOfMeasurement.Contains(table.Throughput_UnitOfMeasurement)) &&
|
||||
(string.IsNullOrEmpty(table.Yield_UnitOfMeasurement) || x.Yield_UnitOfMeasurement.Contains(table.Yield_UnitOfMeasurement)) &&
|
||||
(string.IsNullOrEmpty(table.OperationScale_UnitOfMeasurement) || x.OperationScale_UnitOfMeasurement.Contains(table.OperationScale_UnitOfMeasurement))
|
||||
(string.IsNullOrEmpty(table.OperationScale_UnitOfMeasurement) || x.OperationScale_UnitOfMeasurement.Contains(table.OperationScale_UnitOfMeasurement))
|
||||
select x
|
||||
;
|
||||
|
||||
@@ -97,7 +94,7 @@ namespace BLL
|
||||
{
|
||||
return (from x in Funs.DB.Environmental_EnergyReportItem
|
||||
where x.EnergyReportId == EnergyReportId
|
||||
orderby x.SortIndex,x.SortUnit
|
||||
orderby x.SortIndex, x.SortUnit
|
||||
select x).ToList();
|
||||
}
|
||||
|
||||
@@ -139,7 +136,7 @@ namespace BLL
|
||||
{
|
||||
var q = (from x in Funs.DB.Environmental_EnergyReportItem
|
||||
where x.EnergyReportId == EnergyReportId
|
||||
orderby x.SortIndex,x.SortUnit
|
||||
orderby x.SortIndex, x.SortUnit
|
||||
select x).ToList();
|
||||
//List<Model.Environmental_EnergyReportItem> newItems = new List<Model.Environmental_EnergyReportItem>();
|
||||
//foreach (var item in q)
|
||||
@@ -168,7 +165,7 @@ namespace BLL
|
||||
// newItem.ServiceOperatingIncome_BasePeriod = item.ServiceOperatingIncome_BasePeriod;
|
||||
// newItem.ServiceOperatingIncome_LastYear = item.ServiceOperatingIncome_LastYear;
|
||||
// newItem.ServiceOperatingIncome_ThisYear = item.ServiceOperatingIncome_ThisYear;
|
||||
|
||||
|
||||
// newItems.Add(newItem);
|
||||
//}
|
||||
return q;
|
||||
@@ -213,7 +210,7 @@ namespace BLL
|
||||
db1.SubmitChanges();
|
||||
}
|
||||
|
||||
|
||||
|
||||
public static void UpdateEnvironmental_EnergyReportItem(Model.Environmental_EnergyReportItem newtable)
|
||||
{
|
||||
var db1 = Funs.DB;
|
||||
@@ -277,7 +274,7 @@ namespace BLL
|
||||
db.SubmitChanges();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
@@ -1,8 +1,5 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
using System.Web.UI.WebControls;
|
||||
|
||||
namespace BLL
|
||||
|
||||
@@ -1,8 +1,5 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace BLL
|
||||
{
|
||||
|
||||
@@ -1,8 +1,5 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
using System.Web.UI.WebControls;
|
||||
|
||||
namespace BLL
|
||||
|
||||
@@ -1,8 +1,5 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace BLL
|
||||
{
|
||||
|
||||
@@ -1,11 +1,7 @@
|
||||
using FineUIPro;
|
||||
using System;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Security.Cryptography;
|
||||
using System.Text;
|
||||
using Model;
|
||||
|
||||
|
||||
namespace BLL
|
||||
@@ -91,7 +87,7 @@ namespace BLL
|
||||
FillingDate = newtable.FillingDate,
|
||||
DutyPerson = newtable.DutyPerson,
|
||||
UpState = newtable.UpState,
|
||||
ProjectId=newtable.ProjectId,
|
||||
ProjectId = newtable.ProjectId,
|
||||
};
|
||||
var db1 = Funs.DB;
|
||||
db1.Environmental_ProjectEnergyReport.InsertOnSubmit(table);
|
||||
@@ -142,7 +138,7 @@ namespace BLL
|
||||
table.FillingDate = newtable.FillingDate;
|
||||
table.DutyPerson = newtable.DutyPerson;
|
||||
table.UpState = newtable.UpState;
|
||||
table.ProjectId=newtable.ProjectId;
|
||||
table.ProjectId = newtable.ProjectId;
|
||||
db1.SubmitChanges();
|
||||
}
|
||||
|
||||
|
||||
@@ -1,10 +1,7 @@
|
||||
using FineUIPro;
|
||||
using System;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using Model;
|
||||
|
||||
|
||||
namespace BLL
|
||||
@@ -126,7 +123,7 @@ namespace BLL
|
||||
return (from x in Funs.DB.Environmental_ProjectEnergyReportItem
|
||||
join y in Funs.DB.Environmental_ProjectEnergyReport
|
||||
on x.EnergyReportId equals y.EnergyReportId
|
||||
where y.Year == year && y.Quarters== Quarters
|
||||
where y.Year == year && y.Quarters == Quarters
|
||||
select x).Distinct().ToList();
|
||||
}
|
||||
public static List<Model.Environmental_ProjectEnergyReportItem> GetLastYearItems(int year)
|
||||
@@ -134,7 +131,7 @@ namespace BLL
|
||||
return (from x in Funs.DB.Environmental_ProjectEnergyReportItem
|
||||
join y in Funs.DB.Environmental_ProjectEnergyReport
|
||||
on x.EnergyReportId equals y.EnergyReportId
|
||||
where y.Year == year
|
||||
where y.Year == year
|
||||
select x).Distinct().ToList();
|
||||
}
|
||||
/// <summary>
|
||||
|
||||
Reference in New Issue
Block a user