代码无效引用清理,试压包资料界面看板修改
This commit is contained in:
@@ -1,11 +1,11 @@
|
||||
using System;
|
||||
using FineUIPro;
|
||||
using MiniExcelLibs;
|
||||
using Model;
|
||||
using System;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
using FineUIPro;
|
||||
using MiniExcelLibs;
|
||||
using Model;
|
||||
|
||||
namespace BLL
|
||||
{
|
||||
@@ -78,27 +78,27 @@ namespace BLL
|
||||
querytable.IsTemplate = false;
|
||||
querytable.ParentId = item.MainProjectQuantityId;
|
||||
var tb = PHTGL_QuantityService.GetPHTGL_QuantityByModle(querytable);
|
||||
var exportmodel = (from x in tb
|
||||
select new
|
||||
{
|
||||
专业= x.Major,
|
||||
分部工程= x.SubProject,
|
||||
分项工程= x.SubItemProject,
|
||||
项目编码= x.ProjectCode,
|
||||
项目名称=x.ProjectName,
|
||||
项目特征描述= x.ProjectDescription,
|
||||
计量单位= x.UnitOfMeasurement,
|
||||
工程量=x.Quantity,
|
||||
全费用固定综合单价=x.TotalCostFixedComprehensiveUnitPrice,
|
||||
主材费=x.MainMaterialCost,
|
||||
合价=x.TotalPrice,
|
||||
计算规则=x.CalculationRule,
|
||||
工作内容=x.WorkContent,
|
||||
备注=x.Remarks,
|
||||
}).ToList();
|
||||
sheets.Add(item.MainProjectQuantityName,exportmodel);
|
||||
var exportmodel = (from x in tb
|
||||
select new
|
||||
{
|
||||
专业 = x.Major,
|
||||
分部工程 = x.SubProject,
|
||||
分项工程 = x.SubItemProject,
|
||||
项目编码 = x.ProjectCode,
|
||||
项目名称 = x.ProjectName,
|
||||
项目特征描述 = x.ProjectDescription,
|
||||
计量单位 = x.UnitOfMeasurement,
|
||||
工程量 = x.Quantity,
|
||||
全费用固定综合单价 = x.TotalCostFixedComprehensiveUnitPrice,
|
||||
主材费 = x.MainMaterialCost,
|
||||
合价 = x.TotalPrice,
|
||||
计算规则 = x.CalculationRule,
|
||||
工作内容 = x.WorkContent,
|
||||
备注 = x.Remarks,
|
||||
}).ToList();
|
||||
sheets.Add(item.MainProjectQuantityName, exportmodel);
|
||||
}
|
||||
string path = Funs.RootPath + @"File\Excel\Temp\招标工作清单-"+ bidProjectQuantity.BidProjectCode+ ".xlsx";
|
||||
string path = Funs.RootPath + @"File\Excel\Temp\招标工作清单-" + bidProjectQuantity.BidProjectCode + ".xlsx";
|
||||
path = path.Replace(".xlsx", string.Format("{0:yyyy-MM-dd-HH-mm}", DateTime.Now) + ".xlsx");
|
||||
MiniExcel.SaveAs(path, sheets);
|
||||
string fileName = "招标工作清单-" + bidProjectQuantity.BidProjectCode + ".xlsx";
|
||||
@@ -117,7 +117,7 @@ namespace BLL
|
||||
{
|
||||
var sheets = new Dictionary<string, object>();
|
||||
var mainProjectList = PHTGL_MainProjectQuantityService.GetPHTGL_MainProjectQuantityById(mainProjectQuantityId);//获取主项
|
||||
if (mainProjectList==null)
|
||||
if (mainProjectList == null)
|
||||
{
|
||||
return;
|
||||
}
|
||||
@@ -126,25 +126,25 @@ namespace BLL
|
||||
querytable.ParentId = mainProjectQuantityId;
|
||||
var tb = PHTGL_QuantityService.GetPHTGL_QuantityByModle(querytable);
|
||||
var exportmodel = (from x in tb
|
||||
select new
|
||||
{
|
||||
专业 = x.Major,
|
||||
分部工程 = x.SubProject,
|
||||
分项工程 = x.SubItemProject,
|
||||
项目编码 = x.ProjectCode,
|
||||
项目名称 = x.ProjectName,
|
||||
项目特征描述 = x.ProjectDescription,
|
||||
计量单位 = x.UnitOfMeasurement,
|
||||
工程量 = x.Quantity,
|
||||
全费用固定综合单价 = x.TotalCostFixedComprehensiveUnitPrice,
|
||||
主材费 = x.MainMaterialCost,
|
||||
合价 = x.TotalPrice,
|
||||
计算规则 = x.CalculationRule,
|
||||
工作内容 = x.WorkContent,
|
||||
备注 = x.Remarks,
|
||||
}).ToList();
|
||||
select new
|
||||
{
|
||||
专业 = x.Major,
|
||||
分部工程 = x.SubProject,
|
||||
分项工程 = x.SubItemProject,
|
||||
项目编码 = x.ProjectCode,
|
||||
项目名称 = x.ProjectName,
|
||||
项目特征描述 = x.ProjectDescription,
|
||||
计量单位 = x.UnitOfMeasurement,
|
||||
工程量 = x.Quantity,
|
||||
全费用固定综合单价 = x.TotalCostFixedComprehensiveUnitPrice,
|
||||
主材费 = x.MainMaterialCost,
|
||||
合价 = x.TotalPrice,
|
||||
计算规则 = x.CalculationRule,
|
||||
工作内容 = x.WorkContent,
|
||||
备注 = x.Remarks,
|
||||
}).ToList();
|
||||
sheets.Add(mainProjectList.MainProjectQuantityName, exportmodel);
|
||||
|
||||
|
||||
string path = Funs.RootPath + @"File\Excel\Temp\招标工作清单-" + mainProjectList.MainProjectQuantityCode + ".xlsx";
|
||||
path = path.Replace(".xlsx", string.Format("{0:yyyy-MM-dd-HH-mm}", DateTime.Now) + ".xlsx");
|
||||
MiniExcel.SaveAs(path, sheets);
|
||||
@@ -202,16 +202,16 @@ namespace BLL
|
||||
q = q.Skip(Grid1.PageSize * Grid1.PageIndex).Take(Grid1.PageSize).ToList();
|
||||
// q = SortConditionHelper.SortingAndPaging(q, Grid1.SortField, Grid1.SortDirection, Grid1.PageIndex, Grid1.PageSize);
|
||||
return from x in q
|
||||
select new
|
||||
{
|
||||
x.BidProjectQuantityId,
|
||||
x.LotNumber,
|
||||
x.BidProjectCode,
|
||||
x.IsMainProject,
|
||||
x.ProjectId,
|
||||
x.CreatorId,
|
||||
x.CreateDate
|
||||
};
|
||||
select new
|
||||
{
|
||||
x.BidProjectQuantityId,
|
||||
x.LotNumber,
|
||||
x.BidProjectCode,
|
||||
x.IsMainProject,
|
||||
x.ProjectId,
|
||||
x.CreatorId,
|
||||
x.CreateDate
|
||||
};
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
Reference in New Issue
Block a user