1
This commit is contained in:
@@ -141,11 +141,11 @@ namespace BLL
|
||||
/// </summary>
|
||||
/// <param name="dropName"></param>
|
||||
/// <param name="isShowPlease"></param>
|
||||
public static void InitGetBidCompleteDropDownList(FineUIPro.DropDownList dropName, bool isShowPlease)
|
||||
public static void InitGetBidCompleteDropDownList(FineUIPro.DropDownList dropName,string projectid, bool isShowPlease)
|
||||
{
|
||||
dropName.DataValueField = "BidDocumentsReviewId";
|
||||
dropName.DataTextField = "BidDocumentsCode";
|
||||
dropName.DataSource = GetCompleteBidDocument();
|
||||
dropName.DataSource = GetCompleteBidDocument(projectid);
|
||||
dropName.DataBind();
|
||||
if (isShowPlease)
|
||||
{
|
||||
@@ -153,10 +153,10 @@ namespace BLL
|
||||
}
|
||||
}
|
||||
|
||||
public static List<Model.PHTGL_BidDocumentsReview> GetCompleteBidDocument()
|
||||
public static List<Model.PHTGL_BidDocumentsReview> GetCompleteBidDocument(string projectid)
|
||||
{
|
||||
var list = (from x in Funs.DB.PHTGL_BidDocumentsReview
|
||||
where x.State == Const.ContractReview_Complete
|
||||
where x.State == Const.ContractReview_Complete && x.ProjectId == projectid
|
||||
select x).ToList();
|
||||
return list;
|
||||
}
|
||||
|
||||
@@ -67,7 +67,7 @@ namespace BLL
|
||||
table.Approval_Construction = newtable.Approval_Construction;
|
||||
table.IsOwenerApprove = newtable.IsOwenerApprove;
|
||||
table.DepartId = newtable.DepartId;
|
||||
|
||||
table.BidDocumentsReviewId = newtable.BidDocumentsReviewId;
|
||||
Funs.DB.PHTGL_SetSubReview.InsertOnSubmit(table);
|
||||
Funs.DB.SubmitChanges();
|
||||
}
|
||||
@@ -93,7 +93,7 @@ namespace BLL
|
||||
table.Approval_Construction = newtable.Approval_Construction;
|
||||
table.IsOwenerApprove = newtable.IsOwenerApprove;
|
||||
table.DepartId = newtable.DepartId;
|
||||
|
||||
table.BidDocumentsReviewId = newtable.BidDocumentsReviewId;
|
||||
Funs.DB.SubmitChanges();
|
||||
}
|
||||
|
||||
@@ -165,10 +165,15 @@ namespace BLL
|
||||
}
|
||||
public static object GetMySelfCompleteSetSubReview(string userid, string ProjectId)
|
||||
{
|
||||
var list = (from x in Funs.DB.PHTGL_SetSubReview
|
||||
/*var list = (from x in Funs.DB.PHTGL_SetSubReview
|
||||
join y in Funs.DB.PHTGL_BidApproveUserReview on x.ApproveUserReviewID equals y.ApproveUserReviewID
|
||||
where x.State == Const.ContractReview_Complete && x.CreateUser == userid
|
||||
&& y.ProjectId == ProjectId
|
||||
select x).ToList();*/
|
||||
var list = (from x in Funs.DB.PHTGL_SetSubReview
|
||||
join y in Funs.DB.PHTGL_BidDocumentsReview on x.BidDocumentsReviewId equals y.BidDocumentsReviewId
|
||||
where x.State == Const.ContractReview_Complete && x.CreateUser == userid
|
||||
&& y.ProjectId == ProjectId
|
||||
select x).ToList();
|
||||
return list;
|
||||
}
|
||||
@@ -182,8 +187,7 @@ namespace BLL
|
||||
string filePath = string.Empty;
|
||||
string strSql = "";
|
||||
var getFireWork = PHTGL_SetSubReviewService.GetPHTGL_SetSubReviewById(SetSubReviewID);
|
||||
var BidUser = PHTGL_BidApproveUserReviewService.GetPHTGL_BidApproveUserReviewById(getFireWork.ApproveUserReviewID);
|
||||
var BidDoc = PHTGL_BidDocumentsReviewService.GetPHTGL_BidDocumentsReviewById(BidUser.BidDocumentsReviewId);
|
||||
var BidDoc = PHTGL_BidDocumentsReviewService.GetPHTGL_BidDocumentsReviewById(getFireWork.BidDocumentsReviewId);
|
||||
var Act = BLL.PHTGL_ActionPlanFormationService.GetPHTGL_ActionPlanFormationById(BidDoc.ActionPlanID);
|
||||
|
||||
|
||||
@@ -322,8 +326,7 @@ namespace BLL
|
||||
string newUrl = string.Empty;
|
||||
string initTemplatePath = string.Empty;
|
||||
var getFireWork = PHTGL_SetSubReviewService.GetPHTGL_SetSubReviewById(Id);
|
||||
var BidUser = PHTGL_BidApproveUserReviewService.GetPHTGL_BidApproveUserReviewById(getFireWork.ApproveUserReviewID);
|
||||
var BidDoc = PHTGL_BidDocumentsReviewService.GetPHTGL_BidDocumentsReviewById(BidUser.BidDocumentsReviewId);
|
||||
var BidDoc = PHTGL_BidDocumentsReviewService.GetPHTGL_BidDocumentsReviewById(getFireWork.BidDocumentsReviewId);
|
||||
var Act = BLL.PHTGL_ActionPlanFormationService.GetPHTGL_ActionPlanFormationById(BidDoc.ActionPlanID);
|
||||
|
||||
switch (getFireWork.Type)
|
||||
|
||||
Reference in New Issue
Block a user