lpf/CNCEC_SUBQHSE_WUHUAN
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

2023-10-19

Browse Source
This commit is contained in:
李鹏飞
2023-10-19 21:44:34 +08:00
parent c90f8f4cba
commit 3f9510cede
13 changed files with 250 additions and 329 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/BLL/CQMS/Solution/CQMSConstructSolutionApproveService.cs
+55
View File
@@ -63,6 +63,7 @@ namespace BLL
newApprove.IsAgree = approve.IsAgree;
newApprove.ApproveType = approve.ApproveType;
newApprove.Edition = approve.Edition;
newApprove.Order=approve.Order;
db.SubmitChanges();
}
/// <summary>
@@ -226,9 +227,62 @@ namespace BLL
newApprove.ApproveType = approve.ApproveType;
newApprove.SignType = approve.SignType;
newApprove.Edition = approve.Edition;
newApprove.Order= GetMaxOrderByConstructSolutionId(approve.ConstructSolutionId);
db.Solution_CQMSConstructSolutionApprove.InsertOnSubmit(newApprove);
db.SubmitChanges();
}
public static int GetMaxOrderByConstructSolutionId(string constructSolutionId)
{
int order = 0;
var q = (from x in Funs.DB.Solution_CQMSConstructSolutionApprove
where x.ConstructSolutionId == constructSolutionId
select x).ToList().Count();
order = q + 1;
return order;
}
/// <summary>
/// 获取当前办理人
/// </summary>
/// <param name="constructSolutionId"></param>
/// <returns></returns>
public static Model.Solution_CQMSConstructSolutionApprove GetThisApproveByConstructSolutionId( string constructSolutionId)
{
var q = (from x in Funs.DB.Solution_CQMSConstructSolutionApprove
where x.ConstructSolutionId == constructSolutionId && x.ApproveDate != null
orderby x.Order
select x).FirstOrDefault();
return q;
}
public static string GetThisApproveNameByConstructSolutionId(object constructSolutionId)
{
string name = "";
var q = (from x in Funs.DB.Solution_CQMSConstructSolutionApprove
where x.ConstructSolutionId == constructSolutionId.ToString() && x.ApproveDate != null
orderby x.Order
select x).FirstOrDefault();
if (q!=null)
{
name = UserService.GetUserNameByUserId(q.ApproveMan);
}
return name;
}
/// <summary>
/// 推送待办给下一步办理人
/// </summary>
/// <param name="constructSolutionId"></param>
public static void PushMessageToNextMan(string constructSolutionId)
{
var approve= GetThisApproveByConstructSolutionId(constructSolutionId);
if (approve!=null)
{
APICommonService.SendSubscribeMessage(approve.ApproveMan, "施工方案待办理", UserService.GetUserNameByUserId(approve.ApproveMan), string.Format("{0:yyyy-MM-dd HH:mm:ss}", DateTime.Now));
}
}
public static void AddConstructSolutionApproveForApi(Model.Solution_CQMSConstructSolutionApprove approve)
{
using (var db = new Model.SGGLDB(Funs.ConnString))
@@ -250,6 +304,7 @@ namespace BLL
newApprove.ApproveType = approve.ApproveType;
newApprove.SignType = approve.SignType;
newApprove.Edition = approve.Edition;
newApprove.Order = approve.Order;
db.Solution_CQMSConstructSolutionApprove.InsertOnSubmit(newApprove);
db.SubmitChanges();
}
SGGL/BLL/SysManage/UserService.cs
+3 -6
View File
@@ -623,9 +623,8 @@ namespace BLL
list = (from x in db.Sys_User
join y in db.Project_ProjectUser
on x.UserId equals y.UserId
join z in db.Base_Depart on x.DepartId equals z.DepartId
where y.ProjectId == projectId && x.UnitId == unitId && x.IsPost == true && y.IsPost == true && x.UserId != notCopyManId
orderby z.DepartCode, x.UserName
orderby x.UserName
select x).ToList();
}
else
@@ -633,9 +632,8 @@ namespace BLL
list = (from x in db.Sys_User
join y in db.Project_ProjectUser
on x.UserId equals y.UserId
join z in db.Base_Depart on x.DepartId equals z.DepartId
where y.ProjectId == projectId && x.IsPost == true && y.IsPost == true && x.UserId != notCopyManId
orderby z.DepartCode, x.UserName
orderby x.UserName
select x).ToList();
}
@@ -643,9 +641,8 @@ namespace BLL
else
{
list = (from x in db.Sys_User
join z in db.Base_Depart on x.DepartId equals z.DepartId
where x.UnitId == unitId && x.IsPost == true && x.UserId != notCopyManId
orderby z.DepartCode, x.UserName
orderby x.UserName
select x).ToList();
}
return list;