From 325e1c8f07850629b65b8b462cfcfdcdd51286ee Mon Sep 17 00:00:00 2001 From: qianjiawei <1184704771@qq.com> Date: Thu, 30 Nov 2023 14:02:58 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E4=BF=9D=E5=85=BB=E7=82=B9?= =?UTF-8?q?=E5=B7=A1=E6=A3=80=E5=A4=8D=E6=A0=B8=E5=A2=9E=E5=8A=A0=E9=99=84?= =?UTF-8?q?=E4=BB=B6=E4=B8=8A=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Dto/EquipMaintainRecordQueryOutput.cs | 2 ++ .../Dto/EquipSpotInsRecordQueryOutput.cs | 2 ++ .../Tnb.EquipMgr.Entities/Dto/MaintainRecordRepeatInput.cs | 1 + .../Tnb.EquipMgr.Entities/Dto/SpotInsRecordRepeatInput.cs | 2 ++ EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpMaintainRecordH.cs | 5 +++++ EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSpotInsRecordH.cs | 6 ++++++ EquipMgr/Tnb.EquipMgr/EquMaintainRecordService.cs | 2 ++ EquipMgr/Tnb.EquipMgr/EquSpotInsRecordService.cs | 2 ++ 8 files changed, 22 insertions(+) diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Dto/EquipMaintainRecordQueryOutput.cs b/EquipMgr/Tnb.EquipMgr.Entities/Dto/EquipMaintainRecordQueryOutput.cs index 12b4ded0..ada9dbb8 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Dto/EquipMaintainRecordQueryOutput.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Dto/EquipMaintainRecordQueryOutput.cs @@ -4,6 +4,8 @@ namespace Tnb.EquipMgr.Entities.Dto { public string? id { get; set; } public string? attachment { get; set; } + + public string? fhattachment { get; set; } public string? create_time { get; set; } public string? equip_id { get; set; } public string? equip_id_id { get; set; } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Dto/EquipSpotInsRecordQueryOutput.cs b/EquipMgr/Tnb.EquipMgr.Entities/Dto/EquipSpotInsRecordQueryOutput.cs index ba40ffb9..3664bb2c 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Dto/EquipSpotInsRecordQueryOutput.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Dto/EquipSpotInsRecordQueryOutput.cs @@ -4,6 +4,8 @@ namespace Tnb.EquipMgr.Entities.Dto { public string? id { get; set; } public string? attachment { get; set; } + + public string? fhattachment { get; set; } public string? create_time { get; set; } public string? equip_id { get; set; } public string? repeat_remark { get; set; } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Dto/MaintainRecordRepeatInput.cs b/EquipMgr/Tnb.EquipMgr.Entities/Dto/MaintainRecordRepeatInput.cs index ff09b958..1f07e4c0 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Dto/MaintainRecordRepeatInput.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Dto/MaintainRecordRepeatInput.cs @@ -7,6 +7,7 @@ namespace Tnb.EquipMgr.Entities.Dto public string repeat_result { get; set; } = string.Empty; public string? repeat_remark { get; set; } + public string? attachment { get; set; } public List>? details { get; set; } } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Dto/SpotInsRecordRepeatInput.cs b/EquipMgr/Tnb.EquipMgr.Entities/Dto/SpotInsRecordRepeatInput.cs index 35cc5b6d..35074944 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Dto/SpotInsRecordRepeatInput.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Dto/SpotInsRecordRepeatInput.cs @@ -7,5 +7,7 @@ namespace Tnb.EquipMgr.Entities.Dto public string? repeat_result { get; set; } public string? repeat_remark { get; set; } + + public string? attachment { get; set; } } } \ No newline at end of file diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpMaintainRecordH.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpMaintainRecordH.cs index d6643199..d0d33f2e 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpMaintainRecordH.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpMaintainRecordH.cs @@ -164,5 +164,10 @@ public partial class EqpMaintainRecordH : BaseEntity /// public string? org_id { get; set; } + /// + /// 复核附件 + /// + public string? fhattachment { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSpotInsRecordH.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSpotInsRecordH.cs index 38b993c6..5807603b 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSpotInsRecordH.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSpotInsRecordH.cs @@ -159,4 +159,10 @@ public partial class EqpSpotInsRecordH : BaseEntity /// public string? repeat_result { get; set; } + + /// + /// 复核附件 + /// + public string? fhattachment { get; set; } + } diff --git a/EquipMgr/Tnb.EquipMgr/EquMaintainRecordService.cs b/EquipMgr/Tnb.EquipMgr/EquMaintainRecordService.cs index c7c003da..b1e45c66 100644 --- a/EquipMgr/Tnb.EquipMgr/EquMaintainRecordService.cs +++ b/EquipMgr/Tnb.EquipMgr/EquMaintainRecordService.cs @@ -214,6 +214,7 @@ namespace Tnb.EquipMgr { _ = await _repository.UpdateAsync(x => new EqpMaintainRecordH() { + fhattachment=input.attachment, repeat_result = input.repeat_result, repeat_remark = input.repeat_remark, repeat_user_id = _userManager.UserId, @@ -244,6 +245,7 @@ namespace Tnb.EquipMgr { id = a.id, attachment = a.attachment, + fhattachment= a.fhattachment, create_time = a.create_time == null ? null : a.create_time.Value.ToString(DbTimeFormat.MM), equip_id = b.code, equip_id_id = a.equip_id, diff --git a/EquipMgr/Tnb.EquipMgr/EquSpotInsRecordService.cs b/EquipMgr/Tnb.EquipMgr/EquSpotInsRecordService.cs index 111e86a7..cc558030 100644 --- a/EquipMgr/Tnb.EquipMgr/EquSpotInsRecordService.cs +++ b/EquipMgr/Tnb.EquipMgr/EquSpotInsRecordService.cs @@ -183,6 +183,7 @@ namespace Tnb.EquipMgr repeat_result = input.repeat_result, repeat_remark = input.repeat_remark, repeat_user_id = _userManager.UserId, + fhattachment=input.attachment, repeat_time = DateTime.Now, status = SpotInsRecordExecutionStatus.COMPLETED }, x => x.id == input.id); @@ -204,6 +205,7 @@ namespace Tnb.EquipMgr { id = a.id, attachment = a.attachment, + fhattachment=a.fhattachment, create_time = a.create_time == null ? null : a.create_time.Value.ToString(DbTimeFormat.MM), equip_id = a.equip_id, repeat_remark = a.repeat_remark,