From e12e7ed448fb786bc0d1faebd184f829e41b159e Mon Sep 17 00:00:00 2001
From: gaofei1985 <181547018@qq.com>
Date: Fri, 27 Jun 2025 14:31:50 +0800
Subject: [PATCH] 1
---
SGGL/BLL/BaseInfo/CostTypeService.cs | 52 +++++++++
.../BLL/ZHGL/DataSync/HSSEData_HSSEService.cs | 48 ++++++--
SGGL/FineUIPro.Web/BaseInfo/CostType.aspx | 42 ++++++-
SGGL/FineUIPro.Web/BaseInfo/CostType.aspx.cs | 101 ++++++++++++++++-
.../BaseInfo/CostType.aspx.designer.cs | 87 ++++++++++++---
SGGL/FineUIPro.Web/BaseInfo/CostTypeEdit.aspx | 52 +++++++++
.../BaseInfo/CostTypeEdit.aspx.cs | 99 +++++++++++++++++
.../BaseInfo/CostTypeEdit.aspx.designer.cs | 96 ++++++++++++++++
.../BaseInfo/CostTypeItemEdit.aspx | 56 ++++++++++
.../BaseInfo/CostTypeItemEdit.aspx.cs | 100 +++++++++++++++++
.../CostTypeItemEdit.aspx.designer.cs | 105 ++++++++++++++++++
SGGL/FineUIPro.Web/FineUIPro.Web.csproj | 16 +++
SGGL/FineUIPro.Web/Person/PersonLib.aspx.cs | 4 +
13 files changed, 832 insertions(+), 26 deletions(-)
create mode 100644 SGGL/FineUIPro.Web/BaseInfo/CostTypeEdit.aspx
create mode 100644 SGGL/FineUIPro.Web/BaseInfo/CostTypeEdit.aspx.cs
create mode 100644 SGGL/FineUIPro.Web/BaseInfo/CostTypeEdit.aspx.designer.cs
create mode 100644 SGGL/FineUIPro.Web/BaseInfo/CostTypeItemEdit.aspx
create mode 100644 SGGL/FineUIPro.Web/BaseInfo/CostTypeItemEdit.aspx.cs
create mode 100644 SGGL/FineUIPro.Web/BaseInfo/CostTypeItemEdit.aspx.designer.cs
diff --git a/SGGL/BLL/BaseInfo/CostTypeService.cs b/SGGL/BLL/BaseInfo/CostTypeService.cs
index 649e3ffe..1f57548e 100644
--- a/SGGL/BLL/BaseInfo/CostTypeService.cs
+++ b/SGGL/BLL/BaseInfo/CostTypeService.cs
@@ -53,6 +53,43 @@ namespace BLL
}
}
+ ///
+ /// 添加费用类型明细
+ ///
+ ///
+ public static void AddCostTypeItem(Model.Base_CostTypeItem costTypeItem)
+ {
+ Model.SGGLDB db = Funs.DB;
+ Model.Base_CostTypeItem newCostType = new Model.Base_CostTypeItem
+ {
+ CostTypeItemId= costTypeItem.CostTypeItemId,
+ CostTypeId = costTypeItem.CostTypeId,
+ SortIndex = costTypeItem.SortIndex,
+ CostTypeItemName = costTypeItem.CostTypeItemName,
+ Remark = costTypeItem.Remark
+ };
+ db.Base_CostTypeItem.InsertOnSubmit(newCostType);
+ db.SubmitChanges();
+ }
+
+ ///
+ /// 修改费用类型明细
+ ///
+ ///
+ public static void UpdateCostTypeItem(Model.Base_CostTypeItem costTypeItem)
+ {
+ Model.SGGLDB db = Funs.DB;
+ Model.Base_CostTypeItem newCostType = db.Base_CostTypeItem.FirstOrDefault(e => e.CostTypeId == costTypeItem.CostTypeId);
+ if (newCostType != null)
+ {
+ newCostType.CostTypeId = costTypeItem.CostTypeId;
+ newCostType.SortIndex = costTypeItem.SortIndex;
+ newCostType.CostTypeItemName = costTypeItem.CostTypeItemName;
+ newCostType.Remark = costTypeItem.Remark;
+ db.SubmitChanges();
+ }
+ }
+
///
/// 根据主键删除费用类型
///
@@ -68,6 +105,21 @@ namespace BLL
}
}
+ ///
+ /// 根据主键删除费用类型
+ ///
+ ///
+ public static void DeleteCostTypeItemById(string costTypeItemId)
+ {
+ Model.SGGLDB db = Funs.DB;
+ Model.Base_CostTypeItem costTypeItem = db.Base_CostTypeItem.FirstOrDefault(e => e.CostTypeItemId == costTypeItemId);
+ if (costTypeItem != null)
+ {
+ db.Base_CostTypeItem.DeleteOnSubmit(costTypeItem);
+ db.SubmitChanges();
+ }
+ }
+
///
///
///
diff --git a/SGGL/BLL/ZHGL/DataSync/HSSEData_HSSEService.cs b/SGGL/BLL/ZHGL/DataSync/HSSEData_HSSEService.cs
index b42ef590..57eb0136 100644
--- a/SGGL/BLL/ZHGL/DataSync/HSSEData_HSSEService.cs
+++ b/SGGL/BLL/ZHGL/DataSync/HSSEData_HSSEService.cs
@@ -4191,19 +4191,48 @@ namespace BLL
///
public static List GetQualityPersonNum()
{
- var result = (from x in Funs.DB.QualityAudit_PersonQuality
- join p in Funs.DB.SitePerson_Person on x.PersonId equals p.PersonId into pGroup
- from p in pGroup.DefaultIfEmpty()
- join pp in Funs.DB.Person_Persons on p.PersonId equals pp.PersonId into ppGroup
- from pp in ppGroup.DefaultIfEmpty()
+ //var result = (from x in Funs.DB.QualityAudit_PersonQuality
+ // join p in Funs.DB.SitePerson_Person on x.PersonId equals p.PersonId into pGroup
+ // from p in pGroup.DefaultIfEmpty()
+ // join pp in Funs.DB.Person_Persons on p.PersonId equals pp.PersonId into ppGroup
+ // from pp in ppGroup.DefaultIfEmpty()
+ // join bp in Funs.DB.Base_Project on p.ProjectId equals bp.ProjectId into bpGroup
+ // from bp in bpGroup.DefaultIfEmpty()
+ // join u in Funs.DB.Base_Unit on p.UnitId equals u.UnitId into uGroup
+ // from u in uGroup.DefaultIfEmpty()
+ // join y in Funs.DB.QualityAudit_PersonQuality on x.PersonId equals y.PersonId
+ // join m in Funs.DB.Base_WorkPost on p.WorkPostId equals m.WorkPostId into mGroup
+ // from m in mGroup.DefaultIfEmpty()
+ // where BeUnderConstructionList.Contains(p.ProjectId) && m.PostType == Const.PostType_2 && (x.LimitDate == null || x.LimitDate < DateTime.Now)
+ // select new Model.OfSafetySupervisorsOutput
+ // {
+ // ProjectId = p.ProjectId,
+ // ProjectName = bp.ProjectName,
+ // UnitId = u.UnitId,
+ // UnitName = u.UnitName,
+ // Name = p.PersonName,
+ // Sex = pp.Sex == null ? "" : (pp.Sex == "1" ? "男" : "女"),
+ // IdentityCard = p.IdentityCard,
+ // WorkPostName = m.WorkPostName == null ? "" : m.WorkPostName,
+ // Phone = pp.Telephone
+ // }).ToList();
+ //return result;
+ var result = (from p in Funs.DB.SitePerson_Person
join bp in Funs.DB.Base_Project on p.ProjectId equals bp.ProjectId into bpGroup
from bp in bpGroup.DefaultIfEmpty()
join u in Funs.DB.Base_Unit on p.UnitId equals u.UnitId into uGroup
from u in uGroup.DefaultIfEmpty()
- join y in Funs.DB.QualityAudit_PersonQuality on x.PersonId equals y.PersonId
+ join q in Funs.DB.QualityAudit_PersonQuality on p.PersonId equals q.PersonId into qGroup
+ from q in qGroup.DefaultIfEmpty()
join m in Funs.DB.Base_WorkPost on p.WorkPostId equals m.WorkPostId into mGroup
from m in mGroup.DefaultIfEmpty()
- where BeUnderConstructionList.Contains(p.ProjectId) && m.PostType == Const.PostType_2 && (x.LimitDate == null || x.LimitDate < DateTime.Now)
+ join su in Funs.DB.Person_Persons on q.CompileMan equals su.PersonId into suGroup
+ from su in suGroup.DefaultIfEmpty()
+ join bc in Funs.DB.Base_Certificate on q.CertificateId equals bc.CertificateId into bcGroup
+ from bc in bcGroup.DefaultIfEmpty()
+ join su1 in Funs.DB.Person_Persons on q.AuditorId equals su1.PersonId into su1Group
+ from su1 in su1Group.DefaultIfEmpty()
+ where BeUnderConstructionList.Contains(p.ProjectId) && m.PostType == Const.PostType_2
select new Model.OfSafetySupervisorsOutput
{
ProjectId = p.ProjectId,
@@ -4211,12 +4240,13 @@ namespace BLL
UnitId = u.UnitId,
UnitName = u.UnitName,
Name = p.PersonName,
- Sex = pp.Sex == null ? "" : (pp.Sex == "1" ? "男" : "女"),
+ Sex = su.Sex == null ? "" : (su.Sex == "1" ? "男" : "女"),
IdentityCard = p.IdentityCard,
WorkPostName = m.WorkPostName == null ? "" : m.WorkPostName,
- Phone = pp.Telephone
+ Phone = su.Telephone
}).ToList();
return result;
+
}
///
/// 获取在岗特种作业人员数量(异步)
diff --git a/SGGL/FineUIPro.Web/BaseInfo/CostType.aspx b/SGGL/FineUIPro.Web/BaseInfo/CostType.aspx
index c911d38a..dcecf735 100644
--- a/SGGL/FineUIPro.Web/BaseInfo/CostType.aspx
+++ b/SGGL/FineUIPro.Web/BaseInfo/CostType.aspx
@@ -16,8 +16,20 @@
runat="server" BoxFlex="1" AllowPaging="false" DataKeyNames="ID" EnableTree="true" TreeColumn="Name"
DataIDField="ID" DataParentIDField="ParentId" IsDatabasePaging="true" PageSize="100" OnPageIndexChange="Grid1_PageIndexChange"
AllowSorting="true" SortField="Code" OnSort="Grid1_Sort" SortDirection="ASC" EnableColumnLines="true"
- EnableTextSelection="True" ExpandAllTreeNodes="true">
-
+ EnableTextSelection="True" ExpandAllTreeNodes="true" EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick">
+
+
+
+
+
+
+
+
+
+
+
@@ -25,7 +37,10 @@
-
+
+
+
+
@@ -38,11 +53,32 @@
+
+
+