From 686de1be346a13e3f75270eb3aec64ce89ea22c8 Mon Sep 17 00:00:00 2001
From: zhoukeda <1315948824@qq.com>
Date: Mon, 29 May 2023 10:50:50 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=B4=E4=BF=AE=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Dto/RepairApplyDetailOutput.cs              |  8 ++++++++
 .../Dto/RepairApplyRegisterInput.cs             |  4 ++--
 .../Entity/EqpRepairApply.cs                    |  5 +++++
 .../IEqpRepairApplyService.cs                   |  7 ++++++-
 EquipMgr/Tnb.EquipMgr/EqpRepairApplyService.cs  | 17 ++++++++++++++++-
 5 files changed, 37 insertions(+), 4 deletions(-)
 create mode 100644 EquipMgr/Tnb.EquipMgr.Entities/Dto/RepairApplyDetailOutput.cs

diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Dto/RepairApplyDetailOutput.cs b/EquipMgr/Tnb.EquipMgr.Entities/Dto/RepairApplyDetailOutput.cs
new file mode 100644
index 00000000..34c6c8e0
--- /dev/null
+++ b/EquipMgr/Tnb.EquipMgr.Entities/Dto/RepairApplyDetailOutput.cs
@@ -0,0 +1,8 @@
+namespace Tnb.EquipMgr.Entities.Dto
+{
+    public class RepairApplyDetailOutput
+    {
+        public EqpRepairApply eqpRepairApply { get; set; }
+        public EqpRepairOutApply eqpRepairOutApply { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Dto/RepairApplyRegisterInput.cs b/EquipMgr/Tnb.EquipMgr.Entities/Dto/RepairApplyRegisterInput.cs
index 6004ec09..d7790a52 100644
--- a/EquipMgr/Tnb.EquipMgr.Entities/Dto/RepairApplyRegisterInput.cs
+++ b/EquipMgr/Tnb.EquipMgr.Entities/Dto/RepairApplyRegisterInput.cs
@@ -40,9 +40,9 @@ namespace Tnb.EquipMgr.Entities.Dto
         public string? repair_description { get; set; }
         
         /// <summary>
-        /// 附件
+        /// 维修图片
         /// </summary>
-        public string? attachment { get; set; }
+        public string? repair_img { get; set; }
         
         /// <summary>
         /// 是否外修
diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpRepairApply.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpRepairApply.cs
index 96668b36..ca95fcaa 100644
--- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpRepairApply.cs
+++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpRepairApply.cs
@@ -148,5 +148,10 @@ public partial class EqpRepairApply : BaseEntity<string>
     /// 附件
     /// </summary>
     public string? attachment { get; set; }
+    
+    /// <summary>
+    /// 维修图片
+    /// </summary>
+    public string? repair_img { get; set; }
 
 }
diff --git a/EquipMgr/Tnb.EquipMgr.Interfaces/IEqpRepairApplyService.cs b/EquipMgr/Tnb.EquipMgr.Interfaces/IEqpRepairApplyService.cs
index d8ccb4cf..eee44398 100644
--- a/EquipMgr/Tnb.EquipMgr.Interfaces/IEqpRepairApplyService.cs
+++ b/EquipMgr/Tnb.EquipMgr.Interfaces/IEqpRepairApplyService.cs
@@ -47,6 +47,11 @@ namespace Tnb.EquipMgr.Interfaces
         /// </summary>
         /// <param name="dic"></param>
         public Task<string> Register(RepairApplyRegisterInput input);
-        
+
+        /// <summary>
+        /// 根据id获取维修详细
+        /// </summary>
+        /// <param name="dic"></param>
+        public Task<RepairApplyDetailOutput> GetRepairApplyDetail(Dictionary<string, string> dic);
     }
 }
\ No newline at end of file
diff --git a/EquipMgr/Tnb.EquipMgr/EqpRepairApplyService.cs b/EquipMgr/Tnb.EquipMgr/EqpRepairApplyService.cs
index f9f9f689..79cc078a 100644
--- a/EquipMgr/Tnb.EquipMgr/EqpRepairApplyService.cs
+++ b/EquipMgr/Tnb.EquipMgr/EqpRepairApplyService.cs
@@ -107,12 +107,27 @@ namespace Tnb.EquipMgr
                 is_halt = input.is_halt,
                 halt_take_time = input.halt_take_time,
                 repair_description = input.repair_description,
-                attachment = input.attachment,
+                repair_img = input.repair_img,
                 is_out_apply = input.is_out_apply,
                 status = status,
             }, x => x.id == input.id);
 
             return "登记成功";
         }
+
+        [HttpPost]
+        public async Task<RepairApplyDetailOutput> GetRepairApplyDetail(Dictionary<string, string> dic)
+        {
+            string id = dic["id"];
+
+            EqpRepairApply eqpRepairApply = await _repository.GetSingleAsync(x => x.id == id);
+            EqpRepairOutApply eqpRepairOutApply = await _repository.AsSugarClient().Queryable<EqpRepairOutApply>().FirstAsync(x=>x.repair_apply_id==id);
+
+            return new RepairApplyDetailOutput()
+            {
+                eqpRepairApply = eqpRepairApply,
+                eqpRepairOutApply = eqpRepairOutApply,
+            };
+        }
     }
 }
\ No newline at end of file