From 58c05b301bbd52cfeb1cb6b647b22bf5706b5604 Mon Sep 17 00:00:00 2001
From: zhoukeda <1315948824@qq.com>
Date: Mon, 13 Nov 2023 15:01:49 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=94=E5=9B=9E=E6=95=85=E9=9A=9C=E5=90=8D?=
=?UTF-8?q?=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Entity/EqpRepairApply.part.cs | 13 +++++++++++++
EquipMgr/Tnb.EquipMgr/EqpRepairApplyService.cs | 7 +++++--
2 files changed, 18 insertions(+), 2 deletions(-)
create mode 100644 EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpRepairApply.part.cs
diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpRepairApply.part.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpRepairApply.part.cs
new file mode 100644
index 00000000..4e224964
--- /dev/null
+++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpRepairApply.part.cs
@@ -0,0 +1,13 @@
+using SqlSugar;
+
+namespace Tnb.EquipMgr.Entities
+{
+ public partial class EqpRepairApply
+ {
+ ///
+ /// 故障名称
+ ///
+ [SugarColumn(IsIgnore = true)]
+ public string? fault_name { get; set; }
+ }
+}
\ No newline at end of file
diff --git a/EquipMgr/Tnb.EquipMgr/EqpRepairApplyService.cs b/EquipMgr/Tnb.EquipMgr/EqpRepairApplyService.cs
index de39f2f4..d5388b94 100644
--- a/EquipMgr/Tnb.EquipMgr/EqpRepairApplyService.cs
+++ b/EquipMgr/Tnb.EquipMgr/EqpRepairApplyService.cs
@@ -11,6 +11,7 @@ using JNPF.VisualDev;
using JNPF.VisualDev.Interfaces;
using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json;
+using SQLitePCL;
using SqlSugar;
using Tnb.BasicData;
using Tnb.EquipMgr.Entities;
@@ -281,10 +282,12 @@ namespace Tnb.EquipMgr
public async Task GetRepairApplyDetail(Dictionary dic)
{
string id = dic["id"];
-
+ var db = _repository.AsSugarClient();
EqpRepairApply eqpRepairApply = await _repository.GetSingleAsync(x => x.id == id);
- EqpRepairOutApply eqpRepairOutApply = await _repository.AsSugarClient().Queryable().FirstAsync(x => x.repair_apply_id == id);
+ EqpRepairOutApply eqpRepairOutApply = await db.Queryable().FirstAsync(x => x.repair_apply_id == id);
+ EqpFault eqpFault = await db.Queryable().SingleAsync(x => x.id == eqpRepairApply.fault_id);
+ eqpRepairApply.fault_name = eqpFault != null ? eqpFault.fault_name : "";
return new RepairApplyDetailOutput()
{
eqpRepairApply = eqpRepairApply,