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

修改施工方案和关键事项

Browse Source
This commit is contained in:
潘鸿锋
2024-10-12 15:27:37 +08:00
parent a360cb9448
commit d35d9efdcb
54 changed files with 10572 additions and 2051 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/BLL/CQMS/Solution/CQMSConstructSolutionApproveService.cs
+118 -28
View File
@@ -37,6 +37,13 @@ namespace BLL
return (from x in Funs.DB.Solution_CQMSConstructSolutionApprove where x.ConstructSolutionId == ConstructSolutionId && x.ApproveType != "S" && x.SignType == signType && x.Edition == edtion select x.ApproveMan).ToList();
}
public static List<string> GetUserIdsApprovesBySignTypeNew(string ConstructSolutionId, string signType)
{
var edtion = GetUserIdsApprovesBySignTypeEditon(ConstructSolutionId);
return (from x in Funs.DB.Solution_CQMSConstructSolutionApprove where x.ConstructSolutionId == ConstructSolutionId && x.ApproveType != "S"
&& x.SignType == signType && x.Edition == edtion-1 select x.ApproveMan).ToList();
}
public static int? GetUserIdsApprovesBySignTypeEditon(string ConstructSolutionId)
{
int edition = 0;
@@ -54,17 +61,19 @@ namespace BLL
/// <param name="managerRuleApprove">施工方案审批实体</param>
public static void UpdateConstructSolutionApprove(Model.Solution_CQMSConstructSolutionApprove approve)
{
Model.SGGLDB db = Funs.DB;
Model.Solution_CQMSConstructSolutionApprove newApprove = db.Solution_CQMSConstructSolutionApprove.First(e => e.ConstructSolutionApproveId == approve.ConstructSolutionApproveId && e.ApproveDate == null);
newApprove.ConstructSolutionId = approve.ConstructSolutionId;
newApprove.ApproveMan = approve.ApproveMan;
newApprove.ApproveDate = approve.ApproveDate;
newApprove.ApproveIdea = approve.ApproveIdea;
newApprove.IsAgree = approve.IsAgree;
newApprove.ApproveType = approve.ApproveType;
newApprove.Edition = approve.Edition;
newApprove.Order=approve.Order;
db.SubmitChanges();
using (var db = new Model.SGGLDB(Funs.ConnString)) {
Model.Solution_CQMSConstructSolutionApprove newApprove = db.Solution_CQMSConstructSolutionApprove.First(e => e.ConstructSolutionApproveId == approve.ConstructSolutionApproveId && e.ApproveDate == null);
newApprove.ConstructSolutionId = approve.ConstructSolutionId;
newApprove.ApproveMan = approve.ApproveMan;
newApprove.ApproveDate = approve.ApproveDate;
newApprove.ApproveIdea = approve.ApproveIdea;
newApprove.IsAgree = approve.IsAgree;
newApprove.ApproveType = approve.ApproveType;
newApprove.Edition = approve.Edition;
newApprove.Order=approve.Order;
db.SubmitChanges();
}
}
/// <summary>
/// 根据施工方案发布Id获取所以对应施工方案审批信息(查询全部会签状态)
@@ -78,6 +87,13 @@ namespace BLL
}
public static List<Model.Solution_CQMSConstructSolutionApprove> GetHandleConstructSolutionApprovesByConstructSolutionId2(string ConstructSolutionId, int edition)
{
var list = Funs.DB.Solution_CQMSConstructSolutionApprove.Where(p => p.ConstructSolutionId == ConstructSolutionId && p.ApproveType == Const.CQMSConstructSolution_Audit1 && p.Edition == edition).ToList();
return list;
}
public static List<Model.Solution_CQMSConstructSolutionApprove> GetHandleConstruct(string ConstructSolutionId, int edition)
{
var list = Funs.DB.Solution_CQMSConstructSolutionApprove.Where(p => p.ConstructSolutionId == ConstructSolutionId && p.ApproveType != "S" && p.ApproveDate != null && p.Edition == edition).ToList();
@@ -162,10 +178,13 @@ namespace BLL
/// <param name="ConstructSolutionId"></param>
public static void delSolutionApprove(string constructSolutionId, string man)
{
Model.SGGLDB db = Funs.DB;
var q = (from x in Funs.DB.Solution_CQMSConstructSolutionApprove where x.ConstructSolutionId == constructSolutionId && x.ApproveType != "S" && x.ApproveMan.Equals(man) && x.ApproveDate == null select x).ToList();
db.Solution_CQMSConstructSolutionApprove.DeleteAllOnSubmit(q);
db.SubmitChanges();
using (var db = new Model.SGGLDB(Funs.ConnString))
{
var q = db.Solution_CQMSConstructSolutionApprove.Where(x => x.ConstructSolutionId == constructSolutionId && x.ApproveType != "S" && x.ApproveMan.Equals(man) && x.ApproveDate == null)
.ToList();
db.Solution_CQMSConstructSolutionApprove.DeleteAllOnSubmit(q);
db.SubmitChanges();
}
}
@@ -177,7 +196,7 @@ namespace BLL
public static void DeleteConstructSolutionApprovesByConstructSolutionId(string ConstructSolutionId)
{
Model.SGGLDB db = Funs.DB;
var q = (from x in Funs.DB.Solution_CQMSConstructSolutionApprove where x.ConstructSolutionId == ConstructSolutionId select x).ToList();
var q = (from x in db.Solution_CQMSConstructSolutionApprove where x.ConstructSolutionId == ConstructSolutionId select x).ToList();
db.Solution_CQMSConstructSolutionApprove.DeleteAllOnSubmit(q);
db.SubmitChanges();
}
@@ -209,8 +228,8 @@ namespace BLL
/// <param name="managerRuleApprove">施工方案审批实体</param>
public static void AddConstructSolutionApprove(Model.Solution_CQMSConstructSolutionApprove approve)
{
var db = Funs.DB;
Model.Solution_CQMSConstructSolutionApprove newApprove = new Model.Solution_CQMSConstructSolutionApprove();
using (var db = new Model.SGGLDB(Funs.ConnString)) {
Model.Solution_CQMSConstructSolutionApprove newApprove = new Model.Solution_CQMSConstructSolutionApprove();
if (string.IsNullOrWhiteSpace(approve.ConstructSolutionApproveId))
{
newApprove.ConstructSolutionApproveId = SQLHelper.GetNewID(typeof(Model.Solution_CQMSConstructSolutionApprove));
@@ -227,9 +246,11 @@ namespace BLL
newApprove.ApproveType = approve.ApproveType;
newApprove.SignType = approve.SignType;
newApprove.Edition = approve.Edition;
newApprove.Order= GetMaxOrderByConstructSolutionId(approve.ConstructSolutionId);
//newApprove.Order= GetMaxOrderByConstructSolutionId(approve.ConstructSolutionId);
newApprove.Order = approve.Order;
db.Solution_CQMSConstructSolutionApprove.InsertOnSubmit(newApprove);
db.SubmitChanges();
}
}
public static int GetMaxOrderByConstructSolutionId(string constructSolutionId)
@@ -254,18 +275,87 @@ namespace BLL
select x).FirstOrDefault();
return q;
}
public static string GetThisApproveNameByConstructSolutionId(object constructSolutionId)
public static List<Model.Solution_CQMSConstructSolutionApprove> GetThisApproveByConstructSolutionId(string constructSolutionId,string state)
{
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)
var constructSolution =
CQMSConstructSolutionService.GetConstructSolutionByConstructSolutionId(constructSolutionId.ToString());
var q = new List<Model.Solution_CQMSConstructSolutionApprove>();
if (state == "2")
{
name = UserService.GetUserNameByUserId(q.ApproveMan);
q = (from x in Funs.DB.Solution_CQMSConstructSolutionApprove
where x.ConstructSolutionId == constructSolutionId && x.ApproveDate == null
&& x.SignType == "Yi"
&& x.Edition==constructSolution.Edition
orderby x.Order
select x).ToList();
}
return name;
else if (state == "3")
{
q = (from x in Funs.DB.Solution_CQMSConstructSolutionApprove
where x.ConstructSolutionId == constructSolutionId && x.ApproveDate == null
&& x.SignType == "Er"
&& x.Edition == constructSolution.Edition
orderby x.Order
select x).ToList();
}
else {
q = (from x in Funs.DB.Solution_CQMSConstructSolutionApprove
where x.ConstructSolutionId == constructSolutionId && x.ApproveDate == null
&& x.SignType == null
&& x.Edition == constructSolution.Edition
orderby x.Order
select x).ToList();
}
return q;
}
//加载审批人
public static string GetThisApproveNameByConstructSolutionId(object constructSolutionId,object state)
{
var constructSolution =
CQMSConstructSolutionService.GetConstructSolutionByConstructSolutionId(constructSolutionId.ToString());
string name = "";
if (state.ToString() == "2")
{
var q = (from x in Funs.DB.Solution_CQMSConstructSolutionApprove
where x.ConstructSolutionId == constructSolutionId.ToString() && x.ApproveDate == null
&& x.Edition == constructSolution.Edition
&& x.SignType == "Yi"
orderby x.Order
select x).ToList();
if (q.Count > 0)
{
foreach (var item in q)
{
name += UserService.GetUserNameByUserId(item.ApproveMan) + ",";
}
}
return name;
}
else if (state.ToString() == "3")
{
var q = (from x in Funs.DB.Solution_CQMSConstructSolutionApprove
where x.ConstructSolutionId == constructSolutionId.ToString() && x.ApproveDate == null
&& x.SignType == "Er"
&& x.Edition == constructSolution.Edition
orderby x.Order
select x).ToList();
if (q.Count > 0)
{
foreach (var item in q)
{
name += UserService.GetUserNameByUserId(item.ApproveMan) + ",";
}
}
return name;
}
else {
return "";
}
}
/// <summary>
/// 推送待办给下一步办理人