lpf/SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
李鹏飞
2024-10-30 15:47:15 +08:00
parent ddb85663b2
commit 0b047a056a
14 changed files with 291 additions and 234 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/BLL/PHTGL/BiddingManagement/BidDocumentsReviewService.cs
+4 -4
View File
@@ -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;
}
SGGL/BLL/PHTGL/BiddingManagement/SetSubReviewService.cs
+10 -7
View File
@@ -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)
SGGL/BLL/PHTGL/OAWebSevice.cs
+5 -5
View File
@@ -210,7 +210,7 @@ namespace BLL
break;
case PHTGL_ApproveService.SetSubReview:
var Sub = BLL.PHTGL_SetSubReviewService.GetPHTGL_SetSubReviewById(users.ContractId);
var BidApp2 = BLL.PHTGL_BidApproveUserReviewService.GetPHTGL_BidApproveUserReviewById(Sub.ApproveUserReviewID);
var BidApp2 = BLL.PHTGL_BidDocumentsReviewService.GetPHTGL_BidDocumentsReviewById(Sub.BidDocumentsReviewId);
if (Sub != null)
{
var gereceiver = BLL.Person_PersonsService.GetPerson_PersonsById(Sub.CreateUser);
@@ -387,18 +387,18 @@ namespace BLL
break;
case PHTGL_ApproveService.SetSubReview:
var Sub = BLL.PHTGL_SetSubReviewService.GetPHTGL_SetSubReviewById(users[i].ContractId);
var BidApp2 = BLL.PHTGL_BidApproveUserReviewService.GetPHTGL_BidApproveUserReviewById(Sub.ApproveUserReviewID);
var Biddoc2 = BLL.PHTGL_BidDocumentsReviewService.GetPHTGL_BidDocumentsReviewById(Sub.BidDocumentsReviewId);
if (Sub != null)
{
var geCreatUser = BLL.Person_PersonsService.GetPerson_PersonsById(Sub.CreateUser);
var gereceiver = BLL.Person_PersonsService.GetPerson_PersonsById(users[i].ApproveMan);
webJson.flowid = users[i].ApproveId;
webJson.requestname = "确定分包商审批审批 " + ProjectService.GetProjectNameByProjectId(BidApp2.ProjectId);
webJson.requestname = "确定分包商审批审批 " + ProjectService.GetProjectNameByProjectId(Biddoc2.ProjectId);
webJson.nodename = users[i].ApproveType;
webJson.creator = geCreatUser.JobNum;
webJson.receiver = gereceiver.JobNum;
webJson.pcurl = geturl(BidApp2.ProjectId, PHTGL_ApproveService.SetSubReview, Sub.SetSubReviewID, users[i].ApproveMan);
webJson.appurl = getAppurl(BidApp2.ProjectId, PHTGL_ApproveService.SetSubReview, Sub.SetSubReviewID, users[i].ApproveMan);
webJson.pcurl = geturl(Biddoc2.ProjectId, PHTGL_ApproveService.SetSubReview, Sub.SetSubReviewID, users[i].ApproveMan);
webJson.appurl = getAppurl(Biddoc2.ProjectId, PHTGL_ApproveService.SetSubReview, Sub.SetSubReviewID, users[i].ApproveMan);
}
break;
case PHTGL_ApproveService.ContractReview: