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

修改质量计划

Browse Source
This commit is contained in:
高飞
2023-03-15 16:56:14 +08:00
parent 0b1b5f4731
commit f2a3954a44
7 changed files with 29 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/BLL/CQMS/Plan/CQMS_MainPlanApproveService.cs
+10
View File
@@ -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;
}
/// <summary>
/// 修改总包施工计划审批信息
/// </summary>
SGGL/BLL/CQMS/Plan/CQMS_MainPlanService.cs
+3 -2
View File
@@ -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<Model.Plan_MainPlan> res = new List<Model.Plan_MainPlan>();
@@ -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;
SGGL/BLL/CQMS/Plan/CQMS_SubPlanApproveService.cs
+10 -1
View File
@@ -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;
}
}
}
SGGL/BLL/CQMS/Plan/CQMS_SubPlanService.cs
+3 -2
View File
@@ -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<Model.Plan_SubPlan> res = new List<Model.Plan_SubPlan>();
@@ -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;
}
SGGL/FineUIPro.Web/CQMS/Plan/SubPlan.aspx
+1 -1
View File
@@ -140,7 +140,7 @@
<f:TemplateField ColumnID="State" Width="60px" HeaderText="状态" HeaderTextAlign="Center" TextAlign="Center"
EnableLock="true" Locked="False">
<ItemTemplate>
<asp:Label ID="Label1" runat="server" Text='<%# BLL.CQMSConstructSolutionService.ConvertState(Eval("State")) %>'></asp:Label>
<asp:Label ID="Label1" runat="server" Text='<%# BLL.CQMS_SubPlanService.ConvertState(Eval("State")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:TemplateField ColumnID="AuditMan" Width="80px" HeaderText="办理人" HeaderTextAlign="Center" TextAlign="Center"
SGGL/FineUIPro.Web/CQMS/Plan/SubPlanEdit.aspx
+1 -1
View File
@@ -208,7 +208,7 @@
<f:TemplateField ColumnID="ApproveType" Width="150px" HeaderText="办理类型" HeaderTextAlign="Center" TextAlign="Center"
EnableLock="true" Locked="False">
<ItemTemplate>
<asp:Label ID="Label1" runat="server" Text='<%# BLL.CQMSConstructSolutionService.ConvertState(Eval("ApproveType")) %>'></asp:Label>
<asp:Label ID="Label1" runat="server" Text='<%# BLL.CQMS_SubPlanService.ConvertState(Eval("ApproveType")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:TemplateField ColumnID="ApproveMan" Width="150px" HeaderText="办理人员" HeaderTextAlign="Center" TextAlign="Center"
SGGL/FineUIPro.Web/CQMS/Plan/SubPlanView.aspx
+1 -1
View File
@@ -157,7 +157,7 @@
<f:TemplateField ColumnID="ApproveType" Width="150px" HeaderText="办理类型" HeaderTextAlign="Center" TextAlign="Center"
EnableLock="true" Locked="False">
<ItemTemplate>
<asp:Label ID="Label1" runat="server" Text='<%# BLL.CQMSConstructSolutionService.ConvertState(Eval("ApproveType")) %>'></asp:Label>
<asp:Label ID="Label1" runat="server" Text='<%# BLL.CQMS_SubPlanService.ConvertState(Eval("ApproveType")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:TemplateField ColumnID="ApproveMan" Width="150px" HeaderText="办理人员" HeaderTextAlign="Center" TextAlign="Center"