代码无效引用清理,试压包资料界面看板修改
This commit is contained in:
@@ -11,7 +11,7 @@ namespace BLL
|
||||
/// </summary>
|
||||
public static class ContractStandingBookService
|
||||
{
|
||||
|
||||
|
||||
#region 获取列表
|
||||
/// <summary>
|
||||
/// 记录数
|
||||
@@ -58,7 +58,7 @@ namespace BLL
|
||||
(string.IsNullOrEmpty(table.Retentionmoney) || x.Retentionmoney.Contains(table.Retentionmoney)) &&
|
||||
(string.IsNullOrEmpty(table.CreateDate) || x.CreateDate.Contains(table.CreateDate)) &&
|
||||
(string.IsNullOrEmpty(table.Status) || x.Status.Contains(table.Status)) &&
|
||||
(table.States == null || x.States==table.States) &&
|
||||
(table.States == null || x.States == table.States) &&
|
||||
(string.IsNullOrEmpty(table.ContactUnitOfPartyA) || x.ContactUnitOfPartyA.Contains(table.ContactUnitOfPartyA)) &&
|
||||
(string.IsNullOrEmpty(table.ContactPersonOfPartyA) || x.ContactPersonOfPartyA.Contains(table.ContactPersonOfPartyA)) &&
|
||||
(string.IsNullOrEmpty(table.ContactPersonOfPartyB) || x.ContactPersonOfPartyB.Contains(table.ContactPersonOfPartyB)) &&
|
||||
@@ -72,7 +72,7 @@ namespace BLL
|
||||
(string.IsNullOrEmpty(table.SubcontractingMethod) || x.SubcontractingMethod.Contains(table.SubcontractingMethod)) &&
|
||||
(string.IsNullOrEmpty(table.IsItACentralizedPurchaseSupplier) || x.IsItACentralizedPurchaseSupplier.Contains(table.IsItACentralizedPurchaseSupplier)) &&
|
||||
(string.IsNullOrEmpty(table.Clause) || x.Clause.Contains(table.Clause)) &&
|
||||
(string.IsNullOrEmpty(table.MainContent) || x.MainContent.Contains(table.MainContent))
|
||||
(string.IsNullOrEmpty(table.MainContent) || x.MainContent.Contains(table.MainContent))
|
||||
select x
|
||||
;
|
||||
|
||||
@@ -92,7 +92,7 @@ namespace BLL
|
||||
{
|
||||
return null;
|
||||
}
|
||||
q= q.Take(Grid1.PageSize * Grid1.PageIndex).Skip(Grid1.PageSize * (Grid1.PageIndex)).ToList();
|
||||
q = q.Take(Grid1.PageSize * Grid1.PageIndex).Skip(Grid1.PageSize * (Grid1.PageIndex)).ToList();
|
||||
// q = SortConditionHelper.SortingAndPaging(q, Grid1.SortField, Grid1.SortDirection, Grid1.PageIndex, Grid1.PageSize);
|
||||
return from x in q
|
||||
select new
|
||||
@@ -218,9 +218,9 @@ namespace BLL
|
||||
{
|
||||
ContractId = newtable.ContractId,
|
||||
ProjectId = newtable.ProjectId,
|
||||
UnitId=newtable.UnitId,
|
||||
ProjectName= newtable.ProjectName,
|
||||
ProjectCode= newtable.ProjectCode,
|
||||
UnitId = newtable.UnitId,
|
||||
ProjectName = newtable.ProjectName,
|
||||
ProjectCode = newtable.ProjectCode,
|
||||
ContractName = newtable.ContractName,
|
||||
ContractNum = newtable.ContractNum,
|
||||
Parties = newtable.Parties,
|
||||
@@ -286,9 +286,9 @@ namespace BLL
|
||||
if (newContract != null)
|
||||
{
|
||||
newContract.ProjectId = contract.ProjectId;
|
||||
newContract.UnitId= contract.UnitId;
|
||||
newContract.ProjectName=contract.ProjectName;
|
||||
newContract.ProjectCode=contract.ProjectCode;
|
||||
newContract.UnitId = contract.UnitId;
|
||||
newContract.ProjectName = contract.ProjectName;
|
||||
newContract.ProjectCode = contract.ProjectCode;
|
||||
newContract.ContractCode = contract.ContractCode;
|
||||
newContract.ContractName = contract.ContractName;
|
||||
newContract.ContractNum = contract.ContractNum;
|
||||
@@ -370,7 +370,7 @@ namespace BLL
|
||||
|
||||
public class ContractStandingBooKDtoIn
|
||||
{
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 合同名称
|
||||
///</summary>
|
||||
@@ -379,7 +379,7 @@ namespace BLL
|
||||
/// <summary>
|
||||
/// 合同编号
|
||||
///</summary>
|
||||
[ExcelColumnName("合同编号")]
|
||||
[ExcelColumnName("合同编号")]
|
||||
public string ContractNum { get; set; }
|
||||
|
||||
[ExcelColumnName("项目名称")]
|
||||
@@ -390,7 +390,7 @@ namespace BLL
|
||||
/// <summary>
|
||||
/// 签约方
|
||||
///</summary>
|
||||
[ExcelColumnName("签约方")]
|
||||
[ExcelColumnName("签约方")]
|
||||
public string Parties { get; set; }
|
||||
/// <summary>
|
||||
/// 币种(人民币、美元、欧元、印尼盾)
|
||||
@@ -408,7 +408,7 @@ namespace BLL
|
||||
///</summary>
|
||||
[ExcelColumnName("合同类型")]
|
||||
public string ContractType { get; set; }
|
||||
|
||||
|
||||
/// <summary>
|
||||
///
|
||||
///</summary>
|
||||
@@ -424,7 +424,7 @@ namespace BLL
|
||||
///</summary>
|
||||
[ExcelColumnName("合同属性")]
|
||||
public string ContractAttribute { get; set; }
|
||||
|
||||
|
||||
/// <summary>
|
||||
///
|
||||
///</summary>
|
||||
@@ -455,13 +455,13 @@ namespace BLL
|
||||
///</summary>
|
||||
[ExcelColumnName("质保金")]
|
||||
public string Retentionmoney { get; set; }
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 合同状态
|
||||
///</summary>
|
||||
[ExcelColumnName("合同状态")]
|
||||
public string Status { get; set; }
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 甲方联系单位
|
||||
///</summary>
|
||||
@@ -527,7 +527,7 @@ namespace BLL
|
||||
///</summary>
|
||||
[ExcelColumnName("乙方是否为集采供应商/分包商")]
|
||||
public string IsItACentralizedPurchaseSupplier { get; set; }
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user