From 71f568568d473321cfddb3ffa99e9a05df88f75f Mon Sep 17 00:00:00 2001
From: wyw <571921741@qq.com>
Date: Mon, 25 Aug 2025 16:13:18 +0800
Subject: [PATCH] =?UTF-8?q?FilePathHead=20=E4=BF=AE=E6=94=B9=20.sln?=
=?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=96=B9=E6=A1=88=E5=90=8D=E7=A7=B0=E4=BF=AE?=
=?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
APT.BaseData.Domain/Enums/PF/PFEnums.cs | 43 +++++-------
.../Controllers/Api/BSSafeCheckController.cs | 70 +++++++++----------
.../Controllers/Api/DepartmentController.cs | 48 ++++++-------
.../Controllers/Api/LoginController.cs | 54 +++++++-------
.../Controllers/Api/FMController.cs | 17 ++---
.../Api/MTController/SCMTMeetingController.cs | 16 ++---
.../SEController/6SETrainRecordController.cs | 24 +++----
APT.WebApi.sln => APT.WebApiJY.sln | 0
APT.WebApi_M.sln => APT.WebApiJY_M.sln | 0
9 files changed, 131 insertions(+), 141 deletions(-)
rename APT.WebApi.sln => APT.WebApiJY.sln (100%)
rename APT.WebApi_M.sln => APT.WebApiJY_M.sln (100%)
diff --git a/APT.BaseData.Domain/Enums/PF/PFEnums.cs b/APT.BaseData.Domain/Enums/PF/PFEnums.cs
index 2eb6882..1cf346f 100644
--- a/APT.BaseData.Domain/Enums/PF/PFEnums.cs
+++ b/APT.BaseData.Domain/Enums/PF/PFEnums.cs
@@ -60,41 +60,30 @@ namespace APT.BaseData.Domain.Enums.PF
///
public enum FilePathHead
{
+
///
- /// 行洛坑
+ /// 邦泰
///
- [Description("B043B28B-BBC3-C452-6052-4FBA1457ABFA")]
- XLK = 1,
+ [Description("00500000-0000-0000-0000-000000000000")]
+ BT = 5,
+
///
- /// 龙岩稀土
+ /// 路源
///
- [Description("8F1CF418-8BF3-EA3F-7A6D-FC5D61247008")]
- LYXT = 2,
+ [Description("01000000-0000-0000-0000-000000000000")]
+ LY = 10,
+
///
- /// 洛阳豫鹭
+ /// 昆仑金能
///
- [Description("D9871BA8-0EEC-9E4A-BB87-7D5A540D8913")]
- LYYL = 3,
+ [Description("01500000-0000-0000-0000-000000000000")]
+ KLJN = 15,
+
///
- /// 都昌金鼎
+ /// 西拓
///
- [Description("8B3C41AA-51B1-7CE9-1879-248A038C1B5C")]
- DCJD = 4,
- ///
- /// 广西博白
- ///
- [Description("3EFD5276-632B-E379-9FF3-7A7546591FCA")]
- GXBB = 5,
- ///
- /// sps 演示环境
- ///
- [Description("88888888-8888-8888-8888-888888888888")]
- SPSD = 8,
- ///
- /// 行洛坑
- ///
- [Description("B043B28B-BBC3-C452-6052-4FBA1457ABFA")]
- XLKNEW = 6,
+ [Description("02000000-0000-0000-0000-000000000000")]
+ XT = 20,
}
///
diff --git a/APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSSafeCheckController.cs b/APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSSafeCheckController.cs
index 723fa35..a94e85d 100644
--- a/APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSSafeCheckController.cs
+++ b/APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSSafeCheckController.cs
@@ -8501,49 +8501,49 @@ namespace APT.BS.WebApi.Controllers.Api
}
}
//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 listAREA_ID = null;
+ // if ((listMineType == null || listMineType.Count == 0) || (listMineType != null && listMineType.Count > 0 && !listMineType.Contains(0)))
+ // {
+ // listAREA_ID = GetEntities(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)
{
- //风险库 > 危险源/风险库
- IEnumerable listAREA_ID = null;
- if ((listMineType == null || listMineType.Count == 0) || (listMineType != null && listMineType.Count > 0 && !listMineType.Contains(0)))
- {
- listAREA_ID = GetEntities(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));
- }
+ listMineType = UserService.GetMineType();
}
- else
+ if (listMineType != null && listMineType.Count > 0)
{
- if (listMineType == null)
+ var listDepUnit = GetEntities(e => e.Nav_Enums != null && listMineType.Contains(e.Nav_Enums.VALUE), null, "Nav_Enums");
+ if (listDepUnit != null && listDepUnit.Any())
{
- listMineType = UserService.GetMineType();
- }
- if (listMineType != null && listMineType.Count > 0)
- {
- var listDepUnit = GetEntities(e => e.Nav_Enums != null && listMineType.Contains(e.Nav_Enums.VALUE), null, "Nav_Enums");
- if (listDepUnit != null && listDepUnit.Any())
+ List listDepID = listDepUnit.Select(e => e.DEPARTMENT_ID).ToList();
+ var listDep = GetEntities(e => !e.MineType.HasValue || listDepID.Contains(e.ID), null, null);
+ List listDepId = new List();
+ if (listDep != null && listDep.Any())
{
- List listDepID = listDepUnit.Select(e => e.DEPARTMENT_ID).ToList();
- var listDep = GetEntities(e => !e.MineType.HasValue || listDepID.Contains(e.ID), null, null);
- List listDepId = new List();
- if (listDep != null && listDep.Any())
- {
- listDepId = listDep.Select(e => e.ID).ToList();
- }
- if (listDepId.Count > 0)
- {
- expression = expression.And(e => !e.DEPARTMENT_ID.HasValue || listDepId.Contains(e.DEPARTMENT_ID.Value));
- }
- else
- {
- expression = expression.And(e => !e.DEPARTMENT_ID.HasValue);
- }
+ listDepId = listDep.Select(e => e.ID).ToList();
+ }
+ if (listDepId.Count > 0)
+ {
+ expression = expression.And(e => !e.DEPARTMENT_ID.HasValue || listDepId.Contains(e.DEPARTMENT_ID.Value));
+ }
+ else
+ {
+ expression = expression.And(e => !e.DEPARTMENT_ID.HasValue);
}
}
}
+ //}
PagedActionResult orderPageEntities = GetOrderPageEntities(expression, pageFilter, null);
result.Data = orderPageEntities.Data;
diff --git a/APT.MicroApi/APT.FM.WebApi/Controllers/Api/DepartmentController.cs b/APT.MicroApi/APT.FM.WebApi/Controllers/Api/DepartmentController.cs
index e68c591..64dff7a 100644
--- a/APT.MicroApi/APT.FM.WebApi/Controllers/Api/DepartmentController.cs
+++ b/APT.MicroApi/APT.FM.WebApi/Controllers/Api/DepartmentController.cs
@@ -778,30 +778,30 @@ namespace APT.FM.WebApi.Controllers.Api.FM
string depID = "1BBBBBBB-BBBB-BBBB-BBBB-BBBBBBBBBBBB";
string ORG_ID = entity.ORG_ID.Value.ToString().ToUpper();
- if (ORG_ID == FilePathHead.XLK.GetDescription())
- {
- depID = "1BBBBBBB-BBBB-BBBB-BBBB-BBBBBBBBBBBB";
- }
- else if (ORG_ID == FilePathHead.LYXT.GetDescription())
- {
- depID = "2BBBBBBB-BBBB-BBBB-BBBB-BBBBBBBBBBBB";
- }
- else if (ORG_ID == FilePathHead.LYYL.GetDescription())
- {
- depID = "3BBBBBBB-BBBB-BBBB-BBBB-BBBBBBBBBBBB";
- }
- else if (ORG_ID == FilePathHead.DCJD.GetDescription())
- {
- depID = "4BBBBBBB-BBBB-BBBB-BBBB-BBBBBBBBBBBB";
- }
- else if (ORG_ID == FilePathHead.GXBB.GetDescription())
- {
- depID = "5BBBBBBB-BBBB-BBBB-BBBB-BBBBBBBBBBBB";
- }
- else if (ORG_ID == FilePathHead.SPSD.GetDescription())
- {
- depID = "8BBBBBBB-BBBB-BBBB-BBBB-BBBBBBBBBBBB";
- }
+ //if (ORG_ID == FilePathHead.XLK.GetDescription())
+ //{
+ // depID = "1BBBBBBB-BBBB-BBBB-BBBB-BBBBBBBBBBBB";
+ //}
+ //else if (ORG_ID == FilePathHead.LYXT.GetDescription())
+ //{
+ // depID = "2BBBBBBB-BBBB-BBBB-BBBB-BBBBBBBBBBBB";
+ //}
+ //else if (ORG_ID == FilePathHead.LYYL.GetDescription())
+ //{
+ // depID = "3BBBBBBB-BBBB-BBBB-BBBB-BBBBBBBBBBBB";
+ //}
+ //else if (ORG_ID == FilePathHead.DCJD.GetDescription())
+ //{
+ // depID = "4BBBBBBB-BBBB-BBBB-BBBB-BBBBBBBBBBBB";
+ //}
+ //else if (ORG_ID == FilePathHead.GXBB.GetDescription())
+ //{
+ // depID = "5BBBBBBB-BBBB-BBBB-BBBB-BBBBBBBBBBBB";
+ //}
+ //else if (ORG_ID == FilePathHead.SPSD.GetDescription())
+ //{
+ // depID = "8BBBBBBB-BBBB-BBBB-BBBB-BBBBBBBBBBBB";
+ //}
modelP = new T_FM_DEPARTMENT();
modelP.ID = new Guid(depID);
diff --git a/APT.MicroApi/APT.PF.WebApi/Controllers/Api/LoginController.cs b/APT.MicroApi/APT.PF.WebApi/Controllers/Api/LoginController.cs
index 65e74ad..e88798f 100644
--- a/APT.MicroApi/APT.PF.WebApi/Controllers/Api/LoginController.cs
+++ b/APT.MicroApi/APT.PF.WebApi/Controllers/Api/LoginController.cs
@@ -225,33 +225,33 @@ namespace APT.PF.WebApiControllers.Api.PF
{
hostPort = int.Parse(re["Origin"].ToString().Split(":")[2]);
}
- switch (hostPort)
- {
- case 8000:
- case 8001:
- orgId = new Guid(FilePathHead.XLK.GetDescription());
- break;
- case 8002:
- orgId = new Guid(FilePathHead.LYYL.GetDescription());
- break;
- case 8003:
- orgId = new Guid(FilePathHead.DCJD.GetDescription());
- break;
- case 8004:
- orgId = new Guid(FilePathHead.LYXT.GetDescription());
- break;
- case 8005:
- orgId = new Guid(FilePathHead.GXBB.GetDescription());
- break;
- case 5001:
- orgId = new Guid(FilePathHead.SPSD.GetDescription());
- break;
- case 8006:
- orgId = new Guid(FilePathHead.XLKNEW.GetDescription());
- break;
- default:
- break;
- }
+ //switch (hostPort)
+ //{
+ // case 8000:
+ // case 8001:
+ // orgId = new Guid(FilePathHead.XLK.GetDescription());
+ // break;
+ // case 8002:
+ // orgId = new Guid(FilePathHead.LYYL.GetDescription());
+ // break;
+ // case 8003:
+ // orgId = new Guid(FilePathHead.DCJD.GetDescription());
+ // break;
+ // case 8004:
+ // orgId = new Guid(FilePathHead.LYXT.GetDescription());
+ // break;
+ // case 8005:
+ // orgId = new Guid(FilePathHead.GXBB.GetDescription());
+ // break;
+ // case 5001:
+ // orgId = new Guid(FilePathHead.SPSD.GetDescription());
+ // break;
+ // case 8006:
+ // orgId = new Guid(FilePathHead.XLKNEW.GetDescription());
+ // break;
+ // default:
+ // break;
+ //}
if (orgId != Guid.Empty)
{
filter.Parameter4 = orgId.ToString();
diff --git a/APT.MicroApi/APT.PP.WebApi/Controllers/Api/FMController.cs b/APT.MicroApi/APT.PP.WebApi/Controllers/Api/FMController.cs
index 7b94358..090f842 100644
--- a/APT.MicroApi/APT.PP.WebApi/Controllers/Api/FMController.cs
+++ b/APT.MicroApi/APT.PP.WebApi/Controllers/Api/FMController.cs
@@ -2680,14 +2680,15 @@ namespace APT.PP.WebApi.Controllers.Api.PP
{
task.SYNC_PARAM = "";//清空参数
}
- if (task.ORG_ID.Value.ToString().ToUpper() == FilePathHead.XLK.GetDescription())
- {
- FMNoticeService.SendMsg(NOTICETYPE.Meeting, DataID, KEY, task);
- }
- else if (task.ORG_ID.Value.ToString().ToUpper() == FilePathHead.DCJD.GetDescription())
- {
- FMNoticeService.SendMsg(NOTICETYPE.MeetingJD, DataID, KEY, task);
- }
+
+ //if (task.ORG_ID.Value.ToString().ToUpper() == FilePathHead.XLK.GetDescription())
+ //{
+ // FMNoticeService.SendMsg(NOTICETYPE.Meeting, DataID, KEY, task);
+ //}
+ //else if (task.ORG_ID.Value.ToString().ToUpper() == FilePathHead.DCJD.GetDescription())
+ //{
+ // FMNoticeService.SendMsg(NOTICETYPE.MeetingJD, DataID, KEY, task);
+ //}
}
catch (Exception ex)
{
diff --git a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/MTController/SCMTMeetingController.cs b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/MTController/SCMTMeetingController.cs
index c23b13f..73dabd7 100644
--- a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/MTController/SCMTMeetingController.cs
+++ b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/MTController/SCMTMeetingController.cs
@@ -742,10 +742,10 @@ namespace APT.SC.WebApi.Controllers.Api.SC
Guid Key = Guid.NewGuid();
//所有的人 添加 参会通知
- if (entity.ORG_ID.Value.ToString().ToUpper() == FilePathHead.DCJD.GetDescription())
- {
- noticeType = NOTICETYPE.MeetingJD;
- }
+ //if (entity.ORG_ID.Value.ToString().ToUpper() == FilePathHead.DCJD.GetDescription())
+ //{
+ // noticeType = NOTICETYPE.MeetingJD;
+ //}
foreach (var item in listNoticeDeals)
{
@@ -1028,10 +1028,10 @@ namespace APT.SC.WebApi.Controllers.Api.SC
List listNoticeSend = new List();
NOTICETYPE noticeType = NOTICETYPE.Meeting;
- if (meeting.ORG_ID.Value.ToString().ToUpper() == FilePathHead.DCJD.GetDescription())
- {
- noticeType = NOTICETYPE.MeetingJD;
- }
+ //if (meeting.ORG_ID.Value.ToString().ToUpper() == FilePathHead.DCJD.GetDescription())
+ //{
+ // noticeType = NOTICETYPE.MeetingJD;
+ //}
string TEMPLATE_ID = FMNoticeService.GetTEMPLATE_ID(mtConfig.ORG_ID.Value);
if (!string.IsNullOrEmpty(TEMPLATE_ID))
{
diff --git a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/6SETrainRecordController.cs b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/6SETrainRecordController.cs
index eb6d198..f794305 100644
--- a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/6SETrainRecordController.cs
+++ b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/6SETrainRecordController.cs
@@ -51,18 +51,18 @@ namespace APT.SC.WebApi.Controllers.Api.SE
{
throw new Exception("未关联到培训通知");
}
- if (entity.ORG_ID.HasValue && entity.ORG_ID.Value.ToString().ToUpper() == BaseData.Domain.Enums.PF.FilePathHead.XLK.GetDescription())
- {
- IEnumerable filesCheck = null;
- if (files != null && files.Any())
- {
- filesCheck = files.Where(e => !e.IS_DELETED);
- }
- if (filesCheck == null || !filesCheck.Any())
- {
- throw new Exception("请上传附件！");
- }
- }
+ //if (entity.ORG_ID.HasValue && entity.ORG_ID.Value.ToString().ToUpper() == BaseData.Domain.Enums.PF.FilePathHead.XLK.GetDescription())
+ //{
+ // IEnumerable filesCheck = null;
+ // if (files != null && files.Any())
+ // {
+ // filesCheck = files.Where(e => !e.IS_DELETED);
+ // }
+ // if (filesCheck == null || !filesCheck.Any())
+ // {
+ // throw new Exception("请上传附件！");
+ // }
+ //}
var data = GetEntity(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.草稿)
{
diff --git a/APT.WebApi.sln b/APT.WebApiJY.sln
similarity index 100%
rename from APT.WebApi.sln
rename to APT.WebApiJY.sln
diff --git a/APT.WebApi_M.sln b/APT.WebApiJY_M.sln
similarity index 100%
rename from APT.WebApi_M.sln
rename to APT.WebApiJY_M.sln