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/TestPackage/TestPackageEditService.cs
+27 -21
View File
@@ -1,6 +1,4 @@
using Model;
using NPOI.SS.Formula.Functions;
using NPOI.SS.UserModel;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -12,13 +10,20 @@ namespace BLL
{
public enum State : int
{
未确认 = 0,
已确认 = 1,
待整改 = 2,
已整改 = 3,
已完成 = 4,
试压前条件未确认 = 0,
试压前条件已确认 = 1,
尾项检查待整改 = 2,
尾项检查已整改 = 3,
试压包已完成 = 4,
}
public static Dictionary<int, string> StateMap = new Dictionary<int, string>()
{
{ 0, State.试压前条件未确认.ToString()},
{ 1, State.试压前条件已确认.ToString()},
{ 2, State.尾项检查待整改.ToString()},
{ 3, State.尾项检查已整改.ToString()},
{ 4, State.试压包已完成.ToString()},
};
/// <summary>
/// 根据试压Id获取用于试压信息
/// </summary>
@@ -441,7 +446,7 @@ namespace BLL
{
var q = Funs.DB.PTP_TestPackage.Where(e => e.ProjectId == projectid).ToList();
return q;
}
}
public static void DeletePipelineListByUnitWorkId(string unitworkId)
{
@@ -508,33 +513,33 @@ namespace BLL
Model.SGGLDB db = Funs.DB;
var testPackage = db.PTP_TestPackage.FirstOrDefault(p => p.PTP_ID == PTP_ID);
if (testPackage == null) return null; // 无效试压包，直接返回空结果
result.PTP_ID= PTP_ID;
result.PTP_ID = PTP_ID;
result.TestPackageNo = testPackage.TestPackageNo;
result.UnitWorkName = BLL.UnitWorkService.GetUnitWorkALLName(testPackage.UnitWorkId);
//判断当前试压包的状态
result.StateStr = State.未确认.ToString();
result.StateStr = State.试压前条件未确认.ToString();
if (testPackage.AduditDate.HasValue)
{
result.StateStr=State.已确认.ToString();
result.StateStr = State.试压前条件已确认.ToString();
}
var PtpItemEndCheckList=(from x in db.PTP_ItemEndCheckList where x.PTP_ID==PTP_ID select x).FirstOrDefault();
if (PtpItemEndCheckList != null )
var PtpItemEndCheckList = (from x in db.PTP_ItemEndCheckList where x.PTP_ID == PTP_ID select x).FirstOrDefault();
if (PtpItemEndCheckList != null)
{
if (PtpItemEndCheckList.State == Const.TestPackage_Complete)
{
result.StateStr = State.已整改.ToString();
result.StateStr = State.尾项检查已整改.ToString();
}
else
{
result.StateStr = State.待整改.ToString();
result.StateStr = State.尾项检查待整改.ToString();
}
}
if (testPackage.FinishDate.HasValue)
{
result.StateStr = State.已完成.ToString();
result.StateStr = State.试压包已完成.ToString();
}
// 当前试压包下所有管线ID集合
@@ -709,10 +714,10 @@ namespace BLL
{
Model.SGGLDB db = Funs.DB;
// 获取该单位工程下所有试压包
int totalPipelines = db.PTP_TestPackage.Count(x => x.ProjectId == projectId && x.UnitWorkId == unitWorkId) ;
int totalPipelines = db.PTP_TestPackage.Count(x => x.ProjectId == projectId && x.UnitWorkId == unitWorkId);
if (totalPipelines == 0)
return 0M;
int finishedPipelines = db.PTP_TestPackage.Count(x => x.ProjectId == projectId && x.UnitWorkId == unitWorkId&&x.FinishDate.HasValue);
return 0M;
int finishedPipelines = db.PTP_TestPackage.Count(x => x.ProjectId == projectId && x.UnitWorkId == unitWorkId && x.FinishDate.HasValue);
if (totalPipelines == 0)
return 0M;
return Math.Round((decimal)finishedPipelines / totalPipelines * 100, 2);
@@ -725,7 +730,8 @@ namespace BLL
var groupQuery = db.PTP_TestPackage
.Where(x => x.ProjectId == projectId)
.GroupBy(x => x.UnitWorkId)
.Select(g => new {
.Select(g => new
{
UnitWorkId = g.Key,
Total = g.Count(),
Finished = g.Count(t => t.FinishDate.HasValue)