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-10 16:36:43 +08:00
commit e628bdc3d6
4 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11935,7 +11935,7 @@ namespace APT.BaseData.Services.DomainServices
} }
else else
{ {
var entity = this.GetEntity<T_SK_HIDDEN_DANGER_CONFIRM>(modelApp != null ? modelApp.DATA_ID : entityInt.DATA_ID, "Nav_Report", "Nav_Reasons", "Nav_Files"); var entity = this.GetEntity<T_SK_HIDDEN_DANGER_CONFIRM>(modelApp != null ? modelApp.DATA_ID : entityInt.DATA_ID, "Nav_ApplyUser", "Nav_Report", "Nav_Reasons", "Nav_Files");
entity.STATUS = PFStandardStatus.Archived; entity.STATUS = PFStandardStatus.Archived;
var photos = this.GetEntities<T_SK_HIDDEN_DANGER_CONFIRM_PHOTO>(t => t.HIDDEN_DANGER_CONFIRM_ID == entity.ID, new BaseFilter(entity.ORG_ID)); var photos = this.GetEntities<T_SK_HIDDEN_DANGER_CONFIRM_PHOTO>(t => t.HIDDEN_DANGER_CONFIRM_ID == entity.ID, new BaseFilter(entity.ORG_ID));
var users = this.GetEntities<T_FM_USER>(t => t.ENABLE_STATUS == 0, new BaseFilter(entity.ORG_ID), "Nav_ApproveRole"); var users = this.GetEntities<T_FM_USER>(t => t.ENABLE_STATUS == 0, new BaseFilter(entity.ORG_ID), "Nav_ApproveRole");

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

@ -52,6 +52,10 @@ namespace APT.SK.WebApi.Controllers.Api
} }
pageFilter.Include.Add("Nav_ListCheckQuestion"); pageFilter.Include.Add("Nav_ListCheckQuestion");
pageFilter.Include.Add("Nav_ContentsBasics.Nav_Law"); pageFilter.Include.Add("Nav_ContentsBasics.Nav_Law");
pageFilter.SelectField.Add("Nav_ProductionUnit.NAME");
pageFilter.SelectField.Add("CHECKCONTENT");
pageFilter.SelectField.Add("CHECK_STANDARD");
pageFilter.SelectField.Add("JT_SYNC");
pageFilter.SelectField.Add("Nav_ListCheckQuestion.NUM"); pageFilter.SelectField.Add("Nav_ListCheckQuestion.NUM");
pageFilter.SelectField.Add("Nav_ListCheckQuestion.DESCREPTION"); pageFilter.SelectField.Add("Nav_ListCheckQuestion.DESCREPTION");
pageFilter.SelectField.Add("Nav_ListCheckQuestion.QUESTION_LEVEL"); pageFilter.SelectField.Add("Nav_ListCheckQuestion.QUESTION_LEVEL");

5
APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerHandReportController.cs
View File

@ -88,7 +88,8 @@ namespace APT.SK.WebApi.Controllers.Api
{ {
sendUser = depart.USER_ID; sendUser = depart.USER_ID;
} }
var userName = this.GetEntity<T_FM_USER>(t => t.ENABLE_STATUS == (int)FMEnableStatusEnum.启用 && sendUser == t.ID); var userName = this.GetEntity<T_FM_USER>(t => t.ENABLE_STATUS == (int)FMEnableStatusEnum.启用 && sendUser == t.ID, "Nav_Department");
var checkType = this.GetEntity<T_SK_CHECK_TYPE>(t => t.PRODUCTION_UNIT_ID == entity.PRODUCTION_UNIT_ID && t.NAME == "巡回检查");
confirm = new T_SK_HIDDEN_DANGER_CONFIRM(); confirm = new T_SK_HIDDEN_DANGER_CONFIRM();
confirm.HIDDEN_DANGER_HAND_REPORT_ID = entity.ID; confirm.HIDDEN_DANGER_HAND_REPORT_ID = entity.ID;
confirm.ORG_ID = entity.ORG_ID; confirm.ORG_ID = entity.ORG_ID;
@ -100,6 +101,8 @@ namespace APT.SK.WebApi.Controllers.Api
confirm.HIDDEN_PLACE = entity.HIDDEN_PLACE; confirm.HIDDEN_PLACE = entity.HIDDEN_PLACE;
confirm.HIDDEN_DESCRIPTION = entity.HIDDEN_DESCRIPTION; confirm.HIDDEN_DESCRIPTION = entity.HIDDEN_DESCRIPTION;
confirm.NOTICE_CODE = entity.NOTICE_CODE; confirm.NOTICE_CODE = entity.NOTICE_CODE;
confirm.CHECK_TYPE_ID = checkType?.ID;
confirm.DEPARTMENT_TYPE = (SKDepartmentTypeEnum)userName?.Nav_Department?.DEPARTMENT_TYPE;
if (files != null && files.Any()) if (files != null && files.Any())
{ {
foreach (var file in files) foreach (var file in files)

1
APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerRectifyRecordController.cs
View File

@ -307,6 +307,7 @@ namespace APT.SK.WebApi.Controllers
if (record.ACCEPT_USER_ID != null) if (record.ACCEPT_USER_ID != null)
{ {
record.STATUS = PFStandardStatus.Sign; record.STATUS = PFStandardStatus.Sign;
record.ACCEPT_RESULTE = SKAcceptResultEnum.Yes;
//var departName = this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == record.APPLY_DEPARTMENT_ID && t.ENABLE_STATUS == 0)?.NAME; //var departName = this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == record.APPLY_DEPARTMENT_ID && t.ENABLE_STATUS == 0)?.NAME;
var UserNames = new List<string>(); var UserNames = new List<string>();
var user = this.GetEntity<T_FM_USER>(t => t.ENABLE_STATUS == (int)FMEnableStatusEnum.启用 && t.ID == record.ACCEPT_USER_ID); var user = this.GetEntity<T_FM_USER>(t => t.ENABLE_STATUS == (int)FMEnableStatusEnum.启用 && t.ID == record.ACCEPT_USER_ID);