2023-03-24

SGGL/BLL/PHTGL/BiddingManagement/BidDocStandingBookService.cs

@@ -1,4 +1,5 @@
 using FineUIPro;
+using MiniExcelLibs.Attributes;
 using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -39,8 +40,10 @@ namespace BLL
                               (string.IsNullOrEmpty(table.ProposedInviter) || x.ProposedInviter.Contains(table.ProposedInviter)) &&
                               (string.IsNullOrEmpty(table.ApprovePersonFormCode) || x.ApprovePersonFormCode.Contains(table.ApprovePersonFormCode)) &&
                               (string.IsNullOrEmpty(table.BidWinner) || x.BidWinner.Contains(table.BidWinner)) &&
-                              (string.IsNullOrEmpty(table.SetSubReviewCode) || x.SetSubReviewCode.Contains(table.SetSubReviewCode)) 
-                    select x
+                              (string.IsNullOrEmpty(table.SetSubReviewCode) || x.SetSubReviewCode.Contains(table.SetSubReviewCode)) &&
+                              (string.IsNullOrEmpty(table.ProjectId) || x.ProjectId.Contains(table.ProjectId))&&
+                              (table.State == null||x.State==table.State)
+                              select x
                   ;
 
             return q.ToList();
@@ -80,6 +83,8 @@ namespace BLL
                        x.ApprovePersonFormCode,
                        x.BidWinner,
                        x.SetSubReviewCode,
+                       x.ProjectId,
+                       x.State
 
                    };
         }
@@ -112,6 +117,8 @@ namespace BLL
                 ApprovePersonFormCode = newtable.ApprovePersonFormCode,
                 BidWinner = newtable.BidWinner,
                 SetSubReviewCode = newtable.SetSubReviewCode,
+                ProjectId= newtable.ProjectId,
+                State=newtable.State,
             };
             db.PHTGL_BidDocumentsStandingBook.InsertOnSubmit(table);
             db.SubmitChanges();
@@ -147,6 +154,8 @@ namespace BLL
                 table.ApprovePersonFormCode = newtable.ApprovePersonFormCode;
                 table.BidWinner = newtable.BidWinner;
                 table.SetSubReviewCode = newtable.SetSubReviewCode;
+                table.ProjectId=newtable.ProjectId;
+                table.State=newtable.State;
                 db.SubmitChanges();
             }
 
@@ -173,4 +182,5 @@ namespace BLL
         }
 
     }
+
 }