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-17 14:35:35 +08:00
commit 41f5289a8d
3 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
APT.MicroApi/APT.PP.WebApi/Controllers/Api/SKController.cs
View File

@ -5340,6 +5340,14 @@ namespace APT.PP.WebApi.Controllers.Api
} }
if (detailContents != null && detailContents.Any()) if (detailContents != null && detailContents.Any())
{ {
foreach (var item in contents)
{
var detailLib = libraryDetails.FirstOrDefault(t => t.ID == item.ENTERPRISE_LIBRARY_DETAIL_ID);
var lib = librarys.FirstOrDefault(t => t.ID == detailLib?.ENTERPRISE_LIBRARY_ID);
item.RISK_NAME = lib?.RISK_NAME;
item.AREA_ID = lib?.AREA_ID;
item.Nav_Area = lib?.Nav_Area;
}
foreach (var item in detailContents) foreach (var item in detailContents)
{ {
if (checkTypeIds != null && checkTypeIds.Any() && item.CHECK_TYPE_ID != null && checkTypeIds.Contains((Guid)item.CHECK_TYPE_ID)) if (checkTypeIds != null && checkTypeIds.Any() && item.CHECK_TYPE_ID != null && checkTypeIds.Contains((Guid)item.CHECK_TYPE_ID))
@ -5477,7 +5485,7 @@ namespace APT.PP.WebApi.Controllers.Api
record.DEPARTMENT_TYPE = item.DepartType; record.DEPARTMENT_TYPE = item.DepartType;
record.STATUS = PFStandardStatus.Draft; record.STATUS = PFStandardStatus.Draft;
record.ISAUTO = true; record.ISAUTO = true;
record.NOTICE_CODE = "GWPC" + DateTime.Now.ToString("yyyyMMddHH") + j.ToString().PadLeft(4, '0'); record.NOTICE_CODE = "GWPC" + DateTime.Now.ToString("yyyyMMddHH") + new Random().Next(1, 9999);
records.Add(record); records.Add(record);
if (item.details != null && item.details.Any()) if (item.details != null && item.details.Any())
{ {
@ -5584,7 +5592,7 @@ namespace APT.PP.WebApi.Controllers.Api
send = false; send = false;
} }
} }
if ((send && exist == null && item.CheckPost == "班组负责人") || (send && exist == null && item.CheckPost != "班组负责人" && setTime != null && dt.Hour == setTime.CHECKTIME.Value.Hour)) if ((!send && exist == null && item.CheckPost == "班组负责人" && dt.Hour == 8) || (send && exist == null && item.CheckPost == "班组负责人") || (send && exist == null && item.CheckPost != "班组负责人" && setTime != null && dt.Hour == setTime.CHECKTIME.Value.Hour))
{ {
T_SK_SECURITY_INSPECTION_NOTICE safeNotice = new T_SK_SECURITY_INSPECTION_NOTICE(); T_SK_SECURITY_INSPECTION_NOTICE safeNotice = new T_SK_SECURITY_INSPECTION_NOTICE();
safeNotice.ORG_ID = filter.OrgId; safeNotice.ORG_ID = filter.OrgId;
@ -5595,7 +5603,7 @@ namespace APT.PP.WebApi.Controllers.Api
safeNotice.PLANCHECKFREQUENCY = item.Cycle; safeNotice.PLANCHECKFREQUENCY = item.Cycle;
safeNotice.DEPARTMENT_TYPE = item.DepartType; safeNotice.DEPARTMENT_TYPE = item.DepartType;
safeNotice.STATUS = PFStandardStatus.Draft; safeNotice.STATUS = PFStandardStatus.Draft;
safeNotice.NOTICE_CODE = "JCZD" + DateTime.Now.ToString("yyyyMMddHH") + j.ToString().PadLeft(4, '0'); safeNotice.NOTICE_CODE = "JCZD" + DateTime.Now.ToString("yyyyMMddHH") + new Random().Next(1, 9999);
safeNotice.ISAUTO = true; safeNotice.ISAUTO = true;
safeNotices.Add(safeNotice); safeNotices.Add(safeNotice);
if (item.details != null && item.details.Any()) if (item.details != null && item.details.Any())

3
APT.MicroApi/APT.SK.WebApi/Controllers/Api/EnterpriseLibraryController.cs
View File

@ -78,7 +78,7 @@ namespace APT.SK.WebApi.Controllers.Api
{ {
public string MineType { get; set; } public string MineType { get; set; }
public Guid? PRODUCTION_UNIT_ID { get; set; } public Guid? PRODUCTION_UNIT_ID { get; set; }
public Guid? CHECK_TYPE_ID { get; set; }
public string CheckType { get; set; } public string CheckType { get; set; }
public string CheckCycle { get; set; } public string CheckCycle { get; set; }
public string CheckLevel { get; set; } public string CheckLevel { get; set; }
@ -2677,6 +2677,7 @@ namespace APT.SK.WebApi.Controllers.Api
{ {
CheckListNew listNew = new CheckListNew(); CheckListNew listNew = new CheckListNew();
listNew.PRODUCTION_UNIT_ID = item.Key.PRODUCTION_UNIT_ID; listNew.PRODUCTION_UNIT_ID = item.Key.PRODUCTION_UNIT_ID;
listNew.CHECK_TYPE_ID = item.Key.CHECK_TYPE_ID;
listNew.MineType = item.Key.MINE_NAME; listNew.MineType = item.Key.MINE_NAME;
listNew.CheckType = item.Key.TYPE_NAME; listNew.CheckType = item.Key.TYPE_NAME;
listNew.CheckCycle = item.Key.CHECK_CYCLE.GetDescription(); listNew.CheckCycle = item.Key.CHECK_CYCLE.GetDescription();

4
APT.MicroApi/APT.SK.WebApi/Controllers/Api/SecurityInspectionRecordController.cs
View File

@ -460,6 +460,10 @@ namespace APT.SK.WebApi.Controllers.Api
throw new Exception("检查类型不能为空"); throw new Exception("检查类型不能为空");
if (entity.CHECK_TIME == null || entity.CHECK_TIME == DateTime.MinValue) if (entity.CHECK_TIME == null || entity.CHECK_TIME == DateTime.MinValue)
throw new Exception("检查时间必须填写"); throw new Exception("检查时间必须填写");
if (string.IsNullOrEmpty(entity.NOTICE_CODE))
{
entity.NOTICE_CODE = "JCSD" + DateTime.Now.ToString("yyyyMMddHH") + new Random().Next(1, 9999);
}
T_FM_NOTIFICATION_TASK finishNotice = null; T_FM_NOTIFICATION_TASK finishNotice = null;
if (entity.STATUS != PFStandardStatus.Draft) if (entity.STATUS != PFStandardStatus.Draft)
{ {