diff --git a/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs b/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs index e94009f..be072a3 100644 --- a/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs +++ b/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs @@ -12341,8 +12341,15 @@ namespace APT.BaseData.Services.DomainServices var i = 1; foreach (var ite in measuresTemp) { - var temp2 = i + "、" + ite + "；"; - ideDetail.MEASURE = ideDetail.MEASURE + Environment.NewLine + temp2; + var temp2 = i + "、" + ite; + if (i == 1) + { + ideDetail.MEASURE = temp2; + } + else + { + ideDetail.MEASURE = ideDetail.MEASURE + Environment.NewLine + temp2; + } i++; } } diff --git a/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SKController.cs b/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SKController.cs index 6773b66..aa813a5 100644 --- a/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SKController.cs +++ b/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SKController.cs @@ -1121,8 +1121,15 @@ namespace APT.PP.WebApi.Controllers.Api var i = 1; foreach (var ite in measuresTemp) { - var temp2 = i + "、" + ite + "；"; - ideDetail.MEASURE = ideDetail.MEASURE + Environment.NewLine + temp2; + var temp2 = i + "、" + ite; + if (i == 1) + { + ideDetail.MEASURE = temp2; + } + else + { + ideDetail.MEASURE = ideDetail.MEASURE + Environment.NewLine + temp2; + } i++; } } @@ -1364,8 +1371,15 @@ namespace APT.PP.WebApi.Controllers.Api var i = 1; foreach (var ite in measuresTemp) { - var temp2 = i + "、" + ite + "；"; - ideDetail.MEASURE = ideDetail.MEASURE + Environment.NewLine + temp2; + var temp2 = i + "、" + ite; + if (i == 1) + { + ideDetail.MEASURE = temp2; + } + else + { + ideDetail.MEASURE = ideDetail.MEASURE + Environment.NewLine + temp2; + } i++; } } diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/EnterpriseLibraryController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/EnterpriseLibraryController.cs index 45c3575..9c88202 100644 --- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/EnterpriseLibraryController.cs +++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/EnterpriseLibraryController.cs @@ -2305,7 +2305,9 @@ namespace APT.SK.WebApi.Controllers.Api [HttpPost, Route("GetCheckListNew")] public JsonActionResult> GetCheckListNew([FromBody] KeywordFilter filter) { - var loginDepart = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID; + var loginDepart = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID; + var loginUser = APT.Infrastructure.Api.AppContext.CurrentSession.UserID; + var userInfo = this.GetEntity(t => t.ID == loginUser); var departs = this.GetEntities(t => t.ENABLE_STATUS == 0, new BaseFilter(filter.OrgId)); List selectMinetype = new List(); var minetype = departs.FirstOrDefault(t => t.ID == loginDepart)?.MineType; @@ -2485,7 +2487,14 @@ namespace APT.SK.WebApi.Controllers.Api } list.Add(listNew); } - checkList.Data = list.Where(t => selectMinetype.Contains(t.MineType)).OrderBy(n => n.MineType).ThenBy(x => x.Num).ThenBy(n => n.CheckDepart).ToList(); + if (userInfo != null && userInfo.NAME.Contains("管理员")) + { + checkList.Data = list.OrderBy(n => n.MineType).ThenBy(x => x.Num).ThenBy(n => n.CheckDepart).ToList(); + } + else + { + checkList.Data = list.Where(t => selectMinetype.Contains(t.MineType)).OrderBy(n => n.MineType).ThenBy(x => x.Num).ThenBy(n => n.CheckDepart).ToList(); + } checkList.TotalCount = checkList.Data.Count; } return checkList; diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerConfirmController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerConfirmController.cs index cf89b8c..efef3bd 100644 --- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerConfirmController.cs +++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerConfirmController.cs @@ -109,7 +109,7 @@ namespace APT.SK.WebApi.Controllers.Api if (hiddenLevel == SKHiddenLevel.General) { var departmentType = this.GetEntity(t => t.ID == entity.APPLY_DEPARTMENT_ID && t.ENABLE_STATUS == 0)?.DEPARTMENT_TYPE; - level = Enum.GetName(typeof(FMDepartmentType), departmentType); + level = Enum.GetName(typeof(SKDepartmentTypeEnum), departmentType); } //触发审批 entity.STATUS = PFStandardStatus.Approving; diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerRectifyDelayApplyController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerRectifyDelayApplyController.cs index d55cb42..7c741f6 100644 --- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerRectifyDelayApplyController.cs +++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerRectifyDelayApplyController.cs @@ -54,7 +54,7 @@ namespace APT.SK.WebApi.Controllers.Api if (hiddenLevel == SKHiddenLevel.General) { var departmentType = this.GetEntity(t => t.ID == entity.APPLY_DEPARTMENT_ID && t.ENABLE_STATUS == 0)?.DEPARTMENT_TYPE; - param = Enum.GetName(typeof(FMDepartmentType), departmentType); + param = Enum.GetName(typeof(SKDepartmentTypeEnum), departmentType); } entity.STATUS = PFStandardStatus.Approving; //取审批流水码 diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerRectifyRecordController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerRectifyRecordController.cs index 1fe70f6..2587c5d 100644 --- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerRectifyRecordController.cs +++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerRectifyRecordController.cs @@ -178,7 +178,7 @@ namespace APT.SK.WebApi.Controllers if (entity.HIDDEN_LEVEL == SKHiddenLevel.General) { var departmentType = this.GetEntity(t => t.ID == entity.APPLY_DEPARTMENT_ID && t.ENABLE_STATUS == 0)?.DEPARTMENT_TYPE; - param = Enum.GetName(typeof(FMDepartmentType), departmentType); + param = Enum.GetName(typeof(SKDepartmentTypeEnum), departmentType); } MFlowPermitService.InsertApprove(serialCode[0], "SK022", param, entity.ID, "SK022_SHOWPRINT", entity.TaskID, true, () => { diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/IdentifyEvaluationPlanController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/IdentifyEvaluationPlanController.cs index 1e80891..98938d3 100644 --- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/IdentifyEvaluationPlanController.cs +++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/IdentifyEvaluationPlanController.cs @@ -106,7 +106,7 @@ namespace APT.SK.WebApi.Controllers.Api var department = this.GetEntity(t => t.ID == entity.APPLY_DEPARTMENT_ID && t.ENABLE_STATUS == 0); if (department != null) { - if (department.DEPARTMENT_TYPE == 3 || (department.NAME.Contains("安全环保") && department.DEPARTMENT_TYPE == 0)) + if (department.DEPARTMENT_TYPE == 5 || (department.NAME.Contains("安全环保") && department.DEPARTMENT_TYPE == 10)) { param = "公司"; } } entity.STATUS = PFStandardStatus.Approving; diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskEvaluationController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskEvaluationController.cs index 3dd9c15..510163c 100644 --- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskEvaluationController.cs +++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskEvaluationController.cs @@ -167,7 +167,7 @@ namespace APT.SK.WebApi.Controllers.Api if (entity.PUBLISH != null && entity.PUBLISH.Equals("SaveAndNotify")) { var departmentType = this.GetEntity(t => t.ID == entity.APPLY_DEPARTMENT_ID && t.ENABLE_STATUS == 0)?.DEPARTMENT_TYPE; - var param = Enum.GetName(typeof(FMDepartmentType), departmentType); + var param = Enum.GetName(typeof(SKDepartmentTypeEnum), departmentType); entity.STATUS = PFStandardStatus.Approving; //取审批流水码 var sysFilter = new SystemCodeFilter(); diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskIdentifyController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskIdentifyController.cs index da417a8..ff65b85 100644 --- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskIdentifyController.cs +++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskIdentifyController.cs @@ -120,10 +120,10 @@ namespace APT.SK.WebApi.Controllers.Api if (entity.PUBLISH != null && entity.PUBLISH.Equals("SaveAndNotify")) { var department = this.GetEntity(t => t.ID == entity.APPLY_DEPARTMENT_ID && t.ENABLE_STATUS == 0); - var param = Enum.GetName(typeof(FMDepartmentType), department?.DEPARTMENT_TYPE); - if (department.PARENT_ID != null && param == "公司") + var param = Enum.GetName(typeof(SKDepartmentTypeEnum), department?.DEPARTMENT_TYPE); + if (department.PARENT_ID != null && param == "公司级") { - param = "部门"; + param = "部门级"; } entity.STATUS = PFStandardStatus.Approving; //取审批流水码 diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskIdentifyResultController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskIdentifyResultController.cs index 5a6abfc..39689db 100644 --- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskIdentifyResultController.cs +++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskIdentifyResultController.cs @@ -155,7 +155,7 @@ namespace APT.SK.WebApi.Controllers.Api if (entity.PUBLISH != null && entity.PUBLISH.Equals("SaveAndNotify")) { var departmentType = this.GetEntity(t => t.ID == entity.APPLY_DEPARTMENT_ID && t.ENABLE_STATUS == 0)?.DEPARTMENT_TYPE; - var param = Enum.GetName(typeof(FMDepartmentType), departmentType); + var param = Enum.GetName(typeof(SKDepartmentTypeEnum), departmentType); entity.STATUS = PFStandardStatus.Approving; //取审批流水码 var sysFilter = new SystemCodeFilter();