From bc2427b3354959226a23bfff8b364b5d956015eb Mon Sep 17 00:00:00 2001
From: fei550 <1420031550@qq.com>
Date: Sat, 28 Feb 2026 14:49:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E6=9D=A1=E4=BB=B6=E8=8E=B7?=
=?UTF-8?q?=E5=8F=96=E4=BA=BA=E5=91=98=E5=87=BA=E5=85=A5=E5=9C=BA=E8=AE=B0?=
=?UTF-8?q?=E5=BD=95=E6=8E=A5=E5=8F=A3=E5=8F=96=E6=B6=88=E9=A1=B9=E7=9B=AE?=
=?UTF-8?q?=E4=BB=A3=E5=8F=B7=E5=BF=85=E5=A1=AB=EF=BC=8C=E8=BF=94=E5=9B=9E?=
=?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=A1=B9=E7=9B=AE=E4=BB=A3=E5=8F=B7=EF=BC=8C?=
=?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=90=8D=E7=A7=B0=EF=BC=8C=E4=BA=BA=E5=91=98?=
=?UTF-8?q?=E8=BA=AB=E4=BB=BD=E8=AF=81=E5=8F=B7=E4=BF=A1=E6=81=AF=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
SGGL/BLL/API/APIPersonService.cs | 11 +++++++++--
.../BiddingManagement/ActionPlanReviewEdit.aspx.cs | 2 +-
SGGL/Model/APIItem/HSSE/PersonInOutItem.cs | 14 ++++++++++++++
SGGL/WebAPI/Controllers/PersonController.cs | 13 +++++++------
4 files changed, 31 insertions(+), 9 deletions(-)
diff --git a/SGGL/BLL/API/APIPersonService.cs b/SGGL/BLL/API/APIPersonService.cs
index 1fdbdf8d..7a24e5dc 100644
--- a/SGGL/BLL/API/APIPersonService.cs
+++ b/SGGL/BLL/API/APIPersonService.cs
@@ -1117,14 +1117,17 @@ namespace BLL
var query = from x in db.SitePerson_PersonInOut
join y in db.SitePerson_Person on x.PersonId equals y.PersonId
join z in db.Base_Project on x.ProjectId equals z.ProjectId
- where x.ChangeTime >= filter.StartTime && x.ChangeTime <= filter.EndTime && z.ProjectCode.Contains(filter.ProjectCode)
+ where x.ChangeTime >= filter.StartTime && x.ChangeTime <= filter.EndTime
select new Model.PersonInOutItem
{
PersonId = x.PersonId,
PersonName = y.PersonName,
ProjectId = x.ProjectId,
+ ProjectCode=z.ProjectCode,
+ ProjectName=z.ProjectName,
UnitId = y.UnitId,
UnitName = db.Base_Unit.First(z => z.UnitId == y.UnitId).UnitName,
+ IdentityCard=x.IdentityCard,
WorkPostId = y.WorkPostId,
WorkPostName = db.Base_WorkPost.First(z => z.WorkPostId == y.WorkPostId).WorkPostName,
IsIn = x.IsIn,
@@ -1142,7 +1145,11 @@ namespace BLL
{
query = query.Where(x => x.UnitName.Contains(filter.UnitName));
}
-
+ // 项目代号过滤（模糊查询）
+ if (!string.IsNullOrEmpty(filter.ProjectCode))
+ {
+ query = query.Where(x => x.ProjectCode.Contains(filter.ProjectCode));
+ }
// 人员姓名过滤（模糊查询）
if (!string.IsNullOrEmpty(filter.PersonName))
{
diff --git a/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/ActionPlanReviewEdit.aspx.cs b/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/ActionPlanReviewEdit.aspx.cs
index 516a4da8..9f13d345 100644
--- a/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/ActionPlanReviewEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/ActionPlanReviewEdit.aspx.cs
@@ -67,7 +67,7 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement
BLL.Person_PersonsService.InitUserProjectIdUnitIdRoleIdDropDownList(Approval_Construction, null, CurrUser.UnitId, Const.ConstructionLabor, false);
DropConstructionManager.Label = "现场执行经理";
- Approval_Construction.Label = "劳务管理组";
+ Approval_Construction.Label = "主办部门负责人";
DropProjectManager.Label = "项目经理";
}
#endregion
diff --git a/SGGL/Model/APIItem/HSSE/PersonInOutItem.cs b/SGGL/Model/APIItem/HSSE/PersonInOutItem.cs
index f9f5e72a..32967e74 100644
--- a/SGGL/Model/APIItem/HSSE/PersonInOutItem.cs
+++ b/SGGL/Model/APIItem/HSSE/PersonInOutItem.cs
@@ -86,6 +86,20 @@ namespace Model
get; set;
}
///
+ /// 项目代号
+ ///
+ public string ProjectCode
+ {
+ get; set;
+ }
+ ///
+ /// 项目名称
+ ///
+ public string ProjectName
+ {
+ get; set;
+ }
+ ///
/// 单位ID
///
public string UnitId
diff --git a/SGGL/WebAPI/Controllers/PersonController.cs b/SGGL/WebAPI/Controllers/PersonController.cs
index ab1517f0..f692c6b5 100644
--- a/SGGL/WebAPI/Controllers/PersonController.cs
+++ b/SGGL/WebAPI/Controllers/PersonController.cs
@@ -1075,12 +1075,13 @@ namespace WebAPI.Controllers
responeData.message = "StartTime不能大于EndTime！";
return responeData;
}
- if (filter == null || string.IsNullOrEmpty(filter.ProjectCode))
- {
- responeData.code = 0;
- responeData.message = "ProjectCode为必填参数！";
- return responeData;
- }
+ //20260228 赛鼎it要求取消projectcode必填验证，改为如果有projectcode则按照projectcode查询，没有则不过滤projectcode查询
+ //if (filter == null || string.IsNullOrEmpty(filter.ProjectCode))
+ //{
+ // responeData.code = 0;
+ // responeData.message = "ProjectCode为必填参数！";
+ // return responeData;
+ //}
// 处理可空参数的默认值
int actualPagesize = pagesize ?? 15;