lpf
/
CNCEC_SUBQHSE_WUHUAN
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix:项目级

This commit is contained in:
geh 2025-03-27 18:14:38 +08:00
parent d3022cef86
commit b928a597c4
7 changed files with 72 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
SGGL/FineUIPro.Web/DataShow/EduTrain.aspx.cs
View File

@ -91,7 +91,8 @@ namespace FineUIPro.Web.DataShow
TrainDepart as UnitName
From Bo_Sheng_Train F
LEFT JOIN Base_Project AS Project ON F.ProjectId=Project.ProjectId
)f WHERE 1=1 and Project.ProjectState ='1' ";
where Project.ProjectState ='1'
)f WHERE 1=1 ";
#region 总数
var strSqlSum = @"select Count(*)as allCount from(
@ -129,7 +130,8 @@ namespace FineUIPro.Web.DataShow
TrainDepart as UnitName
From Bo_Sheng_Train F
LEFT JOIN Base_Project AS Project ON F.ProjectId=Project.ProjectId
)f WHERE 1=1 and Project.ProjectState ='1'" ;
WHERE Project.ProjectState ='1'
)f WHERE 1=1 " ;
#endregion
if (this.drpProject.SelectedValue != Const._Null)

4
SGGL/FineUIPro.Web/DataShow/GJSX.aspx.cs
View File

@ -166,7 +166,7 @@ namespace FineUIPro.Web.DataShow
{
var datetime1 = Funs.GetNewDateTime(this.txtStartTime.Text);
var datetime2 = Funs.GetNewDateTime(this.txtStartTime.Text);
var getT = Funs.DB.GJSX.Where(x => x.ProjectId == projectId.ToString());
var getT = Funs.DB.GJSX.Where(x => x.ProjectId == projectId.ToString() && x.State != "1");
if (datetime1.HasValue)
{
getT = getT.Where(x => x.CreateDate >= datetime1);
@ -210,7 +210,7 @@ namespace FineUIPro.Web.DataShow
{
var datetime1 = Funs.GetNewDateTime(this.txtStartTime.Text);
var datetime2 = Funs.GetNewDateTime(this.txtStartTime.Text);
var getT = Funs.DB.GJSX.Where(x => x.ProjectId == projectId.ToString() && x.State != "0");
var getT = Funs.DB.GJSX.Where(x => x.ProjectId == projectId.ToString() && x.State != "0" && x.State != "1");
if (datetime1.HasValue)
{
getT = getT.Where(x => x.CreateDate >= datetime1);

2
SGGL/FineUIPro.Web/DataShow/GJSXItem.aspx.cs
View File

@ -39,7 +39,7 @@ namespace FineUIPro.Web.DataShow
/// </summary>
private void BindGrid()
{
string strSql = "";
string strSql = "and state <> '1'";
List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@ProjectId", Request.Params["projectId"]));

2
SGGL/FineUIPro.Web/FineUIPro.Web.csproj
View File

@ -19814,7 +19814,7 @@
</FlavorProperties>
</VisualStudio>
</ProjectExtensions>
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v15.0\WebApplications\Microsoft.WebApplication.targets" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v17.0\WebApplications\Microsoft.WebApplication.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">

4
SGGL/FineUIPro.Web/common/mainProject2.aspx
View File

@ -2139,8 +2139,8 @@
const list = [
{ TypeName: "<%=majorRisk%>", ValueAmount: <%=riskData4%> },
{ TypeName: "<%=LowRisk%>", ValueAmount: <%=riskData1%> },
{ TypeName: "<%=GeneralRisk%>", ValueAmount: <%=riskData3%> },
{ TypeName: "<%=GreaterRisk%>", ValueAmount: <%=riskData2%> },
{ TypeName: "<%=GeneralRisk%>", ValueAmount: <%=riskData2%> },
{ TypeName: "<%=GreaterRisk%>", ValueAmount: <%=riskData3%> },
]

74
SGGL/FineUIPro.Web/common/mainProject2.aspx.cs
View File

@ -477,7 +477,7 @@ namespace FineUIPro.Web.common
{
return await Task.Run(() =>
{
var result = Project_HSSEData_HSSEService.GetFinishedNum(ProjectId);
var result = Project_HSSEData_HSSEService.GetCompletedNum(ProjectId);
return result;
});
}
@ -555,7 +555,7 @@ namespace FineUIPro.Web.common
{
return await Task.Run(() =>
{
var result = Project_HSSEData_HSSEService.GetSuperFinishedNum(ProjectId);
var result = Project_HSSEData_HSSEService.GetSuperCompletedNum(ProjectId);
return result;
});
}
@ -903,25 +903,62 @@ namespace FineUIPro.Web.common
List<double> listdata = new List<double>();
double result = 0;
Model.SGGLDB db = Funs.DB;
// var ndtList =
// (from x in db.ProcessControl_NondestructiveTest_New
// where x.ProfessionalName == "工艺管道" && x.ProjectId == ProjectId
// orderby x.CreateDate descending
// select x).FirstOrDefault();
// decimal a = 0, b = 0;
// if (ndtList != null)
// {
// if (ndtList.TotalQuantity.HasValue)
// {
// a += Math.Floor(ndtList.TotalQuantity.Value * Funs.GetNewDecimalOrZero(ndtList.TotalRate) /
// 100);
// b += ndtList.TotalQuantity.Value;
// }
//
// if (!string.IsNullOrEmpty(ndtList.TotalRate))
// {
// result = Convert.ToDouble(ndtList.TotalRate);
// }
// }
// else
// {
// var hjglData =
// (from x in db.HJGL_FL_Data
// where x.ProjectId == ProjectId
// orderby x.CompileDate descending
// select x).FirstOrDefault();
// if (hjglData != null)
// {
// a = Funs.GetNewDecimalOrZero(hjglData.OneTimeFilmQualifiedAmount);
// b = Funs.GetNewDecimalOrZero(hjglData.OneTimeFilmAmount);
// if (a > 0 && b > 0)
// {
// result = Convert.ToDouble(Convert.ToDecimal(100.0) * b / a);
// }
// }
// }
var ndtList =
(from x in db.ProcessControl_NondestructiveTest_New
where x.ProfessionalName == "工艺管道" && x.ProjectId == ProjectId
orderby x.CreateDate descending
select x).FirstOrDefault();
where x.ProjectId == ProjectId
select x).ToList();
decimal a = 0, b = 0;
if (ndtList != null)
if (ndtList.Count > 0)
{
if (ndtList.TotalQuantity.HasValue)
foreach (var item in ndtList)
{
a += Math.Floor(ndtList.TotalQuantity.Value * Funs.GetNewDecimalOrZero(ndtList.TotalRate) /
100);
b += ndtList.TotalQuantity.Value;
}
if (!string.IsNullOrEmpty(ndtList.TotalRate))
{
result = Convert.ToDouble(ndtList.TotalRate);
if (item.TotalQuantity.HasValue)
{
a += Math.Floor(item.TotalQuantity.Value * Funs.GetNewDecimalOrZero(item.TotalRate) /
100);
b += item.TotalQuantity.Value;
}
}
result = Convert.ToDouble(Convert.ToDecimal(100.0) * b / a);
}
else
{
@ -940,7 +977,8 @@ namespace FineUIPro.Web.common
}
}
}
if (b > 0)
{
hjallNumber = b.ToString();
@ -1619,7 +1657,7 @@ where qc.QuantityCompletionId=(select top 1 QuantityCompletionId from[JDGL_Quant
SqlParameter[] Staticparameter = listStaticListStr.ToArray();
DataTable statcitbDataTable = SQLHelper.GetDataTableRunProc("Sp_GJSXStatistic", Staticparameter);
var list = from x in Funs.DB.GJSX where x.ProjectId == this.CurrUser.LoginProjectId select x;
var list = from x in Funs.DB.GJSX where x.ProjectId == this.CurrUser.LoginProjectId && x.State!="1" select x;
var allcount = list.Count(x => x.State == "0") + list.Count(x => x.State != "0" && x.CompleteDate < DateTime.Now);
var closecount = list.Count(x => x.State == "0");
gjsxRate = String.Format("{0:N2}", 100.0 * closecount / allcount);
@ -1709,7 +1747,7 @@ where qc.QuantityCompletionId=(select top 1 QuantityCompletionId from[JDGL_Quant
}
//设备材料
var SbclList = Funs.DB.CLGL_ContractListSum.Where(x => x.C1 == "设备" && x.ProjectId == pid);
var SbclList = Funs.DB.CLGL_ContractListSum.Where(x => x.C1 == "管道" && x.ProjectId == pid);
foreach (var item in SbclList)
{
sbclHtml += "<div class=\"row\">";

12
SGGL/FineUIPro.Web/common/main_new.aspx.cs
View File

@ -847,17 +847,17 @@ namespace FineUIPro.Web.common
{
if (pids == null)
{
var znum = (from x in Funs.DB.GJSX select x).Count();
var znum = (from x in Funs.DB.GJSX where x.State != "1" select x).Count();
divGjsxzj.InnerHtml = znum.ToString();
var dqnum = (from x in Funs.DB.GJSX
where x.CompleteDate <= DateTime.Now
where x.CompleteDate <= DateTime.Now && x.State != "1"
select x).Count().ToString();
divGjsxdq.InnerHtml = dqnum;
var wzdnum = (from x in Funs.DB.GJSX
where x.CompleteDate <= DateTime.Now
&& x.State != "0"
&& x.State != "0" && x.State != "1"
select x).Count().ToString();
divGjsxwzd.InnerHtml = wzdnum;
@ -870,18 +870,18 @@ namespace FineUIPro.Web.common
else
{
var znum = (from x in Funs.DB.GJSX
where pids.Contains(x.ProjectId)
where pids.Contains(x.ProjectId) && x.State != "1"
select x).Count();
divGjsxzj.InnerHtml = znum.ToString();
var dqnum = (from x in Funs.DB.GJSX
where x.CompleteDate <= DateTime.Now && pids.Contains(x.ProjectId)
where x.CompleteDate <= DateTime.Now && pids.Contains(x.ProjectId) && x.State != "1"
select x).Count().ToString();
divGjsxdq.InnerHtml = dqnum;
var wzdnum = (from x in Funs.DB.GJSX
where x.CompleteDate <= DateTime.Now
&& x.State != "0" && pids.Contains(x.ProjectId)
&& x.State != "0" && pids.Contains(x.ProjectId) && x.State != "1"
select x).Count().ToString();
divGjsxwzd.InnerHtml = wzdnum;