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-16 14:35:01 +08:00
parent f2a3954a44
commit 49afa7e25d
17 changed files with 826 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/BLL/CQMS/Plan/CQMS_MainPlanApproveService.cs
+2 -2
View File
@@ -118,7 +118,7 @@ namespace BLL
public static string GetHandleManName(string MainPlanId)
{
string name = string.Empty;
var a= Funs.DB.Plan_MainPlanApprove.FirstOrDefault(x => x.MainPlanId == MainPlanId && x.ApproveDate == null);
var a = Funs.DB.Plan_MainPlanApprove.FirstOrDefault(x => x.MainPlanId == MainPlanId && x.ApproveDate == null);
if (a != null)
{
name = BLL.Person_PersonsService.GetPersonsNameById(a.ApproveMan);
@@ -246,7 +246,7 @@ namespace BLL
cd.ApproveDate = item.ApproveDate;
cd.IsAgree = item.IsAgree;
cd.ApproveIdea = item.ApproveIdea;
cd.ApproveType = item.ApproveType;
cd.ApproveType = item.ApproveType + "$" + CQMS_MainPlanService.ConvertState(item.ApproveType);
res.Add(cd);
}
return res;
SGGL/BLL/CQMS/Plan/CQMS_MainPlanService.cs
+3 -3
View File
@@ -195,7 +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),
HandleManName = BLL.CQMS_MainPlanApproveService.GetHandleManName(x.MainPlanId),
FilePath = x.FilePath,
};
List<Model.Plan_MainPlan> res = new List<Model.Plan_MainPlan>();
@@ -209,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 + "&" + item.HandleManName;
cd.State = item.State + "$" + item.StateStr + "$" + item.HandleManName;
cd.FilePath = item.FilePath;
res.Add(cd);
}
@@ -227,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) + "$" + BLL.CQMS_MainPlanApproveService.GetHandleManName(q.State);
q.State = q.State + "$" + ConvertState(q.State) + "$" + BLL.CQMS_MainPlanApproveService.GetHandleManName(q.MainPlanId);
q.CompileMan = q.CompileMan + "$" + BLL.Person_PersonsService.GetPersonsNameById(q.CompileMan);
}
return q;
SGGL/BLL/CQMS/Plan/CQMS_SubPlanApproveService.cs
+1 -1
View File
@@ -288,7 +288,7 @@ namespace BLL
cd.ApproveDate = item.ApproveDate;
cd.IsAgree = item.IsAgree;
cd.ApproveIdea = item.ApproveIdea;
cd.ApproveType = item.ApproveType;
cd.ApproveType = item.ApproveType + "$" + CQMS_SubPlanService.ConvertState(item.ApproveType);
res.Add(cd);
}
return res;
SGGL/BLL/CQMS/Plan/CQMS_SubPlanService.cs
+3 -3
View File
@@ -228,7 +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),
HandleManName = BLL.CQMS_SubPlanApproveService.GetHandleManName(x.SubPlanId),
FilePath = x.FilePath,
};
List<Model.Plan_SubPlan> res = new List<Model.Plan_SubPlan>();
@@ -245,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 + "&" + item.HandleManName;
cd.State = item.State + "$" + item.StateStr + "$" + item.HandleManName;
cd.Edition = item.Edition;
cd.FilePath = item.FilePath;
res.Add(cd);
@@ -268,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) + "$" + BLL.CQMS_SubPlanApproveService.GetHandleManName(q.State);
q.State = q.State + "$" + ConvertState(q.State) + "$" + BLL.CQMS_SubPlanApproveService.GetHandleManName(q.SubPlanId);
}
return q;
}