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 2025-11-25 21:15:01 +08:00
commit 4505cf0fef
10 changed files with 25 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13715,8 +13715,8 @@ namespace APT.BaseData.Services.DomainServices
}
}
var param = "部门级";
var dminetype = departs.FirstOrDefault(t => t.ID == user.DEPARTMENT_ID).DEPARTMENT_TYPE;
if (dminetype == 5 || sum.ISCOMPANY == SKIsStoreEnum.Yes)
var dminetype = departs.FirstOrDefault(t => t.ID == user.DEPARTMENT_ID);
if (dminetype.DEPARTMENT_TYPE == 5 || sum.ISCOMPANY == SKIsStoreEnum.Yes || dminetype.DEPARTMENT_STATUS == 2)
{
param = "公司级";
}
@ -14718,8 +14718,8 @@ namespace APT.BaseData.Services.DomainServices
}
}
var param = "部门级";
var dminetype = departs.FirstOrDefault(t => t.ID == user.DEPARTMENT_ID).DEPARTMENT_TYPE;
if (dminetype == 5 || result.ISCOMPANY == SKIsStoreEnum.Yes)
var dminetype = departs.FirstOrDefault(t => t.ID == user.DEPARTMENT_ID);
if (dminetype.DEPARTMENT_TYPE == 5 || result.ISCOMPANY == SKIsStoreEnum.Yes || dminetype.DEPARTMENT_STATUS == 2)
{
param = "公司级";
}

2
APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerConfirmController.cs
View File

@ -124,7 +124,7 @@ namespace APT.SK.WebApi.Controllers.Api
if (departmentType != null)
{
level = ((SKDepartmentTypeEnum)departmentType.DEPARTMENT_TYPE).GetDescription();
if (departmentType.DEPARTMENT_STATUS != 1)
if (departmentType.DEPARTMENT_STATUS == 2)
{
level = "公司级";
}

2
APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerRectifyDelayApplyController.cs
View File

@ -58,7 +58,7 @@ namespace APT.SK.WebApi.Controllers.Api
if (departmentType != null)
{
level = ((SKDepartmentTypeEnum)departmentType.DEPARTMENT_TYPE).GetDescription();
if (departmentType.DEPARTMENT_STATUS != 1)
if (departmentType.DEPARTMENT_STATUS == 2)
{
level = "公司级";
}

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

@ -195,7 +195,7 @@ namespace APT.SK.WebApi.Controllers
if (departmentType != null)
{
level = ((SKDepartmentTypeEnum)departmentType.DEPARTMENT_TYPE).GetDescription();
if (departmentType.DEPARTMENT_STATUS != 1)
if (departmentType.DEPARTMENT_STATUS == 2)
{
level = "公司级";
}

2
APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerReportController.cs
View File

@ -211,7 +211,7 @@ namespace APT.SK.WebApi.Controllers.Api
if (departmentType != null)
{
level = ((SKDepartmentTypeEnum)departmentType.DEPARTMENT_TYPE).GetDescription();
if (departmentType.DEPARTMENT_STATUS != 1)
if (departmentType.DEPARTMENT_STATUS == 2)
{
level = "公司级";
}

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

@ -128,8 +128,8 @@ namespace APT.SK.WebApi.Controllers.Api
var department = this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == entity.APPLY_DEPARTMENT_ID && t.ENABLE_STATUS == 0);
if (department != null)
{
if (department.DEPARTMENT_TYPE == 5 || (department.NAME.Contains("安全环保") && department.DEPARTMENT_TYPE == 10))
{ param = "公司"; }
if (department.DEPARTMENT_STATUS == 2)
{ param = "公司级"; }
}
entity.STATUS = PFStandardStatus.Approving;
//取审批流水码

8
APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskEvaluationController.cs
View File

@ -204,8 +204,12 @@ namespace APT.SK.WebApi.Controllers.Api
//{
// throw new Exception("管控层级不能为空");
//}
var departmentType = this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == entity.APPLY_DEPARTMENT_ID && t.ENABLE_STATUS == 0)?.DEPARTMENT_TYPE;
var param = Enum.GetName(typeof(SKDepartmentTypeEnum), departmentType);
var department = this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == entity.APPLY_DEPARTMENT_ID && t.ENABLE_STATUS == 0);
var param = Enum.GetName(typeof(SKDepartmentTypeEnum), department.DEPARTMENT_TYPE);
if (department.DEPARTMENT_STATUS == 2)
{
param = "公司级";
}
entity.STATUS = PFStandardStatus.Approving;
//取审批流水码
var sysFilter = new SystemCodeFilter();

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

@ -133,9 +133,9 @@ namespace APT.SK.WebApi.Controllers.Api
{
var department = this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == entity.APPLY_DEPARTMENT_ID && t.ENABLE_STATUS == 0);
var param = Enum.GetName(typeof(SKDepartmentTypeEnum), department?.DEPARTMENT_TYPE);
if (department.PARENT_ID != null && param == "公司级")
if (department.DEPARTMENT_STATUS == 2)
{
param = "部门级";
param = "公司级";
}
entity.STATUS = PFStandardStatus.Approving;
//取审批流水码

8
APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskIdentifyResultController.cs
View File

@ -160,8 +160,12 @@ namespace APT.SK.WebApi.Controllers.Api
List<T_FM_NOTIFICATION_TASK> notices = new List<T_FM_NOTIFICATION_TASK>();
if (entity.PUBLISH != null && entity.PUBLISH.Equals("SaveAndNotify"))
{
var departmentType = this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == entity.APPLY_DEPARTMENT_ID && t.ENABLE_STATUS == 0)?.DEPARTMENT_TYPE;
var param = Enum.GetName(typeof(SKDepartmentTypeEnum), departmentType);
var department = this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == entity.APPLY_DEPARTMENT_ID && t.ENABLE_STATUS == 0);
var param = Enum.GetName(typeof(SKDepartmentTypeEnum), department.DEPARTMENT_TYPE);
if (department.DEPARTMENT_STATUS == 2)
{
param = "公司级";
}
entity.STATUS = PFStandardStatus.Approving;
//取审批流水码
var sysFilter = new SystemCodeFilter();

2
APT.MicroApi/APT.SK.WebApi/Controllers/Api/SecurityInspectionNoticeController.cs
View File

@ -259,7 +259,7 @@ namespace APT.SK.WebApi.Controllers.Api
if (department != null)
{
param = Enum.GetName(typeof(SKDepartmentTypeEnum), department.DEPARTMENT_TYPE);
if (department.DEPARTMENT_STATUS != 1)
if (department.DEPARTMENT_STATUS == 2)
{
param = "公司级";
}