修改移交管理,增加统计报表以及添加字段

This commit is contained in:
2024-08-30 17:45:02 +08:00
parent 7311a2b6fa
commit d21533d599
30 changed files with 885 additions and 271 deletions
@@ -56,13 +56,13 @@ namespace FineUIPro.Web.Transfer
txtTest_Package.Text = model.Test_Package;
ddlFoundation.SelectedValue = model.Foundation;
ddlMainstructure.SelectedValue = model.Mainstructure;
ddlBuildingdecoration.SelectedValue = model.Buildingdecoration;
ddlEquipment.SelectedValue = model.Equipment;
//ddlBuildingdecoration.SelectedValue = model.Buildingdecoration;
//ddlEquipment.SelectedValue = model.Equipment;
//ddlInstrument.SelectedValue = model.Instrument;
//ddlElectrical.SelectedValue = model.Electrical;
//ddlFireFighting.SelectedValue = model.FireFighting;
ddlHVAC.SelectedValue = model.HVAC;
//ddlHVAC.SelectedValue = model.HVAC;
txtDescriptions.Text = model.Descriptions;
}
}
@@ -80,13 +80,13 @@ namespace FineUIPro.Web.Transfer
Test_Package = txtTest_Package.Text,
Foundation = ddlFoundation.SelectedValue,
Mainstructure = ddlMainstructure.SelectedValue,
Buildingdecoration = ddlBuildingdecoration.SelectedValue,
Equipment = ddlEquipment.SelectedValue,
//Buildingdecoration = ddlBuildingdecoration.SelectedValue,
//Equipment = ddlEquipment.SelectedValue,
//Instrument = ddlInstrument.SelectedValue,
//Electrical = ddlElectrical.SelectedValue,
//FireFighting = ddlFireFighting.SelectedValue,
HVAC = ddlHVAC.SelectedValue,
//HVAC = ddlHVAC.SelectedValue,
Descriptions= txtDescriptions.Text
};
@@ -95,19 +95,19 @@ namespace FineUIPro.Web.Transfer
var listObj = new List<string>();
listObj.Add(model.Foundation);
listObj.Add(model.Mainstructure);
listObj.Add(model.Buildingdecoration);
listObj.Add(model.Equipment);
//listObj.Add(model.Buildingdecoration);
//listObj.Add(model.Equipment);
//listObj.Add(model.Instrument);
//listObj.Add(model.Electrical);
//listObj.Add(model.FireFighting);
listObj.Add(model.HVAC);
//listObj.Add(model.HVAC);
//全是NA或Completed 状态是Completed
if (listObj.Where(x => x == "NA" || x == "Completed").ToList().Count == 5)
if (listObj.Where(x => x == "NA" || x == "Completed").ToList().Count == 2)
{
model.FINAL_Status = "Completed";
} //如果全是Not Start 就是 Not Start
else if (listObj.Where(x => x == "Not Start").ToList().Count == 5)
else if (listObj.Where(x => x == "Not Start").ToList().Count == 2)
{
model.FINAL_Status = "Not Start";
}
@@ -130,13 +130,13 @@ namespace FineUIPro.Web.Transfer
newModel.Test_Package = txtTest_Package.Text;
newModel.Foundation = ddlFoundation.SelectedValue;
newModel.Mainstructure = ddlMainstructure.SelectedValue;
newModel.Buildingdecoration = ddlBuildingdecoration.SelectedValue;
newModel.Equipment = ddlEquipment.SelectedValue;
//newModel.Buildingdecoration = ddlBuildingdecoration.SelectedValue;
//newModel.Equipment = ddlEquipment.SelectedValue;
//newModel.Instrument = ddlInstrument.SelectedValue;
//newModel.Electrical = ddlElectrical.SelectedValue;
//newModel.FireFighting = ddlFireFighting.SelectedValue;
newModel.HVAC = ddlHVAC.SelectedValue;
//newModel.HVAC = ddlHVAC.SelectedValue;
newModel.FINAL_Status = model.FINAL_Status;
newModel.Descriptions = txtDescriptions.Text;
}