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

移交修改

Browse Source
This commit is contained in:
潘鸿锋
2024-07-26 09:38:28 +08:00
parent d52f245e59
commit 47e63fb706
17 changed files with 597 additions and 309 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/Transfer/TelecomDataIn.aspx.cs
+82 -69
View File
@@ -130,7 +130,7 @@ namespace FineUIPro.Web.Transfer
oleDBConn.Close();
oleDBConn.Dispose();
AddDatasetToSQL(ds.Tables[0], 7);
AddDatasetToSQL(ds.Tables[0], 8);
hdCheckResult.Text = "1";
}
catch (Exception exc)
@@ -168,30 +168,12 @@ namespace FineUIPro.Web.Transfer
{
for (int i = 1; i < ir; i++)
{
string row4 = pds.Rows[i][4].ToString();
if (!string.IsNullOrEmpty(row4))
string row4 = pds.Rows[i][0].ToString();
if (string.IsNullOrEmpty(row4))
{
try
{
DateTime date = Convert.ToDateTime(row4.Trim());
}
catch (Exception)
{
result += (i + 2).ToString() + "," + "Test Package START" + "," + "[" + row4 + "]错误！不是日期格式！" + "|";
}
}
string row5 = pds.Rows[i][5].ToString();
if (!string.IsNullOrEmpty(row5))
{
try
{
DateTime date = Convert.ToDateTime(row5.Trim());
}
catch (Exception)
{
result += (i + 2).ToString() + "," + "Test Package FINISH" + "," + "[" + row5 + "]错误！不是日期格式！" + "|";
}
result += (i + 2).ToString() + "," + "Telecom" + "," + "不能为空！" + "|";
}
}
if (!string.IsNullOrEmpty(result))
{
@@ -298,7 +280,7 @@ namespace FineUIPro.Web.Transfer
oleDBConn.Close();
oleDBConn.Dispose();
AddDatasetToSQL2(ds.Tables[0], 7);
AddDatasetToSQL2(ds.Tables[0], 8);
}
catch (Exception ex)
{
@@ -331,56 +313,87 @@ namespace FineUIPro.Web.Transfer
{
if (!string.IsNullOrEmpty(pds.Rows[i][0].ToString().Trim()))
{
//查询第一列，没查到的情况下作导入处理
var modelOnly = Funs.DB.Transfer_Telecom.FirstOrDefault(x => x.Telecom == pds.Rows[i][0].ToString().Trim()
&& x.ProjectId == CurrUser.LoginProjectId);
if (modelOnly == null)
// //查询第一列，没查到的情况下作导入处理
// var modelOnly = Funs.DB.Transfer_Telecom.FirstOrDefault(x => x.Telecom == pds.Rows[i][0].ToString().Trim()
//&& x.ProjectId == CurrUser.LoginProjectId);
// if (modelOnly == null)
// {
Model.Transfer_Telecom model = new Model.Transfer_Telecom();
model.Id = Guid.NewGuid().ToString();
model.ProjectId = CurrUser.LoginProjectId;
model.Telecom = pds.Rows[i][0].ToString().Trim();
model.SystemName = pds.Rows[i][1].ToString().Trim();
model.Subsystem = pds.Rows[i][2].ToString().Trim();
model.Test_Package = pds.Rows[i][3].ToString().Trim();
var obj1 = model.Installation = pds.Rows[i][4].ToString().Trim();
var obj2 = model.Communication = pds.Rows[i][5].ToString().Trim();
var obj3 = model.CableLaying = pds.Rows[i][6].ToString().Trim();
var obj4 = model.FunctionTest = pds.Rows[i][7].ToString().Trim();
#region 判断状态
var listObj = new List<string>();
listObj.Add(obj1);
listObj.Add(obj2);
listObj.Add(obj3);
listObj.Add(obj4);
//全是NA或Completed 状态是Completed
if (listObj.Where(x => x == "NA" || x == "Completed").ToList().Count == 4)
{
Model.Transfer_Telecom model = new Model.Transfer_Telecom();
model.Id = Guid.NewGuid().ToString();
model.ProjectId = CurrUser.LoginProjectId;
model.Telecom = pds.Rows[i][0].ToString().Trim();
model.SystemName = pds.Rows[i][1].ToString().Trim();
model.Subsystem = pds.Rows[i][2].ToString().Trim();
model.Test_Package = pds.Rows[i][3].ToString().Trim();
DateTime t1, t2;
if (DateTime.TryParse(pds.Rows[i][4].ToString(), out t1) && !string.IsNullOrEmpty(pds.Rows[i][4].ToString()))
model.Test_Package_START = t1;
if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString()))
model.Test_Package_FINISH = t2;
model.FINAL_Status = pds.Rows[i][6].ToString().Trim();
if (model.FINAL_Status.ToLower() == "finished")
{
model.CompleteTime = DateTime.Now;
}
model.FINAL_Status = "Completed";
list.Add(model);
continue;
}
else
{
//修改
modelOnly.Telecom = pds.Rows[i][0].ToString().Trim();
modelOnly.SystemName = pds.Rows[i][1].ToString().Trim();
modelOnly.Subsystem = pds.Rows[i][2].ToString().Trim();
modelOnly.Test_Package = pds.Rows[i][3].ToString().Trim();
DateTime t1, t2;
if (DateTime.TryParse(pds.Rows[i][4].ToString(), out t1) && !string.IsNullOrEmpty(pds.Rows[i][4].ToString()))
modelOnly.Test_Package_START = t1;
if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString()))
modelOnly.Test_Package_FINISH = t2;
//更改前不是finished，更改后是finished的，才修改实际完成时间
if (modelOnly.FINAL_Status.ToLower() != "finished" && pds.Rows[i][6].ToString().Trim() == "finished")
{
modelOnly.CompleteTime = DateTime.Now;
}
modelOnly.FINAL_Status = pds.Rows[i][6].ToString().Trim();
//if (modelOnly.FINAL_Status.ToLower() == "finished")
//{
// modelOnly.CompleteTime = DateTime.Now;
//}
Funs.DB.SubmitChanges();
//如果全是Not Start 就是 Not Start
if (listObj.Where(x => x == "Not Start").ToList().Count == 4)
{
model.FINAL_Status = "Not Start";
list.Add(model);
continue;
}
//如果其中有一项是In progress 或Not Start 是 In progress
if (listObj.Where(x => x == "In progress" || x == "Not Start").ToList().Count >= 1)
{
model.FINAL_Status = "In progress";
list.Add(model);
continue;
}
model.FINAL_Status = "Not Start";
list.Add(model);
#endregion
list.Add(model);
//}
//else
//{
// //修改
// modelOnly.Telecom = pds.Rows[i][0].ToString().Trim();
// modelOnly.SystemName = pds.Rows[i][1].ToString().Trim();
// modelOnly.Subsystem = pds.Rows[i][2].ToString().Trim();
// modelOnly.Test_Package = pds.Rows[i][3].ToString().Trim();
// DateTime t1, t2;
// if (DateTime.TryParse(pds.Rows[i][4].ToString(), out t1) && !string.IsNullOrEmpty(pds.Rows[i][4].ToString()))
// modelOnly.Test_Package_START = t1;
// if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString()))
// modelOnly.Test_Package_FINISH = t2;
// //更改前不是finished，更改后是finished的，才修改实际完成时间
// if (modelOnly.FINAL_Status.ToLower() != "finished" && pds.Rows[i][6].ToString().Trim() == "finished")
// {
// modelOnly.CompleteTime = DateTime.Now;
// }
// modelOnly.FINAL_Status = pds.Rows[i][6].ToString().Trim();
// //if (modelOnly.FINAL_Status.ToLower() == "finished")
// //{
// // modelOnly.CompleteTime = DateTime.Now;
// //}
// Funs.DB.SubmitChanges();
//}
}
}
if (list.Count > 0)