From 143837b615ff840f7691948acea958253d40a1de Mon Sep 17 00:00:00 2001
From: zhoukeda <1315948824@qq.com>
Date: Tue, 27 Jun 2023 10:58:51 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=BB=B4=E4=BF=AE=E6=8B=92?=
=?UTF-8?q?=E7=BB=9D=E6=B7=BB=E5=8A=A0=E5=8E=9F=E5=9B=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Dto/EquipRepairRefuseInput.cs | 9 ++++
.../Entity/EqpRepairRefuse.cs | 52 +++++++++++++++++++
.../IEqpRepairRefuseService.cs | 15 ++++++
.../Tnb.EquipMgr/EqpRepairApplyService.cs | 21 ++++++--
.../Tnb.EquipMgr/EqpRepairRefuseService.cs | 36 +++++++++++++
5 files changed, 130 insertions(+), 3 deletions(-)
create mode 100644 EquipMgr/Tnb.EquipMgr.Entities/Dto/EquipRepairRefuseInput.cs
create mode 100644 EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpRepairRefuse.cs
create mode 100644 EquipMgr/Tnb.EquipMgr.Interfaces/IEqpRepairRefuseService.cs
create mode 100644 EquipMgr/Tnb.EquipMgr/EqpRepairRefuseService.cs
diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Dto/EquipRepairRefuseInput.cs b/EquipMgr/Tnb.EquipMgr.Entities/Dto/EquipRepairRefuseInput.cs
new file mode 100644
index 00000000..3c30a548
--- /dev/null
+++ b/EquipMgr/Tnb.EquipMgr.Entities/Dto/EquipRepairRefuseInput.cs
@@ -0,0 +1,9 @@
+namespace Tnb.EquipMgr.Entities.Dto
+{
+ public class EquipRepairRefuseInput
+ {
+ public string id { get; set; }
+ public string reason { get; set; }
+
+ }
+}
\ No newline at end of file
diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpRepairRefuse.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpRepairRefuse.cs
new file mode 100644
index 00000000..098edb22
--- /dev/null
+++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpRepairRefuse.cs
@@ -0,0 +1,52 @@
+using JNPF.Common.Contracts;
+using JNPF.Common.Security;
+using SqlSugar;
+
+namespace Tnb.EquipMgr.Entities;
+
+///
+/// 设备维修拒绝表
+///
+[SugarTable("eqp_repair_refuse")]
+public partial class EqpRepairRefuse : BaseEntity
+{
+ public EqpRepairRefuse()
+ {
+ id = SnowflakeIdHelper.NextId();
+ }
+ ///
+ /// 拒绝理由
+ ///
+ public string reason { get; set; } = string.Empty;
+
+ ///
+ /// 报修id
+ ///
+ public string repair_apply_id { get; set; } = string.Empty;
+
+ ///
+ /// 创建用户
+ ///
+ public string? create_id { get; set; }
+
+ ///
+ /// 创建时间
+ ///
+ public DateTime? create_time { get; set; }
+
+ ///
+ /// 所属组织
+ ///
+ public string? org_id { get; set; }
+
+ ///
+ /// 流程任务Id
+ ///
+ public string? f_flowtaskid { get; set; }
+
+ ///
+ /// 流程引擎Id
+ ///
+ public string? f_flowid { get; set; }
+
+}
\ No newline at end of file
diff --git a/EquipMgr/Tnb.EquipMgr.Interfaces/IEqpRepairRefuseService.cs b/EquipMgr/Tnb.EquipMgr.Interfaces/IEqpRepairRefuseService.cs
new file mode 100644
index 00000000..b1417e66
--- /dev/null
+++ b/EquipMgr/Tnb.EquipMgr.Interfaces/IEqpRepairRefuseService.cs
@@ -0,0 +1,15 @@
+namespace Tnb.EquipMgr.Interfaces
+{
+ ///
+ /// 维修拒绝服务
+ ///
+ public interface IEqpRepairRefuseService
+ {
+ ///
+ /// 根据维修id获取拒绝列表
+ ///
+ ///
+ ///
+ public Task GetRepairRefuseByRepairApplyId(Dictionary dic);
+ }
+}
\ No newline at end of file
diff --git a/EquipMgr/Tnb.EquipMgr/EqpRepairApplyService.cs b/EquipMgr/Tnb.EquipMgr/EqpRepairApplyService.cs
index c16efefb..5b7dd85d 100644
--- a/EquipMgr/Tnb.EquipMgr/EqpRepairApplyService.cs
+++ b/EquipMgr/Tnb.EquipMgr/EqpRepairApplyService.cs
@@ -82,10 +82,25 @@ namespace Tnb.EquipMgr
public async Task Refuse(Dictionary dic)
{
string id = dic["id"];
- await _repository.UpdateAsync(x => new EqpRepairApply()
+ string reason = dic["reason"];
+ var db = _repository.AsSugarClient();
+ DbResult result = await db.Ado.UseTranAsync(async () =>
{
- status = RepairApplyStatus.REFUSE,
- }, x => x.id == id);
+ await _repository.UpdateAsync(x => new EqpRepairApply()
+ {
+ status = RepairApplyStatus.REFUSE,
+ }, x => x.id == id);
+ EqpRepairRefuse eqpRepairRefuse = new EqpRepairRefuse()
+ {
+ repair_apply_id = id,
+ reason = reason,
+ create_id = _userManager.UserId,
+ create_time = DateTime.Now,
+ org_id = _userManager.GetUserInfo().Result.organizeId
+ };
+ await db.Insertable(eqpRepairRefuse).ExecuteCommandAsync();
+ });
+ if(!result.IsSuccess) throw Oops.Oh(ErrorCode.COM1008);
return "拒绝成功";
}
diff --git a/EquipMgr/Tnb.EquipMgr/EqpRepairRefuseService.cs b/EquipMgr/Tnb.EquipMgr/EqpRepairRefuseService.cs
new file mode 100644
index 00000000..ffa74714
--- /dev/null
+++ b/EquipMgr/Tnb.EquipMgr/EqpRepairRefuseService.cs
@@ -0,0 +1,36 @@
+using JNPF.Common.Core.Manager;
+using JNPF.DependencyInjection;
+using JNPF.DynamicApiController;
+using Microsoft.AspNetCore.Mvc;
+using SqlSugar;
+using Tnb.EquipMgr.Entities;
+using Tnb.EquipMgr.Entities.Dto;
+using Tnb.EquipMgr.Interfaces;
+
+namespace Tnb.EquipMgr
+{
+ ///
+ /// 设备维修拒绝
+ ///
+ [ApiDescriptionSettings(Tag = ModuleConsts.Tag, Area = ModuleConsts.Area, Order = 700)]
+ [Route("api/[area]/[controller]/[action]")]
+ public class EqpRepairRefuseService : IEqpRepairRefuseService, IDynamicApiController, ITransient
+ {
+ private readonly ISqlSugarRepository _repository;
+ private readonly IUserManager _userManager;
+
+ public EqpRepairRefuseService(ISqlSugarRepository repository,
+ IUserManager userManager)
+ {
+ _repository = repository;
+ _userManager = userManager;
+ }
+
+ [HttpPost]
+ public async Task GetRepairRefuseByRepairApplyId(Dictionary dic)
+ {
+ string repairApplyId = dic["repairApplyId"];
+ return await _repository.GetListAsync(x => x.repair_apply_id == repairApplyId);
+ }
+ }
+}
\ No newline at end of file