diff --git a/DataBase/版本日志/SGGLDB_V2023-10-17.sql b/DataBase/版本日志/SGGLDB_V2023-10-17.sql
index 9f6f55a8..0e2e4c69 100644
--- a/DataBase/版本日志/SGGLDB_V2023-10-17.sql
+++ b/DataBase/版本日志/SGGLDB_V2023-10-17.sql
@@ -11,4 +11,12 @@ Go
INSERT [Sys_Menu] ([MenuId],[MenuName],[Url],[SortIndex],[SuperMenu],[MenuType],[IsOffice],[IsEnd],[IsUsed])
VALUES ( N'D791C4E1-7CF1-4F4E-9457-0CF91ACDB987',N'ĿƽЧͳ',N'PZHGL/InformationProject/ProjectConstructionLogWorkEfficiencySum.aspx',30,N'A9BBF623-83AC-4353-A010-07A5D4CEB7D1',N'Menu_PHTGL',0,1,1)
- Go
\ No newline at end of file
+ Go
+
+alter table dbo.PHTGL_Quantity
+add SerialNumber nvarchar(50)
+go
+
+exec sp_addextendedproperty 'MS_Description', N'', 'SCHEMA', 'dbo', 'TABLE', 'PHTGL_Quantity', 'COLUMN',
+'SerialNumber'
+go
\ No newline at end of file
diff --git a/DataBase/版本日志/SGGLDB_V2023-10-20.sql b/DataBase/版本日志/SGGLDB_V2023-10-20.sql
new file mode 100644
index 00000000..51233de9
--- /dev/null
+++ b/DataBase/版本日志/SGGLDB_V2023-10-20.sql
@@ -0,0 +1,124 @@
+
+CREATE TABLE [dbo].[ZHGL_ConstructionLogWorkEfficiencyMonth](
+ [ConstructionLogWorkEfficiencyMonthId] [nvarchar](50) NOT NULL,
+ [ProjectId] [nvarchar](50) NULL,
+ [Month] [datetime] NULL,
+ [ContractTrackId] [varchar](50) NULL,
+ [PhysicalCompletionQuantity] [decimal](18, 2) NULL,
+ [MaterialConsumption] [decimal](18, 2) NULL,
+ [UnitOfMeasurement] [nvarchar](50) NULL,
+ [Type] [nvarchar](20) NULL,
+ [TypeId] [nvarchar](50) NULL,
+ [ConsumeHours] [decimal](18, 2) NULL,
+ [WorkEfficiency] [decimal](18, 2) NULL,
+ CONSTRAINT [PK_ZHGL_ConstructionLogWorkEfficiencyMonth] PRIMARY KEY CLUSTERED
+(
+ [ConstructionLogWorkEfficiencyMonthId] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY]
+
+GO
+
+SET ANSI_PADDING OFF
+GO
+
+ALTER TABLE [dbo].[ZHGL_ConstructionLogWorkEfficiencyMonth] WITH CHECK ADD CONSTRAINT [FK_ZHGL_ConstructionLogWorkEfficiencyMonth_Base_Project] FOREIGN KEY([ProjectId])
+REFERENCES [dbo].[Base_Project] ([ProjectId])
+GO
+
+ALTER TABLE [dbo].[ZHGL_ConstructionLogWorkEfficiencyMonth] CHECK CONSTRAINT [FK_ZHGL_ConstructionLogWorkEfficiencyMonth_Base_Project]
+GO
+
+ALTER TABLE [dbo].[ZHGL_ConstructionLogWorkEfficiencyMonth] WITH CHECK ADD CONSTRAINT [FK_ZHGL_ConstructionLogWorkEfficiencyMonth_PHTGL_ContractTrack] FOREIGN KEY([ContractTrackId])
+REFERENCES [dbo].[PHTGL_ContractTrack] ([Id])
+GO
+
+ALTER TABLE [dbo].[ZHGL_ConstructionLogWorkEfficiencyMonth] CHECK CONSTRAINT [FK_ZHGL_ConstructionLogWorkEfficiencyMonth_PHTGL_ContractTrack]
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'ZHGL_ConstructionLogWorkEfficiencyMonth', @level2type=N'COLUMN',@level2name=N'ConstructionLogWorkEfficiencyMonthId'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ĿId' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'ZHGL_ConstructionLogWorkEfficiencyMonth', @level2type=N'COLUMN',@level2name=N'ProjectId'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'·' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'ZHGL_ConstructionLogWorkEfficiencyMonth', @level2type=N'COLUMN',@level2name=N'Month'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ͬId' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'ZHGL_ConstructionLogWorkEfficiencyMonth', @level2type=N'COLUMN',@level2name=N'ContractTrackId'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ʵ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'ZHGL_ConstructionLogWorkEfficiencyMonth', @level2type=N'COLUMN',@level2name=N'PhysicalCompletionQuantity'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'ZHGL_ConstructionLogWorkEfficiencyMonth', @level2type=N'COLUMN',@level2name=N'MaterialConsumption'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'λ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'ZHGL_ConstructionLogWorkEfficiencyMonth', @level2type=N'COLUMN',@level2name=N'UnitOfMeasurement'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ͣ˹/е' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'ZHGL_ConstructionLogWorkEfficiencyMonth', @level2type=N'COLUMN',@level2name=N'Type'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Id' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'ZHGL_ConstructionLogWorkEfficiencyMonth', @level2type=N'COLUMN',@level2name=N'TypeId'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Ĺ/̨ʱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'ZHGL_ConstructionLogWorkEfficiencyMonth', @level2type=N'COLUMN',@level2name=N'ConsumeHours'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Ч' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'ZHGL_ConstructionLogWorkEfficiencyMonth', @level2type=N'COLUMN',@level2name=N'WorkEfficiency'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Чͳ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'ZHGL_ConstructionLogWorkEfficiencyMonth'
+GO
+
+
+
+CREATE TABLE [dbo].[ZHGL_ConstructionLogWorkEfficiencyProject](
+ [ConstructionLogWorkEfficiencyProjectId] [nvarchar](50) NOT NULL,
+ [ProjectId] [nvarchar](50) NULL,
+ [Type] [nvarchar](20) NULL,
+ [TypeId] [nvarchar](50) NULL,
+ [UnitOfMeasurement] [nvarchar](50) NULL,
+ [BaseWorkEfficiency] [decimal](18, 2) NULL,
+ [AvgWorkEfficiency] [decimal](18, 2) NULL,
+ CONSTRAINT [PK_ZHGL_ConstructionLogWorkEfficiencyProject] PRIMARY KEY CLUSTERED
+(
+ [ConstructionLogWorkEfficiencyProjectId] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY]
+
+GO
+
+ALTER TABLE [dbo].[ZHGL_ConstructionLogWorkEfficiencyProject] WITH CHECK ADD CONSTRAINT [FK_ZHGL_ConstructionLogWorkEfficiencyProject_Base_Project] FOREIGN KEY([ProjectId])
+REFERENCES [dbo].[Base_Project] ([ProjectId])
+GO
+
+ALTER TABLE [dbo].[ZHGL_ConstructionLogWorkEfficiencyProject] CHECK CONSTRAINT [FK_ZHGL_ConstructionLogWorkEfficiencyProject_Base_Project]
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'ZHGL_ConstructionLogWorkEfficiencyProject', @level2type=N'COLUMN',@level2name=N'ConstructionLogWorkEfficiencyProjectId'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ĿId' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'ZHGL_ConstructionLogWorkEfficiencyProject', @level2type=N'COLUMN',@level2name=N'ProjectId'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ͣ˹/е' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'ZHGL_ConstructionLogWorkEfficiencyProject', @level2type=N'COLUMN',@level2name=N'Type'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Id' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'ZHGL_ConstructionLogWorkEfficiencyProject', @level2type=N'COLUMN',@level2name=N'TypeId'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'λ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'ZHGL_ConstructionLogWorkEfficiencyProject', @level2type=N'COLUMN',@level2name=N'UnitOfMeasurement'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Ч' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'ZHGL_ConstructionLogWorkEfficiencyProject', @level2type=N'COLUMN',@level2name=N'BaseWorkEfficiency'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ĿǰƽЧ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'ZHGL_ConstructionLogWorkEfficiencyProject', @level2type=N'COLUMN',@level2name=N'AvgWorkEfficiency'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ĿЧ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'ZHGL_ConstructionLogWorkEfficiencyProject'
+GO
+
+
diff --git a/SGGL/BLL/BLL.csproj b/SGGL/BLL/BLL.csproj
index dd14cece..3b5f63e6 100644
--- a/SGGL/BLL/BLL.csproj
+++ b/SGGL/BLL/BLL.csproj
@@ -649,6 +649,8 @@
+
+
diff --git a/SGGL/BLL/PHTGL/ContractCompile/PhtglContracttrackService .cs b/SGGL/BLL/PHTGL/ContractCompile/PhtglContracttrackService .cs
index cf08d95d..70fca224 100644
--- a/SGGL/BLL/PHTGL/ContractCompile/PhtglContracttrackService .cs
+++ b/SGGL/BLL/PHTGL/ContractCompile/PhtglContracttrackService .cs
@@ -838,11 +838,19 @@ namespace BLL
row[7] = item.Id;
if (workEfficiencys.Count() > 0)
{
- var we = workEfficiencys.FirstOrDefault(x => x.ContractTrackId == item.Id);
- if (we != null)
+ var we = (from x in workEfficiencys
+ where x.ContractTrackId == item.Id
+ select new { x.ConstructionLogId, x.ContractTrackId, x.PhysicalCompletionQuantity, x.MaterialConsumption }).Distinct().ToList();
+ decimal physicalCompletionQuantity = 0, materialConsumption = 0;
+ if (we.Count() > 0)
{
- row[5] = we.PhysicalCompletionQuantity;
- row[6] = we.MaterialConsumption;
+ foreach (var w in we)
+ {
+ physicalCompletionQuantity += w.PhysicalCompletionQuantity ?? 0;
+ materialConsumption += w.MaterialConsumption ?? 0;
+ }
+ row[5] = physicalCompletionQuantity;
+ row[6] = materialConsumption;
}
for (int i = 0; i < workPostIds.Count; i++)
{
@@ -860,9 +868,9 @@ namespace BLL
if (d > 0)
{
row[8 + i * 2] = decimal.Round(d, 2);
- if (we.PhysicalCompletionQuantity != null && we.PhysicalCompletionQuantity > 0)
+ if (physicalCompletionQuantity > 0)
{
- row[9 + i * 2] = decimal.Round(Convert.ToDecimal(we.PhysicalCompletionQuantity / d), 2);
+ row[9 + i * 2] = decimal.Round(Convert.ToDecimal(physicalCompletionQuantity / d), 2);
}
}
}
@@ -883,9 +891,9 @@ namespace BLL
if (d > 0)
{
row[48 + i * 2] = decimal.Round(d, 2);
- if (we.PhysicalCompletionQuantity != null && we.PhysicalCompletionQuantity > 0)
+ if (physicalCompletionQuantity > 0)
{
- row[49 + i * 2] = decimal.Round(Convert.ToDecimal(we.PhysicalCompletionQuantity / d), 2);
+ row[49 + i * 2] = decimal.Round(Convert.ToDecimal(physicalCompletionQuantity / d), 2);
}
}
}
diff --git a/SGGL/BLL/PZHGL/InformationProject/ConstructionLogWorkEfficiencyMonthService.cs b/SGGL/BLL/PZHGL/InformationProject/ConstructionLogWorkEfficiencyMonthService.cs
new file mode 100644
index 00000000..86cd9e10
--- /dev/null
+++ b/SGGL/BLL/PZHGL/InformationProject/ConstructionLogWorkEfficiencyMonthService.cs
@@ -0,0 +1,63 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace BLL
+{
+ public class ConstructionLogWorkEfficiencyMonthService
+ {
+ public static Model.SGGLDB db = Funs.DB;
+
+ ///
+ /// 获取施工日志月工效明细列表
+ ///
+ ///
+ ///
+ ///
+ public static List getListData(string projectId, DateTime month)
+ {
+ return (from x in db.ZHGL_ConstructionLogWorkEfficiencyMonth
+ where x.ProjectId == projectId && x.Month == month
+ select x).ToList();
+ }
+
+ ///
+ /// 增加施工日志月工效明细
+ ///
+ /// 施工日志月工效明细实体
+ public static void AddConstructionLogWorkEfficiencyMonth(Model.ZHGL_ConstructionLogWorkEfficiencyMonth constructionLogWorkEfficiencyMonth)
+ {
+ Model.SGGLDB db = Funs.DB;
+ Model.ZHGL_ConstructionLogWorkEfficiencyMonth newConstructionLogWorkEfficiencyMonth = new Model.ZHGL_ConstructionLogWorkEfficiencyMonth();
+ newConstructionLogWorkEfficiencyMonth.ConstructionLogWorkEfficiencyMonthId = constructionLogWorkEfficiencyMonth.ConstructionLogWorkEfficiencyMonthId;
+ newConstructionLogWorkEfficiencyMonth.ProjectId = constructionLogWorkEfficiencyMonth.ProjectId;
+ newConstructionLogWorkEfficiencyMonth.Month = constructionLogWorkEfficiencyMonth.Month;
+ newConstructionLogWorkEfficiencyMonth.ContractTrackId = constructionLogWorkEfficiencyMonth.ContractTrackId;
+ newConstructionLogWorkEfficiencyMonth.PhysicalCompletionQuantity = constructionLogWorkEfficiencyMonth.PhysicalCompletionQuantity;
+ newConstructionLogWorkEfficiencyMonth.MaterialConsumption = constructionLogWorkEfficiencyMonth.MaterialConsumption;
+ newConstructionLogWorkEfficiencyMonth.UnitOfMeasurement = constructionLogWorkEfficiencyMonth.UnitOfMeasurement;
+ newConstructionLogWorkEfficiencyMonth.Type = constructionLogWorkEfficiencyMonth.Type;
+ newConstructionLogWorkEfficiencyMonth.TypeId = constructionLogWorkEfficiencyMonth.TypeId;
+ newConstructionLogWorkEfficiencyMonth.ConsumeHours = constructionLogWorkEfficiencyMonth.ConsumeHours;
+ newConstructionLogWorkEfficiencyMonth.WorkEfficiency = constructionLogWorkEfficiencyMonth.WorkEfficiency;
+
+ db.ZHGL_ConstructionLogWorkEfficiencyMonth.InsertOnSubmit(newConstructionLogWorkEfficiencyMonth);
+ db.SubmitChanges();
+ }
+
+ ///
+ /// 根据月报id删除对应的所有施工日志月工效明细
+ ///
+ /// 施工日志月工效明细编号
+ public static void DeleteConstructionLogWorkEfficiencyMonthsByConstructionLogId(string projectId, DateTime month)
+ {
+ Model.SGGLDB db = Funs.DB;
+ var q = (from x in db.ZHGL_ConstructionLogWorkEfficiencyMonth where x.ProjectId == projectId && x.Month == month select x).ToList();
+ if (q.Count() > 0)
+ {
+ db.ZHGL_ConstructionLogWorkEfficiencyMonth.DeleteAllOnSubmit(q);
+ db.SubmitChanges();
+ }
+ }
+ }
+}
diff --git a/SGGL/BLL/PZHGL/InformationProject/ConstructionLogWorkEfficiencyProjectService.cs b/SGGL/BLL/PZHGL/InformationProject/ConstructionLogWorkEfficiencyProjectService.cs
new file mode 100644
index 00000000..28fec743
--- /dev/null
+++ b/SGGL/BLL/PZHGL/InformationProject/ConstructionLogWorkEfficiencyProjectService.cs
@@ -0,0 +1,59 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace BLL
+{
+ public class ConstructionLogWorkEfficiencyProjectService
+ {
+ public static Model.SGGLDB db = Funs.DB;
+
+ ///
+ /// 获取施工日志项目工效明细列表
+ ///
+ ///
+ ///
+ ///
+ public static List getListData(string projectId, DateTime month)
+ {
+ return (from x in db.ZHGL_ConstructionLogWorkEfficiencyProject
+ where x.ProjectId == projectId
+ select x).ToList();
+ }
+
+ ///
+ /// 增加施工日志项目工效明细
+ ///
+ /// 施工日志项目工效明细实体
+ public static void AddConstructionLogWorkEfficiencyProject(Model.ZHGL_ConstructionLogWorkEfficiencyProject constructionLogWorkEfficiencyProject)
+ {
+ Model.SGGLDB db = Funs.DB;
+ Model.ZHGL_ConstructionLogWorkEfficiencyProject newConstructionLogWorkEfficiencyProject = new Model.ZHGL_ConstructionLogWorkEfficiencyProject();
+ newConstructionLogWorkEfficiencyProject.ConstructionLogWorkEfficiencyProjectId = constructionLogWorkEfficiencyProject.ConstructionLogWorkEfficiencyProjectId;
+ newConstructionLogWorkEfficiencyProject.ProjectId = constructionLogWorkEfficiencyProject.ProjectId;
+ newConstructionLogWorkEfficiencyProject.Type = constructionLogWorkEfficiencyProject.Type;
+ newConstructionLogWorkEfficiencyProject.TypeId = constructionLogWorkEfficiencyProject.TypeId;
+ newConstructionLogWorkEfficiencyProject.UnitOfMeasurement = constructionLogWorkEfficiencyProject.UnitOfMeasurement;
+ newConstructionLogWorkEfficiencyProject.BaseWorkEfficiency = constructionLogWorkEfficiencyProject.BaseWorkEfficiency;
+ newConstructionLogWorkEfficiencyProject.AvgWorkEfficiency = constructionLogWorkEfficiencyProject.AvgWorkEfficiency;
+
+ db.ZHGL_ConstructionLogWorkEfficiencyProject.InsertOnSubmit(newConstructionLogWorkEfficiencyProject);
+ db.SubmitChanges();
+ }
+
+ ///
+ /// 根据月报id删除对应的所有施工日志项目工效明细
+ ///
+ /// 施工日志项目工效明细编号
+ public static void DeleteConstructionLogWorkEfficiencyProjectsByConstructionLogId(string projectId)
+ {
+ Model.SGGLDB db = Funs.DB;
+ var q = (from x in db.ZHGL_ConstructionLogWorkEfficiencyProject where x.ProjectId == projectId select x).ToList();
+ if (q.Count() > 0)
+ {
+ db.ZHGL_ConstructionLogWorkEfficiencyProject.DeleteAllOnSubmit(q);
+ db.SubmitChanges();
+ }
+ }
+ }
+}
diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
index 27ee9d06..08258896 100644
--- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
@@ -1336,6 +1336,7 @@
+
@@ -12921,6 +12922,13 @@
ProjectConstructionLogWorkEfficiency.aspx
+
+ ProjectConstructionLogWorkEfficiencySum.aspx
+ ASPXCodeBehind
+
+
+ ProjectConstructionLogWorkEfficiencySum.aspx
+
ReceiveFileManager.aspx
ASPXCodeBehind
diff --git a/SGGL/FineUIPro.Web/PZHGL/InformationProject/ConstructionLogFileCabinet.aspx.cs b/SGGL/FineUIPro.Web/PZHGL/InformationProject/ConstructionLogFileCabinet.aspx.cs
index 0bce8cac..e63fab34 100644
--- a/SGGL/FineUIPro.Web/PZHGL/InformationProject/ConstructionLogFileCabinet.aspx.cs
+++ b/SGGL/FineUIPro.Web/PZHGL/InformationProject/ConstructionLogFileCabinet.aspx.cs
@@ -147,11 +147,11 @@ namespace FineUIPro.Web.PZHGL.InformationProject
DateTime? endTime = startTime.HasValue ? startTime.Value.AddMonths(1) : System.DateTime.Now;
this.tvControlItem.Nodes.Clear();
- var persons = from x in Funs.DB.Person_Persons
+ var persons = (from x in Funs.DB.Person_Persons
join y in Funs.DB.ZHGL_ConstructionLog
on x.PersonId equals y.CompileMan
where y.ProjectId == this.CurrUser.LoginProjectId && y.CompileDate >= startTime && y.CompileDate < endTime
- select x;
+ select x).Distinct().ToList();
foreach (var person in persons)
{
var logs = from x in Funs.DB.ZHGL_ConstructionLog
diff --git a/SGGL/FineUIPro.Web/PZHGL/InformationProject/ConstructionLogWorkEfficiency.aspx.cs b/SGGL/FineUIPro.Web/PZHGL/InformationProject/ConstructionLogWorkEfficiency.aspx.cs
index 7a340691..dbc75e9a 100644
--- a/SGGL/FineUIPro.Web/PZHGL/InformationProject/ConstructionLogWorkEfficiency.aspx.cs
+++ b/SGGL/FineUIPro.Web/PZHGL/InformationProject/ConstructionLogWorkEfficiency.aspx.cs
@@ -186,9 +186,6 @@ namespace FineUIPro.Web.PZHGL.InformationProject
{
string constructionLogId = Request.Params["ConstructionLogId"];
Model.SGGLDB db = Funs.DB;
- var oldViewInfos = from x in db.ZHGL_ConstructionLogWorkEfficiency
- where x.ConstructionLogId == constructionLogId
- select x;
BLL.ConstructionLogWorkEfficiencyService.DeleteConstructionLogWorkEfficiencysByConstructionLogId(constructionLogId);
List workPostIds = Funs.GetStrListByStr(Request.Params["WorkPostId"], ',');
List machineIds = Funs.GetStrListByStr(Request.Params["MachineId"], ',');
diff --git a/SGGL/FineUIPro.Web/PZHGL/InformationProject/DayConstructionLogWorkEfficiency.aspx b/SGGL/FineUIPro.Web/PZHGL/InformationProject/DayConstructionLogWorkEfficiency.aspx
index 734901a9..398a4c5e 100644
--- a/SGGL/FineUIPro.Web/PZHGL/InformationProject/DayConstructionLogWorkEfficiency.aspx
+++ b/SGGL/FineUIPro.Web/PZHGL/InformationProject/DayConstructionLogWorkEfficiency.aspx
@@ -54,27 +54,9 @@
HeaderText="材料消耗量(净量+损耗量)" HeaderTextAlign="Center" TextAlign="Left">
-
-
-
-