wyw/mh_jy_safe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://121.41.2.71:3000/wyw/mh_jy_safe

Browse Source
This commit is contained in:
wyw 2026-04-14 17:25:37 +08:00
commit 24f69a65ba
2 changed files with 146 additions and 143 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs
View File

@ -13993,6 +13993,8 @@ namespace APT.BaseData.Services.DomainServices
foreach (var bm in summarys) foreach (var bm in summarys)
{ {
var user = users.FirstOrDefault(t => t.ID == bm.APPLY_USER_ID); var user = users.FirstOrDefault(t => t.ID == bm.APPLY_USER_ID);
if (user != null)
{
T_SK_RISK_EVALUATION result = new T_SK_RISK_EVALUATION(); T_SK_RISK_EVALUATION result = new T_SK_RISK_EVALUATION();
result.ORG_ID = entity.ORG_ID; result.ORG_ID = entity.ORG_ID;
result.IDENTIFY_EVALUATION_PLAN_ID = entity.IDENTIFY_EVALUATION_PLAN_ID; result.IDENTIFY_EVALUATION_PLAN_ID = entity.IDENTIFY_EVALUATION_PLAN_ID;
@ -14143,6 +14145,7 @@ namespace APT.BaseData.Services.DomainServices
} }
} }
} }
}
UnifiedCommit(() => UnifiedCommit(() =>
{ {
if (modelApp != null) if (modelApp != null)

16
APT.MS.Domain/Enums/FO/FOShiftRecordEnum.cs
View File

@ -241,14 +241,14 @@ namespace APT.MS.Domain.Enums
[Description("审核中")] [Description("审核中")]
Approving = 5, Approving = 5,
/// <summary> /// <summary>
/// 审核完成 /// 技术交底
/// </summary> /// </summary>
[Description("审核完成")] [Description("技术交底")]
ApprovingFinish = 6, ApprovingFinish = 6,
/// <summary> /// <summary>
/// 动火人员确认 10 /// 动火人员现场验收 10
/// </summary> /// </summary>
[Description("动火人员确认")] [Description("动火现场验收")]
Sign = 10, Sign = 10,
/// <summary> /// <summary>
/// 审阅中 15 /// 审阅中 15
@ -256,14 +256,14 @@ namespace APT.MS.Domain.Enums
[Description("审阅中")] [Description("审阅中")]
Reading = 15, Reading = 15,
/// <summary> /// <summary>
/// 监护人 18 /// 监护人监护 18
/// </summary> /// </summary>
[Description("监护人")] [Description("监护人监护")]
Monitor = 18, Monitor = 18,
/// <summary> /// <summary>
/// 完工审阅 21 /// 完工验收 21
/// </summary> /// </summary>
[Description("完工审阅")] [Description("完工验收")]
ReadingFinish = 21, ReadingFinish = 21,
/// <summary> /// <summary>