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

FilePathHead 修改

Browse Source 
.sln解决方案名称修改
This commit is contained in:
wyw 2025-08-25 16:13:18 +08:00
parent 062a4242d7
commit 71f568568d
9 changed files with 131 additions and 141 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
APT.BaseData.Domain/Enums/PF/PFEnums.cs
View File

@ -60,41 +60,30 @@ namespace APT.BaseData.Domain.Enums.PF
/// </summary> /// </summary>
public enum FilePathHead public enum FilePathHead
{ {
/// <summary> /// <summary>
/// 行洛坑 /// 邦泰
/// </summary> /// </summary>
[Description("B043B28B-BBC3-C452-6052-4FBA1457ABFA")] [Description("00500000-0000-0000-0000-000000000000")]
XLK = 1, BT = 5,
/// <summary> /// <summary>
/// 龙岩稀土 /// 路源
/// </summary> /// </summary>
[Description("8F1CF418-8BF3-EA3F-7A6D-FC5D61247008")] [Description("01000000-0000-0000-0000-000000000000")]
LYXT = 2, LY = 10,
/// <summary> /// <summary>
/// 洛阳豫鹭 /// 昆仑金能
/// </summary> /// </summary>
[Description("D9871BA8-0EEC-9E4A-BB87-7D5A540D8913")] [Description("01500000-0000-0000-0000-000000000000")]
LYYL = 3, KLJN = 15,
/// <summary> /// <summary>
/// 都昌金鼎 /// 西拓
/// </summary> /// </summary>
[Description("8B3C41AA-51B1-7CE9-1879-248A038C1B5C")] [Description("02000000-0000-0000-0000-000000000000")]
DCJD = 4, XT = 20,
/// <summary>
/// 广西博白
/// </summary>
[Description("3EFD5276-632B-E379-9FF3-7A7546591FCA")]
GXBB = 5,
/// <summary>
/// sps 演示环境
/// </summary>
[Description("88888888-8888-8888-8888-888888888888")]
SPSD = 8,
/// <summary>
/// 行洛坑
/// </summary>
[Description("B043B28B-BBC3-C452-6052-4FBA1457ABFA")]
XLKNEW = 6,
} }
/// <summary> /// <summary>

70
APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSSafeCheckController.cs
View File

@ -8501,49 +8501,49 @@ namespace APT.BS.WebApi.Controllers.Api
} }
} }
//listMineType != null && listMineType.Count > 0 && //listMineType != null && listMineType.Count > 0 &&
if (APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID.HasValue && pageFilter.OrgId.HasValue && pageFilter.OrgId.Value.ToString().ToUpper() == FilePathHead.LYYL.GetDescription())//豫鹭 //if (APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID.HasValue && pageFilter.OrgId.HasValue && pageFilter.OrgId.Value.ToString().ToUpper() == FilePathHead.LYYL.GetDescription())//豫鹭
//{
// //风险库 > 危险源/风险库
// IEnumerable<Guid> listAREA_ID = null;
// if ((listMineType == null || listMineType.Count == 0) || (listMineType != null && listMineType.Count > 0 && !listMineType.Contains(0)))
// {
// listAREA_ID = GetEntities<T_HM_EVALUATE_RISK>(e => e.AREA_ID.HasValue && e.DEPARTMENT_LIABLE_ID.HasValue && !e.IS_DELETED && e.DEPARTMENT_LIABLE_ID.Value == APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID, null, null).Select(e => e.AREA_ID.Value);
// }
// if (listAREA_ID != null && listAREA_ID.Any())
// {
// listAREA_ID = listAREA_ID.Distinct();
// expression = expression.And(e => listAREA_ID.Contains(e.ID));
// }
//}
//else
//{
if (listMineType == null)
{ {
//风险库 > 危险源/风险库 listMineType = UserService.GetMineType();
IEnumerable<Guid> listAREA_ID = null;
if ((listMineType == null || listMineType.Count == 0) || (listMineType != null && listMineType.Count > 0 && !listMineType.Contains(0)))
{
listAREA_ID = GetEntities<T_HM_EVALUATE_RISK>(e => e.AREA_ID.HasValue && e.DEPARTMENT_LIABLE_ID.HasValue && !e.IS_DELETED && e.DEPARTMENT_LIABLE_ID.Value == APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID, null, null).Select(e => e.AREA_ID.Value);
}
if (listAREA_ID != null && listAREA_ID.Any())
{
listAREA_ID = listAREA_ID.Distinct();
expression = expression.And(e => listAREA_ID.Contains(e.ID));
}
} }
else if (listMineType != null && listMineType.Count > 0)
{ {
if (listMineType == null) var listDepUnit = GetEntities<T_FM_DEPARTMENT_PRODUCTION_UNIT>(e => e.Nav_Enums != null && listMineType.Contains(e.Nav_Enums.VALUE), null, "Nav_Enums");
if (listDepUnit != null && listDepUnit.Any())
{ {
listMineType = UserService.GetMineType(); List<Guid> listDepID = listDepUnit.Select(e => e.DEPARTMENT_ID).ToList();
} var listDep = GetEntities<T_FM_DEPARTMENT>(e => !e.MineType.HasValue || listDepID.Contains(e.ID), null, null);
if (listMineType != null && listMineType.Count > 0) List<Guid> listDepId = new List<Guid>();
{ if (listDep != null && listDep.Any())
var listDepUnit = GetEntities<T_FM_DEPARTMENT_PRODUCTION_UNIT>(e => e.Nav_Enums != null && listMineType.Contains(e.Nav_Enums.VALUE), null, "Nav_Enums");
if (listDepUnit != null && listDepUnit.Any())
{ {
List<Guid> listDepID = listDepUnit.Select(e => e.DEPARTMENT_ID).ToList(); listDepId = listDep.Select(e => e.ID).ToList();
var listDep = GetEntities<T_FM_DEPARTMENT>(e => !e.MineType.HasValue || listDepID.Contains(e.ID), null, null); }
List<Guid> listDepId = new List<Guid>(); if (listDepId.Count > 0)
if (listDep != null && listDep.Any()) {
{ expression = expression.And(e => !e.DEPARTMENT_ID.HasValue || listDepId.Contains(e.DEPARTMENT_ID.Value));
listDepId = listDep.Select(e => e.ID).ToList(); }
} else
if (listDepId.Count > 0) {
{ expression = expression.And(e => !e.DEPARTMENT_ID.HasValue);
expression = expression.And(e => !e.DEPARTMENT_ID.HasValue || listDepId.Contains(e.DEPARTMENT_ID.Value));
}
else
{
expression = expression.And(e => !e.DEPARTMENT_ID.HasValue);
}
} }
} }
} }
//}
PagedActionResult<T_HM_RISK_AREA> orderPageEntities = GetOrderPageEntities<T_HM_RISK_AREA>(expression, pageFilter, null); PagedActionResult<T_HM_RISK_AREA> orderPageEntities = GetOrderPageEntities<T_HM_RISK_AREA>(expression, pageFilter, null);
result.Data = orderPageEntities.Data; result.Data = orderPageEntities.Data;

48
APT.MicroApi/APT.FM.WebApi/Controllers/Api/DepartmentController.cs
View File

@ -778,30 +778,30 @@ namespace APT.FM.WebApi.Controllers.Api.FM
string depID = "1BBBBBBB-BBBB-BBBB-BBBB-BBBBBBBBBBBB"; string depID = "1BBBBBBB-BBBB-BBBB-BBBB-BBBBBBBBBBBB";
string ORG_ID = entity.ORG_ID.Value.ToString().ToUpper(); string ORG_ID = entity.ORG_ID.Value.ToString().ToUpper();
if (ORG_ID == FilePathHead.XLK.GetDescription()) //if (ORG_ID == FilePathHead.XLK.GetDescription())
{ //{
depID = "1BBBBBBB-BBBB-BBBB-BBBB-BBBBBBBBBBBB"; // depID = "1BBBBBBB-BBBB-BBBB-BBBB-BBBBBBBBBBBB";
} //}
else if (ORG_ID == FilePathHead.LYXT.GetDescription()) //else if (ORG_ID == FilePathHead.LYXT.GetDescription())
{ //{
depID = "2BBBBBBB-BBBB-BBBB-BBBB-BBBBBBBBBBBB"; // depID = "2BBBBBBB-BBBB-BBBB-BBBB-BBBBBBBBBBBB";
} //}
else if (ORG_ID == FilePathHead.LYYL.GetDescription()) //else if (ORG_ID == FilePathHead.LYYL.GetDescription())
{ //{
depID = "3BBBBBBB-BBBB-BBBB-BBBB-BBBBBBBBBBBB"; // depID = "3BBBBBBB-BBBB-BBBB-BBBB-BBBBBBBBBBBB";
} //}
else if (ORG_ID == FilePathHead.DCJD.GetDescription()) //else if (ORG_ID == FilePathHead.DCJD.GetDescription())
{ //{
depID = "4BBBBBBB-BBBB-BBBB-BBBB-BBBBBBBBBBBB"; // depID = "4BBBBBBB-BBBB-BBBB-BBBB-BBBBBBBBBBBB";
} //}
else if (ORG_ID == FilePathHead.GXBB.GetDescription()) //else if (ORG_ID == FilePathHead.GXBB.GetDescription())
{ //{
depID = "5BBBBBBB-BBBB-BBBB-BBBB-BBBBBBBBBBBB"; // depID = "5BBBBBBB-BBBB-BBBB-BBBB-BBBBBBBBBBBB";
} //}
else if (ORG_ID == FilePathHead.SPSD.GetDescription()) //else if (ORG_ID == FilePathHead.SPSD.GetDescription())
{ //{
depID = "8BBBBBBB-BBBB-BBBB-BBBB-BBBBBBBBBBBB"; // depID = "8BBBBBBB-BBBB-BBBB-BBBB-BBBBBBBBBBBB";
} //}
modelP = new T_FM_DEPARTMENT(); modelP = new T_FM_DEPARTMENT();
modelP.ID = new Guid(depID); modelP.ID = new Guid(depID);

54
APT.MicroApi/APT.PF.WebApi/Controllers/Api/LoginController.cs
View File

@ -225,33 +225,33 @@ namespace APT.PF.WebApiControllers.Api.PF
{ {
hostPort = int.Parse(re["Origin"].ToString().Split(":")[2]); hostPort = int.Parse(re["Origin"].ToString().Split(":")[2]);
} }
switch (hostPort) //switch (hostPort)
{ //{
case 8000: // case 8000:
case 8001: // case 8001:
orgId = new Guid(FilePathHead.XLK.GetDescription()); // orgId = new Guid(FilePathHead.XLK.GetDescription());
break; // break;
case 8002: // case 8002:
orgId = new Guid(FilePathHead.LYYL.GetDescription()); // orgId = new Guid(FilePathHead.LYYL.GetDescription());
break; // break;
case 8003: // case 8003:
orgId = new Guid(FilePathHead.DCJD.GetDescription()); // orgId = new Guid(FilePathHead.DCJD.GetDescription());
break; // break;
case 8004: // case 8004:
orgId = new Guid(FilePathHead.LYXT.GetDescription()); // orgId = new Guid(FilePathHead.LYXT.GetDescription());
break; // break;
case 8005: // case 8005:
orgId = new Guid(FilePathHead.GXBB.GetDescription()); // orgId = new Guid(FilePathHead.GXBB.GetDescription());
break; // break;
case 5001: // case 5001:
orgId = new Guid(FilePathHead.SPSD.GetDescription()); // orgId = new Guid(FilePathHead.SPSD.GetDescription());
break; // break;
case 8006: // case 8006:
orgId = new Guid(FilePathHead.XLKNEW.GetDescription()); // orgId = new Guid(FilePathHead.XLKNEW.GetDescription());
break; // break;
default: // default:
break; // break;
} //}
if (orgId != Guid.Empty) if (orgId != Guid.Empty)
{ {
filter.Parameter4 = orgId.ToString(); filter.Parameter4 = orgId.ToString();

17
APT.MicroApi/APT.PP.WebApi/Controllers/Api/FMController.cs
View File

@ -2680,14 +2680,15 @@ namespace APT.PP.WebApi.Controllers.Api.PP
{ {
task.SYNC_PARAM = "";//清空参数 task.SYNC_PARAM = "";//清空参数
} }
if (task.ORG_ID.Value.ToString().ToUpper() == FilePathHead.XLK.GetDescription())
{ //if (task.ORG_ID.Value.ToString().ToUpper() == FilePathHead.XLK.GetDescription())
FMNoticeService.SendMsg(NOTICETYPE.Meeting, DataID, KEY, task); //{
} // FMNoticeService.SendMsg(NOTICETYPE.Meeting, DataID, KEY, task);
else if (task.ORG_ID.Value.ToString().ToUpper() == FilePathHead.DCJD.GetDescription()) //}
{ //else if (task.ORG_ID.Value.ToString().ToUpper() == FilePathHead.DCJD.GetDescription())
FMNoticeService.SendMsg(NOTICETYPE.MeetingJD, DataID, KEY, task); //{
} // FMNoticeService.SendMsg(NOTICETYPE.MeetingJD, DataID, KEY, task);
//}
} }
catch (Exception ex) catch (Exception ex)
{ {

16
APT.MicroApi/APT.SC.WebApi/Controllers/Api/MTController/SCMTMeetingController.cs
View File

@ -742,10 +742,10 @@ namespace APT.SC.WebApi.Controllers.Api.SC
Guid Key = Guid.NewGuid(); Guid Key = Guid.NewGuid();
//所有的人 添加 参会通知 //所有的人 添加 参会通知
if (entity.ORG_ID.Value.ToString().ToUpper() == FilePathHead.DCJD.GetDescription()) //if (entity.ORG_ID.Value.ToString().ToUpper() == FilePathHead.DCJD.GetDescription())
{ //{
noticeType = NOTICETYPE.MeetingJD; // noticeType = NOTICETYPE.MeetingJD;
} //}
foreach (var item in listNoticeDeals) foreach (var item in listNoticeDeals)
{ {
@ -1028,10 +1028,10 @@ namespace APT.SC.WebApi.Controllers.Api.SC
List<T_FM_NOTICE> listNoticeSend = new List<T_FM_NOTICE>(); List<T_FM_NOTICE> listNoticeSend = new List<T_FM_NOTICE>();
NOTICETYPE noticeType = NOTICETYPE.Meeting; NOTICETYPE noticeType = NOTICETYPE.Meeting;
if (meeting.ORG_ID.Value.ToString().ToUpper() == FilePathHead.DCJD.GetDescription()) //if (meeting.ORG_ID.Value.ToString().ToUpper() == FilePathHead.DCJD.GetDescription())
{ //{
noticeType = NOTICETYPE.MeetingJD; // noticeType = NOTICETYPE.MeetingJD;
} //}
string TEMPLATE_ID = FMNoticeService.GetTEMPLATE_ID(mtConfig.ORG_ID.Value); string TEMPLATE_ID = FMNoticeService.GetTEMPLATE_ID(mtConfig.ORG_ID.Value);
if (!string.IsNullOrEmpty(TEMPLATE_ID)) if (!string.IsNullOrEmpty(TEMPLATE_ID))
{ {

24
APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/6SETrainRecordController.cs
View File

@ -51,18 +51,18 @@ namespace APT.SC.WebApi.Controllers.Api.SE
{ {
throw new Exception("未关联到培训通知"); throw new Exception("未关联到培训通知");
} }
if (entity.ORG_ID.HasValue && entity.ORG_ID.Value.ToString().ToUpper() == BaseData.Domain.Enums.PF.FilePathHead.XLK.GetDescription()) //if (entity.ORG_ID.HasValue && entity.ORG_ID.Value.ToString().ToUpper() == BaseData.Domain.Enums.PF.FilePathHead.XLK.GetDescription())
{ //{
IEnumerable<T_SE_TRAIN_RECORD_FILE> filesCheck = null; // IEnumerable<T_SE_TRAIN_RECORD_FILE> filesCheck = null;
if (files != null && files.Any()) // if (files != null && files.Any())
{ // {
filesCheck = files.Where(e => !e.IS_DELETED); // filesCheck = files.Where(e => !e.IS_DELETED);
} // }
if (filesCheck == null || !filesCheck.Any()) // if (filesCheck == null || !filesCheck.Any())
{ // {
throw new Exception("请上传附件！"); // throw new Exception("请上传附件！");
} // }
} //}
var data = GetEntity<T_SE_TRAIN_RECORD>(t => t.ID == entity.ID, new BaseFilter(entity.ORG_ID), new string[] { "Nav_Notify.Nav_TrainCheckType", "Nav_Notify.Nav_TrainContentList", "Nav_Users" }); var data = GetEntity<T_SE_TRAIN_RECORD>(t => t.ID == entity.ID, new BaseFilter(entity.ORG_ID), new string[] { "Nav_Notify.Nav_TrainCheckType", "Nav_Notify.Nav_TrainContentList", "Nav_Users" });
if (data != null && data.STATUS != SETrainRecordStatus.草稿) if (data != null && data.STATUS != SETrainRecordStatus.草稿)
{ {

0
APT.WebApi.sln → APT.WebApiJY.sln
View File

0
APT.WebApi_M.sln → APT.WebApiJY_M.sln
View File