From 2b35927d70edc348df9f4afe2a080d1baa8e5191 Mon Sep 17 00:00:00 2001
From: gaofei <181547018@qq.com>
Date: Mon, 27 Mar 2023 17:09:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B4=A8=E9=87=8F=E6=8E=A5?=
=?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
SGGL/BLL/CQMS/Train/CQMS_TrainPlanService.cs | 81 ++++++++++++++++---
.../Controllers/CQMS/CQMSTrainController.cs | 5 +-
2 files changed, 73 insertions(+), 13 deletions(-)
diff --git a/SGGL/BLL/CQMS/Train/CQMS_TrainPlanService.cs b/SGGL/BLL/CQMS/Train/CQMS_TrainPlanService.cs
index 580b52e9..1b9871bf 100644
--- a/SGGL/BLL/CQMS/Train/CQMS_TrainPlanService.cs
+++ b/SGGL/BLL/CQMS/Train/CQMS_TrainPlanService.cs
@@ -167,21 +167,80 @@ namespace BLL
///
public static Model.Train_TrainPlan GetTraiPlanByTrainPlanIdForApi(string TrainPlanId)
{
+ //using (var db = new Model.SGGLDB(Funs.ConnString))
+ //{
+ // var q = db.Train_TrainPlan.FirstOrDefault(e => e.TrainPlanId == TrainPlanId);
+ // Model.Train_TrainPlan t = new Model.Train_TrainPlan();
+ // if (q != null)
+ // {
+ // t.TrainPlanId = q.TrainPlanId;
+ // t.ProjectId = q.ProjectId;
+ // t.TrainContent = q.TrainContent;
+ // t.PlanTrainDate = q.PlanTrainDate;
+ // t.RealTrainDate = q.RealTrainDate;
+ // t.Place = q.Place;
+ // t.TeachHour = q.TeachHour;
+ // t.CompileDate = q.CompileDate;
+ // t.TrainPersonNum = q.TrainPersonNum;
+ // t.PlanTrainPersons = q.PlanTrainPersons + "$" + ConvertPlanTrainPersons(q.PlanTrainPersons);
+ // t.TrainTypeId = q.TrainTypeId + "$" + (from y in db.Base_CQMSTrainType where y.TrainTypeId == q.TrainTypeId select y.TrainTypeName).First();
+ // t.RealTrainPersons = q.RealTrainPersons + "$" + Person_PersonsService.getPersonsNamesPersonIds(q.RealTrainPersons);
+ // t.HostMan = q.HostMan + "$" + BLL.Person_PersonsService.getPersonsNamesPersonIds(q.HostMan);
+ // t.CompileMan = q.CompileMan + "$" + BLL.Person_PersonsService.GetPersonsNameById(q.CompileMan);
+ // t.AttachUrl = AttachFileService.getFileUrl(q.TrainPlanId);
+ // }
+ // return t;
+ //}
using (var db = new Model.SGGLDB(Funs.ConnString))
{
- var q = db.Train_TrainPlan.FirstOrDefault(e => e.TrainPlanId == TrainPlanId);
- if (q != null)
+ IQueryable q = db.Train_TrainPlan;
+ if (!string.IsNullOrEmpty(TrainPlanId))
{
- q.TeachHour = q.TeachHour;
- q.TrainPersonNum = q.TrainPersonNum;
- q.PlanTrainPersons = q.PlanTrainPersons + "$" + ConvertPlanTrainPersons(q.PlanTrainPersons);
- q.TrainTypeId = q.TrainTypeId + "$" + (from y in db.Base_CQMSTrainType where y.TrainTypeId == q.TrainTypeId select y.TrainTypeName).First();
- q.RealTrainPersons = q.RealTrainPersons + "$" + Person_PersonsService.getPersonsNamesPersonIds(q.RealTrainPersons);
- q.HostMan = q.HostMan + "$" + BLL.Person_PersonsService.getPersonsNamesPersonIds(q.HostMan);
- q.CompileMan = q.CompileMan + "$" + BLL.Person_PersonsService.GetPersonsNameById(q.CompileMan);
- q.AttachUrl = AttachFileService.getFileUrl(q.TrainPlanId);
+ q = q.Where(e => e.TrainPlanId == TrainPlanId);
}
- return q;
+ var qres = from x in q
+ orderby x.CompileDate descending
+ select new
+ {
+ x.TrainPlanId,
+ x.ProjectId,
+ x.PlanTrainPersons,
+ PlanTrainPersonsStr = ConvertPlanTrainPersons(x.PlanTrainPersons),
+ x.TrainTypeId,
+ TrainTypeName = (from y in db.Base_CQMSTrainType where y.TrainTypeId == x.TrainTypeId select y.TrainTypeName).First(),
+ x.TrainContent,
+ x.PlanTrainDate,
+ x.HostMan,
+ x.RealTrainDate,
+ x.Place,
+ x.TeachHour,
+ x.TrainPersonNum,
+ x.RealTrainPersons,
+ x.CompileDate,
+ x.CompileMan,
+ x.AttachUrl,
+ CompileManName = (from y in db.Person_Persons where y.PersonId == x.CompileMan select y.PersonName).First(),
+ };
+ Model.Train_TrainPlan res = new Model.Train_TrainPlan();
+ var list = qres.FirstOrDefault();
+ Model.Train_TrainPlan cd = new Model.Train_TrainPlan();
+ cd.TrainPlanId = list.TrainPlanId;
+ cd.ProjectId = list.ProjectId;
+ cd.PlanTrainPersons = list.PlanTrainPersons + "$" + list.PlanTrainPersonsStr;
+ cd.TrainTypeId = list.TrainTypeId + "$" + list.TrainTypeName;
+ cd.TrainContent = list.TrainContent;
+ cd.PlanTrainDate = list.PlanTrainDate;
+ cd.HostMan = list.HostMan;
+ cd.RealTrainDate = list.RealTrainDate;
+ cd.Place = list.Place;
+ cd.TeachHour = list.TeachHour;
+ cd.TrainPersonNum = list.TrainPersonNum;
+ cd.RealTrainPersons = list.RealTrainPersons;
+ cd.CompileDate = list.CompileDate;
+ cd.CompileMan = list.CompileMan + "$" + list.CompileManName;
+ cd.AttachUrl = AttachFileService.getFileUrl(list.TrainPlanId);
+ res = cd;
+ return res;
}
}
diff --git a/SGGL/WebAPI/Controllers/CQMS/CQMSTrainController.cs b/SGGL/WebAPI/Controllers/CQMS/CQMSTrainController.cs
index eadd83e4..1127e90d 100644
--- a/SGGL/WebAPI/Controllers/CQMS/CQMSTrainController.cs
+++ b/SGGL/WebAPI/Controllers/CQMS/CQMSTrainController.cs
@@ -36,10 +36,11 @@ namespace WebAPI.Controllers
public ResponseData GetTrainPlanByTrainPlanId(string id)
{
ResponseData res = new ResponseData();
- Train_TrainPlan cd = BLL.CQMS_TrainPlanService.GetTraiPlanByTrainPlanIdForApi(id);
+ //Train_TrainPlan cd = BLL.CQMS_TrainPlanService.GetTraiPlanByTrainPlanIdForApi(id);
res.successful = true;
- res.resultValue = BeanUtil.CopyOjbect(cd, true);
+ //res.resultValue = BeanUtil.CopyOjbect(cd, true);
+ res.resultValue = BLL.CQMS_TrainPlanService.GetTraiPlanByTrainPlanIdForApi(id);
return res;
}
///