From 4a61f084873457008bfda13c845e558c42b359dd Mon Sep 17 00:00:00 2001
From: xiaju <1784803958@qq.com>
Date: Mon, 15 Sep 2025 16:40:38 +0800
Subject: [PATCH 1/5] 1
---
DataBase/版本日志/SUBQHSE_V2025-09-15-xiaj.sql | 5 +++++
1 file changed, 5 insertions(+)
create mode 100644 DataBase/版本日志/SUBQHSE_V2025-09-15-xiaj.sql
diff --git a/DataBase/版本日志/SUBQHSE_V2025-09-15-xiaj.sql b/DataBase/版本日志/SUBQHSE_V2025-09-15-xiaj.sql
new file mode 100644
index 00000000..8916591c
--- /dev/null
+++ b/DataBase/版本日志/SUBQHSE_V2025-09-15-xiaj.sql
@@ -0,0 +1,5 @@
+
+
+
+ALTER TABLE Comprehensive_InspectionEquipment
+ALTER COLUMN UsedPlace NVARCHAR(500);
\ No newline at end of file
From 8409c7bc71d1ecbedb2fcdf5e9bb5c5b4509f26b Mon Sep 17 00:00:00 2001
From: xiaju <1784803958@qq.com>
Date: Mon, 15 Sep 2025 19:12:00 +0800
Subject: [PATCH 2/5] 1
---
SGGL/BLL/OpenService/FileInsertService.cs | 27 ++++++++++++++-----
SGGL/BLL/WebService/CNCECHSSEGetWebService.cs | 14 +++++++---
.../APIItem/CNCEC/DCGLCheckRectifyItem.cs | 9 +++++++
3 files changed, 40 insertions(+), 10 deletions(-)
diff --git a/SGGL/BLL/OpenService/FileInsertService.cs b/SGGL/BLL/OpenService/FileInsertService.cs
index 3f19aac2..5331491e 100644
--- a/SGGL/BLL/OpenService/FileInsertService.cs
+++ b/SGGL/BLL/OpenService/FileInsertService.cs
@@ -5,6 +5,7 @@ using System.Text;
using System.Collections;
using System.IO;
using System.Web;
+using System.Text.RegularExpressions;
namespace BLL
{
@@ -44,6 +45,7 @@ namespace BLL
}
}
+
///
/// 获取多附件数据流类
///
@@ -61,18 +63,30 @@ namespace BLL
{
if (strs.Count() > i)
{
+ //string physicalpath = Funs.AttachRootPath;
string physicalpath = Funs.RootPath;
- //HttpContext.Current.Request.PhysicalApplicationPath;
- string fullPath = physicalpath + strs[i];
+ string fpath = strs[i];
+ string fullPath = physicalpath + fpath;
if (!File.Exists(fullPath))
{
byte[] fileContext = item;
- int index = fullPath.LastIndexOf("\\");
- string filePath = fullPath.Substring(0, index);
+ string fileName = Regex.Match(fullPath, @"[^/\\?]+(\?.*)?$").Value;
+ string filePath = fullPath.Replace(fileName, "");
+ //int index = fullPath.LastIndexOf("\\");
+ //string filePath = fullPath.Substring(0, index) ;
+ //string filePath = index > 0 ? fullPath.Substring(0, index) : fullPath;
- if (!Directory.Exists(filePath))
+ try
{
- Directory.CreateDirectory(filePath);
+ if (!Directory.Exists(filePath))
+ {
+ Directory.CreateDirectory(filePath);
+ }
+ }
+ catch (Exception ex)
+ {
+ ErrLogInfo.WriteLog($"附件【{filePath}】获取异常!");
+ //continue;
}
//string savePath = fullPath + fileName;
@@ -93,6 +107,7 @@ namespace BLL
}
}
+
///
/// 数据和附件插入到多附件表
///
diff --git a/SGGL/BLL/WebService/CNCECHSSEGetWebService.cs b/SGGL/BLL/WebService/CNCECHSSEGetWebService.cs
index 0872c8cb..88587aca 100644
--- a/SGGL/BLL/WebService/CNCECHSSEGetWebService.cs
+++ b/SGGL/BLL/WebService/CNCECHSSEGetWebService.cs
@@ -13,6 +13,8 @@ namespace BLL
#region 督查检查整改上报
+
+
///
/// 督查检查整改上报
///
@@ -23,12 +25,12 @@ namespace BLL
{
try
{
- // CNCECHSSEService.HSSEServiceClient hsseC = new CNCECHSSEService.HSSEServiceClient();
var upCheckReport = from x in db.View_DCGL_CheckRectifyListFromSUB
where x.RealEndDate.HasValue && x.CheckRectifyId == checkRectifyId
select new Model.DCGLCheckRectifyItem
{
CheckRectifyId = x.CheckRectifyId,
+ NoticeItemId = x.NoticeItemId,
CheckRectifyCode = x.CheckRectifyCode,
ProjectId = x.ProjectId,
UnitId = x.UnitId,
@@ -42,13 +44,15 @@ namespace BLL
OrderEndDate = x.OrderEndDate,
OrderEndPerson = x.OrderEndPerson,
RealEndDate = x.RealEndDate,
- Verification = x.Verification,
+ //Verification = x.Verification,
+ Situation = x.Situation,
AttachFileId = x.AttachFileId2,
ToKeyId = x.ToKeyId2,
AttachSource = x.AttachSource2,
AttachUrl = x.AttachUrl2,
- ////附件转为字节传送
- FileContext = FileStructService.GetMoreFileStructByAttachUrl(x.AttachUrl2),
+ FilePath = Funs.SGGLUrl
+ //////附件转为字节传送
+ //FileContext = FileStructService.GetMoreFileStructByAttachUrl(x.AttachUrl2),
};
string baseurl = SysConstSetService.CNCECPath + "/api/HSSEData/UpDCGLCheckRectifyTable";
@@ -91,6 +95,8 @@ namespace BLL
return code;
}
}
+
+
#endregion
diff --git a/SGGL/Model/APIItem/CNCEC/DCGLCheckRectifyItem.cs b/SGGL/Model/APIItem/CNCEC/DCGLCheckRectifyItem.cs
index 55be12d1..7c7c5758 100644
--- a/SGGL/Model/APIItem/CNCEC/DCGLCheckRectifyItem.cs
+++ b/SGGL/Model/APIItem/CNCEC/DCGLCheckRectifyItem.cs
@@ -264,6 +264,15 @@
set;
}
+ ///
+ /// 附件路径域名地址
+ ///
+ public string FilePath
+ {
+ get;
+ set;
+ }
+
///
/// 附件路径
///
From ffd65b87a1d5036a23a844e4d25f1ec14b06b139 Mon Sep 17 00:00:00 2001
From: xiaju <1784803958@qq.com>
Date: Tue, 16 Sep 2025 19:27:36 +0800
Subject: [PATCH 3/5] =?UTF-8?q?1=E3=80=81=E8=A1=A5=E5=85=85=E8=A7=92?=
=?UTF-8?q?=E8=89=B2=EF=BC=9A=E9=A1=B9=E7=9B=AE=E4=B8=BB=E7=AE=A1=EF=BC=9B?=
=?UTF-8?q?=202=E3=80=81=E9=A1=B9=E7=9B=AE=E8=A1=A5=E5=85=85=E9=A1=B9?=
=?UTF-8?q?=E7=9B=AE=E4=B8=BB=E7=AE=A1=E4=BA=BA=EF=BC=9B=203=E3=80=81?=
=?UTF-8?q?=E5=85=B3=E9=94=AE=E4=BA=8B=E9=A1=B9=E9=80=BE=E6=9C=9F=E6=8F=90?=
=?UTF-8?q?=E9=86=92=E9=A1=B9=E7=9B=AE=E4=B8=BB=E7=AE=A1=E5=92=8C=E9=A1=B9?=
=?UTF-8?q?=E7=9B=AE=E7=BB=8F=E7=90=86=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
...BQHSE_V2025-09-16-xiaj(角色补充项目主管).sql | 17 ++++
SGGL/BLL/Common/Const.cs | 4 +
SGGL/BLL/PZHGL/GJSX/GJSXMonitorService.cs | 96 ++++++++++++++++++-
SGGL/BLL/ProjectData/ProjectUserService.cs | 11 ++-
.../ProjectData/ProjectSetSave.aspx | 14 +--
.../ProjectData/ProjectSetSave.aspx.cs | 53 +++++++++-
.../ProjectSetSave.aspx.designer.cs | 17 +++-
SGGL/FineUIPro.Web/SysManage/UserList.aspx | 2 +-
.../FineUIPro.Web/SysManage/UserListEdit.aspx | 2 +-
.../PublishProfiles/FolderProfile.pubxml.user | 22 ++---
SGGL/WebAPI/WebAPI.csproj.user | 2 +-
11 files changed, 212 insertions(+), 28 deletions(-)
create mode 100644 DataBase/版本日志/SUBQHSE_V2025-09-16-xiaj(角色补充项目主管).sql
diff --git a/DataBase/版本日志/SUBQHSE_V2025-09-16-xiaj(角色补充项目主管).sql b/DataBase/版本日志/SUBQHSE_V2025-09-16-xiaj(角色补充项目主管).sql
new file mode 100644
index 00000000..4f34021a
--- /dev/null
+++ b/DataBase/版本日志/SUBQHSE_V2025-09-16-xiaj(角色补充项目主管).sql
@@ -0,0 +1,17 @@
+
+
+
+update Sys_Role set RoleCode='101' where RoleName='Ŀ';
+
+
+--ɫĿ
+IF NOT EXISTS (SELECT 1 FROM Sys_Role WHERE RoleName = 'Ŀ')
+BEGIN
+ insert into Sys_Role(RoleId,RoleName,RoleCode,IsSystemBuilt,RoleType,IsAuditFlow)
+ values('b51072d6-5c8d-4763-b010-b3492b50feac','Ŀ','100',1,1,1)
+END
+GO
+
+
+
+
diff --git a/SGGL/BLL/Common/Const.cs b/SGGL/BLL/Common/Const.cs
index cba955dc..e6c00786 100644
--- a/SGGL/BLL/Common/Const.cs
+++ b/SGGL/BLL/Common/Const.cs
@@ -390,6 +390,10 @@ namespace BLL
#region 内置项目角色定义
///
+ /// 项目主管
+ ///
+ public const string ProjectSupervisor = "b51072d6-5c8d-4763-b010-b3492b50feac";
+ ///
/// 项目经理
///
public const string ProjectManager = "1184835B-73AF-47FB-9F83-20740CE2FAD7";
diff --git a/SGGL/BLL/PZHGL/GJSX/GJSXMonitorService.cs b/SGGL/BLL/PZHGL/GJSX/GJSXMonitorService.cs
index 4a2bf1e2..e0ffeee7 100644
--- a/SGGL/BLL/PZHGL/GJSX/GJSXMonitorService.cs
+++ b/SGGL/BLL/PZHGL/GJSX/GJSXMonitorService.cs
@@ -125,7 +125,7 @@ namespace BLL