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

Compare commits

base: wyw:5e5046079e44c8d292e6f4677ca138d3e82975aa
Branches Tags
wyw:master
..
compare: wyw:100dc5f5f83e6161d882bcb426b833978be797b7
Branches Tags
wyw:master

No commits in common. "5e5046079e44c8d292e6f4677ca138d3e82975aa" and "100dc5f5f83e6161d882bcb426b833978be797b7" have entirely different histories.
5e5046079e ... 100dc5f5f8

3 changed files with 2 additions and 6 deletions
Show Stats 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
{
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");
var entity = this.GetEntity<T_SK_HIDDEN_DANGER_CONFIRM>(modelApp != null ? modelApp.DATA_ID : entityInt.DATA_ID, "Nav_Report", "Nav_Reasons", "Nav_Files");
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 users = this.GetEntities<T_FM_USER>(t => t.ENABLE_STATUS == 0, new BaseFilter(entity.ORG_ID), "Nav_ApproveRole");

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

@ -88,8 +88,7 @@ namespace APT.SK.WebApi.Controllers.Api
{
sendUser = depart.USER_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 == "巡回检查");
var userName = this.GetEntity<T_FM_USER>(t => t.ENABLE_STATUS == (int)FMEnableStatusEnum.启用 && sendUser == t.ID);
confirm = new T_SK_HIDDEN_DANGER_CONFIRM();
confirm.HIDDEN_DANGER_HAND_REPORT_ID = entity.ID;
confirm.ORG_ID = entity.ORG_ID;
@ -101,8 +100,6 @@ namespace APT.SK.WebApi.Controllers.Api
confirm.HIDDEN_PLACE = entity.HIDDEN_PLACE;
confirm.HIDDEN_DESCRIPTION = entity.HIDDEN_DESCRIPTION;
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())
{
foreach (var file in files)

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

@ -307,7 +307,6 @@ namespace APT.SK.WebApi.Controllers
if (record.ACCEPT_USER_ID != null)
{
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 UserNames = new List<string>();
var user = this.GetEntity<T_FM_USER>(t => t.ENABLE_STATUS == (int)FMEnableStatusEnum.启用 && t.ID == record.ACCEPT_USER_ID);