From 462bdf624f407166438faeac71fa503ed5d06e30 Mon Sep 17 00:00:00 2001 From: wyw <571921741@qq.com> Date: Wed, 8 Apr 2026 17:19:56 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=A8=A1=E6=9D=BF=E5=8E=BB?= =?UTF-8?q?=E9=99=A4=E9=80=82=E7=94=A8=E5=B2=97=E4=BD=8D:=E9=A2=98?= =?UTF-8?q?=E5=BA=93=20=E8=AF=BE=E4=BB=B6=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Api/SEController/SECoursewearlibrary.cs | 64 +++++++++---------- .../Api/SEController/SETestController.cs | 63 +++++++++--------- 2 files changed, 64 insertions(+), 63 deletions(-) diff --git a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/SECoursewearlibrary.cs b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/SECoursewearlibrary.cs index 4a153e7..1a7e43e 100644 --- a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/SECoursewearlibrary.cs +++ b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/SECoursewearlibrary.cs @@ -737,38 +737,38 @@ namespace APT.SE.WebApi.Controllers.Api } sub1sPer = new List(); sub2sPer = new List(); + //if (!string.IsNullOrEmpty(dtSource.Rows[i][9].ToString().Trim())) + //{ + // var testPosts = dtSource.Rows[i][9].ToString().Trim().Split(';'); + // foreach (var postName in testPosts) + // { + // if (!string.IsNullOrEmpty(postName)) + // { + // modelPost = posts.FirstOrDefault(t => t.NAME == postName); + // if (modelPost == null) + // { + // if (!listPostNameEmpty.Contains(postName)) + // listPostNameEmpty.Add(postName); + // } + // else + // { + // T_SE_TEST_LIST_POST sub1 = new T_SE_TEST_LIST_POST + // { + // ID = Guid.NewGuid(), + // ORG_ID = orgId, + // TEST_ID = mainTable.ID, + // POST_ID = posts.FirstOrDefault(t => t.NAME == postName).ID + // }; + // sub1sPer.Add(sub1); + // } + // } + // } + //} + + if (!string.IsNullOrEmpty(dtSource.Rows[i][9].ToString().Trim())) { - var testPosts = dtSource.Rows[i][9].ToString().Trim().Split(';'); - foreach (var postName in testPosts) - { - if (!string.IsNullOrEmpty(postName)) - { - modelPost = posts.FirstOrDefault(t => t.NAME == postName); - if (modelPost == null) - { - if (!listPostNameEmpty.Contains(postName)) - listPostNameEmpty.Add(postName); - } - else - { - T_SE_TEST_LIST_POST sub1 = new T_SE_TEST_LIST_POST - { - ID = Guid.NewGuid(), - ORG_ID = orgId, - TEST_ID = mainTable.ID, - POST_ID = posts.FirstOrDefault(t => t.NAME == postName).ID - }; - sub1sPer.Add(sub1); - } - } - } - } - - - if (!string.IsNullOrEmpty(dtSource.Rows[i][10].ToString().Trim())) - { - var testPoints = dtSource.Rows[i][10].ToString().Trim().Split(';'); + var testPoints = dtSource.Rows[i][9].ToString().Trim().Split(';'); foreach (var pointName in testPoints) { if (!string.IsNullOrEmpty(pointName)) @@ -798,9 +798,9 @@ namespace APT.SE.WebApi.Controllers.Api if (sub2sPer != null && sub2sPer.Count > 0) sub2s.AddRange(sub2sPer); - if (!string.IsNullOrEmpty(dtSource.Rows[i][11].ToString().Trim())) + if (!string.IsNullOrEmpty(dtSource.Rows[i][10].ToString().Trim())) { - mainTable.TRAINNAME = dtSource.Rows[i][11].ToString().Trim(); + mainTable.TRAINNAME = dtSource.Rows[i][10].ToString().Trim(); } mainTables.Add((T_SE_TEST)mainTable.Clone()); diff --git a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/SETestController.cs b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/SETestController.cs index 7d37adf..5042d17 100644 --- a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/SETestController.cs +++ b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/SETestController.cs @@ -325,13 +325,14 @@ namespace APT.SE.WebApi.Controllers.Api /// public bool InsertModel(DataTable dtSource, Guid? orgId, ref string Msg, int rowIndex = 1) { + //适用岗位去除 列：9 var userId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID; if (dtSource == null || dtSource.Rows.Count < rowIndex) { Msg = "未获取到导入数据"; throw new Exception(Msg); } - List listNotEmpty = new List() { 0, 1, 7, 8, 10 }; + List listNotEmpty = new List() { 0, 1, 7, 8, 9 };// 10 =>9 Dictionary> dicIndexEmpty = new Dictionary>(); int rowAll = dtSource.Rows.Count; int colAll = dtSource.Columns.Count; @@ -562,36 +563,36 @@ namespace APT.SE.WebApi.Controllers.Api } mainTable.USAGE = k; } + //if (!string.IsNullOrEmpty(dtSource.Rows[i][9].ToString().Trim())) + //{ + // var testPosts = dtSource.Rows[i][9].ToString().Trim().Split(';'); + // foreach (var postName in testPosts) + // { + // if (!string.IsNullOrEmpty(postName)) + // { + // modelPost = posts.FirstOrDefault(t => t.NAME == postName); + // if (modelPost == null) + // { + // if (!listPostNameEmpty.Contains(postName)) + // listPostNameEmpty.Add(postName); + // } + // else + // { + // T_SE_TEST_LIST_POST sub1 = new T_SE_TEST_LIST_POST + // { + // ID = Guid.NewGuid(), + // ORG_ID = orgId, + // TEST_ID = mainTable.ID, + // POST_ID = posts.FirstOrDefault(t => t.NAME == postName).ID + // }; + // sub1s.Add(sub1); + // } + // } + // } + //} if (!string.IsNullOrEmpty(dtSource.Rows[i][9].ToString().Trim())) { - var testPosts = dtSource.Rows[i][9].ToString().Trim().Split(';'); - foreach (var postName in testPosts) - { - if (!string.IsNullOrEmpty(postName)) - { - modelPost = posts.FirstOrDefault(t => t.NAME == postName); - if (modelPost == null) - { - if (!listPostNameEmpty.Contains(postName)) - listPostNameEmpty.Add(postName); - } - else - { - T_SE_TEST_LIST_POST sub1 = new T_SE_TEST_LIST_POST - { - ID = Guid.NewGuid(), - ORG_ID = orgId, - TEST_ID = mainTable.ID, - POST_ID = posts.FirstOrDefault(t => t.NAME == postName).ID - }; - sub1s.Add(sub1); - } - } - } - } - if (!string.IsNullOrEmpty(dtSource.Rows[i][10].ToString().Trim())) - { - var testPoints = dtSource.Rows[i][10].ToString().Trim().Split(';'); + var testPoints = dtSource.Rows[i][9].ToString().Trim().Split(';'); foreach (var pointName in testPoints) { if (!string.IsNullOrEmpty(pointName)) @@ -616,9 +617,9 @@ namespace APT.SE.WebApi.Controllers.Api } } } - if (!string.IsNullOrEmpty(dtSource.Rows[i][11].ToString().Trim())) + if (!string.IsNullOrEmpty(dtSource.Rows[i][10].ToString().Trim())) { - mainTable.TRAINNAME = dtSource.Rows[i][11].ToString().Trim(); + mainTable.TRAINNAME = dtSource.Rows[i][10].ToString().Trim(); } mainTables.Add(mainTable); }