20240429 修改综合管理导入导出

This commit is contained in:
2024-04-29 19:13:54 +08:00
parent fc56b1f6c2
commit a3e123957d
48 changed files with 560 additions and 266 deletions
@@ -178,7 +178,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
&& x.SuperUnitWork == null
select x;
for (int i = 0; i < ir; i++)
for (int i = 1; i < ir; i++)
{
string row0 = pds.Rows[i][0].ToString();
if (string.IsNullOrEmpty(row0))
@@ -246,6 +246,17 @@ namespace FineUIPro.Web.CQMS.Comprehensive
{
result += (i + 2).ToString() + "," + "标志编号" + "," + "此项为必填项!" + "|";
}
else
{
try
{
int t = Convert.ToInt32(row8);
}
catch (Exception)
{
result += (i + 2).ToString() + "," + "标识编号" + "," + "[" + row8 + "]错误!" + "|";
}
}
}
if (!string.IsNullOrEmpty(result))
{
@@ -395,13 +406,13 @@ namespace FineUIPro.Web.CQMS.Comprehensive
&& x.SuperUnitWork == null
select x;
for (int i = 0; i < ir; i++)
for (int i = 1; i < ir; i++)
{
Model.Comprehensive_ConTechnologyDisclosure oldViewInfo = new Model.Comprehensive_ConTechnologyDisclosure();
string row0 = pds.Rows[i][0].ToString().Trim();
string row3 = pds.Rows[i][3].ToString().Trim();
var cn = cns.Where(y => y.ProfessionalName == row0).FirstOrDefault();
oldViewInfo = oldViewInfos.Where(x => x.RemarkCode == pds.Rows[i][8].ToString().Trim()
oldViewInfo = oldViewInfos.Where(x => x.RemarkCode ==Funs.GetNewInt( pds.Rows[i][8].ToString().Trim())
).FirstOrDefault();
if (oldViewInfo == null)
{
@@ -419,7 +430,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
des.UnitWorkId = BLL.UnitWorkService.GetUnitWorkIdsByUnitWorkNames(this.CurrUser.LoginProjectId, pds.Rows[i][6].ToString().Trim());
}
des.AttendMan = pds.Rows[i][7].ToString().Trim();
des.RemarkCode = pds.Rows[i][8].ToString().Trim();
des.RemarkCode =Funs.GetNewInt( pds.Rows[i][8].ToString().Trim());
des.CompileMan = this.CurrUser.UserId;
des.CompileDate = DateTime.Now;
BLL.ConTechnologyDisclosureService.AddConTechnologyDisclosure(des);