diff --git a/SGGL/BLL/CQMS/Plan/CQMS_MainPlanApproveService.cs b/SGGL/BLL/CQMS/Plan/CQMS_MainPlanApproveService.cs
index 4c15c203..ccdf36ee 100644
--- a/SGGL/BLL/CQMS/Plan/CQMS_MainPlanApproveService.cs
+++ b/SGGL/BLL/CQMS/Plan/CQMS_MainPlanApproveService.cs
@@ -115,6 +115,16 @@ namespace BLL
{
return db.Plan_MainPlanApprove.OrderByDescending(x => x.ApproveDate).FirstOrDefault(x => x.MainPlanId == MainPlanId && x.ApproveType == state);
}
+ public static string GetHandleManName(string MainPlanId)
+ {
+ string name = string.Empty;
+ var a= Funs.DB.Plan_MainPlanApprove.FirstOrDefault(x => x.MainPlanId == MainPlanId && x.ApproveDate == null);
+ if (a != null)
+ {
+ name = BLL.Person_PersonsService.GetPersonsNameById(a.ApproveMan);
+ }
+ return name;
+ }
///
/// 修改总包施工计划审批信息
///
diff --git a/SGGL/BLL/CQMS/Plan/CQMS_MainPlanService.cs b/SGGL/BLL/CQMS/Plan/CQMS_MainPlanService.cs
index 4bbe5917..67f9df2d 100644
--- a/SGGL/BLL/CQMS/Plan/CQMS_MainPlanService.cs
+++ b/SGGL/BLL/CQMS/Plan/CQMS_MainPlanService.cs
@@ -195,6 +195,7 @@ namespace BLL
x.State,
StateStr = ConvertState(x.State),
CompileManName = (from y in db.Person_Persons where y.PersonId == x.CompileMan select y.PersonName).First(),
+ HandleManName = BLL.CQMS_MainPlanApproveService.GetHandleManName(x.State),
FilePath = x.FilePath,
};
List res = new List();
@@ -208,7 +209,7 @@ namespace BLL
cd.FileName = item.FileName;
cd.CompileDate = item.CompileDate;
cd.CompileMan = item.CompileMan + "$" + item.CompileManName;
- cd.State = item.State + "$" + item.StateStr;
+ cd.State = item.State + "$" + item.StateStr + "&" + item.HandleManName;
cd.FilePath = item.FilePath;
res.Add(cd);
}
@@ -226,7 +227,7 @@ namespace BLL
var q = Funs.DB.Plan_MainPlan.FirstOrDefault(e => e.MainPlanId == MainPlanId);
if (q != null)
{
- q.State = q.State + "$" + ConvertState(q.State);
+ q.State = q.State + "$" + ConvertState(q.State) + "$" + BLL.CQMS_MainPlanApproveService.GetHandleManName(q.State);
q.CompileMan = q.CompileMan + "$" + BLL.Person_PersonsService.GetPersonsNameById(q.CompileMan);
}
return q;
diff --git a/SGGL/BLL/CQMS/Plan/CQMS_SubPlanApproveService.cs b/SGGL/BLL/CQMS/Plan/CQMS_SubPlanApproveService.cs
index ace062f5..93a47911 100644
--- a/SGGL/BLL/CQMS/Plan/CQMS_SubPlanApproveService.cs
+++ b/SGGL/BLL/CQMS/Plan/CQMS_SubPlanApproveService.cs
@@ -295,6 +295,15 @@ namespace BLL
}
}
-
+ public static string GetHandleManName(string SubPlanId)
+ {
+ string name = string.Empty;
+ var a = Funs.DB.Plan_SubPlanApprove.FirstOrDefault(x => x.SubPlanId == SubPlanId && x.ApproveDate == null);
+ if (a != null)
+ {
+ name = BLL.Person_PersonsService.GetPersonsNameById(a.ApproveMan);
+ }
+ return name;
+ }
}
}
diff --git a/SGGL/BLL/CQMS/Plan/CQMS_SubPlanService.cs b/SGGL/BLL/CQMS/Plan/CQMS_SubPlanService.cs
index 2e909131..57c64856 100644
--- a/SGGL/BLL/CQMS/Plan/CQMS_SubPlanService.cs
+++ b/SGGL/BLL/CQMS/Plan/CQMS_SubPlanService.cs
@@ -228,6 +228,7 @@ namespace BLL
UnitName = BLL.UnitService.GetUnitNameByUnitId(x.UnitId),
UnitWorkNames=BLL.UnitWorkService.GetUnitWorkName(x.UnitWorkIds),
CNProfessionalNames=BLL.CNProfessionalService.GetCNProfessionalNameByCode(x.CNProfessionalCodes),
+ HandleManName = BLL.CQMS_SubPlanApproveService.GetHandleManName(x.State),
FilePath = x.FilePath,
};
List res = new List();
@@ -244,7 +245,7 @@ namespace BLL
cd.CNProfessionalCodes = item.CNProfessionalCodes + "$" + item.CNProfessionalNames;
cd.CompileDate = item.CompileDate;
cd.CompileMan = item.CompileMan + "$" + item.CompileManName;
- cd.State = item.State + "$" + item.StateStr;
+ cd.State = item.State + "$" + item.StateStr + "&" + item.HandleManName;
cd.Edition = item.Edition;
cd.FilePath = item.FilePath;
res.Add(cd);
@@ -267,7 +268,7 @@ namespace BLL
q.UnitWorkIds = q.UnitWorkIds + "$" + BLL.UnitWorkService.GetUnitWorkName(q.UnitWorkIds);
q.CNProfessionalCodes = q.CNProfessionalCodes + "$" + BLL.CNProfessionalService.GetCNProfessionalNameByCode(q.CNProfessionalCodes);
q.CompileMan=q.CompileMan + "$" + BLL.Person_PersonsService.GetPersonsNameById(q.CompileMan);
- q.State = q.State + "$" + ConvertState(q.State);
+ q.State = q.State + "$" + ConvertState(q.State) + "$" + BLL.CQMS_SubPlanApproveService.GetHandleManName(q.State);
}
return q;
}
diff --git a/SGGL/FineUIPro.Web/CQMS/Plan/SubPlan.aspx b/SGGL/FineUIPro.Web/CQMS/Plan/SubPlan.aspx
index 98f66789..305ed6c3 100644
--- a/SGGL/FineUIPro.Web/CQMS/Plan/SubPlan.aspx
+++ b/SGGL/FineUIPro.Web/CQMS/Plan/SubPlan.aspx
@@ -140,7 +140,7 @@
-
+
-
+
-
+