From e153e403c909f6a5f43acd015f1aae0e507a7743 Mon Sep 17 00:00:00 2001
From: gaofei <181547018@qq.com>
Date: Thu, 6 Apr 2023 13:11:46 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B4=A8=E9=87=8F?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SGGL/BLL/CQMS/Models/QualityModelService.cs   | 52 +++++++++++++++++++
 .../Controllers/CQMS/CQMSModelsController.cs  |  2 +-
 2 files changed, 53 insertions(+), 1 deletion(-)

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);
         }
 
+        /// <summary>
+        /// 获取质量样板信息
+        /// </summary>
+        /// <param name="UnitWorkId"></param>
+        /// <returns></returns>
+        public static List<Model.Model_QualityModel> GetQualityModelByIdForApi(string QualityModelId)
+        {
+            using (var db = new Model.SGGLDB(Funs.ConnString))
+            {
+                IQueryable<Model.Model_QualityModel> 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<Model.Model_QualityModel> res = new List<Model.Model_QualityModel>();
+                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;
+            }
+        }
+
         /// <summary>
         /// 添加公司质量样板
         /// </summary>
diff --git a/SGGL/WebAPI/Controllers/CQMS/CQMSModelsController.cs b/SGGL/WebAPI/Controllers/CQMS/CQMSModelsController.cs
index ee979a2e..b7f10b3c 100644
--- a/SGGL/WebAPI/Controllers/CQMS/CQMSModelsController.cs
+++ b/SGGL/WebAPI/Controllers/CQMS/CQMSModelsController.cs
@@ -36,7 +36,7 @@ namespace WebAPI.Controllers
         public ResponseData<Model_QualityModel> GetModelsById(string id)
         {
             ResponseData<Model_QualityModel> res = new ResponseData<Model_QualityModel>();
-            Model_QualityModel cd = BLL.QualityModelService.GetQualityModelById(id);
+            Model_QualityModel cd = BLL.QualityModelService.GetQualityModelByIdForApi(id);
 
             res.successful = true;
             res.resultValue = BeanUtil.CopyOjbect<Model_QualityModel>(cd, true);

From 02a970b67cc158da7b944211dedc238901ae632a Mon Sep 17 00:00:00 2001
From: gaofei <181547018@qq.com>
Date: Thu, 6 Apr 2023 15:15:30 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B4=A8=E9=87=8F?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SGGL/WebAPI/Controllers/CQMS/CQMSModelsController.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/SGGL/WebAPI/Controllers/CQMS/CQMSModelsController.cs b/SGGL/WebAPI/Controllers/CQMS/CQMSModelsController.cs
index b7f10b3c..84a69dd2 100644
--- a/SGGL/WebAPI/Controllers/CQMS/CQMSModelsController.cs
+++ b/SGGL/WebAPI/Controllers/CQMS/CQMSModelsController.cs
@@ -33,13 +33,13 @@ namespace WebAPI.Controllers
         /// <param name="id"></param>
         /// <returns></returns>
         [HttpGet]
-        public ResponseData<Model_QualityModel> GetModelsById(string id)
+        public ResponseData<List<Model_QualityModel>> GetModelsById(string id)
         {
-            ResponseData<Model_QualityModel> res = new ResponseData<Model_QualityModel>();
-            Model_QualityModel cd = BLL.QualityModelService.GetQualityModelByIdForApi(id);
+            ResponseData<List<Model_QualityModel>> res = new ResponseData<List<Model_QualityModel>>();
+            List<Model_QualityModel> cd = BLL.QualityModelService.GetQualityModelByIdForApi(id);
 
             res.successful = true;
-            res.resultValue = BeanUtil.CopyOjbect<Model_QualityModel>(cd, true);
+            res.resultValue = cd;
             return res;
         }