代码无效引用清理,试压包资料界面看板修改
This commit is contained in:
@@ -3,8 +3,6 @@ using System;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using Model;
|
||||
|
||||
|
||||
namespace BLL
|
||||
@@ -65,9 +63,9 @@ namespace BLL
|
||||
{
|
||||
return Funs.DB.HJGL_DesignBasisDataImport.FirstOrDefault(x => x.DesignBasisDataImportId == DesignBasisDataImportId);
|
||||
}
|
||||
public static List<Model.HJGL_DesignBasisDataImport> GetDataByUnitWorkIdAndVersion(string unitworkid,decimal version,string dataclassification)
|
||||
public static List<Model.HJGL_DesignBasisDataImport> GetDataByUnitWorkIdAndVersion(string unitworkid, decimal version, string dataclassification)
|
||||
{
|
||||
var q = Funs.DB.HJGL_DesignBasisDataImport.Where(e => e.UnitWorkId == unitworkid && e.Version == version&& e.DataClassification==dataclassification).OrderBy(e => e.CreateDate).ToList();
|
||||
var q = Funs.DB.HJGL_DesignBasisDataImport.Where(e => e.UnitWorkId == unitworkid && e.Version == version && e.DataClassification == dataclassification).OrderBy(e => e.CreateDate).ToList();
|
||||
|
||||
return q;
|
||||
|
||||
@@ -100,7 +98,7 @@ namespace BLL
|
||||
FileId = newtable.FileId,
|
||||
Version = newtable.Version,
|
||||
Remark = newtable.Remark,
|
||||
DataClassification=newtable.DataClassification,
|
||||
DataClassification = newtable.DataClassification,
|
||||
CreateMan = newtable.CreateMan,
|
||||
CreateDate = newtable.CreateDate,
|
||||
};
|
||||
@@ -108,11 +106,12 @@ namespace BLL
|
||||
db1.HJGL_DesignBasisDataImport.InsertOnSubmit(table);
|
||||
db1.SubmitChanges();
|
||||
}
|
||||
public static List<decimal?> GetListVersionByUnitWorkId(string UnitWorkId,string dataclassification)
|
||||
public static List<decimal?> GetListVersionByUnitWorkId(string UnitWorkId, string dataclassification)
|
||||
{
|
||||
//decimal a = 0.1M;
|
||||
var q = (from x in Funs.DB.HJGL_DesignBasisDataImport where x.UnitWorkId == UnitWorkId &&x.DataClassification==dataclassification
|
||||
select x.Version).Distinct().ToList();
|
||||
var q = (from x in Funs.DB.HJGL_DesignBasisDataImport
|
||||
where x.UnitWorkId == UnitWorkId && x.DataClassification == dataclassification
|
||||
select x.Version).Distinct().ToList();
|
||||
return q;
|
||||
}
|
||||
/// <summary>
|
||||
@@ -120,11 +119,12 @@ namespace BLL
|
||||
/// </summary>
|
||||
/// <param name="UnitWorkId"></param>
|
||||
/// <returns></returns>
|
||||
public static decimal GetNewVersionByUnitWorkId(string UnitWorkId,string dataclassification)
|
||||
public static decimal GetNewVersionByUnitWorkId(string UnitWorkId, string dataclassification)
|
||||
{
|
||||
decimal MaxVersion = 0.0M;
|
||||
var q = (from x in Funs.DB.HJGL_DesignBasisDataImport where x.UnitWorkId == UnitWorkId && x.DataClassification == dataclassification
|
||||
select x.Version).Distinct().ToList();
|
||||
var q = (from x in Funs.DB.HJGL_DesignBasisDataImport
|
||||
where x.UnitWorkId == UnitWorkId && x.DataClassification == dataclassification
|
||||
select x.Version).Distinct().ToList();
|
||||
if (q != null && q.Count() > 0)
|
||||
{
|
||||
MaxVersion = (decimal)q.Max();
|
||||
@@ -133,11 +133,11 @@ namespace BLL
|
||||
return newVersion;
|
||||
}
|
||||
|
||||
public static decimal GetNowVersionByUnitWorkId(string unitworkId,string dataclassification)
|
||||
public static decimal GetNowVersionByUnitWorkId(string unitworkId, string dataclassification)
|
||||
{
|
||||
decimal newVersion=0.0M;
|
||||
var q= Funs.DB.HJGL_DesignBasisDataImportVerSionLog.FirstOrDefault(x => x.UnitWorkId == unitworkId && x.DataClassification == dataclassification);
|
||||
if (q!=null)
|
||||
decimal newVersion = 0.0M;
|
||||
var q = Funs.DB.HJGL_DesignBasisDataImportVerSionLog.FirstOrDefault(x => x.UnitWorkId == unitworkId && x.DataClassification == dataclassification);
|
||||
if (q != null)
|
||||
{
|
||||
newVersion = (decimal)q.Version;
|
||||
|
||||
@@ -145,10 +145,10 @@ namespace BLL
|
||||
|
||||
return newVersion;
|
||||
}
|
||||
public static void InitVersionDownList(FineUIPro.DropDownList dropName, string UnitWorkId,string dataClassification)
|
||||
public static void InitVersionDownList(FineUIPro.DropDownList dropName, string UnitWorkId, string dataClassification)
|
||||
{
|
||||
|
||||
dropName.DataSource = GetListVersionByUnitWorkId(UnitWorkId,dataClassification);
|
||||
dropName.DataSource = GetListVersionByUnitWorkId(UnitWorkId, dataClassification);
|
||||
dropName.DataBind();
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user