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

审批参数优化

Browse Source
This commit is contained in:
何美荣 2025-09-30 11:03:05 +08:00
parent 6aa5f20eb1
commit 1a2c37eb04
10 changed files with 47 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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++;
}
}

22
APT.MicroApi/APT.PP.WebApi/Controllers/Api/SKController.cs
View File

@ -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++;
}
}

13
APT.MicroApi/APT.SK.WebApi/Controllers/Api/EnterpriseLibraryController.cs
View File

@ -2305,7 +2305,9 @@ namespace APT.SK.WebApi.Controllers.Api
[HttpPost, Route("GetCheckListNew")]
public JsonActionResult<List<CheckListNew>> 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_FM_USER>(t => t.ID == loginUser);
var departs = this.GetEntities<T_FM_DEPARTMENT>(t => t.ENABLE_STATUS == 0, new BaseFilter(filter.OrgId));
List<string> selectMinetype = new List<string>();
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;

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

@ -109,7 +109,7 @@ namespace APT.SK.WebApi.Controllers.Api
if (hiddenLevel == SKHiddenLevel.General)
{
var departmentType = this.GetEntity<T_FM_DEPARTMENT>(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;

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

@ -54,7 +54,7 @@ namespace APT.SK.WebApi.Controllers.Api
if (hiddenLevel == SKHiddenLevel.General)
{
var departmentType = this.GetEntity<T_FM_DEPARTMENT>(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;
//取审批流水码

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

@ -178,7 +178,7 @@ namespace APT.SK.WebApi.Controllers
if (entity.HIDDEN_LEVEL == SKHiddenLevel.General)
{
var departmentType = this.GetEntity<T_FM_DEPARTMENT>(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, () =>
{

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

@ -106,7 +106,7 @@ 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 == 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;

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

@ -167,7 +167,7 @@ namespace APT.SK.WebApi.Controllers.Api
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(FMDepartmentType), departmentType);
var param = Enum.GetName(typeof(SKDepartmentTypeEnum), departmentType);
entity.STATUS = PFStandardStatus.Approving;
//取审批流水码
var sysFilter = new SystemCodeFilter();

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

@ -120,10 +120,10 @@ namespace APT.SK.WebApi.Controllers.Api
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 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;
//取审批流水码

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

@ -155,7 +155,7 @@ namespace APT.SK.WebApi.Controllers.Api
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(FMDepartmentType), departmentType);
var param = Enum.GetName(typeof(SKDepartmentTypeEnum), departmentType);
entity.STATUS = PFStandardStatus.Approving;
//取审批流水码
var sysFilter = new SystemCodeFilter();