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

Compare commits

base: wyw:0da60d33a14df0e1a6704eeacf720fdcf2e3dff5
Branches Tags
wyw:master
..
compare: wyw:3bc9a80abd0110a0f801da1fabedd2e88ea2ba32
Branches Tags
wyw:master

No commits in common. "0da60d33a14df0e1a6704eeacf720fdcf2e3dff5" and "3bc9a80abd0110a0f801da1fabedd2e88ea2ba32" have entirely different histories.
0da60d33a1 ... 3bc9a80abd

10 changed files with 17 additions and 25 deletions
Show Stats 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 param = "部门级";
var dminetype = departs.FirstOrDefault(t => t.ID == user.DEPARTMENT_ID); var dminetype = departs.FirstOrDefault(t => t.ID == user.DEPARTMENT_ID).DEPARTMENT_TYPE;
if (dminetype.DEPARTMENT_TYPE == 5 || sum.ISCOMPANY == SKIsStoreEnum.Yes || dminetype.DEPARTMENT_STATUS == 2) if (dminetype == 5 || sum.ISCOMPANY == SKIsStoreEnum.Yes)
{ {
param = "公司级"; param = "公司级";
} }
@ -14718,8 +14718,8 @@ namespace APT.BaseData.Services.DomainServices
} }
} }
var param = "部门级"; var param = "部门级";
var dminetype = departs.FirstOrDefault(t => t.ID == user.DEPARTMENT_ID); var dminetype = departs.FirstOrDefault(t => t.ID == user.DEPARTMENT_ID).DEPARTMENT_TYPE;
if (dminetype.DEPARTMENT_TYPE == 5 || result.ISCOMPANY == SKIsStoreEnum.Yes || dminetype.DEPARTMENT_STATUS == 2) if (dminetype == 5 || result.ISCOMPANY == SKIsStoreEnum.Yes)
{ {
param = "公司级"; 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) if (departmentType != null)
{ {
level = ((SKDepartmentTypeEnum)departmentType.DEPARTMENT_TYPE).GetDescription(); level = ((SKDepartmentTypeEnum)departmentType.DEPARTMENT_TYPE).GetDescription();
if (departmentType.DEPARTMENT_STATUS == 2) if (departmentType.DEPARTMENT_STATUS != 1)
{ {
level = "公司级"; 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) if (departmentType != null)
{ {
level = ((SKDepartmentTypeEnum)departmentType.DEPARTMENT_TYPE).GetDescription(); level = ((SKDepartmentTypeEnum)departmentType.DEPARTMENT_TYPE).GetDescription();
if (departmentType.DEPARTMENT_STATUS == 2) if (departmentType.DEPARTMENT_STATUS != 1)
{ {
level = "公司级"; 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) if (departmentType != null)
{ {
level = ((SKDepartmentTypeEnum)departmentType.DEPARTMENT_TYPE).GetDescription(); level = ((SKDepartmentTypeEnum)departmentType.DEPARTMENT_TYPE).GetDescription();
if (departmentType.DEPARTMENT_STATUS == 2) if (departmentType.DEPARTMENT_STATUS != 1)
{ {
level = "公司级"; 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) if (departmentType != null)
{ {
level = ((SKDepartmentTypeEnum)departmentType.DEPARTMENT_TYPE).GetDescription(); level = ((SKDepartmentTypeEnum)departmentType.DEPARTMENT_TYPE).GetDescription();
if (departmentType.DEPARTMENT_STATUS == 2) if (departmentType.DEPARTMENT_STATUS != 1)
{ {
level = "公司级"; 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); var department = this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == entity.APPLY_DEPARTMENT_ID && t.ENABLE_STATUS == 0);
if (department != null) if (department != null)
{ {
if (department.DEPARTMENT_STATUS == 2) if (department.DEPARTMENT_TYPE == 5 || (department.NAME.Contains("安全环保") && department.DEPARTMENT_TYPE == 10))
{ param = "公司级"; } { param = "公司"; }
} }
entity.STATUS = PFStandardStatus.Approving; entity.STATUS = PFStandardStatus.Approving;
//取审批流水码 //取审批流水码

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

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

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

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