diff --git a/.gitignore b/.gitignore
index c7ff1217..31c821ec 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,3 +32,4 @@
/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverRun
/SGGL/FineUIPro.Web/FileUpload/Solution/2024-02
/SGGL/FineUIPro.Web/FileUpload/Solution/2024-03
+/SGGL/FineUIPro.Web/FileUpload/TestRun/TestRunMonthSummary/2024-03
diff --git a/DataBase/版本日志/SGGLDB_WH_2024-03-29-gaofei.sql b/DataBase/版本日志/SGGLDB_WH_2024-03-29-gaofei.sql
new file mode 100644
index 00000000..6814ee7d
--- /dev/null
+++ b/DataBase/版本日志/SGGLDB_WH_2024-03-29-gaofei.sql
@@ -0,0 +1,254 @@
+alter table [dbo].[Person_TestRunMonthSummary] add Major nvarchar(50) null
+GO
+
+
+ALTER PROCEDURE [dbo].[Sp_GJSX_getlist]
+ -- Add the parameters for the stored procedure here
+ @ProjectId nvarchar(max),
+ @sql_where varchar(max)
+AS
+BEGIN
+ --IF EXISTS(select * from tempdb..sysobjects where id=object_id('tempdb..#GJSX_List'))
+ --BEGIN
+ -- DROP TABLE #GJSX_List
+ --END
+ --DECLARE @Sql NVARCHAR(200)
+ --select * into #GJSX_List from(
+ -- select
+ --a.GJSXID
+ --,a.ProjectId
+ --,a.detail
+ --,b.username
+ --,a.createDate
+ --,User_ReceiveID=STUFF(( SELECT ',' + p2.UserName FROM dbo.Sys_User as p2 where PATINDEX('%,' + RTRIM(p2.UserId) + ',%',',' +a.User_ReceiveID + ',') >0 FOR XML PATH('')), 1, 1,'')
+ --, CNProfessionalId=STUFF(( SELECT ',' + Base_CNProfessional.ProfessionalName FROM dbo.Base_CNProfessional where PATINDEX('%,' + RTRIM(Base_CNProfessional.CNProfessionalId) + ',%',',' +a.CNProfessional_ID + ',') >0 FOR XML PATH('')), 1, 1,'')
+ --,Base_Project.ProjectName
+ --,Base_Unit.unitname
+ --,a.CloseDate
+ --,case a.state when 2 then 'ڽ' when 0 then 'ر' when 1 then '' end as state
+ --,QuestionTypeName=STUFF(( SELECT ',' + Base_QuestionType.QuestionTypeName FROM dbo.Base_QuestionType where PATINDEX('%,' + RTRIM(Base_QuestionType.QuestionTypeID) + ',%',',' +a.QuestionTypeID + ',') >0 FOR XML PATH('')), 1, 1,'')
+ --,a.IsManypeople
+ --,a.CompleteDate
+ --,a.AttachUrl
+ --,user_Acceptance =STUFF(( SELECT ',' + p2.UserName FROM dbo.Sys_User as p2 where PATINDEX('%,' + RTRIM(p2.UserId) + ',%',',' +a.user_Acceptance + ',') >0 FOR XML PATH('')), 1, 1,'')
+ --from GJSX as a left join Sys_User as b on a.UserId=b.UserId
+ --left join [dbo].[Base_Project] on a.ProjectId =Base_Project.ProjectId
+ --left join [dbo].[Base_Unit] on a.UnitId=Base_Unit.UnitId
+ --left join [dbo].[Base_QuestionType] on a.QuestionTypeID=Base_QuestionType.QuestionTypeID ) as a
+
+ --set @Sql ='select * from #GJSX_List where ProjectId='''+@ProjectId+''' ' +@sql_where
+
+ --exec(@Sql)
+
+ select
+ a.GJSXID
+ ,a.ProjectId
+ ,a.detail
+ ,b.username
+ ,a.createDate
+ ,User_ReceiveID=STUFF(( SELECT ',' + p2.UserName FROM dbo.Sys_User as p2 where PATINDEX('%,' + RTRIM(p2.UserId) + ',%',',' +a.User_ReceiveID + ',') >0 FOR XML PATH('')), 1, 1,'')
+ , CNProfessionalId=STUFF(( SELECT ',' + Base_CNProfessional.ProfessionalName FROM dbo.Base_CNProfessional where PATINDEX('%,' + RTRIM(Base_CNProfessional.CNProfessionalId) + ',%',',' +a.CNProfessional_ID + ',') >0 FOR XML PATH('')), 1, 1,'')
+ ,Base_Project.ProjectName
+ ,Base_Unit.unitname
+ ,a.CloseDate
+ ,case a.state when 2 then 'ڽ' when 0 then 'ر' when 1 then '' end as state
+ ,QuestionTypeName=STUFF(( SELECT ',' + Base_QuestionType.QuestionTypeName FROM dbo.Base_QuestionType where PATINDEX('%,' + RTRIM(Base_QuestionType.QuestionTypeID) + ',%',',' +a.QuestionTypeID + ',') >0 FOR XML PATH('')), 1, 1,'')
+ ,a.IsManypeople
+ ,a.CompleteDate
+ ,a.AttachUrl
+ ,user_Acceptance =STUFF(( SELECT ',' + p2.UserName FROM dbo.Sys_User as p2 where PATINDEX('%,' + RTRIM(p2.UserId) + ',%',',' +a.user_Acceptance + ',') >0 FOR XML PATH('')), 1, 1,'')
+ from GJSX as a left join Sys_User as b on a.UserId=b.UserId
+ left join [dbo].[Base_Project] on a.ProjectId =Base_Project.ProjectId
+ left join [dbo].[Base_Unit] on a.UnitId=Base_Unit.UnitId
+ left join [dbo].[Base_QuestionType] on a.QuestionTypeID=Base_QuestionType.QuestionTypeID
+ where a.ProjectId=@ProjectId
+END
+
+
+
+GO
+
+
+--cd C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.8 Tools
+--SqlMetal /views /server:wq /database:SGGLDB_WH /code:C:\Model.cs /namespace:Model
+
+delete Sys_Menu where MenuId='AC5BC922-FA5E-4141-8458-7DE89434A8E7'
+delete Sys_Menu where MenuId='BEAE1E66-5783-489B-A268-F46491AE1257'
+delete Sys_Menu where MenuId='D8DF6DDB-3CDD-41C0-B374-1AAE40802B68'
+delete Sys_Menu where MenuId='C2E827C4-6E04-4EB6-8E51-B43FCBD3753F'
+delete Sys_Menu where MenuId='AF4EEC31-73E9-4F36-BEA7-2A92468F324E'
+delete Sys_Menu where MenuId='7400F47B-3F45-4142-B21F-3BECCABBB202'
+delete Sys_Menu where MenuId='F2D170C3-6CA5-439D-8CC7-81E4FB906B1F'
+delete Sys_Menu where MenuId='A7BBF5F1-F145-43D1-9227-7EC24099BBEC'
+INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Icon,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)VALUES('AC5BC922-FA5E-4141-8458-7DE89434A8E7','ģ',null,'TestRun/Produce/InspectTemplate.aspx',2,'F4827DE7-FDA6-42B6-A495-616EEFC4C8A5','Menu_TestRun',0,1,1)
+INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Icon,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)VALUES('BEAE1E66-5783-489B-A268-F46491AE1257','ͶԳ',null,'TestRun/Produce/SubInspectTerm.aspx',3,'F4827DE7-FDA6-42B6-A495-616EEFC4C8A5','Menu_TestRun',0,1,1)
+INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Icon,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)VALUES('D8DF6DDB-3CDD-41C0-B374-1AAE40802B68','ͶԳȷ',null,'TestRun/Produce/SubWorkInspect.aspx',4,'F4827DE7-FDA6-42B6-A495-616EEFC4C8A5','Menu_TestRun',0,1,1)
+INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Icon,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)VALUES('C2E827C4-6E04-4EB6-8E51-B43FCBD3753F','β',null,'TestRun/Produce/InspectTailTermList.aspx',5,'F4827DE7-FDA6-42B6-A495-616EEFC4C8A5','Menu_TestRun',0,1,1)
+INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Icon,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)VALUES('AF4EEC31-73E9-4F36-BEA7-2A92468F324E','β',null,'TestRun/Produce/TailTermHandleList.aspx',6,'F4827DE7-FDA6-42B6-A495-616EEFC4C8A5','Menu_TestRun',0,1,1)
+INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Icon,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)VALUES('7400F47B-3F45-4142-B21F-3BECCABBB202','β',null,'TestRun/Produce/TailTermApproveList.aspx',7,'F4827DE7-FDA6-42B6-A495-616EEFC4C8A5','Menu_TestRun',0,1,1)
+INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Icon,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)VALUES('F2D170C3-6CA5-439D-8CC7-81E4FB906B1F','ǩ',null,'TestRun/Produce/InspectWanderAboutList.aspx',8,'F4827DE7-FDA6-42B6-A495-616EEFC4C8A5','Menu_TestRun',0,1,1)
+INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Icon,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)VALUES('A7BBF5F1-F145-43D1-9227-7EC24099BBEC','תȫͨ',null,'TestRun/Produce/InspectWanderAboutAllPassList.aspx',9,'F4827DE7-FDA6-42B6-A495-616EEFC4C8A5','Menu_TestRun',0,1,1)
+go
+
+--==ܿģϢ
+if object_id(N'ProduceRun_WorkInspectTemplate',N'U') is not null
+drop table dbo.ProduceRun_WorkInspectTemplate
+CREATE TABLE dbo.ProduceRun_WorkInspectTemplate(
+ WorkInspectId varchar(50) NOT NULL,--
+ WorkInspectName varchar(500) NULL,--
+ Remark nvarchar(150) NULL,--ע
+ AddUser varchar(50) NULL,--
+ AddTime datetime NULL,--
+ Sort int NULL,--
+ CONSTRAINT PK_ProduceRun_WorkInspectTemplate PRIMARY KEY CLUSTERED
+(
+ WorkInspectId 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
+
+--==ܿ
+delete ProduceRun_WorkInspectTemplate where WorkInspectId='A95825BD-709E-46DB-AEFD-1E7C9C1BF524'
+delete ProduceRun_WorkInspectTemplate where WorkInspectId='55CB964B-A82A-4BBC-BC2D-040E31C7CC36'
+delete ProduceRun_WorkInspectTemplate where WorkInspectId='EE35FF88-6E30-4797-AE46-0623B9BD3E81'
+delete ProduceRun_WorkInspectTemplate where WorkInspectId='C679A7B8-4244-42E5-96C8-B5A941FF5130'
+delete ProduceRun_WorkInspectTemplate where WorkInspectId='30470FF1-0BA2-4DE0-8CDB-DF812C0AC4B8'
+delete ProduceRun_WorkInspectTemplate where WorkInspectId='E369582C-25FB-49EF-B3ED-4A7EDF8CA61C'
+delete ProduceRun_WorkInspectTemplate where WorkInspectId='2255D8C6-B12D-4035-B56A-11A5815B7C4F'
+delete ProduceRun_WorkInspectTemplate where WorkInspectId='015D647D-ECB4-4252-BA9E-C60190D63F0A'
+delete ProduceRun_WorkInspectTemplate where WorkInspectId='6CDFE6DD-E113-4A07-B5F4-083343672A9E'
+INSERT INTO dbo.ProduceRun_WorkInspectTemplate(WorkInspectId,WorkInspectName,Remark,AddUser,AddTime,Sort)
+VALUES('A95825BD-709E-46DB-AEFD-1E7C9C1BF524','ڹ涨ĸ±¶ѾָѴȶ״̬','','',GETDATE(),1)
+INSERT INTO dbo.ProduceRun_WorkInspectTemplate(WorkInspectId,WorkInspectName,Remark,AddUser,AddTime,Sort)
+VALUES('55CB964B-A82A-4BBC-BC2D-040E31C7CC36','ȫװôȶ״̬','','',GETDATE(),2)
+INSERT INTO dbo.ProduceRun_WorkInspectTemplate(WorkInspectId,WorkInspectName,Remark,AddUser,AddTime,Sort)
+VALUES('EE35FF88-6E30-4797-AE46-0623B9BD3E81','˷ƶ','','',GETDATE(),3)
+INSERT INTO dbo.ProduceRun_WorkInspectTemplate(WorkInspectId,WorkInspectName,Remark,AddUser,AddTime,Sort)
+VALUES('C679A7B8-4244-42E5-96C8-B5A941FF5130','רùߺDZ뱸УϸЧڡ','','',GETDATE(),4)
+INSERT INTO dbo.ProduceRun_WorkInspectTemplate(WorkInspectId,WorkInspectName,Remark,AddUser,AddTime,Sort)
+VALUES('30470FF1-0BA2-4DE0-8CDB-DF812C0AC4B8','Ա֯ȷʵ','','',GETDATE(),5)
+INSERT INTO dbo.ProduceRun_WorkInspectTemplate(WorkInspectId,WorkInspectName,Remark,AddUser,AddTime,Sort)
+VALUES('E369582C-25FB-49EF-B3ED-4A7EDF8CA61C','ĿĿȷ','','',GETDATE(),6)
+INSERT INTO dbo.ProduceRun_WorkInspectTemplate(WorkInspectId,WorkInspectName,Remark,AddUser,AddTime,Sort)
+VALUES('2255D8C6-B12D-4035-B56A-11A5815B7C4F','ԭϡȼϡѧҩƷļҪ','','',GETDATE(),7)
+INSERT INTO dbo.ProduceRun_WorkInspectTemplate(WorkInspectId,WorkInspectName,Remark,AddUser,AddTime,Sort)
+VALUES('015D647D-ECB4-4252-BA9E-C60190D63F0A','ˮ硢ԭϡȼϡѧҩƷȷȶӦ','','',GETDATE(),8)
+INSERT INTO dbo.ProduceRun_WorkInspectTemplate(WorkInspectId,WorkInspectName,Remark,AddUser,AddTime,Sort)
+VALUES('6CDFE6DD-E113-4A07-B5F4-083343672A9E','ԿDZװͶȶС','','',GETDATE(),9)
+go
+
+--==
+if object_id(N'ProduceRun_SubInspectTerm',N'U') is not null
+drop table dbo.ProduceRun_SubInspectTerm
+CREATE TABLE dbo.ProduceRun_SubInspectTerm(
+ SubInspectId varchar(50) NOT NULL,--
+ ProjectId varchar(50) NULL,--Ŀ
+ Contractor varchar(50) null,--а
+ Owner varchar(50) null,--ҵ
+ ProcessPatent varchar(50) null,--ר
+ ContractorIsAllPass int NULL,--аǷͨ0/null:δͨ 1:ͨ
+ OwnerIsAllPass int NULL,--ҵǷͨ0/null:δͨ 1:ͨ
+ ProcessPatentIsAllPass int NULL,--רǷͨ0/null:δͨ 1:ͨ
+ ContractorAllPassData datetime null,--аͨ
+ OwnerAllPassData datetime null,--ҵͨ
+ ProcessPatentAllPassData datetime null,--רͨ
+ InspectionIsAllPass int NULL,--0/null:δͨ 1:ͨ
+ WanderIsComplete int null,--תǷȫͨ0:δͨ1:ͨ
+ WanderCompleteData datetime null,--ת
+ IsUnifyWanderAbout int null,--Ƿͳһת0:1:
+ UnifyWanderAboutData datetime null,--ͳһתʱ
+ UnifyWanderAboutOpinion varchar(max) null,--ͳһתע
+ InspectIsClose int null,--Ƿر0:δر1:ѹر
+ InspectCloseData datetime null,--ر
+ InspectTime datetime NULL,--ʱ
+ AddUser varchar(50) NULL,--
+ AddTime datetime NULL,--
+ CONSTRAINT PK_ProduceRun_SubInspectTerm PRIMARY KEY CLUSTERED
+(
+ SubInspectId 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
+
+--==
+if object_id(N'ProduceRun_SubInspectTermItem',N'U') is not null
+drop table dbo.ProduceRun_SubInspectTermItem
+CREATE TABLE dbo.ProduceRun_SubInspectTermItem(
+ TermItemId varchar(50) NOT NULL,--
+ ProjectId varchar(50) NULL,--Ŀ
+ SubInspectId varchar(50) NULL,--
+ GroupName varchar(50) NULL,--
+ WorkInspectId varchar(50) NOT NULL,--ģ
+ WorkInspectName varchar(500) NULL,--
+ InspectedUser varchar(50) NULL,--
+ InspectionResults int NULL,--0:δͨ 1:ͨ
+ InspectionIllustrate varchar(200) NULL,--˵
+ Contractor varchar(50) null,--а
+ Owner varchar(50) null,--ҵ
+ ProcessPatent varchar(50) null,--ר
+ ContractorIsPass int NULL,--аǷͨ0/null:δͨ 1:ͨ
+ OwnerIsPass int NULL,--ҵǷͨ0/null:δͨ 1:ͨ
+ ProcessPatentIsPass int NULL,--רǷͨ0/null:δͨ 1:ͨ
+ ContractorRemark varchar(1000) NULL,--а̱ע
+ OwnerRemark varchar(1000) NULL,--ҵע
+ ProcessPatentRemark varchar(1000) NULL,--ר̱ע
+ Remark varchar(200) NULL,--ע
+ AddUser varchar(50) NULL,--
+ AddTime datetime NULL,--
+ Sort int NULL,--
+ CONSTRAINT PK_ProduceRun_SubInspectTermItem PRIMARY KEY CLUSTERED
+(
+ TermItemId 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
+
+--==β
+if object_id(N'ProduceRun_InspectTailTerm',N'U') is not null
+drop table dbo.ProduceRun_InspectTailTerm
+CREATE TABLE dbo.ProduceRun_InspectTailTerm(
+ TailTermId varchar(50) NOT NULL,--
+ ProjectId varchar(50) NULL,--Ŀ
+ ProjectName varchar(50) NULL,--Ŀ
+ TailTermCode varchar(50) NULL,--Ѳ
+ ConstructionUnit varchar(50) NULL,--ʩλ
+ SubInspectId varchar(50) NULL,--
+ TermItemId varchar(50) NULL,--
+ QuestionDesc varchar(max) NULL,--
+ RectifyOpinion varchar(max) NULL,--
+ RectifyTime datetime NULL,--βʱ
+ InspectUser varchar(50) NULL,--
+ HandleUser varchar(50) NULL,--
+ ApproveUser varchar(50) NULL,--
+ AdjustCompleteTime datetime NULL,--Ҫʱ
+ ApproveState int NULL,--0:ύ1:2:˻3:˻4:5:ͨ
+ AddUser varchar(50) NULL,--
+ AddTime datetime NULL,--
+ CONSTRAINT PK_ProduceRun_InspectTailTerm PRIMARY KEY CLUSTERED
+(
+ TailTermId 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
+
+--==/˼¼
+if object_id(N'ProduceRun_InspectTermApproveRecords',N'U') is not null
+drop table dbo.ProduceRun_InspectTermApproveRecords
+CREATE TABLE dbo.ProduceRun_InspectTermApproveRecords(
+ InspectTermId varchar(50) NOT NULL,--
+ ProjectId varchar(50) NULL,--Ŀ
+ TermItemId varchar(50) NULL,--
+ TailTermId varchar(50) NULL,--β
+ ApproveOpinion varchar(max) NULL,--
+ ApproveTime datetime NULL,--ʱ
+ ApproveUser varchar(50) NULL,--
+ ApproveType int NULL,--¼0:¼1:˼¼
+ ApproveState int NULL,--0:˻1:ͨ
+ AddUser varchar(50) NULL,--
+ AddTime datetime NULL,--
+ CONSTRAINT PK_ProduceRun_InspectTermApproveRecords PRIMARY KEY CLUSTERED
+(
+ InspectTermId 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
\ No newline at end of file
diff --git a/SGGL/BLL/Common/AttachFileService.cs b/SGGL/BLL/Common/AttachFileService.cs
index 0f63dabb..59070a1e 100644
--- a/SGGL/BLL/Common/AttachFileService.cs
+++ b/SGGL/BLL/Common/AttachFileService.cs
@@ -92,6 +92,17 @@ namespace BLL
return fileUrl;
}
+ ///
+ /// 根据对应主键和菜单获取文件信息
+ ///
+ /// 对应主键
+ /// 对应菜单
+ /// 文件信息
+ public static Model.AttachFile GetAttachFileByToKeyId(string toKey)
+ {
+ return Funs.DB.AttachFile.FirstOrDefault(e => e.ToKeyId == toKey);
+ }
+
///
///
///
diff --git a/SGGL/BLL/Person/Person_TestRunMonthSummaryService.cs b/SGGL/BLL/Person/Person_TestRunMonthSummaryService.cs
index 451b3595..3cfe836c 100644
--- a/SGGL/BLL/Person/Person_TestRunMonthSummaryService.cs
+++ b/SGGL/BLL/Person/Person_TestRunMonthSummaryService.cs
@@ -30,6 +30,7 @@ namespace BLL
TestRunMonthSummaryId = TestRunMonthSummary.TestRunMonthSummaryId,
ProjectId = TestRunMonthSummary.ProjectId,
UserId = TestRunMonthSummary.UserId,
+ Major = TestRunMonthSummary.Major,
ProcessName = TestRunMonthSummary.ProcessName,
RaiseDate = TestRunMonthSummary.RaiseDate,
ProblemDescription = TestRunMonthSummary.ProblemDescription,
@@ -50,6 +51,7 @@ namespace BLL
Model.Person_TestRunMonthSummary newTestRunMonthSummary = db.Person_TestRunMonthSummary.FirstOrDefault(e => e.TestRunMonthSummaryId == TestRunMonthSummary.TestRunMonthSummaryId);
if (newTestRunMonthSummary != null)
{
+ newTestRunMonthSummary.Major = TestRunMonthSummary.Major;
newTestRunMonthSummary.ProcessName = TestRunMonthSummary.ProcessName;
newTestRunMonthSummary.RaiseDate = TestRunMonthSummary.RaiseDate;
newTestRunMonthSummary.ProblemDescription = TestRunMonthSummary.ProblemDescription;
diff --git a/SGGL/FineUIPro.Web/ErrLog.txt b/SGGL/FineUIPro.Web/ErrLog.txt
index f7b0779a..187a54e3 100644
--- a/SGGL/FineUIPro.Web/ErrLog.txt
+++ b/SGGL/FineUIPro.Web/ErrLog.txt
@@ -259,3 +259,132 @@ IP地址:::1
出错时间:03/26/2024 10:58:48
+
+错误信息开始=====>
+错误类型:HttpParseException
+错误信息:基类包括字段“txtProcessName”,但其类型(FineUIPro.TextArea)与控件(FineUIPro.TextBox)的类型不兼容。
+错误堆栈:
+ 在 System.Web.Compilation.BaseTemplateCodeDomTreeGenerator.BuildFieldDeclaration(ControlBuilder builder)
+ 在 System.Web.Compilation.BaseTemplateCodeDomTreeGenerator.BuildSourceDataTreeFromBuilder(ControlBuilder builder, Boolean fInTemplate, Boolean topLevelControlInTemplate, PropertyEntry pse)
+ 在 System.Web.Compilation.BaseTemplateCodeDomTreeGenerator.BuildSourceDataTreeFromBuilder(ControlBuilder builder, Boolean fInTemplate, Boolean topLevelControlInTemplate, PropertyEntry pse)
+ 在 System.Web.Compilation.BaseTemplateCodeDomTreeGenerator.BuildSourceDataTreeFromBuilder(ControlBuilder builder, Boolean fInTemplate, Boolean topLevelControlInTemplate, PropertyEntry pse)
+ 在 System.Web.Compilation.BaseTemplateCodeDomTreeGenerator.BuildSourceDataTreeFromBuilder(ControlBuilder builder, Boolean fInTemplate, Boolean topLevelControlInTemplate, PropertyEntry pse)
+ 在 System.Web.Compilation.BaseTemplateCodeDomTreeGenerator.BuildSourceDataTreeFromBuilder(ControlBuilder builder, Boolean fInTemplate, Boolean topLevelControlInTemplate, PropertyEntry pse)
+ 在 System.Web.Compilation.BaseTemplateCodeDomTreeGenerator.BuildSourceDataTreeFromBuilder(ControlBuilder builder, Boolean fInTemplate, Boolean topLevelControlInTemplate, PropertyEntry pse)
+ 在 System.Web.Compilation.BaseTemplateCodeDomTreeGenerator.BuildSourceDataTreeFromBuilder(ControlBuilder builder, Boolean fInTemplate, Boolean topLevelControlInTemplate, PropertyEntry pse)
+ 在 System.Web.Compilation.TemplateControlCodeDomTreeGenerator.BuildMiscClassMembers()
+ 在 System.Web.Compilation.PageCodeDomTreeGenerator.BuildMiscClassMembers()
+ 在 System.Web.Compilation.BaseCodeDomTreeGenerator.BuildSourceDataTree()
+ 在 System.Web.Compilation.BaseCodeDomTreeGenerator.GetCodeDomTree(CodeDomProvider codeDomProvider, StringResourceBuilder stringResourceBuilder, VirtualPath virtualPath)
+ 在 System.Web.Compilation.BaseTemplateBuildProvider.GenerateCode(AssemblyBuilder assemblyBuilder)
+ 在 System.Web.Compilation.AssemblyBuilder.AddBuildProvider(BuildProvider buildProvider)
+出错时间:03/28/2024 15:18:32
+出错文件:http://localhost:8579/Personal/TestRunMonthSummaryEdit.aspx?TestRunMonthSummaryId=85881239-5093-461d-b96f-863374ea0928
+IP地址:::1
+
+出错时间:03/28/2024 15:18:32
+
+
+错误信息开始=====>
+错误类型:ArgumentException
+错误信息:提供的 URI 方案“http”无效,应为“https”。
+参数名: via
+错误堆栈:
+ 在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via)
+ 在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+ 在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+ 在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via)
+ 在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via)
+ 在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via)
+ 在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via)
+ 在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via)
+ 在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via)
+ 在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via)
+ 在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via)
+ 在 System.ServiceModel.ChannelFactory`1.CreateChannel()
+ 在 System.ServiceModel.ClientBase`1.CreateChannel()
+ 在 System.ServiceModel.ClientBase`1.CreateChannelInternal()
+ 在 System.ServiceModel.ClientBase`1.get_Channel()
+ 在 BLL.CNCECHSSEService.HSSEServiceClient.GetSupervise_SubUnitReportListToSUB() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\Service References\CNCECHSSEService\Reference.cs:行号 14204
+ 在 BLL.CNCECHSSEWebService.getSupervise_SubUnitReport() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 2181
+出错时间:03/29/2024 12:56:24
+出错时间:03/29/2024 12:56:24
+
+
+错误信息开始=====>
+错误类型:ArgumentException
+错误信息:提供的 URI 方案“http”无效,应为“https”。
+参数名: via
+错误堆栈:
+ 在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via)
+ 在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+ 在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+ 在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via)
+ 在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via)
+ 在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via)
+ 在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via)
+ 在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via)
+ 在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via)
+ 在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via)
+ 在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via)
+ 在 System.ServiceModel.ChannelFactory`1.CreateChannel()
+ 在 System.ServiceModel.ClientBase`1.CreateChannel()
+ 在 System.ServiceModel.ClientBase`1.CreateChannelInternal()
+ 在 System.ServiceModel.ClientBase`1.get_Channel()
+ 在 BLL.CNCECHSSEService.HSSEServiceClient.GetCheck_CheckInfo_Table8ItemListToSUB(String unitId) 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\Service References\CNCECHSSEService\Reference.cs:行号 14228
+ 在 BLL.CNCECHSSEWebService.getCheck_CheckInfo_Table8Item() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 2046
+出错时间:03/29/2024 12:56:24
+出错时间:03/29/2024 12:56:24
+
+
+错误信息开始=====>
+错误类型:ArgumentException
+错误信息:提供的 URI 方案“http”无效,应为“https”。
+参数名: via
+错误堆栈:
+ 在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via)
+ 在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+ 在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+ 在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via)
+ 在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via)
+ 在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via)
+ 在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via)
+ 在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via)
+ 在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via)
+ 在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via)
+ 在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via)
+ 在 System.ServiceModel.ChannelFactory`1.CreateChannel()
+ 在 System.ServiceModel.ClientBase`1.CreateChannel()
+ 在 System.ServiceModel.ClientBase`1.CreateChannelInternal()
+ 在 System.ServiceModel.ClientBase`1.get_Channel()
+ 在 BLL.CNCECHSSEService.HSSEServiceClient.GetCheck_CheckRectifyListToSUB(String unitId) 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\Service References\CNCECHSSEService\Reference.cs:行号 14220
+ 在 BLL.CNCECHSSEWebService.getCheck_CheckRectify() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 1942
+出错时间:03/29/2024 12:56:24
+出错时间:03/29/2024 12:56:24
+
+
+错误信息开始=====>
+错误类型:ArgumentException
+错误信息:提供的 URI 方案“http”无效,应为“https”。
+参数名: via
+错误堆栈:
+ 在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via)
+ 在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+ 在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+ 在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via)
+ 在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via)
+ 在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via)
+ 在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via)
+ 在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via)
+ 在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via)
+ 在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via)
+ 在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via)
+ 在 System.ServiceModel.ChannelFactory`1.CreateChannel()
+ 在 System.ServiceModel.ClientBase`1.CreateChannel()
+ 在 System.ServiceModel.ClientBase`1.CreateChannelInternal()
+ 在 System.ServiceModel.ClientBase`1.get_Channel()
+ 在 BLL.CNCECHSSEService.HSSEServiceClient.GetInformation_UrgeReportToSUB(String unitId) 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\Service References\CNCECHSSEService\Reference.cs:行号 14020
+ 在 BLL.CNCECHSSEWebService.getInformation_UrgeReport() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 1884
+出错时间:03/29/2024 12:56:24
+出错时间:03/29/2024 12:56:24
+
diff --git a/SGGL/FineUIPro.Web/Personal/TestRunMonthSummary.aspx b/SGGL/FineUIPro.Web/Personal/TestRunMonthSummary.aspx
index f96e7f5f..c27543fa 100644
--- a/SGGL/FineUIPro.Web/Personal/TestRunMonthSummary.aspx
+++ b/SGGL/FineUIPro.Web/Personal/TestRunMonthSummary.aspx
@@ -5,16 +5,36 @@
开车月技术总结
-
+
+
@@ -42,22 +62,40 @@
-
-
-
+
+
+
+
+
+
+
+ FieldType="String" HeaderText="案例描述" HeaderTextAlign="Center" TextAlign="Center">
+ FieldType="String" HeaderText="案例分析及解决方案" HeaderTextAlign="Center" TextAlign="Center">
+
+
+
+
+
+
+
+
+
+
@@ -91,6 +129,9 @@
+
+

+
diff --git a/SGGL/FineUIPro.Web/Personal/TestRunMonthSummary.aspx.cs b/SGGL/FineUIPro.Web/Personal/TestRunMonthSummary.aspx.cs
index e8072392..db5671b7 100644
--- a/SGGL/FineUIPro.Web/Personal/TestRunMonthSummary.aspx.cs
+++ b/SGGL/FineUIPro.Web/Personal/TestRunMonthSummary.aspx.cs
@@ -36,7 +36,7 @@ namespace FineUIPro.Web.Personal
///
private void BindGrid()
{
- string strSql = @"SELECT summary.TestRunMonthSummaryId,summary.ProjectId,summary.UserId,summary.RaiseDate,summary.ProcessName,summary.ProblemDescription,summary.HandleMethod,summary.ExperienceOrSuggestion,Users.UserName,case when summary.ProjectId='0' then '本部' else Project.ProjectName end as ProjectName "
+ string strSql = @"SELECT summary.TestRunMonthSummaryId,summary.ProjectId,summary.UserId,summary.RaiseDate,summary.Major,summary.ProcessName,summary.ProblemDescription,summary.HandleMethod,summary.ExperienceOrSuggestion,Users.UserName,case when summary.ProjectId='0' then '本部' else Project.ProjectName end as ProjectName "
+ @" From dbo.Person_TestRunMonthSummary AS summary"
+ @" LEFT JOIN Sys_User AS Users ON Users.UserId=summary.UserId"
+ @" LEFT JOIN Base_Project AS Project ON Project.ProjectId=summary.ProjectId"
@@ -200,5 +200,45 @@ namespace FineUIPro.Web.Personal
{
BindGrid();
}
+
+ ///
+ /// 获取整改前图片(放于Img中)
+ ///
+ ///
+ ///
+ protected string ConvertImageUrlByImage(object TestRunMonthSummaryId)
+ {
+ string url = string.Empty;
+ string httpUrl = string.Empty;
+ if (TestRunMonthSummaryId != null)
+ {
+ var file = BLL.AttachFileService.GetAttachFileByToKeyId(TestRunMonthSummaryId.ToString());
+ if (file != null)
+ {
+ url = BLL.UploadAttachmentService.ShowImage(Funs.SGGLUrl, file.AttachUrl);
+ }
+ }
+ return url;
+ }
+
+ ///
+ /// 获取整改前图片(放于Img中)
+ ///
+ ///
+ ///
+ protected string ConvertImageUrlByImage2(object TestRunMonthSummaryId)
+ {
+ string url = string.Empty;
+ string httpUrl = string.Empty;
+ if (TestRunMonthSummaryId != null)
+ {
+ var file = BLL.AttachFileService.GetAttachFileByToKeyId(TestRunMonthSummaryId.ToString() + "R");
+ if (file != null)
+ {
+ url = BLL.UploadAttachmentService.ShowImage(Funs.SGGLUrl, file.AttachUrl);
+ }
+ }
+ return url;
+ }
}
}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/Personal/TestRunMonthSummary.aspx.designer.cs b/SGGL/FineUIPro.Web/Personal/TestRunMonthSummary.aspx.designer.cs
index 3aba779b..afb2a9e7 100644
--- a/SGGL/FineUIPro.Web/Personal/TestRunMonthSummary.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/Personal/TestRunMonthSummary.aspx.designer.cs
@@ -84,6 +84,24 @@ namespace FineUIPro.Web.Personal {
///
protected global::FineUIPro.Button btnNew;
+ ///
+ /// lbImageUrl1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::System.Web.UI.WebControls.Label lbImageUrl1;
+
+ ///
+ /// lbImageUrl2 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::System.Web.UI.WebControls.Label lbImageUrl2;
+
///
/// ToolbarSeparator1 控件。
///
diff --git a/SGGL/FineUIPro.Web/Personal/TestRunMonthSummaryEdit.aspx b/SGGL/FineUIPro.Web/Personal/TestRunMonthSummaryEdit.aspx
index 8403bc5f..b379ba85 100644
--- a/SGGL/FineUIPro.Web/Personal/TestRunMonthSummaryEdit.aspx
+++ b/SGGL/FineUIPro.Web/Personal/TestRunMonthSummaryEdit.aspx
@@ -15,30 +15,27 @@
-
-
+
+
+
+
-
-
+
-
-
-
-
-
-
+
@@ -46,10 +43,25 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -59,6 +71,10 @@
+
+