From 9051f99543353fae2c61c15833c62b100bf2ffe2 Mon Sep 17 00:00:00 2001
From: zhoukeda <1315948824@qq.com>
Date: Fri, 20 Oct 2023 17:28:13 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=BB=B4=E4=BF=AE=E6=8A=A5?=
=?UTF-8?q?=E4=BF=AE=E5=88=97=E8=A1=A8=E7=9C=8B=E6=9D=BF=E7=AB=AF=E6=8E=A5?=
=?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Dto/PadRepairListInput.cs | 9 +++
.../Dto/PadRepairListOutput.cs | 24 ++++++++
.../IEqpRepairApplyService.cs | 6 ++
.../Tnb.EquipMgr/EqpRepairApplyService.cs | 61 +++++++++++++++++++
4 files changed, 100 insertions(+)
create mode 100644 EquipMgr/Tnb.EquipMgr.Entities/Dto/PadRepairListInput.cs
create mode 100644 EquipMgr/Tnb.EquipMgr.Entities/Dto/PadRepairListOutput.cs
diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Dto/PadRepairListInput.cs b/EquipMgr/Tnb.EquipMgr.Entities/Dto/PadRepairListInput.cs
new file mode 100644
index 00000000..3d40f76a
--- /dev/null
+++ b/EquipMgr/Tnb.EquipMgr.Entities/Dto/PadRepairListInput.cs
@@ -0,0 +1,9 @@
+namespace Tnb.EquipMgr.Entities.Dto
+{
+ public class PadRepairListInput
+ {
+ public string status { get; set; }
+
+ public string equip_info { get; set; }
+ }
+}
\ No newline at end of file
diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Dto/PadRepairListOutput.cs b/EquipMgr/Tnb.EquipMgr.Entities/Dto/PadRepairListOutput.cs
new file mode 100644
index 00000000..ef577df0
--- /dev/null
+++ b/EquipMgr/Tnb.EquipMgr.Entities/Dto/PadRepairListOutput.cs
@@ -0,0 +1,24 @@
+namespace Tnb.EquipMgr.Entities.Dto
+{
+ public class PadRepairListOutput
+ {
+ public string id { get; set; }
+
+ public string code { get; set; }
+
+ public string name { get; set; }
+ public string equip_id { get; set; }
+ public string equip_id_id { get; set; }
+ public string apply_user_id { get; set; }
+ public string apply_user_id_id { get; set; }
+ public string expect_complete_time { get; set; }
+ public string is_ugent { get; set; }
+ public string description { get; set; }
+ public string remark { get; set; }
+ public string create_time { get; set; }
+ public string complete_time { get; set; }
+ public string repairer_id { get; set; }
+ public string repairer_id_id { get; set; }
+ public string status { get; set; }
+ }
+}
\ No newline at end of file
diff --git a/EquipMgr/Tnb.EquipMgr.Interfaces/IEqpRepairApplyService.cs b/EquipMgr/Tnb.EquipMgr.Interfaces/IEqpRepairApplyService.cs
index f23044b1..00a88135 100644
--- a/EquipMgr/Tnb.EquipMgr.Interfaces/IEqpRepairApplyService.cs
+++ b/EquipMgr/Tnb.EquipMgr.Interfaces/IEqpRepairApplyService.cs
@@ -59,5 +59,11 @@ namespace Tnb.EquipMgr.Interfaces
///
///
public Task GetRepairRecordList(EquipQueryInput input);
+
+ ///
+ /// 看板端设备报修维修列表接口
+ ///
+ ///
+ public Task GetPadRepairList(PadRepairListInput input);
}
}
\ No newline at end of file
diff --git a/EquipMgr/Tnb.EquipMgr/EqpRepairApplyService.cs b/EquipMgr/Tnb.EquipMgr/EqpRepairApplyService.cs
index f6047912..01d77186 100644
--- a/EquipMgr/Tnb.EquipMgr/EqpRepairApplyService.cs
+++ b/EquipMgr/Tnb.EquipMgr/EqpRepairApplyService.cs
@@ -6,9 +6,11 @@ using JNPF.DependencyInjection;
using JNPF.DynamicApiController;
using JNPF.FriendlyException;
using JNPF.Systems.Entitys.Permission;
+using JNPF.Systems.Entitys.System;
using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json;
using SqlSugar;
+using Tnb.BasicData;
using Tnb.EquipMgr.Entities;
using Tnb.EquipMgr.Entities.Dto;
using Tnb.EquipMgr.Interfaces;
@@ -177,5 +179,64 @@ namespace Tnb.EquipMgr
return PageResult.SqlSugarPageResult(result);
}
+
+ [HttpPost]
+ public async Task GetPadRepairList(PadRepairListInput input)
+ {
+ List statusList = new List();
+ if (!string.IsNullOrEmpty(input.status))
+ {
+ switch (input.status)
+ {
+ case "1" :
+ statusList.Add(RepairApplyStatus.TOBEEXECUTED);
+ statusList.Add(RepairApplyStatus.REFUSE);
+ break;
+ case "2" :
+ statusList.Add(RepairApplyStatus.TOBERECEIVED);
+ statusList.Add(RepairApplyStatus.RECEIVED);
+ statusList.Add(RepairApplyStatus.OUTAPPLYAPPROVE);
+ statusList.Add(RepairApplyStatus.APPROVEPASS);
+ statusList.Add(RepairApplyStatus.APPROVENOTPASS);
+ statusList.Add(RepairApplyStatus.TOBEOUTAPPLY);
+ break;
+ case "3" :
+ statusList.Add(RepairApplyStatus.COMPLETED);
+ statusList.Add(RepairApplyStatus.CLOSE);
+ statusList.Add(RepairApplyStatus.REPEAL);
+ break;
+ }
+ }
+ var db = _repository.AsSugarClient();
+ var result = await db.Queryable()
+ .LeftJoin((a,b)=>a.apply_user_id==b.Id)
+ .LeftJoin((a,b,c)=>a.repairer_id==c.Id)
+ .LeftJoin((a,b,c,d)=>a.equip_id==d.id)
+ .LeftJoin((a,b,c,d,e)=>e.EnCode==DictConst.RepairStatus)
+ .LeftJoin((a,b,c,d,e,f)=>e.Id==f.DictionaryTypeId && a.status==f.EnCode)
+ .WhereIF(!string.IsNullOrEmpty(input.equip_info),(a,b,c,d)=>d.code.Contains(input.equip_info) || d.name.Contains(input.equip_info))
+ .WhereIF(!string.IsNullOrEmpty(input.status),(a,b,c,d)=>statusList.Contains(a.status))
+ .Select((a,b,c,d,e,f) => new PadRepairListOutput
+ {
+ id = a.id,
+ equip_id = d.code+"/"+d.name,
+ equip_id_id = a.equip_id,
+ code = a.code,
+ name = a.name,
+ apply_user_id =b.RealName,
+ apply_user_id_id =b.Id,
+ is_ugent = a.is_ugent==1 ? "是" : "否",
+ description = a.description,
+ create_time = a.create_time==null ? "" : a.create_time.Value.ToString("yyyy-MM-dd HH:mm:ss"),
+ complete_time = a.complete_time==null ? "" : a.complete_time.Value.ToString("yyyy-MM-dd HH:mm:ss"),
+ expect_complete_time = a.expect_complete_time==null ? "" : a.expect_complete_time.Value.ToString("yyyy-MM-dd HH:mm:ss"),
+ repairer_id = c.RealName,
+ repairer_id_id = c.Id,
+ remark = a.remark,
+ status = f.FullName
+ }).ToListAsync();
+
+ return result;
+ }
}
}
\ No newline at end of file