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

Merge branch 'master' of https://gitee.com/frane-yang/SGGL_SeDin_New

Browse Source
This commit is contained in:
李鹏飞
2023-06-27 22:03:52 +08:00
parent fc86274161 ca2e5715b8
commit 0741fadfb0
7 changed files with 221 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/ZHGL/Plan/ActionPlanList.aspx.cs
+1 -1
View File
@@ -183,7 +183,7 @@ namespace FineUIPro.Web.ZHGL.Plan
return;
}
}
else if (actionPlanList.States == Const.ActionPlanList_Review || actionPlanList.States == Const.ActionPlanList_Reviewing || actionPlanList.States == Const.ActionPlanList_ReCompile || actionPlanList.States == Const.ActionPlanList_Review2)
else if (actionPlanList.States == Const.ActionPlanList_Review || actionPlanList.States == Const.ActionPlanList_Reviewing || actionPlanList.States == Const.ActionPlanList_ReCompile || actionPlanList.States == Const.ActionPlanList_Review2 || actionPlanList.States == Const.ActionPlanList_DepartReview)
{
Model.ActionPlan_ActionPlanListApprove approve = ActionPlanListApproveService.GetActionPlanListApproveByApproveMan(id, CurrUser.PersonId);
if (approve != null || CurrUser.PersonId == Const.sysglyId)
SGGL/FineUIPro.Web/ZHGL/Plan/ActionPlanListEdit.aspx.cs
+53 -3
View File
@@ -222,6 +222,10 @@ namespace FineUIPro.Web.ZHGL.Plan
rblIsCompanyReview.SelectedValue = "False";
}
ContactImg = -1;
this.btnNew.Hidden = true;
this.btnMenuEdit.Hidden = true;
this.btnMenuDelete.Hidden = true;
this.gvDepart.EnableRowDoubleClickEvent = false;
}
//提交版本人多次修改
if (actionPlanList.CompileMan.Equals(CurrUser.PersonId))
@@ -443,7 +447,17 @@ namespace FineUIPro.Web.ZHGL.Plan
{
if (rblIsCompanyReview.SelectedValue == "True") //公司部门评审
{
OAWebSevice.PushoaActionPlan(); //推送OA待办
Model.ActionPlan_ActionPlanListApprove approve = ActionPlanListApproveService.GetConstructSoluAppByApproveMan(ActionPlanListId, CurrUser.PersonId, Convert.ToInt32(actionPlanList1.Edition));
if (type == BLL.Const.BtnSubmit)
{
approve.ApproveDate = DateTime.Now;
}
approve.Edition = Convert.ToInt32(edtion);
approve.IsAgree = Convert.ToBoolean(rblIsAgree.SelectedValue);
approve.ApproveIdea = txtOptions.Text.Trim();
ActionPlanListApproveService.UpdateActionPlanListApprove(approve);
actionPlanList.States = Const.ActionPlanList_DepartReview;
}
else //备案
{
@@ -459,6 +473,41 @@ namespace FineUIPro.Web.ZHGL.Plan
actionPlanList.States = Const.ActionPlanList_Complete;
}
}
else if (actionPlanList1.States == Const.ActionPlanList_DepartReview)
{
actionPlanList.States = Const.ActionPlanList_DepartReview;
Model.ActionPlan_ActionPlanListApprove approve = ActionPlanListApproveService.GetConstructSoluAppByApproveMan(ActionPlanListId, CurrUser.PersonId, Convert.ToInt32(actionPlanList1.Edition));
if (approve != null)
{
approve.ApproveDate = DateTime.Now;
approve.ApproveIdea = this.txtOptions.Text.Trim();
approve.IsAgree = Convert.ToBoolean(this.rblIsAgree.SelectedValue);
BLL.ActionPlanListApproveService.UpdateActionPlanListApprove(approve);
OAWebSevice.DoneRequestActionPlan(approve.ActionPlanListApproveId); //处理待办流程
}
List<Model.ActionPlan_ActionPlanListApprove> approve3s = BLL.ActionPlanListApproveService.GetDepartReviewings(ActionPlanListId, edtion); //审批集合
List<Model.ActionPlan_ActionPlanListApprove> approve3Ends = BLL.ActionPlanListApproveService.GetDepartReviewingEnds(ActionPlanListId, edtion); //审批完成集合
int okNum = approve3Ends.Count(x => x.IsAgree == true); //审批同意数量
if (approve3s.Count == approve3Ends.Count)
{
if (approve3s.Count == okNum) //全部同意,审批完成
{
actionPlanList.States = Const.ActionPlanList_Complete;
}
else //有人不同意，（编制人）修改
{
Model.ActionPlan_ActionPlanListApprove reApprove = new Model.ActionPlan_ActionPlanListApprove();
reApprove.ActionPlanListId = actionPlanList.ActionPlanListId;
reApprove.ApproveMan = actionPlanList1.CompileMan;
reApprove.ApproveType = Const.ActionPlanList_ReCompile;
edtion++;
reApprove.Edition = edtion;
ActionPlanListApproveService.AddActionPlanListApprove(reApprove);
actionPlanList.States = Const.ActionPlanList_ReCompile;
actionPlanList.Edition = edtion;
}
}
}
}
else
{
@@ -645,7 +694,8 @@ namespace FineUIPro.Web.ZHGL.Plan
private void BindDepart()
{
var list = ActionPlanListApproveService.getDepartListData(ActionPlanListId);
Model.ActionPlan_ActionPlanList actionPlanList = BLL.ActionPlanListService.GetActionPlanListById(this.ActionPlanListId);
var list = ActionPlanListApproveService.getDepartListData(ActionPlanListId, actionPlanList.Edition);
gvDepart.DataSource = list;
gvDepart.DataBind();
}
@@ -716,7 +766,7 @@ namespace FineUIPro.Web.ZHGL.Plan
string rowID = gvDepart.DataKeys[rowIndex][0].ToString();
BLL.ActionPlanListApproveService.DeleteActionPlanListApprovesByActionPlanListApproveId(rowID);
}
//BindGrid();
BindDepart();
ShowNotify("删除数据成功!（表格数据已重新绑定）", MessageBoxIcon.Success);
}
}
SGGL/FineUIPro.Web/ZHGL/Plan/DepartEdit.aspx.cs
+4
View File
@@ -91,6 +91,7 @@ namespace FineUIPro.Web.ZHGL.Plan
Alert.ShowInTop("请选择办理人!", MessageBoxIcon.Warning);
return;
}
Model.ActionPlan_ActionPlanList actionPlanList = BLL.ActionPlanListService.GetActionPlanListById(this.ActionPlanListId);
Model.ActionPlan_ActionPlanListApprove approve = new Model.ActionPlan_ActionPlanListApprove
{
ActionPlanListId = this.ActionPlanListId
@@ -103,6 +104,9 @@ namespace FineUIPro.Web.ZHGL.Plan
{
approve.ApproveMan = this.drpApproveMan.SelectedValue;
}
approve.ApproveType = BLL.Const.ActionPlanList_DepartReview;
approve.Edition = actionPlanList.Edition;
approve.IsPushOa = 0;
if (!string.IsNullOrEmpty(this.ActionPlanListApproveId))
{
approve.ActionPlanListApproveId = this.ActionPlanListApproveId;