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

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
@@ -130,7 +130,7 @@ namespace FineUIPro.Web.Transfer
oleDBConn.Close();
oleDBConn.Dispose();
AddDatasetToSQL(ds.Tables[0], 10);
AddDatasetToSQL(ds.Tables[0], 7);
hdCheckResult.Text = "1";
}
catch (Exception exc)
@@ -280,7 +280,7 @@ namespace FineUIPro.Web.Transfer
oleDBConn.Close();
oleDBConn.Dispose();
AddDatasetToSQL2(ds.Tables[0], 10);
AddDatasetToSQL2(ds.Tables[0], 7);
}
catch (Exception ex)
{
@@ -330,18 +330,18 @@ namespace FineUIPro.Web.Transfer
var obj1 = model.Foundation = pds.Rows[i][5].ToString().Trim();
var obj2 = model.Mainstructure = pds.Rows[i][6].ToString().Trim();
var obj3 = model.Equipment = pds.Rows[i][7].ToString().Trim();
var obj4 = model.Buildingdecoration = pds.Rows[i][8].ToString().Trim();
var obj5 = model.HVAC = pds.Rows[i][9].ToString().Trim();
//var obj3 = model.Equipment = pds.Rows[i][7].ToString().Trim();
//var obj4 = model.Buildingdecoration = pds.Rows[i][8].ToString().Trim();
//var obj5 = model.HVAC = pds.Rows[i][9].ToString().Trim();
#region
var listObj = new List<string>();
listObj.Add(obj1);
listObj.Add(obj2);
listObj.Add(obj3);
listObj.Add(obj4);
listObj.Add(obj5);
//listObj.Add(obj3);
//listObj.Add(obj4);
//listObj.Add(obj5);
//全是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";
list.Add(model);
@@ -350,7 +350,7 @@ namespace FineUIPro.Web.Transfer
//如果全是Not Start 就是 Not Start
if (listObj.Where(x => x == "Not Start").ToList().Count == 5)
if (listObj.Where(x => x == "Not Start").ToList().Count == 2)
{
model.FINAL_Status = "Not Start";
list.Add(model);