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/BLL/HJGL/DataImport/DataImportService.cs
+17 -16
View File
@@ -43,20 +43,20 @@ namespace BLL
/// <param name="FileName"></param>
/// <param name="project"></param>
/// <returns></returns>
public static Model.HJGL_DataImport GetLatestFileByFileName(string FileName,string ImportType, string project)
public static Model.HJGL_DataImport GetLatestFileByFileName(string FileName, string ImportType, string project)
{
var q = (from x in Funs.DB.HJGL_DataImport
where x.FileName.Contains(FileName) && x.ProjectId == project&&x.ImportType==ImportType
where x.FileName.Contains(FileName) && x.ProjectId == project && x.ImportType == ImportType
select x
).OrderByDescending(x => x.Version).FirstOrDefault();
return q;
}
public static string ConvertFileType(object ImportType)
public static string ConvertFileType(object ImportType)
{
string TypeName=string.Empty;
string TypeName = string.Empty;
if (ImportType != null)
{
switch (ImportType.ToString ())
switch (ImportType.ToString())
{
case "0":
TypeName = "ISO轴测图";
@@ -77,7 +77,7 @@ namespace BLL
}
return TypeName;
}
public static List<decimal?> GetListVersionByUnitWorkId(string UnitWorkId)
{
@@ -115,13 +115,14 @@ namespace BLL
System.Web.HttpContext.Current.Response.TransmitFile(url, 0, fileSize);
System.Web.HttpContext.Current.Response.Flush();
System.Web.HttpContext.Current.Response.Close();
}
}
}
catch (System.Exception ex)
{
throw;
};
}
;
}
/// <summary>
@@ -150,11 +151,11 @@ namespace BLL
catch (System.Exception)
{
result =false;
result = false;
}
return result;
}
}
/// <summary>
/// 获取当前文件新的版本号
/// </summary>
@@ -173,7 +174,7 @@ namespace BLL
var newVersion = MaxVersion + 0.1m;
return newVersion;
}
public static string Getlatest3DModelNameByUnitWorkId(string UnitWorkId )
public static string Getlatest3DModelNameByUnitWorkId(string UnitWorkId)
{
string result = "";
var q = (from x in Funs.DB.HJGL_DataImport
@@ -184,13 +185,13 @@ namespace BLL
from t in tt.DefaultIfEmpty()
select new
{
FileName = (from x2 in tt where x2.Version == tt.Max(x => x.Version ) select x2.FileName).FirstOrDefault()
FileName = (from x2 in tt where x2.Version == tt.Max(x => x.Version) select x2.FileName).FirstOrDefault()
}
).FirstOrDefault();
//where t.Key == UnitWorkId & x.FileType == "1" select x.Version).Distinct().ToList();
if (q!=null&&!string.IsNullOrEmpty(q.FileName))
if (q != null && !string.IsNullOrEmpty(q.FileName))
{
result=q.FileName.Substring (0,q.FileName.LastIndexOf('.'));
result = q.FileName.Substring(0, q.FileName.LastIndexOf('.'));
}
return result;