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;
SGGL/BLL/HJGL/DataImport/HJGL_DesignBasisDataImport.cs
+17 -17
View File
@@ -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();
}
SGGL/BLL/HJGL/DataImport/HJGL_DesignBasisDataImportVerSionLog.cs
+9 -15
View File
@@ -1,10 +1,4 @@
using FineUIPro;
using System;
using System.Collections;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using Model;
using System.Linq;
namespace BLL
@@ -17,10 +11,10 @@ namespace BLL
return Funs.DB.HJGL_DesignBasisDataImportVerSionLog.FirstOrDefault(x => x.DesignBasisDataImportVerSionLogId == DesignBasisDataImportVerSionLogId);
}
public static Model.HJGL_DesignBasisDataImportVerSionLog GetHJGL_DesignBasisDataImportVerSionLogByunitworkId(string unitworkId,string DataClassification)
public static Model.HJGL_DesignBasisDataImportVerSionLog GetHJGL_DesignBasisDataImportVerSionLogByunitworkId(string unitworkId, string DataClassification)
{
var q = Funs.DB.HJGL_DesignBasisDataImportVerSionLog.FirstOrDefault(x => x.UnitWorkId == unitworkId&&x.DataClassification== DataClassification);
var q = Funs.DB.HJGL_DesignBasisDataImportVerSionLog.FirstOrDefault(x => x.UnitWorkId == unitworkId && x.DataClassification == DataClassification);
return q;
}
public static void AddHJGL_DesignBasisDataImportVerSionLog(Model.HJGL_DesignBasisDataImportVerSionLog newtable)
@@ -50,18 +44,18 @@ namespace BLL
table.ProjectId = newtable.ProjectId;
table.UnitWorkId = newtable.UnitWorkId;
table.Version = newtable.Version;
table.DataClassification=newtable.DataClassification;
table.DataClassification = newtable.DataClassification;
db1.SubmitChanges();
}
}
public static void UpdateVersion(string projectId,string unitworkId,decimal version,string DataClassification)
public static void UpdateVersion(string projectId, string unitworkId, decimal version, string DataClassification)
{
var q = GetHJGL_DesignBasisDataImportVerSionLogByunitworkId(unitworkId,DataClassification);
var q = GetHJGL_DesignBasisDataImportVerSionLogByunitworkId(unitworkId, DataClassification);
var db1 = Funs.DB;
if (q!=null)
if (q != null)
{
q.Version = version;
db1.SubmitChanges();
@@ -75,7 +69,7 @@ namespace BLL
ProjectId = projectId,
UnitWorkId = unitworkId,
Version = version,
DataClassification= DataClassification
DataClassification = DataClassification
};
db1.HJGL_DesignBasisDataImportVerSionLog.InsertOnSubmit(table);
db1.SubmitChanges();