diff --git a/SGGL/BLL/CQMS/Models/QualityModelService.cs b/SGGL/BLL/CQMS/Models/QualityModelService.cs
index 2a79a28f..334adca1 100644
--- a/SGGL/BLL/CQMS/Models/QualityModelService.cs
+++ b/SGGL/BLL/CQMS/Models/QualityModelService.cs
@@ -21,6 +21,58 @@ namespace BLL
return Funs.DB.Model_QualityModel.FirstOrDefault(e => e.QualityModelId == QualityModelId);
}
+ ///
+ /// 获取质量样板信息
+ ///
+ ///
+ ///
+ public static List GetQualityModelByIdForApi(string QualityModelId)
+ {
+ using (var db = new Model.SGGLDB(Funs.ConnString))
+ {
+ IQueryable q = db.Model_QualityModel;
+ if (!string.IsNullOrEmpty(QualityModelId))
+ {
+ q = q.Where(e => e.QualityModelId == QualityModelId);
+ }
+ var qres = from x in q
+ orderby x.CompileDate descending
+ select new
+ {
+ x.QualityModelId,
+ x.ProjectId,
+ x.CompanyModelId,
+ ModelType = (from y in db.Base_CompanyModel where y.CompanyModelId == x.CompanyModelId select y.ModelType).First(),
+ CompanyModelKindName = (from y in db.Base_CompanyModelKind
+ join z in db.Base_CompanyModel on y.CompanyModelKindId equals z.CompanyModelKindId
+ where z.CompanyModelId == x.CompanyModelId
+ select y.CompanyModelKindName).First(),
+ x.Evaluate,
+ x.Remark,
+ x.CompileDate,
+ x.CompileMan,
+ CompileManName = (from y in db.Person_Persons where y.PersonId == x.CompileMan select y.PersonName).First(),
+ x.AttachUrl,
+ };
+ List res = new List();
+ foreach (var item in qres)
+ {
+ Model.Model_QualityModel cd = new Model.Model_QualityModel();
+ cd.QualityModelId = item.QualityModelId;
+ cd.ProjectId = item.ProjectId;
+ cd.CompanyModelId = item.CompanyModelId + "$" + item.ModelType + "$" + item.CompanyModelKindName;
+ cd.Evaluate = item.Evaluate;
+ cd.Remark = item.Remark;
+ cd.CompileDate = item.CompileDate;
+ cd.CompileMan = item.CompileMan + "$" + item.CompileManName;
+ cd.AttachUrlModel = AttachFileService.getFileUrl(item.CompanyModelId);
+ cd.AttachUrl = AttachFileService.getFileUrl(item.QualityModelId);
+ res.Add(cd);
+ }
+ return res;
+ }
+ }
+
///
/// 添加公司质量样板
///
diff --git a/SGGL/WebAPI/Controllers/CQMS/CQMSModelsController.cs b/SGGL/WebAPI/Controllers/CQMS/CQMSModelsController.cs
index ee979a2e..84a69dd2 100644
--- a/SGGL/WebAPI/Controllers/CQMS/CQMSModelsController.cs
+++ b/SGGL/WebAPI/Controllers/CQMS/CQMSModelsController.cs
@@ -33,13 +33,13 @@ namespace WebAPI.Controllers
///
///
[HttpGet]
- public ResponseData GetModelsById(string id)
+ public ResponseData> GetModelsById(string id)
{
- ResponseData res = new ResponseData();
- Model_QualityModel cd = BLL.QualityModelService.GetQualityModelById(id);
+ ResponseData> res = new ResponseData>();
+ List cd = BLL.QualityModelService.GetQualityModelByIdForApi(id);
res.successful = true;
- res.resultValue = BeanUtil.CopyOjbect(cd, true);
+ res.resultValue = cd;
return res;
}