From defbe1243cc327160a6e0708e506f16c636c8771 Mon Sep 17 00:00:00 2001
From: qianjiawei <1184704771@qq.com>
Date: Thu, 30 Nov 2023 16:30:52 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E5=85=B7=E7=BB=B4=E4=BF=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Dto/MoldStartWxInput.cs                   | 13 ++++++++++
 .../Dto/PadRepairListOutput.cs                |  1 +
 .../Entity/ToolMoldMaintainTask.cs            |  8 ++++++
 .../Tnb.EquipMgr/EqpRepairApplyService.cs     |  3 ++-
 .../ToolMoldMaintainTaskService.cs            | 26 +++++++++++++++++--
 5 files changed, 48 insertions(+), 3 deletions(-)
 create mode 100644 EquipMgr/Tnb.EquipMgr.Entities/Dto/MoldStartWxInput.cs

diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Dto/MoldStartWxInput.cs b/EquipMgr/Tnb.EquipMgr.Entities/Dto/MoldStartWxInput.cs
new file mode 100644
index 00000000..2a861c76
--- /dev/null
+++ b/EquipMgr/Tnb.EquipMgr.Entities/Dto/MoldStartWxInput.cs
@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Tnb.EquipMgr.Entities
+{
+    public class MoldStartWxInput
+    {
+        public string? id { get; set; }
+    }
+}
diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Dto/PadRepairListOutput.cs b/EquipMgr/Tnb.EquipMgr.Entities/Dto/PadRepairListOutput.cs
index 228f6286..d865e4e5 100644
--- a/EquipMgr/Tnb.EquipMgr.Entities/Dto/PadRepairListOutput.cs
+++ b/EquipMgr/Tnb.EquipMgr.Entities/Dto/PadRepairListOutput.cs
@@ -20,5 +20,6 @@ namespace Tnb.EquipMgr.Entities.Dto
         public string repairer_id { get; set; }
         public string repairer_id_id { get; set; }
         public string status { get; set; }
+        public string attachment { get; set; }
     }
 }
\ No newline at end of file
diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolMoldMaintainTask.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolMoldMaintainTask.cs
index b077342b..e843dc6d 100644
--- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolMoldMaintainTask.cs
+++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolMoldMaintainTask.cs
@@ -53,4 +53,12 @@ public partial class ToolMoldMaintainTask : BaseEntity<string>
     /// </summary>
     public string status { get; set; }
 
+    public string? name { get; set; }
+    public string? attachment { get; set; }
+    public string? describe { get; set; }
+
+    public int is_finish { get; set; }
+    public string? wxattachment { get; set; }
+    public string? wxdescribe { get; set; }
+
 }
diff --git a/EquipMgr/Tnb.EquipMgr/EqpRepairApplyService.cs b/EquipMgr/Tnb.EquipMgr/EqpRepairApplyService.cs
index 0617edca..9d92a6e5 100644
--- a/EquipMgr/Tnb.EquipMgr/EqpRepairApplyService.cs
+++ b/EquipMgr/Tnb.EquipMgr/EqpRepairApplyService.cs
@@ -397,7 +397,8 @@ namespace Tnb.EquipMgr
                     repairer_id = c.RealName,
                     repairer_id_id = c.Id,
                     remark = a.remark,
-                    status = f.FullName
+                    status = f.FullName,
+                    attachment=a.attachment
                 }).ToPagedListAsync(input?.currentPage ?? 1, input?.pageSize ?? 50);
 
             return PageResult<PadRepairListOutput>.SqlSugarPageResult(result);
diff --git a/EquipMgr/Tnb.EquipMgr/ToolMoldMaintainTaskService.cs b/EquipMgr/Tnb.EquipMgr/ToolMoldMaintainTaskService.cs
index 4979f99f..fcbe2d65 100644
--- a/EquipMgr/Tnb.EquipMgr/ToolMoldMaintainTaskService.cs
+++ b/EquipMgr/Tnb.EquipMgr/ToolMoldMaintainTaskService.cs
@@ -1,4 +1,5 @@
-using JNPF.Common.Enums;
+using JNPF.Common.Core.Manager;
+using JNPF.Common.Enums;
 using JNPF.Common.Extension;
 using JNPF.DependencyInjection;
 using JNPF.DynamicApiController;
@@ -29,16 +30,19 @@ namespace Tnb.EquipMgr
         private readonly IRunService _runService;
         private readonly IVisualDevService _visualDevService;
         private static Dictionary<string, (string code, string name)> _dicMold = new();
+        private readonly IUserManager _userManager;
         public ToolMoldMaintainTaskService(
             ISqlSugarRepository<ToolMoldMaintainTask> repository,
             IRunService runService,
-            IVisualDevService visualDevService
+            IVisualDevService visualDevService,
+            IUserManager userManager
             )
         {
             _db = repository.AsSugarClient();
             _runService = runService;
             _visualDevService = visualDevService;
             OverideFuncs.GetListAsync = GetList;
+            _userManager = userManager;
             //OverideFuncs.CreateAsync = Create;
         }
         public OverideVisualDevFunc OverideFuncs { get; } = new OverideVisualDevFunc();
@@ -100,5 +104,23 @@ namespace Tnb.EquipMgr
                 throw Oops.Oh(ErrorCode.COM1001);
             }
         }
+
+
+        /// <summary>
+        /// 开始维修 
+        /// </summary>
+        /// <param name="input">输入参数</param>
+        /// <returns></returns>
+        [HttpPost]
+        public async Task StartWx(MoldStartWxInput input)
+        {
+            DateTime? StartTime = DateTime.Now;
+            int row = await _db.Updateable<ToolMoldMaintainTask>().SetColumns(it => new ToolMoldMaintainTask { status = "WXZ", modify_strat_time = StartTime, modify_id = _userManager.UserId })
+              .Where(it => input.id == it.id).ExecuteCommandAsync();
+            if (row < 1)
+            {
+                throw Oops.Oh(ErrorCode.COM1001);
+            }
+        }
     }
 }