2023-11-08

SGGL/BLL/PHTGL/ContractCompile/PhtglContracttrackService .cs

@@ -168,7 +168,6 @@ namespace BLL
             return Funs.DB.PHTGL_ContractTrack.FirstOrDefault(x => x.Id == id);
         }
 
-
         public static void AddPHTGL_ContractTrack(PHTGL_ContractTrack newtable)
         {
             var table = new PHTGL_ContractTrack
@@ -209,7 +208,14 @@ namespace BLL
             PhtglContracttrackprogressService.CreateTemplateByContractTrackId(newtable.Id);
 
         }
-         
+
+        public static void AddBulkPHTGL_ContractTrack(List<PHTGL_ContractTrack> list)
+        {
+            Model.SGGLDB db = Funs.DB;
+            db.PHTGL_ContractTrack.InsertAllOnSubmit(list);
+            db.SubmitChanges();
+        }
+
 
 
         public static void UpdatePHTGL_ContractTrack(PHTGL_ContractTrack newtable)
@@ -352,12 +358,12 @@ namespace BLL
         {
             var responeData = new ResponeData();
             List<PHTGL_ContractTrackDtoIn> rows;
+            List<PHTGL_ContractTrack> goingAddList =new List<PHTGL_ContractTrack>();
             var sheetNames = MiniExcel.GetSheetNames(path);
             foreach (var sheet in sheetNames) ////多sheet导入
             {
                 try
                 {
-                    
                     rows = MiniExcel.Query<PHTGL_ContractTrackDtoIn>(path, sheetName: sheet,startCell:"A2").ToList();
                 }
                 catch (Exception ex)
@@ -388,16 +394,16 @@ namespace BLL
                         ContractId = contractid,
                         ProjectId = projectid,
                     };
-                    var resultModel = GetPHTGL_ContractTrackByModle(phtglContractTrack);
+                    var resultModel = GetFirstPHTGL_ContractTrackByModle(phtglContractTrack);
                     item.ContractNum = ContractService.GetContractById(contractid)?.ContractNum;
                     if (!string.IsNullOrEmpty(item.ProjectCode) && !item.ProjectCode.Contains("-"))
                     {
 
                         item.ProjectCode = item.MainItemCode + "-" + item.ProjectCode;
                     }
-                    if (resultModel.Any())
+                    if (resultModel!=null)
                     {
-                        item.Id = resultModel[0].Id;
+                        item.Id = resultModel.Id;
                         UpdatePHTGL_ContractTrack(item);
                     }
                     else

SGGL/BLL/PHTGL/ContractCompile/PhtglContracttrackprogressService.cs

@@ -17,8 +17,7 @@ namespace BLL
         /// </summary>
         public static int Count { get; set; }
 
-        public static List<PHTGL_ContractTrackProgress> GetPHTGL_ContractTrackProgressByModle(
-            PHTGL_ContractTrackProgress table)
+        public static IQueryable<PHTGL_ContractTrackProgress> GetPHTGL_ContractTrackProgressByModle( PHTGL_ContractTrackProgress table)
         {
             var q = from x in Funs.DB.PHTGL_ContractTrackProgress
                     where
@@ -31,10 +30,23 @@ namespace BLL
                         orderby x.Date
                     select x
                 ;
-
-            return q.ToList();
+            return q;
+        }
+        public static  PHTGL_ContractTrackProgress GetFirstOrDefaultByModle(PHTGL_ContractTrackProgress table)
+        {
+            var q = (from x in Funs.DB.PHTGL_ContractTrackProgress
+                    where
+                        (string.IsNullOrEmpty(table.ContractTrackProgressId) ||
+                         x.ContractTrackProgressId.Contains(table.ContractTrackProgressId)) &&
+                        (string.IsNullOrEmpty(table.ContractTrackId) ||
+                         x.ContractTrackId.Contains(table.ContractTrackId)) &&
+                        (string.IsNullOrEmpty(table.Date) ||
+                         x.Date.Contains(table.Date))
+                    orderby x.Date
+                    select x).FirstOrDefault()
+                ;
+            return q;
         }
-
         /// <summary>
         ///     获取分页列表
         /// </summary>
@@ -46,7 +58,7 @@ namespace BLL
             var q = GetPHTGL_ContractTrackProgressByModle(table);
             Count = q.Count();
             if (Count == 0) return null;
-            q = q.Skip(grid1.PageSize * grid1.PageIndex).Take(grid1.PageSize).ToList();
+            q = q.Skip(grid1.PageSize * grid1.PageIndex).Take(grid1.PageSize);
             // q = SortConditionHelper.SortingAndPaging(q, Grid1.SortField, Grid1.SortDirection, Grid1.PageIndex, Grid1.PageSize);
             return from x in q
                 select new