wenkai.chen/tnb.server
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

设备点巡检保养维修

Browse Source
This commit is contained in:
qianjiawei
2023-11-28 14:24:20 +08:00
parent 64d0a9bf9a
commit c36679d418
10 changed files with 25 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpMaintainRecordH.cs
View File

@@ -164,4 +164,5 @@ public partial class EqpMaintainRecordH : BaseEntity<string>
/// </summary>
public string? org_id { get; set; }
}

3
EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpMaintainTemEquipH.cs
View File

@@ -134,4 +134,7 @@ public partial class EqpMaintainTemEquipH : BaseEntity<string>
/// </summary>
public string? org_id { get; set; }
public string? duty_user_id { get; set; }
public string? repeat_user_id { get; set; }
}

3
EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpMaintainTemH.cs
View File

@@ -129,4 +129,7 @@ public partial class EqpMaintainTemH : BaseEntity<string>
/// </summary>
public string? org_id { get; set; }
public string? duty_user_id { get; set; }
public string? repeat_user_id { get; set; }
}

2
EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSpotInsTemEquipH.cs
View File

@@ -128,5 +128,7 @@ public partial class EqpSpotInsTemEquipH : BaseEntity<string>
/// 所属组织
/// </summary>
public string? org_id { get; set; }
public string? duty_user_id { get; set; }
public string? repeat_user_id { get; set; }
}

3
EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSpotInsTemH.cs
View File

@@ -124,4 +124,7 @@ public partial class EqpSpotInsTemH : BaseEntity<string>
/// </summary>
public string? org_id { get; set; }
public string? duty_user_id { get; set; }
public string? repeat_user_id { get; set; }
}

2
EquipMgr/Tnb.EquipMgr/EqpMaintainTemService.cs
View File

@@ -74,6 +74,8 @@ namespace Tnb.EquipMgr
org_id = eqpMaintainTemH.org_id,
create_id = _userManager.UserId,
create_time = DateTime.Now,
duty_user_id= eqpMaintainTemH.duty_user_id,
repeat_user_id= eqpMaintainTemH.repeat_user_id
};
insertEqpMaintainTemEquipHs.Add(eqpMaintainTemEquipH);

6
EquipMgr/Tnb.EquipMgr/EqpRepairApplyService.cs
View File

@@ -103,15 +103,15 @@ namespace Tnb.EquipMgr
code = (string)input.data["code"],
name = (string)input.data["name"],
equip_id = (string)input.data["equip_id"],
expect_complete_time = input.data["expect_complete_time"] != null && input.data["expect_complete_time"].ToString() != "" ? Convert.ToDateTime(input.data["expect_complete_time"]) : null,
expect_complete_time = input.data["expect_complete_time"] != null && input.data["expect_complete_time"].ToString() != "" ? DateTimeOffset.FromUnixTimeSeconds(((long)input.data["expect_complete_time"]) / 1000).ToLocalTime().DateTime : null,
is_ugent = (int?)(long)input.data["is_ugent"],
attachment = input.data.ContainsKey("attachment") ? (string)input.data["attachment"] : null,
apply_user_id = (string)input.data["apply_user_id"],
create_id = (string)input.data["create_id"],
create_time = DateTime.Now,
org_id = (string)input.data["org_id"],
remark = (string)input.data["remark"],
description = (string)input.data["description"],
remark = input.data.ContainsKey("remark") ? (string)input.data["remark"] : "",
description = input.data.ContainsKey("description") ? (string)input.data["description"] : "",
status = RepairApplyStatus.TOBEEXECUTED
};
_ = await _repository.InsertAsync(eqpRepairApply);

2
EquipMgr/Tnb.EquipMgr/EqpSpotInsTemService.cs
View File

@@ -74,6 +74,8 @@ namespace Tnb.EquipMgr
org_id = eqpSpotInsTemH.org_id,
create_id = _userManager.UserId,
create_time = DateTime.Now,
duty_user_id= eqpSpotInsTemH.duty_user_id,
repeat_user_id= eqpSpotInsTemH.repeat_user_id
};
insertEqpSpotInsTemEquipHs.Add(eqpSpotInsTemEquipH);

4
taskschedule/Tnb.TaskScheduler/Listener/GenerateMaintainPlanTimeWorker.cs
View File

@@ -105,7 +105,11 @@ namespace JNPF.TaskScheduler.Listener
is_repeat = item.is_repeat,
repeat_post_info_user_id = item.repeat_post_info_user_id,
is_send = item.is_send,
repeat_user_id = item.repeat_user_id,
execute_user_id = item.duty_user_id,
create_time = DateTime.Now,
status = Tnb.EquipMgr.SpotInsRecordExecutionStatus.TOBEEXECUTED
});
}

2
taskschedule/Tnb.TaskScheduler/Listener/GenerateSpotInspectionPlanTimeWorker.cs
View File

@@ -104,6 +104,8 @@ namespace JNPF.TaskScheduler.Listener
repeat_post_info_user_id = item.repeat_post_info_user_id,
is_send = item.is_send,
create_time = DateTime.Now,
repeat_user_id= item.repeat_user_id,
spot_record_user_id=item.duty_user_id,
status = Tnb.EquipMgr.SpotInsRecordExecutionStatus.TOBEEXECUTED
});
}