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

2022-09-08 合同基本修改，焊接数据分析修改

Browse Source
This commit is contained in:
李鹏飞
2022-09-08 20:14:51 +08:00
parent e0f256688a
commit 6881455e9d
22 changed files with 2744 additions and 259 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Mobile/PHTGL/BiddingManagement/ActionPlanReviewDetail.aspx.cs
+10 -10
View File
@@ -59,16 +59,16 @@ namespace FineUIPro.Mobile.PHTGL.BiddingManagement
Session["ApproveManModels"] = value;
}
}
public string UserId
public string PersonId
{
get
{
UserId = Request.Params["UserId"];
return (string)ViewState["UserId"];
PersonId = Request.Params["PersonId"];
return (string)ViewState["PersonId"];
}
set
{
ViewState["UserId"] = value;
ViewState["PersonId"] = value;
}
}
#endregion
@@ -86,23 +86,23 @@ namespace FineUIPro.Mobile.PHTGL.BiddingManagement
ApproveManModels = PHTGL_ActionPlanReviewService.GetApproveManModels(_ActionPlanFormation.ProjectID, ActionPlanReviewId);
EndApproveType = ApproveManModels.Count;
//获取当前登录人审批信息
pHTGL_Approve = BLL.PHTGL_ApproveService.GetPHTGL_ApproveByUserId(ActionPlanReviewId, UserId);
pHTGL_Approve = BLL.PHTGL_ApproveService.GetPHTGL_ApproveByUserId(ActionPlanReviewId, PersonId);
this.txtProjectCode.Text = _ActionPlanFormation.EPCCode;
this.txtProjectName.Text = _ActionPlanFormation.ProjectShortName;
this.txtCreateUser.Text = BLL.Person_PersonsService.GetPersonsNameById(_ActionPlanFormation.CreatUser);
if (PHTGL_ApproveService.IsApproveMan(ActionPlanReviewId, UserId))
if (PHTGL_ApproveService.IsApproveMan(ActionPlanReviewId, PersonId))
{
BindGrid();
}
else if (UserId == Const.sysglyId || UserId == Const.hfnbdId)
else if (PersonId == Const.sysglyId || PersonId == Const.hfnbdId)
{
BindGrid();
}
else if (_ActionPlanFormation.CreatUser == UserId)
else if (_ActionPlanFormation.CreatUser == PersonId)
{
BindGrid();
}
@@ -125,7 +125,7 @@ namespace FineUIPro.Mobile.PHTGL.BiddingManagement
/// </summary>
private void BindGrid()
{
string strSql = @" select u.UserName as ApproveMan,
string strSql = @" select u.PersonName as ApproveMan,
App.ApproveDate,
(CASE App.IsAgree WHEN '1' THEN '不同意'
WHEN '2' THEN '同意' END) AS IsAgree,
@@ -133,7 +133,7 @@ namespace FineUIPro.Mobile.PHTGL.BiddingManagement
App.ApproveId,
App.ApproveType
from PHTGL_Approve as App"
+ @" left join Sys_User AS U ON U.UserId = App.ApproveMan WHERE 1=1 and App.IsAgree <>0 and app.ContractId= @ContractId order by convert(datetime ,App.ApproveDate) ";
+ @" left join SitePerson_Person AS U ON U.PersonId = App.ApproveMan WHERE 1=1 and App.IsAgree <>0 and app.ContractId= @ContractId order by convert(datetime ,App.ApproveDate) ";
List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@ContractId", ActionPlanReviewId));
SGGL/FineUIPro.Mobile/PHTGL/BiddingManagement/ApproveUserReviewDetail.aspx.cs
+11 -11
View File
@@ -60,16 +60,16 @@ namespace FineUIPro.Mobile.PHTGL.BiddingManagement
Session["pHTGL_Approve"] = value;
}
}
public string UserId
public string PersonId
{
get
{
UserId = Request.Params["UserId"];
return (string)ViewState["UserId"];
PersonId = Request.Params["PersonId"];
return (string)ViewState["PersonId"];
}
set
{
ViewState["UserId"] = value;
ViewState["PersonId"] = value;
}
}
#endregion
@@ -86,24 +86,24 @@ namespace FineUIPro.Mobile.PHTGL.BiddingManagement
EndApproveType = ApproveManModels.Count;
//获取当前登录人审批信息
pHTGL_Approve = BLL.PHTGL_ApproveService.GetPHTGL_ApproveByUserId(ApproveUserReviewID, UserId);
pHTGL_Approve = BLL.PHTGL_ApproveService.GetPHTGL_ApproveByUserId(ApproveUserReviewID, PersonId);
//文本框赋值
txtBidProject.Text = _Bid.BidProject;
txtProjectName.Text = PHTGL_ActionPlanFormationService.GetPHTGL_ActionPlanFormationById(BidDoc.ActionPlanID).ProjectShortName;
txtBidDocumentsCode.Text = BidDoc.BidDocumentsCode; ;
this.txtCreateUser.Text = BLL.Person_PersonsService.GetPersonsNameById(_Bid.CreateUser);
if (PHTGL_ApproveService.IsApproveMan(ApproveUserReviewID, UserId))
if (PHTGL_ApproveService.IsApproveMan(ApproveUserReviewID, PersonId))
{
BindGrid();
}
else if (UserId == Const.sysglyId || UserId == Const.hfnbdId)
else if (PersonId == Const.sysglyId || PersonId == Const.hfnbdId)
{
BindGrid();
}
else if (_Bid.CreateUser == UserId)
else if (_Bid.CreateUser == PersonId)
{
BindGrid();
}
@@ -119,7 +119,7 @@ namespace FineUIPro.Mobile.PHTGL.BiddingManagement
/// </summary>
private void BindGrid()
{
string strSql = @" select u.UserName as ApproveMan,
string strSql = @" select u.PersonName as ApproveMan,
App.ApproveDate,
(CASE App.IsAgree WHEN '1' THEN '不同意'
WHEN '2' THEN '同意' END) AS IsAgree,
@@ -127,7 +127,7 @@ namespace FineUIPro.Mobile.PHTGL.BiddingManagement
App.ApproveId,
App.ApproveType
from PHTGL_Approve as App"
+ @" left join Sys_User AS U ON U.UserId = App.ApproveMan WHERE 1=1 and App.IsAgree <>0 and app.ContractId= @ContractId order by convert(datetime ,App.ApproveDate) ";
+ @" left join SitePerson_Person AS U ON U.PersonId = App.ApproveMan WHERE 1=1 and App.IsAgree <>0 and app.ContractId= @ContractId order by convert(datetime ,App.ApproveDate) ";
List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@ContractId", ApproveUserReviewID));
@@ -148,7 +148,7 @@ namespace FineUIPro.Mobile.PHTGL.BiddingManagement
,APP.ApproveUserUnit
,APP.Remarks"
+ @" FROM PHTGL_BidApproveUserReview_Sch1 AS APP "
+ @" LEFT JOIN Sys_User AS U ON U.UserId =APP.ApproveUserName "
+ @" LEFT JOIN SitePerson_Person AS U ON U.PersonId =APP.ApproveUserName "
+ @"where 1=1 AND ApproveUserReviewID = @ApproveUserReviewID ";
List<SqlParameter> listStr = new List<SqlParameter>();
if (string.IsNullOrEmpty(ApproveUserReviewID))
SGGL/FineUIPro.Mobile/PHTGL/BiddingManagement/BidDocumentsReviewDetail.aspx.cs
+10 -10
View File
@@ -73,16 +73,16 @@ namespace FineUIPro.Mobile.PHTGL.BiddingManagement
Session["pHTGL_Approve"] = value;
}
}
public string UserId
public string PersonId
{
get
{
UserId = Request.Params["UserId"];
return (string)ViewState["UserId"];
PersonId = Request.Params["PersonId"];
return (string)ViewState["PersonId"];
}
set
{
ViewState["UserId"] = value;
ViewState["PersonId"] = value;
}
}
#endregion
@@ -106,22 +106,22 @@ namespace FineUIPro.Mobile.PHTGL.BiddingManagement
ApproveManModels = PHTGL_BidDocumentsReviewService.GetApproveManModels(_Bid.ProjectId, _Bid.BidDocumentsReviewId);
//获取当前登录人审批信息
pHTGL_Approve = BLL.PHTGL_ApproveService.GetPHTGL_ApproveByUserId(BidDocumentsReviewId, UserId);
pHTGL_Approve = BLL.PHTGL_ApproveService.GetPHTGL_ApproveByUserId(BidDocumentsReviewId, PersonId);
this.txtProjectCode.Text = _ActionPlanFormation.EPCCode;
this.txtProjectName.Text = _ActionPlanFormation.ProjectShortName;
this.txtCreateUser.Text = BLL.Person_PersonsService.GetPersonsNameById(_Bid.CreateUser);
if (PHTGL_ApproveService.IsApproveMan(BidDocumentsReviewId, UserId))
if (PHTGL_ApproveService.IsApproveMan(BidDocumentsReviewId, PersonId))
{
BindGrid();
}
else if (UserId == Const.sysglyId || UserId == Const.hfnbdId)
else if (PersonId == Const.sysglyId || PersonId == Const.hfnbdId)
{
BindGrid();
}
else if (_Bid.CreateUser == UserId)
else if (_Bid.CreateUser == PersonId)
{
BindGrid();
}
@@ -146,7 +146,7 @@ namespace FineUIPro.Mobile.PHTGL.BiddingManagement
/// </summary>
private void BindGrid()
{
string strSql = @" select u.UserName as ApproveMan,
string strSql = @" select u.PersonName as ApproveMan,
App.ApproveDate,
(CASE App.IsAgree WHEN '1' THEN '不同意'
WHEN '2' THEN '同意' END) AS IsAgree,
@@ -154,7 +154,7 @@ namespace FineUIPro.Mobile.PHTGL.BiddingManagement
App.ApproveId,
App.ApproveType
from PHTGL_Approve as App"
+ @" left join Sys_User AS U ON U.UserId = App.ApproveMan WHERE 1=1 and App.IsAgree <>0 and app.ContractId= @ContractId order by convert(datetime ,App.ApproveDate) ";
+ @" left join SitePerson_Person AS U ON U.PersonId = App.ApproveMan WHERE 1=1 and App.IsAgree <>0 and app.ContractId= @ContractId order by convert(datetime ,App.ApproveDate) ";
List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@ContractId", BidDocumentsReviewId));
SGGL/FineUIPro.Mobile/PHTGL/BiddingManagement/SetSubReviewDetail.aspx.cs
+10 -10
View File
@@ -73,16 +73,16 @@ namespace FineUIPro.Mobile.PHTGL.BiddingManagement
Session["pHTGL_Approve"] = value;
}
}
public string UserId
public string PersonId
{
get
{
UserId = Request.Params["UserId"];
return (string)ViewState["UserId"];
PersonId = Request.Params["PersonId"];
return (string)ViewState["PersonId"];
}
set
{
ViewState["UserId"] = value;
ViewState["PersonId"] = value;
}
}
#endregion
@@ -97,22 +97,22 @@ namespace FineUIPro.Mobile.PHTGL.BiddingManagement
Dic_ApproveMan = PHTGL_SetSubReviewService.Get_DicApproveman(SetSubReviewID);
ApproveManModels = PHTGL_SetSubReviewService.GetApproveManModels(SetSubReviewID);
//获取当前登录人审批信息
pHTGL_Approve = BLL.PHTGL_ApproveService.GetPHTGL_ApproveByUserId(SetSubReviewID, UserId);
pHTGL_Approve = BLL.PHTGL_ApproveService.GetPHTGL_ApproveByUserId(SetSubReviewID, PersonId);
//数据加载
Bind();
var _SetSubReview = BLL.PHTGL_SetSubReviewService.GetPHTGL_SetSubReviewById(SetSubReviewID);
if (PHTGL_ApproveService.IsApproveMan(SetSubReviewID, UserId))
if (PHTGL_ApproveService.IsApproveMan(SetSubReviewID, PersonId))
{
BindGrid();
}
else if (UserId == Const.sysglyId || UserId == Const.hfnbdId)
else if (PersonId == Const.sysglyId || PersonId == Const.hfnbdId)
{
BindGrid();
}
else if (_SetSubReview.CreateUser == UserId)
else if (_SetSubReview.CreateUser == PersonId)
{
BindGrid();
}
@@ -236,7 +236,7 @@ namespace FineUIPro.Mobile.PHTGL.BiddingManagement
/// </summary>
private void BindGrid()
{
string strSql = @" select u.UserName as ApproveMan,
string strSql = @" select u.PersonName as ApproveMan,
App.ApproveDate,
(CASE App.IsAgree WHEN '1' THEN '不同意'
WHEN '2' THEN '同意' END) AS IsAgree,
@@ -244,7 +244,7 @@ namespace FineUIPro.Mobile.PHTGL.BiddingManagement
App.ApproveId,
App.ApproveType
from PHTGL_Approve as App"
+ @" left join Sys_User AS U ON U.UserId = App.ApproveMan WHERE 1=1 and App.IsAgree <>0 and app.ContractId= @ContractId order by convert(datetime ,App.ApproveDate) ";
+ @" left join SitePerson_Person AS U ON U.PersonId = App.ApproveMan WHERE 1=1 and App.IsAgree <>0 and app.ContractId= @ContractId order by convert(datetime ,App.ApproveDate) ";
List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@ContractId", SetSubReviewID));