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

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

@ -13993,6 +13993,8 @@ namespace APT.BaseData.Services.DomainServices
foreach (var bm in summarys)
{
var user = users.FirstOrDefault(t => t.ID == bm.APPLY_USER_ID);
if (user != null)
{
T_SK_RISK_EVALUATION result = new T_SK_RISK_EVALUATION();
result.ORG_ID = entity.ORG_ID;
result.IDENTIFY_EVALUATION_PLAN_ID = entity.IDENTIFY_EVALUATION_PLAN_ID;
@ -14047,7 +14049,7 @@ namespace APT.BaseData.Services.DomainServices
detail.EMERGENCY = de.EMERGENCY;
//if (departTemp != null)
//{
var sumDetailTemps = summaryMes.Where(t => t.RISK_IDENTIFY_RESULT_DETAIL_ID == de.ID).Select(m=>m.MEASURE).Distinct().ToList();
var sumDetailTemps = summaryMes.Where(t => t.RISK_IDENTIFY_RESULT_DETAIL_ID == de.ID).Select(m => m.MEASURE).Distinct().ToList();
if (sumDetailTemps.Any())
{
var i = 1;
@ -14096,7 +14098,7 @@ namespace APT.BaseData.Services.DomainServices
T_SK_RISK_EVALUATION_DETAIL_DEPART dep = new T_SK_RISK_EVALUATION_DETAIL_DEPART();
dep.DEPARTMENT_TYPE = item.DEPARTMENT_TYPE;
dep.DEPARTMENT_ID = item.DEPARTMENT_ID;
dep.USER_ID = departs.FirstOrDefault(t=>t.ID == item.DEPARTMENT_ID)?.USER_ID;
dep.USER_ID = departs.FirstOrDefault(t => t.ID == item.DEPARTMENT_ID)?.USER_ID;
dep.ORG_ID = item.ORG_ID;
dep.RISK_EVALUATION_DETAIL_ID = detail.ID;
detailDeparts.Add(dep);
@ -14143,6 +14145,7 @@ namespace APT.BaseData.Services.DomainServices
}
}
}
}
UnifiedCommit(() =>
{
if (modelApp != null)

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

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