代码无效引用清理,试压包资料界面看板修改
This commit is contained in:
@@ -1,7 +1,6 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Web.UI.WebControls;
|
||||
|
||||
namespace BLL
|
||||
{
|
||||
@@ -60,7 +59,7 @@ namespace BLL
|
||||
newSubPlan.CompileDate = SubPlan.CompileDate;
|
||||
newSubPlan.State = SubPlan.State;
|
||||
newSubPlan.Edition = SubPlan.Edition;
|
||||
newSubPlan.FilePath=SubPlan.FilePath;
|
||||
newSubPlan.FilePath = SubPlan.FilePath;
|
||||
db.Plan_SubPlan.InsertOnSubmit(newSubPlan);
|
||||
db.SubmitChanges();
|
||||
}
|
||||
@@ -226,8 +225,8 @@ namespace BLL
|
||||
StateStr = ConvertState(x.State),
|
||||
CompileManName = (from y in db.Person_Persons where y.PersonId == x.CompileMan select y.PersonName).First(),
|
||||
UnitName = BLL.UnitService.GetUnitNameByUnitId(x.UnitId),
|
||||
UnitWorkNames=BLL.UnitWorkService.GetUnitWorkName(x.UnitWorkIds),
|
||||
CNProfessionalNames=BLL.CNProfessionalService.GetCNProfessionalNameByCode(x.CNProfessionalCodes),
|
||||
UnitWorkNames = BLL.UnitWorkService.GetUnitWorkName(x.UnitWorkIds),
|
||||
CNProfessionalNames = BLL.CNProfessionalService.GetCNProfessionalNameByCode(x.CNProfessionalCodes),
|
||||
HandleManName = BLL.CQMS_SubPlanApproveService.GetHandleManName(x.SubPlanId),
|
||||
FilePath = x.FilePath,
|
||||
};
|
||||
@@ -239,9 +238,9 @@ namespace BLL
|
||||
cd.SubPlanId = item.SubPlanId;
|
||||
cd.ProjectId = item.ProjectId;
|
||||
cd.Code = item.Code;
|
||||
cd.UnitId=item.UnitId + "$" + item.UnitName;
|
||||
cd.UnitId = item.UnitId + "$" + item.UnitName;
|
||||
cd.PlanName = item.PlanName;
|
||||
cd.UnitWorkIds=item.UnitWorkIds + "$" + item.UnitWorkNames;
|
||||
cd.UnitWorkIds = item.UnitWorkIds + "$" + item.UnitWorkNames;
|
||||
cd.CNProfessionalCodes = item.CNProfessionalCodes + "$" + item.CNProfessionalNames;
|
||||
cd.CompileDate = item.CompileDate;
|
||||
cd.CompileMan = item.CompileMan + "$" + item.CompileManName;
|
||||
@@ -261,13 +260,13 @@ namespace BLL
|
||||
/// <returns>一个分包施工质量计划实体</returns>
|
||||
public static Model.Plan_SubPlan GetSubPlanBySubPlanIdForApi(string SubPlanId)
|
||||
{
|
||||
var q= Funs.DB.Plan_SubPlan.FirstOrDefault(x => x.SubPlanId == SubPlanId);
|
||||
var q = Funs.DB.Plan_SubPlan.FirstOrDefault(x => x.SubPlanId == SubPlanId);
|
||||
if (q != null)
|
||||
{
|
||||
q.UnitId = q.UnitId + "$" + BLL.UnitService.GetUnitNameByUnitId(q.UnitId);
|
||||
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.CompileMan = q.CompileMan + "$" + BLL.Person_PersonsService.GetPersonsNameById(q.CompileMan);
|
||||
q.State = q.State + "$" + ConvertState(q.State) + "$" + BLL.CQMS_SubPlanApproveService.GetHandleManName(q.SubPlanId);
|
||||
}
|
||||
return q;
|
||||
|
||||
Reference in New Issue
Block a user