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

1移交子表状态判断逻辑调整

This commit is contained in:
夏菊 2025-02-17 12:15:10 +08:00
parent 8039877553
commit d7504526a4
16 changed files with 64 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19357,7 +19357,7 @@
</FlavorProperties> </FlavorProperties>
</VisualStudio> </VisualStudio>
</ProjectExtensions> </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. <!-- 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. Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild"> <Target Name="BeforeBuild">

8
SGGL/FineUIPro.Web/Transfer/CivilStructureDataIn.aspx.cs
View File

@ -363,16 +363,16 @@ namespace FineUIPro.Web.Transfer
continue; continue;
} }
//如果全是NA或Not Start 就是 Not Start //如果全是NA或Not Start、空 就是 Not Start
if (listObj.Where(x => x == "NA" || x == "Not Start").ToList().Count == 2) if (listObj.Where(x => string.IsNullOrWhiteSpace(x) || x == "NA" || x == "Not Start").ToList().Count == 2)
{ {
model.FINAL_Status = "Not Start"; model.FINAL_Status = "Not Start";
list.Add(model); list.Add(model);
continue; continue;
} }
//如果其中有一项是In progress 或Not Start 是 In progress //如果其中有一项是In progress 或Not Start、空 是 In progress
if (listObj.Where(x => x == "In progress" || x == "Not Start").ToList().Count >= 1) if (listObj.Where(x => string.IsNullOrWhiteSpace(x) || x == "In progress" || x == "Not Start").ToList().Count >= 1)
{ {
model.FINAL_Status = "In progress"; model.FINAL_Status = "In progress";
list.Add(model); list.Add(model);

8
SGGL/FineUIPro.Web/Transfer/CivilStructureEdit.aspx.cs
View File

@ -119,14 +119,14 @@ namespace FineUIPro.Web.Transfer
{ {
model.FINAL_Status = "Completed"; model.FINAL_Status = "Completed";
} }
//如果全是NA或Not Start 就是 Not Start //如果全是NA或Not Start、空 就是 Not Start
else if (listObj.Where(x => x == "NA" || x == "Not Start").ToList().Count == 2) else if (listObj.Where(x => string.IsNullOrWhiteSpace(x) || x == "NA" || x == "Not Start").ToList().Count == 2)
{ {
model.FINAL_Status = "Not Start"; model.FINAL_Status = "Not Start";
} }
//如果其中有一项是In progress 或Not Start 是 In progress //如果其中有一项是In progress 或Not Start、空 是 In progress
else if (listObj.Where(x => x == "In progress" || x == "Not Start").ToList().Count >= 1) else if (listObj.Where(x => string.IsNullOrWhiteSpace(x) || x == "In progress" || x == "Not Start").ToList().Count >= 1)
{ {
model.FINAL_Status = "In progress"; model.FINAL_Status = "In progress";
} }

8
SGGL/FineUIPro.Web/Transfer/ElectricalDataIn.aspx.cs
View File

@ -359,16 +359,16 @@ namespace FineUIPro.Web.Transfer
continue; continue;
} }
//如果全是NA或Not Start 就是 Not Start //如果全是NA或Not Start、空 就是 Not Start
if (listObj.Where(x => x == "NA" || x == "Not Start").ToList().Count == 4) if (listObj.Where(x => string.IsNullOrWhiteSpace(x) || x == "NA" || x == "Not Start").ToList().Count == 4)
{ {
model.FINAL_Status = "Not Start"; model.FINAL_Status = "Not Start";
list.Add(model); list.Add(model);
continue; continue;
} }
//如果其中有一项是In progress 或Not Start 是 In progress //如果其中有一项是In progress 或Not Start、空 是 In progress
if (listObj.Where(x => x == "In progress" || x == "Not Start").ToList().Count >= 1) if (listObj.Where(x => string.IsNullOrWhiteSpace(x) || x == "In progress" || x == "Not Start").ToList().Count >= 1)
{ {
model.FINAL_Status = "In progress"; model.FINAL_Status = "In progress";
list.Add(model); list.Add(model);

8
SGGL/FineUIPro.Web/Transfer/ElectricalEdit.aspx.cs
View File

@ -105,14 +105,14 @@ namespace FineUIPro.Web.Transfer
{ {
model.FINAL_Status = "Completed"; model.FINAL_Status = "Completed";
} }
//如果全是NA或Not Start 就是 Not Start //如果全是NA或Not Start、空 就是 Not Start
else if (listObj.Where(x => x == "NA" || x == "Not Start").ToList().Count == 4) else if (listObj.Where(x => string.IsNullOrWhiteSpace(x) || x == "NA" || x == "Not Start").ToList().Count == 4)
{ {
model.FINAL_Status = "Not Start"; model.FINAL_Status = "Not Start";
} }
//如果其中有一项是In progress 或Not Start 是 In progress //如果其中有一项是In progress 或Not Start、空 是 In progress
else if (listObj.Where(x => x == "In progress" || x == "Not Start").ToList().Count >= 1) else if (listObj.Where(x => string.IsNullOrWhiteSpace(x) || x == "In progress" || x == "Not Start").ToList().Count >= 1)
{ {
model.FINAL_Status = "In progress"; model.FINAL_Status = "In progress";
} }

11
SGGL/FineUIPro.Web/Transfer/InstrumentationDataIn.aspx.cs
View File

@ -316,7 +316,8 @@ namespace FineUIPro.Web.Transfer
{ {
Sn = 1000; Sn = 1000;
} }
else { else
{
Sn = snModel.SN; Sn = snModel.SN;
} }
for (int i = 1; i < ir; i++) for (int i = 1; i < ir; i++)
@ -370,16 +371,16 @@ namespace FineUIPro.Web.Transfer
continue; continue;
} }
//如果全是NA或Not Start 就是 Not Start //如果全是NA或Not Start、空 就是 Not Start
if (listObj.Where(x => x == "NA" || x == "Not Start").ToList().Count == 3) if (listObj.Where(x => string.IsNullOrWhiteSpace(x) || x == "NA" || x == "Not Start").ToList().Count == 3)
{ {
model.FINAL_Status = "Not Start"; model.FINAL_Status = "Not Start";
list.Add(model); list.Add(model);
continue; continue;
} }
//如果其中有一项是In progress 或Not Start 是 In progress //如果其中有一项是In progress 或Not Start、空 是 In progress
if (listObj.Where(x => x == "In progress" || x == "Not Start").ToList().Count >= 1) if (listObj.Where(x => string.IsNullOrWhiteSpace(x) || x == "In progress" || x == "Not Start").ToList().Count >= 1)
{ {
model.FINAL_Status = "In progress"; model.FINAL_Status = "In progress";
list.Add(model); list.Add(model);

8
SGGL/FineUIPro.Web/Transfer/InstrumentationEdit.aspx.cs
View File

@ -111,14 +111,14 @@ namespace FineUIPro.Web.Transfer
{ {
model.FINAL_Status = "Completed"; model.FINAL_Status = "Completed";
} }
//如果全是NA或Not Start 就是 Not Start //如果全是NA或Not Start、空 就是 Not Start
else if (listObj.Where(x => x == "NA" || x == "Not Start").ToList().Count == 3) else if (listObj.Where(x => string.IsNullOrWhiteSpace(x) || x == "NA" || x == "Not Start").ToList().Count == 3)
{ {
model.FINAL_Status = "Not Start"; model.FINAL_Status = "Not Start";
} }
//如果其中有一项是In progress 或Not Start 是 In progress //如果其中有一项是In progress 或Not Start、空 是 In progress
else if (listObj.Where(x => x == "In progress" || x == "Not Start").ToList().Count >= 1) else if (listObj.Where(x => string.IsNullOrWhiteSpace(x) || x == "In progress" || x == "Not Start").ToList().Count >= 1)
{ {
model.FINAL_Status = "In progress"; model.FINAL_Status = "In progress";
} }

8
SGGL/FineUIPro.Web/Transfer/PipingDataIn.aspx.cs
View File

@ -414,16 +414,16 @@ namespace FineUIPro.Web.Transfer
continue; continue;
} }
//如果全是NA或Not Start 就是 Not Start //如果全是NA或Not Start、空 就是 Not Start
if (listObj.Where(x => x == "NA" || x == "Not Start").ToList().Count == 3) if (listObj.Where(x => string.IsNullOrWhiteSpace(x) || x == "NA" || x == "Not Start").ToList().Count == 3)
{ {
model.FINALStatus = "Not Start"; model.FINALStatus = "Not Start";
list.Add(model); list.Add(model);
continue; continue;
} }
//如果其中有一项是In progress 或Not Start 是 In progress //如果其中有一项是In progress 或Not Start、空 是 In progress
if (listObj.Where(x => x == "In progress" || x == "Not Start").ToList().Count >= 1) if (listObj.Where(x => string.IsNullOrWhiteSpace(x) || x == "In progress" || x == "Not Start").ToList().Count >= 1)
{ {
model.FINALStatus = "In progress"; model.FINALStatus = "In progress";
list.Add(model); list.Add(model);

8
SGGL/FineUIPro.Web/Transfer/PipingEdit.aspx.cs
View File

@ -147,14 +147,14 @@ namespace FineUIPro.Web.Transfer
model.FINALStatus = "Completed"; model.FINALStatus = "Completed";
} }
//如果全是NA或Not Start 就是 Not Start //如果全是NA或Not Start、空 就是 Not Start
else if (listObj.Where(x => x == "NA" || x == "Not Start").ToList().Count == 3) else if (listObj.Where(x => string.IsNullOrWhiteSpace(x) || x == "NA" || x == "Not Start").ToList().Count == 3)
{ {
model.FINALStatus = "Not Start"; model.FINALStatus = "Not Start";
} }
//如果其中有一项是In progress 或Not Start 是 In progress //如果其中有一项是In progress 或Not Start、空 是 In progress
else if (listObj.Where(x => x == "In progress" || x == "Not Start").ToList().Count >= 1) else if (listObj.Where(x => string.IsNullOrWhiteSpace(x) || x == "In progress" || x == "Not Start").ToList().Count >= 1)
{ {
model.FINALStatus = "In progress"; model.FINALStatus = "In progress";
} }

8
SGGL/FineUIPro.Web/Transfer/RotatingEquipmentDataIn.aspx.cs
View File

@ -355,16 +355,16 @@ namespace FineUIPro.Web.Transfer
continue; continue;
} }
//如果全是NA或Not Start 就是 Not Start //如果全是NA或Not Start、空 就是 Not Start
if (listObj.Where(x => x == "NA" || x == "Not Start").ToList().Count == 4) if (listObj.Where(x => string.IsNullOrWhiteSpace(x) || x == "NA" || x == "Not Start").ToList().Count == 4)
{ {
model.MechanicalFINALStatus = "Not Start"; model.MechanicalFINALStatus = "Not Start";
list.Add(model); list.Add(model);
continue; continue;
} }
//如果其中有一项是In progress 或Not Start 是 In progress //如果其中有一项是In progress 或Not Start、空 是 In progress
if (listObj.Where(x => x == "In progress" || x == "Not Start").ToList().Count >= 1) if (listObj.Where(x => string.IsNullOrWhiteSpace(x) || x == "In progress" || x == "Not Start").ToList().Count >= 1)
{ {
model.MechanicalFINALStatus = "In progress"; model.MechanicalFINALStatus = "In progress";
list.Add(model); list.Add(model);

8
SGGL/FineUIPro.Web/Transfer/RotatingEquipmentEdit.aspx.cs
View File

@ -103,14 +103,14 @@ namespace FineUIPro.Web.Transfer
{ {
model.MechanicalFINALStatus = "Completed"; model.MechanicalFINALStatus = "Completed";
} }
//如果全是NA或Not Start 就是 Not Start //如果全是NA或Not Start、空 就是 Not Start
else if (listObj.Where(x => x == "NA" || x == "Not Start").ToList().Count == 4) else if (listObj.Where(x => string.IsNullOrWhiteSpace(x) || x == "NA" || x == "Not Start").ToList().Count == 4)
{ {
model.MechanicalFINALStatus = "Not Start"; model.MechanicalFINALStatus = "Not Start";
} }
//如果其中有一项是In progress 或Not Start 是 In progress //如果其中有一项是In progress 或Not Start、空 是 In progress
else if (listObj.Where(x => x == "In progress" || x == "Not Start").ToList().Count >= 1) else if (listObj.Where(x => string.IsNullOrWhiteSpace(x) || x == "In progress" || x == "Not Start").ToList().Count >= 1)
{ {
model.MechanicalFINALStatus = "In progress"; model.MechanicalFINALStatus = "In progress";
} }

8
SGGL/FineUIPro.Web/Transfer/StaticEquipmentDataIn.aspx.cs
View File

@ -353,16 +353,16 @@ namespace FineUIPro.Web.Transfer
continue; continue;
} }
//如果全是NA或Not Start 就是 Not Start //如果全是NA或Not Start、空 就是 Not Start
if (listObj.Where(x => x == "NA" || x == "Not Start").ToList().Count == 3) if (listObj.Where(x => string.IsNullOrWhiteSpace(x) || x == "NA" || x == "Not Start").ToList().Count == 3)
{ {
model.MechanicalFINALStatus = "Not Start"; model.MechanicalFINALStatus = "Not Start";
list.Add(model); list.Add(model);
continue; continue;
} }
//如果其中有一项是In progress 或Not Start 是 In progress //如果其中有一项是In progress 或Not Start、空 是 In progress
if (listObj.Where(x => x == "In progress" || x == "Not Start").ToList().Count >= 1) if (listObj.Where(x => string.IsNullOrWhiteSpace(x) || x == "In progress" || x == "Not Start").ToList().Count >= 1)
{ {
model.MechanicalFINALStatus = "In progress"; model.MechanicalFINALStatus = "In progress";
list.Add(model); list.Add(model);

8
SGGL/FineUIPro.Web/Transfer/StaticEquipmentEdit.aspx.cs
View File

@ -101,14 +101,14 @@ namespace FineUIPro.Web.Transfer
{ {
model.MechanicalFINALStatus = "Completed"; model.MechanicalFINALStatus = "Completed";
} }
//如果全是NA或Not Start 就是 Not Start //如果全是NA或Not Start、空 就是 Not Start
else if (listObj.Where(x => x == "NA" || x == "Not Start").ToList().Count == 3) else if (listObj.Where(x => string.IsNullOrWhiteSpace(x) || x == "NA" || x == "Not Start").ToList().Count == 3)
{ {
model.MechanicalFINALStatus = "Not Start"; model.MechanicalFINALStatus = "Not Start";
} }
//如果其中有一项是In progress 或Not Start 是 In progress //如果其中有一项是In progress 或Not Start、空 是 In progress
else if (listObj.Where(x => x == "In progress" || x == "Not Start").ToList().Count >= 1) else if (listObj.Where(x => string.IsNullOrWhiteSpace(x) || x == "In progress" || x == "Not Start").ToList().Count >= 1)
{ {
model.MechanicalFINALStatus = "In progress"; model.MechanicalFINALStatus = "In progress";
} }

8
SGGL/FineUIPro.Web/Transfer/TelecomDataIn.aspx.cs
View File

@ -359,16 +359,16 @@ namespace FineUIPro.Web.Transfer
continue; continue;
} }
//如果全是NA或Not Start 就是 Not Start //如果全是NA或Not Start、空 就是 Not Start
if (listObj.Where(x => x == "NA" || x == "Not Start").ToList().Count == 4) if (listObj.Where(x => string.IsNullOrWhiteSpace(x) || x == "NA" || x == "Not Start").ToList().Count == 4)
{ {
model.FINAL_Status = "Not Start"; model.FINAL_Status = "Not Start";
list.Add(model); list.Add(model);
continue; continue;
} }
//如果其中有一项是In progress 或Not Start 是 In progress //如果其中有一项是In progress、空 或Not Start 是 In progress
if (listObj.Where(x => x == "In progress" || x == "Not Start").ToList().Count >= 1) if (listObj.Where(x => string.IsNullOrWhiteSpace(x) || x == "In progress" || x == "Not Start").ToList().Count >= 1)
{ {
model.FINAL_Status = "In progress"; model.FINAL_Status = "In progress";
list.Add(model); list.Add(model);

8
SGGL/FineUIPro.Web/Transfer/TelecomEdit.aspx.cs
View File

@ -103,13 +103,13 @@ namespace FineUIPro.Web.Transfer
{ {
model.FINAL_Status = "Completed"; model.FINAL_Status = "Completed";
} }
//如果全是NA或Not Start 就是 Not Start //如果全是NA或Not Start、空 就是 Not Start
else if (listObj.Where(x => x == "NA" || x == "Not Start").ToList().Count == 4) else if (listObj.Where(x => string.IsNullOrWhiteSpace(x) || x == "NA" || x == "Not Start").ToList().Count == 4)
{ {
model.FINAL_Status = "Not Start"; model.FINAL_Status = "Not Start";
} }
//如果其中有一项是In progress 或Not Start 是 In progress //如果其中有一项是In progress 或Not Start、空 是 In progress
else if (listObj.Where(x => x == "In progress" || x == "Not Start").ToList().Count >= 1) else if (listObj.Where(x => string.IsNullOrWhiteSpace(x) || x == "In progress" || x == "Not Start").ToList().Count >= 1)
{ {
model.FINAL_Status = "In progress"; model.FINAL_Status = "In progress";
} }

4
SGGL/FineUIPro.Web/Web.config
View File

@ -11,7 +11,7 @@
<FineUIPro DebugMode="true" Theme="Cupertino"/> <FineUIPro DebugMode="true" Theme="Cupertino"/>
<appSettings> <appSettings>
<!--连接字符串--> <!--连接字符串-->
<add key="ConnectionString" value="Server=.\MSSQLSERVER01;Database=SGGLDB_WH;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Connect Timeout=1200"/> <add key="ConnectionString" value="Server=.;Database=SGGLDB_WH;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Connect Timeout=1200"/>
<!--<add key="ConnectionString" value="Server=.\MSSQLSERVER01;Database=SGGLDB_WH;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Connect Timeout=1200"/>--> <!--<add key="ConnectionString" value="Server=.\MSSQLSERVER01;Database=SGGLDB_WH;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Connect Timeout=1200"/>-->
<!--系统名称--> <!--系统名称-->
<add key="SystemName" value="智慧施工管理信息系统V1.0"/> <add key="SystemName" value="智慧施工管理信息系统V1.0"/>
@ -77,7 +77,7 @@
<add verb="GET" path="res.axd" type="FineUIPro.ResourceHandler, FineUIPro" validate="false"/> <add verb="GET" path="res.axd" type="FineUIPro.ResourceHandler, FineUIPro" validate="false"/>
<add path="ChartImg.axd" verb="GET,POST,HEAD" type="System.Web.UI.DataVisualization.Charting.ChartHttpHandler, System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" validate="false"/> <add path="ChartImg.axd" verb="GET,POST,HEAD" type="System.Web.UI.DataVisualization.Charting.ChartHttpHandler, System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" validate="false"/>
</httpHandlers> </httpHandlers>
<compilation debug="false" targetFramework="4.6.1"/> <compilation debug="true" targetFramework="4.6.1"/>
<httpRuntime requestValidationMode="2.0" maxRequestLength="2147483647" executionTimeout="36000"/> <httpRuntime requestValidationMode="2.0" maxRequestLength="2147483647" executionTimeout="36000"/>
<authentication mode="Forms"> <authentication mode="Forms">
<forms loginUrl="Login.aspx" name="PUBLISHERCOOKIE" protection="All" timeout="1440" path="/"/> <forms loginUrl="Login.aspx" name="PUBLISHERCOOKIE" protection="All" timeout="1440" path="/"/>