lpf
/
SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

合并

This commit is contained in:
李鹏飞 2022-09-23 00:02:42 +08:00
parent 337cbbebe6 87582b0fa5
commit 08c2646ef1
34 changed files with 473 additions and 1635 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

116
DataBase/版本日志/SGGLDB_V2022-09-22.sql Normal file
View File

@ -0,0 +1,116 @@
--焊工业绩
ALTER PROC [dbo].[sp_rpt_WelderPerformance]
@unitcode NVARCHAR(50) = NULL,
@UnitWorkId NVARCHAR(50) = NULL,
@steel NVARCHAR(50) = NULL,
@wloName NVARCHAR(50) = NULL,
@date1 DATETIME = NULL,
@date2 DATETIME = NULL,
@projectId NVARCHAR(50) = NULL
AS
/*焊工业绩分析*/
SELECT
welder.ProjectId,
welder.WelderCode,-- 焊工代码
welder.PersonName,--焊工名称
(CASE WHEN Persons.Sex ='2' THEN '女' ELSE '男' END) AS Sex, --性别
-------------本期start
CAST(ISNULL(nowtotal_din.nowtotal_din,0) AS DECIMAL(19,2)) AS nowtotal_din, --本期总达因值
ISNULL(nowtotal_din.nowtotal_jot,0) AS nowtotal_jot, --本期总焊口
ISNULL(nowtotal_Rt.Rt_JotNum,0) AS rt_total_Jot, -- 本期已RT焊口数
ISNULL(nowtotal_repairjot.nowtotal_repairjot,0) AS nowtotal_repairjot, -- 本期RT返修焊口数
CONVERT(NVARCHAR(10),(CAST((CASE ISNULL(nowtotal_Rt.Rt_JotNum,0) WHEN 0 THEN 0
ELSE 100.0 * ISNULL(nowtotal_repairjot.nowtotal_repairjot,0)/(1.0 * nowtotal_Rt.Rt_JotNum) END) AS DECIMAL(8,1))))+'%' AS nowrepairrate, -- 本期RT返修率（焊口）
ISNULL(nowtotalfilm.nowtotalfilm,0) AS nowtotalfilm, --本期RT拍片总数
ISNULL(nowtotalfilm.nopassfilm,0) AS nopassfilm, --本期RT不合格拍片数
CONVERT(NVARCHAR(10),(CAST((CASE ISNULL(nowtotalfilm.nowtotalfilm,0) WHEN 0 THEN 0
ELSE 100.0 * ISNULL(nowtotalfilm.nopassfilm,0)/(1.0 * nowtotalfilm.nowtotalfilm) END) AS DECIMAL(8,1))))+'%'
AS nopassfilmrate , ---本期RT返修率（片数）
teamGroup.TeamGroupName AS education, --所在班组
welder.States
FROM SitePerson_Person AS welder
LEFT JOIN Person_Persons AS Persons ON welder.PersonId =Persons.PersonId
left join ProjectData_TeamGroup as teamGroup on teamGroup.TeamGroupId=welder.TeamGroupId
--本期总达因值 --本期总焊口
LEFT JOIN (SELECT SUM(jot.Size) AS nowtotal_din
,COUNT(*) AS nowtotal_jot
,jot.CoverWelderId
FROM dbo.HJGL_WeldJoint jot
LEFT JOIN dbo.HJGL_Pipeline pipe ON pipe.PipelineId = jot.PipelineId
LEFT JOIN dbo.HJGL_WeldingDaily daily ON daily.WeldingDailyId = jot.WeldingDailyId
LEFT JOIN WBS_UnitWork UnitWork ON UnitWork.UnitWorkId = pipe.UnitWorkId
WHERE jot.WeldingDailyId IS NOT NULL
AND (daily.WeldingDate >= @date1 OR @date1 IS NULL) AND (daily.WeldingDate <= @date2 OR @date2 IS NULL)
AND (pipe.UnitWorkId =@UnitWorkId OR @UnitWorkId IS NULL)
AND (jot.Material1Id=@steel OR @steel IS NULL)
GROUP BY jot.CoverWelderId) AS nowtotal_din ON nowtotal_din.CoverWelderId = welder.PersonId
--本期已Rt焊口数
LEFT JOIN (SELECT COUNT(pointItem.PointBatchItemId) AS Rt_JotNum --RT焊口数
,jot.CoverWelderId
FROM dbo.HJGL_Batch_PointBatchItem pointItem
LEFT JOIN dbo.HJGL_WeldJoint jot ON jot.WeldJointId = pointItem.WeldJointId
LEFT JOIN dbo.HJGL_Batch_PointBatch point ON point.PointBatchId = pointItem.PointBatchId
LEFT JOIN Base_DetectionType ndeType ON ndeType.DetectionTypeId = point.DetectionTypeId
LEFT JOIN dbo.HJGL_Pipeline pipe ON pipe.PipelineId = jot.PipelineId
LEFT JOIN dbo.HJGL_WeldingDaily daily ON daily.WeldingDailyId = jot.WeldingDailyId
WHERE pointItem.PointDate IS NOT NULL
AND ndeType.DetectionTypeCode='RT' --表示RT类型
AND (daily.WeldingDate >= @date1 OR @date1 IS NULL)
AND (daily.WeldingDate <= @date2 OR @date2 IS NULL)
AND (pipe.UnitWorkId =@UnitWorkId OR @UnitWorkId IS NULL)
AND (jot.Material1Id=@steel OR @steel IS NULL)
GROUP BY jot.CoverWelderId) AS nowtotal_Rt ON nowtotal_Rt.CoverWelderId = welder.PersonId
-- 本期RT返口数
LEFT JOIN (SELECT COUNT(pointItem.PointBatchItemId) AS nowtotal_repairjot --返修口数
,jot.CoverWelderId
FROM dbo.HJGL_Batch_PointBatchItem pointItem
LEFT JOIN dbo.HJGL_WeldJoint jot ON jot.WeldJointId = pointItem.WeldJointId
LEFT JOIN dbo.HJGL_Batch_PointBatch point ON point.PointBatchId = pointItem.PointBatchId
LEFT JOIN Base_DetectionType ndeType ON ndeType.DetectionTypeId = point.DetectionTypeId
LEFT JOIN dbo.HJGL_Pipeline pipe ON pipe.PipelineId = jot.PipelineId
LEFT JOIN dbo.HJGL_WeldingDaily daily ON daily.WeldingDailyId = jot.WeldingDailyId
LEFT JOIN dbo.HJGL_Batch_BatchTrustItem trustItem ON trustItem.PointBatchItemId = pointItem.PointBatchItemId
LEFT JOIN dbo.HJGL_Batch_NDEItem ndeItem ON ndeItem.TrustBatchItemId = trustItem.TrustBatchItemId
WHERE pointItem.PointDate IS NOT NULL
AND ndeType.DetectionTypeCode='RT' --表示RT类型
AND ndeItem.CheckResult='2'
AND (daily.WeldingDate >= @date1 OR @date1 IS NULL)
AND (daily.WeldingDate <= @date2 OR @date2 IS NULL)
AND (pipe.UnitWorkId =@UnitWorkId OR @UnitWorkId IS NULL)
AND (jot.Material1Id=@steel OR @steel IS NULL)
GROUP BY jot.CoverWelderId) AS nowtotal_repairjot ON nowtotal_repairjot.CoverWelderId = welder.PersonId
--本期RT总片数
LEFT JOIN (SELECT SUM(ndeItem.TotalFilm) AS nowtotalfilm
,SUM(ndeItem.PassFilm) AS nowpassfilm
,SUM(ndeItem.TotalFilm-ndeItem.PassFilm) AS nopassfilm,
jot.CoverWelderId
FROM dbo.HJGL_Batch_NDEItem ndeItem
LEFT JOIN dbo.HJGL_Batch_BatchTrustItem trustItem ON trustItem.TrustBatchItemId = ndeItem.TrustBatchItemId
LEFT JOIN dbo.HJGL_Batch_PointBatchItem pointItem ON pointItem.PointBatchItemId = trustItem.PointBatchItemId
LEFT JOIN dbo.HJGL_Batch_PointBatch point ON point.PointBatchId = pointItem.PointBatchId
LEFT JOIN Base_DetectionType ndeType ON ndeType.DetectionTypeId = point.DetectionTypeId
LEFT JOIN dbo.HJGL_WeldJoint jot ON jot.WeldJointId = pointItem.WeldJointId
LEFT JOIN dbo.HJGL_WeldingDaily daily ON daily.WeldingDailyId = jot.WeldingDailyId
WHERE ndeType.DetectionTypeCode='RT'
AND ndeItem.CheckResult IS NOT NULL --表示有检测结果
AND jot.WeldingDailyId IS NOT NULL
AND (point.UnitWorkId=@UnitWorkId OR @UnitWorkId IS NULL)
AND (jot.Material1Id=@steel OR @steel IS NULL)
AND (daily.WeldingDate >= @date1 OR @date1 IS NULL) AND (daily.WeldingDate <= @date2 OR @date2 IS NULL)
GROUP BY jot.CoverWelderId) AS nowtotalfilm ON nowtotalfilm.CoverWelderId = welder.PersonId
WHERE (welder.WelderCode IS NOT NULL AND welder.WelderCode!='') AND
(welder.ProjectId = @projectId OR @projectId IS NULL)
AND (welder.UnitId=@unitcode OR @unitcode IS NULL)
AND (welder.WorkPostId='19B8F2A9-28D3-4F20-867A-1B2237C2E228')
AND (welder.PersonId=@wloName OR @wloname IS NULL)
ORDER BY welder.WelderCode
GO

10
DataBase/版本日志/SGGLDB_V2022-09-22修改明细.txt Normal file
View File

@ -0,0 +1,10 @@
--ADD BY YangHongwei 2022-09-22
1、焊工业绩存储过程修改。
2、人员库是否在岗空时报错。
3、合同流程审批页选择框人员加载问题。
4、小程序订阅推送检查。
--END

0
DataBase/版本日志/SGGLDB_V2022-09-08.sql → DataBase/版本日志/已更新脚本/SGGLDB_V2022-09-08.sql
View File

0
DataBase/版本日志/SGGLDB_V2022-09-08修改明细.txt → DataBase/版本日志/已更新脚本/SGGLDB_V2022-09-08修改明细.txt
View File

0
DataBase/版本日志/SGGLDB_V2022-09-12.sql → DataBase/版本日志/已更新脚本/SGGLDB_V2022-09-12.sql
View File

0
DataBase/版本日志/SGGLDB_V2022-09-12修改明细.txt → DataBase/版本日志/已更新脚本/SGGLDB_V2022-09-12修改明细.txt
View File

0
DataBase/版本日志/SGGLDB_V2022-09-13.sql → DataBase/版本日志/已更新脚本/SGGLDB_V2022-09-13.sql
View File

0
DataBase/版本日志/SGGLDB_V2022-09-13修改明细.txt → DataBase/版本日志/已更新脚本/SGGLDB_V2022-09-13修改明细.txt
View File

0
DataBase/版本日志/SGGLDB_V2022-09-14.sql → DataBase/版本日志/已更新脚本/SGGLDB_V2022-09-14.sql
View File

0
DataBase/版本日志/SGGLDB_V2022-09-14修改明细.txt → DataBase/版本日志/已更新脚本/SGGLDB_V2022-09-14修改明细.txt
View File

0
DataBase/版本日志/SGGLDB_V2022-09-15.sql → DataBase/版本日志/已更新脚本/SGGLDB_V2022-09-15.sql
View File

0
DataBase/版本日志/SGGLDB_V2022-09-15修改明细.txt → DataBase/版本日志/已更新脚本/SGGLDB_V2022-09-15修改明细.txt
View File

0
DataBase/版本日志/SGGLDB_V2022-09-16 lpf.sql → DataBase/版本日志/已更新脚本/SGGLDB_V2022-09-16.sql
View File

0
DataBase/版本日志/SGGLDB_V2022-09-16修改明细.txt → DataBase/版本日志/已更新脚本/SGGLDB_V2022-09-16修改明细.txt
View File

0
DataBase/版本日志/SGGLDB_V2022-09-18 lpf.sql → DataBase/版本日志/已更新脚本/SGGLDB_V2022-09-18.sql
View File

0
DataBase/版本日志/SGGLDB_V2022-09-18修改明细.txt → DataBase/版本日志/已更新脚本/SGGLDB_V2022-09-18修改明细.txt
View File

9
DataBase/版本日志/已更新脚本/SGGLDB_V2022-09-19修改明细.txt Normal file
View File

@ -0,0 +1,9 @@
--ADD BY YangHongwei 2022-09-19
1、部门人员列表员工类型取值修改。
2、人员历史数据中当前项目当前岗位为空的情况进行初始化取值处理。
3、部门员工列表自定义列导出功能实现。
--END

16
SGGL/BLL/BLL.csproj
View File

@ -64,9 +64,7 @@
<HintPath>..\FineUIPro\Reference BLL\Interop.WIA.dll</HintPath>
<EmbedInteropTypes>True</EmbedInteropTypes>
</Reference>
<Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=5.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.5.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=6.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL" />
<Reference Include="Microsoft.Office.Interop.Excel, Version=15.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Office.Interop.Excel.15.0.4795.1000\lib\net20\Microsoft.Office.Interop.Excel.dll</HintPath>
<EmbedInteropTypes>True</EmbedInteropTypes>
@ -113,25 +111,13 @@
<Reference Include="System.Drawing" />
<Reference Include="System.IO.Compression" />
<Reference Include="System.Management" />
<Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
</Reference>
<Reference Include="System.Net.Http" />
<Reference Include="System.Numerics" />
<Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
</Reference>
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.5.0.0\lib\net45\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
</Reference>
<Reference Include="System.Runtime.Serialization" />
<Reference Include="System.ServiceModel" />
<Reference Include="System.Text.Encodings.Web, Version=5.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Text.Encodings.Web.5.0.0\lib\net461\System.Text.Encodings.Web.dll</HintPath>
</Reference>
<Reference Include="System.Text.Json, Version=5.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Text.Json.5.0.0\lib\net461\System.Text.Json.dll</HintPath>
</Reference>
<Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
</Reference>

11
SGGL/BLL/BaseInfo/PositionService.cs
View File

@ -20,6 +20,17 @@ namespace BLL
return Funs.DB.Base_Position.FirstOrDefault(e => e.PositionId == positionId);
}
public static string GetPositionNameById(string positionId)
{
string name =string.Empty;
var getData= Funs.DB.Base_Position.FirstOrDefault(e => e.PositionId == positionId);
if (getData != null)
{
name = getData.PositionName;
}
return name;
}
/// <summary>
/// 添加职务
/// </summary>

18
SGGL/BLL/Person/Person_PersonsService.cs
View File

@ -107,6 +107,7 @@ namespace BLL
WorkPostName = WorkPostService.getWorkPostNamesWorkPostIds(x.WorkPostId),
x.PostTitleId,
PostTitleName = PostTitleService.getPostTitleNameById(x.PostTitleId),
x.PostTitleDate,
x.IsOffice,
x.RoleIds,
RoleName = RoleService.getRoleNamesRoleIds(x.RoleIds),
@ -124,10 +125,21 @@ namespace BLL
x.PersonType,
PersonTypeName = DropListService.getPersonTypeNameByValue(x.PersonType),
x.ValidityDate,
x.IntoDate,
x.WorkDate,
x.RetirementDate,
PositionName = PositionService.GetPositionNameById(x.PositionId),
x.Graduate,
x.ForeignLanguage,
NationName = BasicDataService.GetDictNameByDictCode(x.Nation),
PoliticsStatusName = BasicDataService.GetDictNameByDictCode(x.PoliticsStatus),
MaritalStatusName = BasicDataService.GetDictNameByDictCode(x.MaritalStatus),
x.RelativeName,
x.RelativeTel,
};
}
#endregion
#region 根据主键获取人员信息
/// <summary>
/// 根据主键获取人员信息
@ -584,7 +596,7 @@ namespace BLL
ForeignLanguage = person.ForeignLanguage,
CountryCode = person.CountryCode,
ProvinceCode = person.ProvinceCode,
IsPost = person.IsPost,
IsPost = person.IsPost ?? true,
Graduate = person.Graduate,
Major = person.Major,
IntoDate = person.IntoDate,
@ -677,7 +689,7 @@ namespace BLL
newPerson.ForeignLanguage = person.ForeignLanguage;
newPerson.CountryCode = person.CountryCode;
newPerson.ProvinceCode = person.ProvinceCode;
newPerson.IsPost = person.IsPost;
newPerson.IsPost = person.IsPost ?? true;
newPerson.Graduate = person.Graduate;
newPerson.Major = person.Major;
newPerson.IntoDate = person.IntoDate;

280
SGGL/FineUIPro.Web/ErrLog.txt
View File

@ -1,280 +0,0 @@
错误信息开始=====>
错误类型:SqlException
错误信息:列名 'Sex' 无效。
列名 'IsUsed' 无效。
错误堆栈:
在 System.Data.SqlClient.SqlConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
在 System.Data.SqlClient.SqlInternalConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
在 System.Data.SqlClient.TdsParser.ThrowExceptionAndWarning(TdsParserStateObject stateObj, Boolean callerHasConnectionLock, Boolean asyncClose)
在 System.Data.SqlClient.TdsParser.TryRun(RunBehavior runBehavior, SqlCommand cmdHandler, SqlDataReader dataStream, BulkCopySimpleResultSet bulkCopyHandler, TdsParserStateObject stateObj, Boolean& dataReady)
在 System.Data.SqlClient.SqlDataReader.TryConsumeMetaData()
在 System.Data.SqlClient.SqlDataReader.get_MetaData()
在 System.Data.SqlClient.SqlCommand.FinishExecuteReader(SqlDataReader ds, RunBehavior runBehavior, String resetOptionsString, Boolean isInternal, Boolean forDescribeParameterEncryption, Boolean shouldCacheForAlwaysEncrypted)
在 System.Data.SqlClient.SqlCommand.RunExecuteReaderTds(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, Boolean async, Int32 timeout, Task& task, Boolean asyncWrite, Boolean inRetry, SqlDataReader ds, Boolean describeParameterEncryptionRequest)
在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method, TaskCompletionSource`1 completion, Int32 timeout, Task& task, Boolean& usedCache, Boolean asyncWrite, Boolean inRetry)
在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method)
在 System.Data.SqlClient.SqlCommand.ExecuteReader(CommandBehavior behavior, String method)
在 System.Data.SqlClient.SqlCommand.ExecuteDbDataReader(CommandBehavior behavior)
在 System.Data.Common.DbCommand.System.Data.IDbCommand.ExecuteReader(CommandBehavior behavior)
在 System.Data.Common.DbDataAdapter.FillInternal(DataSet dataset, DataTable[] datatables, Int32 startRecord, Int32 maxRecords, String srcTable, IDbCommand command, CommandBehavior behavior)
在 System.Data.Common.DbDataAdapter.Fill(DataTable[] dataTables, Int32 startRecord, Int32 maxRecords, IDbCommand command, CommandBehavior behavior)
在 System.Data.Common.DbDataAdapter.Fill(DataTable dataTable)
在 BLL.SQLHelper.GetDataTableRunProc(String storedProcName, SqlParameter[] parameters) 位置 D:\诺必达\赛鼎\SGGL_SeDin_new\SGGL\BLL\SQLHelper.cs:行号 277
在 FineUIPro.Web.HJGL.WeldingReport.WelderPerformance.BindGrid() 位置 D:\诺必达\赛鼎\SGGL_SeDin_new\SGGL\FineUIPro.Web\HJGL\WeldingReport\WelderPerformance.aspx.cs:行号 90
在 FineUIPro.Web.HJGL.WeldingReport.WelderPerformance.BtnAnalyse_Click(Object sender, EventArgs e) 位置 D:\诺必达\赛鼎\SGGL_SeDin_new\SGGL\FineUIPro.Web\HJGL\WeldingReport\WelderPerformance.aspx.cs:行号 137
在 FineUIPro.Button.OnClick(EventArgs e)
在 (Button , EventArgs )
在 FineUIPro.Button.RaisePostBackEvent(String eventArgument)
在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument)
在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData)
在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
出错时间:09/08/2022 19:56:26
出错文件:http://localhost:8008/HJGL/WeldingReport/WelderPerformance.aspx
IP地址:::1
操作人员:JT
出错时间:09/08/2022 19:56:26
错误信息开始=====>
错误类型:SqlException
错误信息:列名 'Sex' 无效。
列名 'IsUsed' 无效。
错误堆栈:
在 System.Data.SqlClient.SqlConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
在 System.Data.SqlClient.SqlInternalConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
在 System.Data.SqlClient.TdsParser.ThrowExceptionAndWarning(TdsParserStateObject stateObj, Boolean callerHasConnectionLock, Boolean asyncClose)
在 System.Data.SqlClient.TdsParser.TryRun(RunBehavior runBehavior, SqlCommand cmdHandler, SqlDataReader dataStream, BulkCopySimpleResultSet bulkCopyHandler, TdsParserStateObject stateObj, Boolean& dataReady)
在 System.Data.SqlClient.SqlDataReader.TryConsumeMetaData()
在 System.Data.SqlClient.SqlDataReader.get_MetaData()
在 System.Data.SqlClient.SqlCommand.FinishExecuteReader(SqlDataReader ds, RunBehavior runBehavior, String resetOptionsString, Boolean isInternal, Boolean forDescribeParameterEncryption, Boolean shouldCacheForAlwaysEncrypted)
在 System.Data.SqlClient.SqlCommand.RunExecuteReaderTds(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, Boolean async, Int32 timeout, Task& task, Boolean asyncWrite, Boolean inRetry, SqlDataReader ds, Boolean describeParameterEncryptionRequest)
在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method, TaskCompletionSource`1 completion, Int32 timeout, Task& task, Boolean& usedCache, Boolean asyncWrite, Boolean inRetry)
在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method)
在 System.Data.SqlClient.SqlCommand.ExecuteReader(CommandBehavior behavior, String method)
在 System.Data.SqlClient.SqlCommand.ExecuteDbDataReader(CommandBehavior behavior)
在 System.Data.Common.DbCommand.System.Data.IDbCommand.ExecuteReader(CommandBehavior behavior)
在 System.Data.Common.DbDataAdapter.FillInternal(DataSet dataset, DataTable[] datatables, Int32 startRecord, Int32 maxRecords, String srcTable, IDbCommand command, CommandBehavior behavior)
在 System.Data.Common.DbDataAdapter.Fill(DataTable[] dataTables, Int32 startRecord, Int32 maxRecords, IDbCommand command, CommandBehavior behavior)
在 System.Data.Common.DbDataAdapter.Fill(DataTable dataTable)
在 BLL.SQLHelper.GetDataTableRunProc(String storedProcName, SqlParameter[] parameters) 位置 D:\诺必达\赛鼎\SGGL_SeDin_new\SGGL\BLL\SQLHelper.cs:行号 277
在 FineUIPro.Web.HJGL.WeldingReport.WelderPerformance.BindGrid() 位置 D:\诺必达\赛鼎\SGGL_SeDin_new\SGGL\FineUIPro.Web\HJGL\WeldingReport\WelderPerformance.aspx.cs:行号 90
在 FineUIPro.Web.HJGL.WeldingReport.WelderPerformance.BtnAnalyse_Click(Object sender, EventArgs e) 位置 D:\诺必达\赛鼎\SGGL_SeDin_new\SGGL\FineUIPro.Web\HJGL\WeldingReport\WelderPerformance.aspx.cs:行号 137
在 FineUIPro.Button.OnClick(EventArgs e)
在 (Button , EventArgs )
在 FineUIPro.Button.RaisePostBackEvent(String eventArgument)
在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument)
在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData)
在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
出错时间:09/08/2022 19:57:31
出错文件:http://localhost:8008/HJGL/WeldingReport/WelderPerformance.aspx
IP地址:::1
操作人员:JT
出错时间:09/08/2022 19:57:31
错误信息开始=====>
错误类型:SqlException
错误信息:列名 'Sex' 无效。
列名 'IsUsed' 无效。
错误堆栈:
在 System.Data.SqlClient.SqlConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
在 System.Data.SqlClient.SqlInternalConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
在 System.Data.SqlClient.TdsParser.ThrowExceptionAndWarning(TdsParserStateObject stateObj, Boolean callerHasConnectionLock, Boolean asyncClose)
在 System.Data.SqlClient.TdsParser.TryRun(RunBehavior runBehavior, SqlCommand cmdHandler, SqlDataReader dataStream, BulkCopySimpleResultSet bulkCopyHandler, TdsParserStateObject stateObj, Boolean& dataReady)
在 System.Data.SqlClient.SqlDataReader.TryConsumeMetaData()
在 System.Data.SqlClient.SqlDataReader.get_MetaData()
在 System.Data.SqlClient.SqlCommand.FinishExecuteReader(SqlDataReader ds, RunBehavior runBehavior, String resetOptionsString, Boolean isInternal, Boolean forDescribeParameterEncryption, Boolean shouldCacheForAlwaysEncrypted)
在 System.Data.SqlClient.SqlCommand.RunExecuteReaderTds(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, Boolean async, Int32 timeout, Task& task, Boolean asyncWrite, Boolean inRetry, SqlDataReader ds, Boolean describeParameterEncryptionRequest)
在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method, TaskCompletionSource`1 completion, Int32 timeout, Task& task, Boolean& usedCache, Boolean asyncWrite, Boolean inRetry)
在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method)
在 System.Data.SqlClient.SqlCommand.ExecuteReader(CommandBehavior behavior, String method)
在 System.Data.SqlClient.SqlCommand.ExecuteDbDataReader(CommandBehavior behavior)
在 System.Data.Common.DbCommand.System.Data.IDbCommand.ExecuteReader(CommandBehavior behavior)
在 System.Data.Common.DbDataAdapter.FillInternal(DataSet dataset, DataTable[] datatables, Int32 startRecord, Int32 maxRecords, String srcTable, IDbCommand command, CommandBehavior behavior)
在 System.Data.Common.DbDataAdapter.Fill(DataTable[] dataTables, Int32 startRecord, Int32 maxRecords, IDbCommand command, CommandBehavior behavior)
在 System.Data.Common.DbDataAdapter.Fill(DataTable dataTable)
在 BLL.SQLHelper.GetDataTableRunProc(String storedProcName, SqlParameter[] parameters) 位置 D:\诺必达\赛鼎\SGGL_SeDin_new\SGGL\BLL\SQLHelper.cs:行号 277
在 FineUIPro.Web.HJGL.WeldingReport.WelderPerformance.BindGrid() 位置 D:\诺必达\赛鼎\SGGL_SeDin_new\SGGL\FineUIPro.Web\HJGL\WeldingReport\WelderPerformance.aspx.cs:行号 90
在 FineUIPro.Web.HJGL.WeldingReport.WelderPerformance.BtnAnalyse_Click(Object sender, EventArgs e) 位置 D:\诺必达\赛鼎\SGGL_SeDin_new\SGGL\FineUIPro.Web\HJGL\WeldingReport\WelderPerformance.aspx.cs:行号 137
在 FineUIPro.Button.OnClick(EventArgs e)
在 (Button , EventArgs )
在 FineUIPro.Button.RaisePostBackEvent(String eventArgument)
在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument)
在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData)
在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
出错时间:09/08/2022 19:57:53
出错文件:http://localhost:8008/HJGL/WeldingReport/WelderPerformance.aspx
IP地址:::1
操作人员:JT
出错时间:09/08/2022 19:57:53
错误信息开始=====>
错误类型:ChangeConflictException
错误信息:2 的 1 更新失败。
错误堆栈:
在 System.Data.Linq.ChangeProcessor.SubmitChanges(ConflictMode failureMode)
在 System.Data.Linq.DataContext.SubmitChanges(ConflictMode failureMode)
在 System.Data.Linq.DataContext.SubmitChanges()
在 BLL.ContractService.UpdateContract(PHTGL_Contract contract) 位置 E:\工作\赛鼎施工平台\SGGL_SeDin(New)\SGGL_SeDin_New\SGGL\BLL\PHTGL\ContractCompile\ContractService.cs:行号 177
在 FineUIPro.Web.PHTGL.ContractCompile.ContractFormationEdit.btnSave_Tab1_Click(Object sender, EventArgs e) 位置 E:\工作\赛鼎施工平台\SGGL_SeDin(New)\SGGL_SeDin_New\SGGL\FineUIPro.Web\PHTGL\ContractCompile\ContractFormationEdit.aspx.cs:行号 564
在 FineUIPro.Button.OnClick(EventArgs e)
在 (Button , EventArgs )
在 FineUIPro.Button.RaisePostBackEvent(String eventArgument)
在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument)
在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData)
在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
出错时间:09/13/2022 10:46:27
出错文件:http://localhost:8008/PHTGL/ContractCompile/ContractFormationEdit.aspx?ContractId=60594f33-0093-416f-afbf-a7c1bac3170c
IP地址:::1
操作人员:JT
出错时间:09/13/2022 10:46:27
错误信息开始=====>
错误类型:HttpParseException
错误信息:基类包括字段“WebReport1”，但其类型(FastReport.Web.WebReport)与控件(FastReport.Web.WebReport)的类型不兼容。
错误堆栈:
在 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.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)
出错时间:09/22/2022 00:35:36
出错文件:http://localhost:8008/Controls/Fastreport.aspx?ReportPath=D:%5C%E8%AF%BA%E5%BF%85%E8%BE%BE%5C%E8%B5%9B%E9%BC%8E%5CSGGL_SeDin_new%5CSGGL%5CFineUIPro.Web%5CFile%5CFastreport%5C%E7%BB%84%E4%BB%B6%E6%89%93%E5%8D%B0.frx
IP地址:::1
出错时间:09/22/2022 00:35:36
错误信息开始=====>
错误类型:HttpParseException
错误信息:基类包括字段“WebReport1”，但其类型(FastReport.Web.WebReport)与控件(FastReport.Web.WebReport)的类型不兼容。
错误堆栈:
在 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.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)
出错时间:09/22/2022 00:35:41
出错文件:http://localhost:8008/Controls/Fastreport.aspx?ReportPath=D:%5C%E8%AF%BA%E5%BF%85%E8%BE%BE%5C%E8%B5%9B%E9%BC%8E%5CSGGL_SeDin_new%5CSGGL%5CFineUIPro.Web%5CFile%5CFastreport%5C%E7%BB%84%E4%BB%B6%E6%89%93%E5%8D%B0.frx
IP地址:::1
出错时间:09/22/2022 00:35:41
错误信息开始=====>
错误类型:HttpParseException
错误信息:基类包括字段“WebReport1”，但其类型(FastReport.Web.WebReport)与控件(FastReport.Web.WebReport)的类型不兼容。
错误堆栈:
在 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.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)
出错时间:09/22/2022 00:36:29
出错文件:http://localhost:8008/Controls/Fastreport.aspx?ReportPath=D:%5C%E8%AF%BA%E5%BF%85%E8%BE%BE%5C%E8%B5%9B%E9%BC%8E%5CSGGL_SeDin_new%5CSGGL%5CFineUIPro.Web%5CFile%5CFastreport%5C%E7%BB%84%E4%BB%B6%E6%89%93%E5%8D%B0.frx
IP地址:::1
出错时间:09/22/2022 00:36:29
错误信息开始=====>
错误类型:HttpParseException
错误信息:基类包括字段“WebReport1”，但其类型(FastReport.Web.WebReport)与控件(FastReport.Web.WebReport)的类型不兼容。
错误堆栈:
在 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.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)
出错时间:09/22/2022 00:36:58
出错文件:http://localhost:8008/Controls/Fastreport.aspx?ReportPath=D:%5C%E8%AF%BA%E5%BF%85%E8%BE%BE%5C%E8%B5%9B%E9%BC%8E%5CSGGL_SeDin_new%5CSGGL%5CFineUIPro.Web%5CFile%5CFastreport%5C%E7%BB%84%E4%BB%B6%E6%89%93%E5%8D%B0.frx
IP地址:::1
出错时间:09/22/2022 00:36:58
错误信息开始=====>
错误类型:ArgumentNullException
错误信息:路径不能为 null。
参数名: path
错误堆栈:
在 System.IO.FileStream.Init(String path, FileMode mode, FileAccess access, Int32 rights, Boolean useRights, FileShare share, Int32 bufferSize, FileOptions options, SECURITY_ATTRIBUTES secAttrs, String msgPath, Boolean bFromProxy, Boolean useLongPath, Boolean checkHost)
在 System.IO.FileStream..ctor(String path, FileMode mode, FileAccess access, FileShare share)
在 FastReport.Report.Load(String fileName)
在 FineUIPro.Web.Controls.Fastreport.Page_Load(Object sender, EventArgs e) 位置 D:\诺必达\赛鼎\SGGL_SeDin_new\SGGL\FineUIPro.Web\Controls\Fastreport.aspx.cs:行号 54
在 System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e)
在 System.EventHandler.Invoke(Object sender, EventArgs e)
在 System.Web.UI.Control.OnLoad(EventArgs e)
在 System.Web.UI.Control.LoadRecursive()
在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
出错时间:09/22/2022 00:43:55
出错文件:http://localhost:8008/Controls/Fastreport.aspx
IP地址:::1
出错时间:09/22/2022 00:43:55
错误信息开始=====>
错误类型:NullReferenceException
错误信息:未将对象引用设置到对象的实例。
错误堆栈:
在 FineUIPro.Web.HJGL.PreDesign.PrePipeline.btnImportQRCode_Click(Object sender, EventArgs e)
在 FineUIPro.Button.OnClick(EventArgs e)
在 (Button , EventArgs )
在 FineUIPro.Button.RaisePostBackEvent(String eventArgument)
在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument)
在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData)
在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
出错时间:09/22/2022 00:46:14
出错文件:http://localhost:8008/HJGL/PreDesign/PrePipeline.aspx
IP地址:::1
操作人员:JT
出错时间:09/22/2022 00:46:14
错误信息开始=====>
错误类型:NullReferenceException
错误信息:未将对象引用设置到对象的实例。
错误堆栈:
在 FineUIPro.Web.HJGL.PreDesign.PrePipeline.btnImportQRCode_Click(Object sender, EventArgs e)
在 FineUIPro.Button.OnClick(EventArgs e)
在 (Button , EventArgs )
在 FineUIPro.Button.RaisePostBackEvent(String eventArgument)
在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument)
在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData)
在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
出错时间:09/22/2022 00:46:21
出错文件:http://localhost:8008/HJGL/PreDesign/PrePipeline.aspx
IP地址:::1
操作人员:JT
出错时间:09/22/2022 00:46:21

3
SGGL/FineUIPro.Web/HJGL/WeldingReport/PipePrefabricationRateStatistics.aspx
View File

@ -31,7 +31,8 @@
<Toolbars>
<f:Toolbar ID="Toolbar3" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:RadioButtonList ID="rdType" runat="server" AutoPostBack="true" OnSelectedIndexChanged="rdType_SelectedIndexChanged">
<f:RadioButtonList ID="rdType" runat="server" AutoPostBack="true" AutoColumnWidth="true"
OnSelectedIndexChanged="rdType_SelectedIndexChanged">
<f:RadioItem Text="按管线分析" Value="1" Selected="true" />
<f:RadioItem Text="按焊口分析" Value="2" />
</f:RadioButtonList>

2
SGGL/FineUIPro.Web/HSSE/EduTrain/TestRecord.aspx.cs
View File

@ -57,7 +57,7 @@ namespace FineUIPro.Web.HSSE.EduTrain
(CASE WHEN TestPlan.PlanName IS NULL THEN Training.TrainingName ELSE TestPlan.PlanName END) AS PlanName,Person.IdentityCard,WorkPost.WorkPostName,Person.PersonId,SitePerson.SitePersonId,
(CASE WHEN TestRecord.TestScores>=60 THEN '是' ELSE '否' END) AS IsPass,
ISNULL(TestPlan.Duration,90) AS Duration,ISNULL(TestPlan.TotalScore,100) AS TotalScore,TestPlan.TestPalce,ISNULL(TestPlan.QuestionCount,95) AS QuestionCount,TestRecord.TemporaryUser,Person.PersonName AS TestManName
,Unit.UnitName
,Unit.UnitName,Person.Telephone
FROM dbo.Training_TestRecord AS TestRecord
LEFT JOIN dbo.Training_TestPlan AS TestPlan ON TestPlan.TestPlanId=TestRecord.TestPlanId
LEFT JOIN dbo.Training_TestTraining AS Training ON Training.TrainingId = TestRecord.TestType

1
SGGL/FineUIPro.Web/HSSE/Manager/HSEDiary.aspx.cs
View File

@ -102,6 +102,7 @@ namespace FineUIPro.Web.HSSE.Manager
/// <param name="e"></param>
protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
{
Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue);
BindGrid();
}

4
SGGL/FineUIPro.Web/HSSE/Manager/HSEDiaryView.aspx
View File

@ -129,13 +129,13 @@
</f:FormRow>
<f:FormRow>
<Items>
<f:TextArea ID="txtDailySummary" runat="server" Label="今日小结" Readonly="true" LabelWidth="90px" Height="64px">
<f:TextArea ID="txtDailySummary" runat="server" Label="今日小结" Readonly="true" LabelWidth="90px" Height="90px">
</f:TextArea>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextArea ID="txtTomorrowPlan" runat="server" Label="明日计划" Readonly="true" LabelWidth="90px" Height="64px">
<f:TextArea ID="txtTomorrowPlan" runat="server" Label="明日计划" Readonly="true" LabelWidth="90px" Height="90px">
</f:TextArea>
</Items>
</f:FormRow>

32
SGGL/FineUIPro.Web/Person/CompanyPerson.aspx
View File

@ -31,11 +31,11 @@
LabelAlign="Right" AutoPostBack="true" EmptyText="项目" OnSelectedIndexChanged="btSearch_Click">
</f:DropDownList>
<f:TextBox runat="server" ID="txtPersonName" EmptyText="按姓名查询"></f:TextBox>
<f:TextBox runat="server" ID="txtIdCard" EmptyText="按身份证查询"></f:TextBox>
<f:DropDownList runat="server" ID="drpIsPost" EnableEdit="true"
<f:TextBox runat="server" ID="txtIdCard" EmptyText="按身份证查询"></f:TextBox>
<f:DropDownList runat="server" ID="drpIsPost" EnableEdit="true"
LabelAlign="Right" EmptyText="按人员状态查询" AutoPostBack="true" OnSelectedIndexChanged="btSearch_Click">
</f:DropDownList>
<f:DropDownList runat="server" ID="drpPersonType" EnableEdit="true"
<f:DropDownList runat="server" ID="drpPersonType" EnableEdit="true"
LabelAlign="Right" EmptyText="按员工类别查询" AutoPostBack="true" OnSelectedIndexChanged="btSearch_Click">
</f:DropDownList>
<f:ToolbarFill runat="server">
@ -51,8 +51,12 @@
</f:Toolbar>
</Toolbars>
<Columns>
<f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center"
TextAlign="Center" />
<f:TemplateField ColumnID="tfNumber" Width="55px" HeaderText="序号" HeaderTextAlign="Center"
TextAlign="Center">
<ItemTemplate>
<asp:Label ID="lblNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:RenderField Width="85px" ColumnID="JobNum" DataField="JobNum" SortField="JobNum"
FieldType="String" HeaderText="工号" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
@ -67,12 +71,12 @@
<f:RenderField Width="185px" ColumnID="IdentityCard" DataField="IdentityCard"
FieldType="String" HeaderText="身份证" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:TemplateField Width="60px" HeaderText="年龄" HeaderTextAlign="Center" TextAlign="Center">
<f:TemplateField Width="60px" HeaderText="年龄" HeaderTextAlign="Center" TextAlign="Center">
<ItemTemplate>
<asp:Label ID="Label1" runat="server" Text='<%# ConvertAgeByIdentityCard(Eval("IdentityCard")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<%-- <f:RenderField Width="200px" ColumnID="UnitName" DataField="UnitName" SortField="UnitId"
<%-- <f:RenderField Width="200px" ColumnID="UnitName" DataField="UnitName" SortField="UnitId"
FieldType="String" HeaderText="单位" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>--%>
<f:RenderField Width="110px" ColumnID="DepartName" DataField="DepartName" SortField="DepartId"
@ -84,10 +88,10 @@
<f:RenderField Width="100px" ColumnID="PostTitleName" DataField="PostTitleName"
FieldType="String" HeaderText="职称" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="120px" ColumnID="Account" DataField="Account"
<f:RenderField Width="120px" ColumnID="Account" DataField="Account"
FieldType="String" HeaderText="账号" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="110px" ColumnID="RoleName" DataField="RoleName"
<f:RenderField Width="110px" ColumnID="RoleName" DataField="RoleName"
FieldType="String" HeaderText="角色" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:TemplateField ColumnID="tfImageUrl1" Width="90px" HeaderText="电子签名" HeaderTextAlign="Center"
@ -96,7 +100,7 @@
<asp:Label ID="lbImageUrl" runat="server" Text='<%# ConvertImageByUrl(Eval("SignatureUrl")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<%-- <f:TemplateField Width="60px" HeaderText="在岗" HeaderTextAlign="Center" TextAlign="Center">
<%-- <f:TemplateField Width="60px" HeaderText="在岗" HeaderTextAlign="Center" TextAlign="Center">
<ItemTemplate>
<asp:Label ID="lbIsPost" runat="server" Text='<%# GetIsOrNo(Eval("IsPost")) %>'></asp:Label>
</ItemTemplate>
@ -118,7 +122,7 @@
</Items>
</f:Panel>
<f:Window ID="Window1" Title="员工信息" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="1200px" Maximized="true"
Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="1200px" Maximized="true"
Height="620px">
</f:Window>
<f:Window ID="Window2" Title="导入人员信息" Hidden="true" EnableIFrame="true" EnableMaximize="true"
@ -131,10 +135,10 @@
</f:MenuButton>
<f:MenuButton ID="btnMenuDelete" OnClick="btnMenuDelete_Click" EnablePostBack="true"
Hidden="true" ConfirmText="确定删除选中行？" ConfirmTarget="Parent" runat="server"
Icon="Delete" Text="删除">
Icon="Delete" Text="删除">
</f:MenuButton>
<f:MenuButton ID="btnSee" OnClick="btnSee_Click" EnablePostBack="true"
runat="server" Text="查看" Icon="Find">
<f:MenuButton ID="btnSee" OnClick="btnSee_Click" EnablePostBack="true"
runat="server" Text="查看" Icon="Find">
</f:MenuButton>
</f:Menu>
</form>

9
SGGL/FineUIPro.Web/Person/CompanyPerson.aspx.designer.cs generated
View File

@ -140,6 +140,15 @@ namespace FineUIPro.Web.Person
/// </remarks>
protected global::FineUIPro.Button btnImport;
/// <summary>
/// lblNumber 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblNumber;
/// <summary>
/// lbSex 控件。
/// </summary>

94
SGGL/FineUIPro.Web/Person/DepartPerson.aspx
View File

@ -19,7 +19,7 @@
<f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="部门员工"
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="部门员工" EnableHeaderMenu="true"
runat="server" DataKeyNames="PersonId" DataIDField="PersonId" AllowSorting="true"
SortField="PersonName" ForceFit="true" EnableColumnLines="true" BoxFlex="1" PageSize="10"
SortDirection="ASC" OnSort="Grid1_Sort" AllowPaging="true" IsDatabasePaging="true"
@ -33,10 +33,10 @@
</f:DropDownList>
<f:TextBox runat="server" ID="txtPersonName" EmptyText="按姓名查询"></f:TextBox>
<f:TextBox runat="server" ID="txtIdCard" EmptyText="按身份证查询"></f:TextBox>
<f:DropDownList runat="server" ID="drpIsPost" EnableEdit="true"
<f:DropDownList runat="server" ID="drpIsPost" EnableEdit="true"
LabelAlign="Right" EmptyText="请选择人员状态" AutoPostBack="true" OnSelectedIndexChanged="btSearch_Click">
</f:DropDownList>
<f:DropDownList runat="server" ID="drpPersonType" EnableEdit="true"
<f:DropDownList runat="server" ID="drpPersonType" EnableEdit="true"
LabelAlign="Right" EmptyText="请选择员工类别" AutoPostBack="true" OnSelectedIndexChanged="btSearch_Click">
</f:DropDownList>
<f:ToolbarFill runat="server">
@ -48,47 +48,54 @@
<f:Button ID="btnImport" Text="导入" Icon="FolderUp" Hidden="true" runat="server"
OnClick="btnImport_Click">
</f:Button>
<f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" Text="导出" Icon="FolderUp"
EnableAjax="false" DisableControlBeforePostBack="false">
</f:Button>
</Items>
</f:Toolbar>
</Toolbars>
<Columns>
<f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center"
TextAlign="Center" />
<f:TemplateField ColumnID="tfNumber" Width="55px" HeaderText="序号" HeaderTextAlign="Center"
TextAlign="Center">
<ItemTemplate>
<asp:Label ID="lblNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:RenderField Width="90px" ColumnID="PersonName" DataField="PersonName" SortField="PersonName"
FieldType="String" HeaderText="姓名" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:TemplateField Width="50px" HeaderText="性别" HeaderTextAlign="Center" TextAlign="Center">
<f:TemplateField Width="50px" ColumnID="tfSex" HeaderText="性别" HeaderTextAlign="Center" TextAlign="Center">
<ItemTemplate>
<asp:Label ID="lbSex" runat="server" Text='<%# GetGender(Eval("Sex")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:TemplateField Width="50px" HeaderText="年龄" HeaderTextAlign="Center" TextAlign="Center">
<f:TemplateField Width="50px" ColumnID="tfAge" HeaderText="年龄" HeaderTextAlign="Center" TextAlign="Center">
<ItemTemplate>
<asp:Label ID="Label1" runat="server" Text='<%# ConvertAgeByIdentityCard(Eval("IdentityCard")) %>'></asp:Label>
<asp:Label ID="lbAge" runat="server" Text='<%# ConvertAgeByIdentityCard(Eval("IdentityCard")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:RenderField Width="150px" ColumnID="IdentityCard" DataField="IdentityCard"
FieldType="String" HeaderText="身份证" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="Address" DataField="Address"
<f:RenderField Width="150px" ColumnID="Address" DataField="Address"
FieldType="String" HeaderText="家庭住址" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="Telephone" DataField="Telephone"
FieldType="String" HeaderText="联系电话" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
</f:RenderField>
<f:RenderField Width="80px" ColumnID="EduLevelName" DataField="EduLevelName"
FieldType="String" HeaderText="最高学历" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="80px" ColumnID="Major" DataField="Major"
FieldType="String" HeaderText="所学专业" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="80px" ColumnID="Major" DataField="Major"
<f:RenderField Width="80px" ColumnID="PersonTypeName" DataField="PersonTypeName"
FieldType="String" HeaderText="员工类别" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="ValidityDate" DataField="ValidityDate"
FieldType="Date" Renderer="Date" HeaderText="合同有效期" HeaderTextAlign="Center" TextAlign="Left">
<f:RenderField Width="100px" ColumnID="ValidityDate" DataField="ValidityDate"
FieldType="Date" Renderer="Date" HeaderText="合同有效期" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:TemplateField Width="60px" HeaderText="在岗" HeaderTextAlign="Center" TextAlign="Center">
<f:TemplateField Width="60px" ColumnID="tfIsPost" HeaderText="在岗" HeaderTextAlign="Center" TextAlign="Center">
<ItemTemplate>
<asp:Label ID="lbIsPost" runat="server" Text='<%# GetIsOrNo(Eval("IsPost")) %>'></asp:Label>
</ItemTemplate>
@ -99,6 +106,51 @@
<f:RenderField Width="100px" ColumnID="CurrentProjectWorkPostName" DataField="CurrentProjectWorkPostName"
FieldType="String" HeaderText="项目岗位" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="IntoDate" DataField="IntoDate" Hidden="true"
FieldType="Date" Renderer="Date" HeaderText="入院时间" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="WorkDate" DataField="WorkDate" Hidden="true"
FieldType="Date" Renderer="Date" HeaderText="参加工作时间" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="RetirementDate" DataField="RetirementDate" Hidden="true"
FieldType="Date" Renderer="Date" HeaderText="退休日期" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="PositionName" DataField="PositionName" Hidden="true"
FieldType="String" HeaderText="职务" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="PostTitleName" DataField="PostTitleName" Hidden="true"
FieldType="String" HeaderText="职称" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="PostTitleDate" DataField="PostTitleDate" Hidden="true"
FieldType="Date" Renderer="Date" HeaderText="职称取得时间" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="Graduate" DataField="Graduate" Hidden="true"
FieldType="String" HeaderText="毕业院校" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="ForeignLanguage" DataField="ForeignLanguage" Hidden="true"
FieldType="String" HeaderText="外语能力" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:TemplateField Width="100px" ColumnID="tfNativePlace" HeaderText="籍贯" Hidden="true"
HeaderTextAlign="Center" TextAlign="Center">
<ItemTemplate>
<asp:Label ID="lbNativePlace" runat="server" Text='<%# ConvertNativePlace(Eval("PersonId")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:RenderField Width="100px" ColumnID="NationName" DataField="NationName" Hidden="true"
FieldType="String" HeaderText="民族" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="PoliticsStatusName" DataField="PoliticsStatusName" Hidden="true"
FieldType="String" HeaderText="政治面貌" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="MaritalStatusName" DataField="MaritalStatusName" Hidden="true"
FieldType="String" HeaderText="婚姻状况" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="RelativeName" DataField="RelativeName" Hidden="true"
FieldType="String" HeaderText="亲属姓名" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="RelativeTel" DataField="RelativeTel" Hidden="true"
FieldType="String" HeaderText="亲属电话" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:TemplateField Width="50px" ColumnID="Actions" HeaderText="操作" HeaderTextAlign="Center" TextAlign="Center">
<ItemTemplate>
<div class="action btncontainer"></div>
@ -175,26 +227,26 @@
type: 'menuitem', text: '编辑', icon: '../res/icon/pencil.png',
handler: function () {
var rowData = getRowDataViaMenuItem(this);
__doPostBack('', 'editit$Action1$' + rowData.index + '$' + rowData.id );
__doPostBack('', 'editit$Action1$' + rowData.index + '$' + rowData.id);
}
}, {
type: 'menuitem', text: '人员详情', icon: '../res/icon/folder_user.png',
type: 'menuitem', text: '人员详情', icon: '../res/icon/folder_user.png',
handler: function () {
var rowData = getRowDataViaMenuItem(this);
__doPostBack('', 'details$Action2$' + rowData.index + '$' + rowData.id );
__doPostBack('', 'details$Action2$' + rowData.index + '$' + rowData.id);
}
}, {
type: 'menuitem', text: '重置密码', icon: '../res/icon/arrow_refresh.png',
type: 'menuitem', text: '重置密码', icon: '../res/icon/arrow_refresh.png',
handler: function () {
var rowData = getRowDataViaMenuItem(this);
__doPostBack('', 'reset$Action3$' + rowData.index + '$' + rowData.id );
__doPostBack('', 'reset$Action3$' + rowData.index + '$' + rowData.id);
}
}
, {
type: 'menuitem', text: '工资详情', icon: '../res/icon/table_multiple.png',
type: 'menuitem', text: '工资详情', icon: '../res/icon/table_multiple.png',
handler: function () {
var rowData = getRowDataViaMenuItem(this);
__doPostBack('', 'salary$Action4$' + rowData.index + '$' + rowData.id );
__doPostBack('', 'salary$Action4$' + rowData.index + '$' + rowData.id);
}
}]
});

20
SGGL/FineUIPro.Web/Person/DepartPerson.aspx.cs
View File

@ -1,6 +1,7 @@
using BLL;
using System;
using System.Linq;
using System.Text;
namespace FineUIPro.Web.Person
{
@ -256,5 +257,24 @@ namespace FineUIPro.Web.Person
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("PersonView.aspx?PersonId={0}", Grid1.SelectedRowID, "查看 - ")));
}
#endregion
#region 导出按钮
/// 导出按钮
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnOut_Click(object sender, EventArgs e)
{
Response.ClearContent();
string filename = Funs.GetNewFileName();
Response.AddHeader("content-disposition", "attachment; filename=" + System.Web.HttpUtility.UrlEncode("部门人员列表" + filename, System.Text.Encoding.UTF8) + ".xls");
Response.ContentType = "application/excel";
Response.ContentEncoding = Encoding.UTF8;
this.Grid1.PageSize = this.Grid1.RecordCount;
this.BindGrid();
Response.Write(GetGridTableHtml(Grid1));
Response.End();
}
#endregion
}
}

31
SGGL/FineUIPro.Web/Person/DepartPerson.aspx.designer.cs generated
View File

@ -131,6 +131,24 @@ namespace FineUIPro.Web.Person
/// </remarks>
protected global::FineUIPro.Button btnImport;
/// <summary>
/// btnOut 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnOut;
/// <summary>
/// lblNumber 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblNumber;
/// <summary>
/// lbSex 控件。
/// </summary>
@ -141,13 +159,13 @@ namespace FineUIPro.Web.Person
protected global::System.Web.UI.WebControls.Label lbSex;
/// <summary>
/// Label1 控件。
/// lbAge 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label1;
protected global::System.Web.UI.WebControls.Label lbAge;
/// <summary>
/// lbIsPost 控件。
@ -158,6 +176,15 @@ namespace FineUIPro.Web.Person
/// </remarks>
protected global::System.Web.UI.WebControls.Label lbIsPost;
/// <summary>
/// lbNativePlace 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label lbNativePlace;
/// <summary>
/// ToolbarSeparator1 控件。
/// </summary>

2
SGGL/FineUIPro.Web/Person/PersonEdit.aspx.cs
View File

@ -76,7 +76,7 @@ namespace FineUIPro.Web.Person
this.txtPersonName.Text = person.PersonName;
this.txtJobNum.Text = person.JobNum;
this.drpUnit.SelectedValue = person.UnitId;
this.ckIsPost.Checked = person.IsPost.Value;
this.ckIsPost.Checked = person.IsPost ?? true;
if (!string.IsNullOrEmpty(person.DepartId))
{
this.drpDepart.SelectedValue = person.DepartId;

18
SGGL/FineUIPro.Web/Person/PersonLib.aspx.cs
View File

@ -88,7 +88,7 @@ namespace FineUIPro.Web.Person
}
}
if (this.CurrUser.PersonId == Const.hfnbdId)
if (this.CurrUser.PersonId == Const.hfnbdId || this.CurrUser.PersonId == Const.sysglyId)
{
this.btnIDCard.Hidden = false;
}
@ -243,6 +243,8 @@ namespace FineUIPro.Web.Person
protected void btnIDCard_Click(object sender, EventArgs e)
{
int countRecod = 0;
int pCountRecod = 0;
string info=string.Empty;
var getPerson = (from x in Funs.DB.Person_Persons
where x.IdentityCard != null && x.IdentityCard.Length > 1 && !x.Birthday.HasValue && x.IsCardNoOK.Value
select x).Take(1000);
@ -264,7 +266,19 @@ namespace FineUIPro.Web.Person
Funs.DB.SubmitChanges();
countRecod++;
}
Alert.ShowInTop("操作完成，共处理" + countRecod.ToString() + "条人员信息", MessageBoxIcon.Success);
info = "操作完成，共处理人员按身份证设置年龄" + countRecod.ToString() + "条。";
var getPPersons = (from x in Funs.DB.SitePerson_Person
join y in Funs.DB.Person_Persons on x.PersonId equals y.PersonId
where x.States == Const.ProjectPersonStates_1 && y.CurrentProjectId == null
select x).Take(1000);
foreach (var pitem in getPPersons)
{
SitePerson_PersonItemService.SetPersonItemInOut(pitem);
pCountRecod++;
}
info+= "共处理人员所在当前项目取值" + pCountRecod.ToString() + "条。";
}
}
}

82
SGGL/FineUIPro.Web/common/PageBase.cs
View File

@ -1196,7 +1196,10 @@ namespace FineUIPro.Web
foreach (GridColumn column in grid.Columns)
{
sb.AppendFormat("<td>{0}</td>", column.HeaderText);
if (column.ColumnID != "Actions" && !column.Hidden)
{
sb.AppendFormat("<td>{0}</td>", column.HeaderText);
}
}
sb.Append("</tr>");
foreach (GridRow row in grid.Rows)
@ -1204,41 +1207,60 @@ namespace FineUIPro.Web
sb.Append("<tr>");
foreach (GridColumn column in grid.Columns)
{
string html = row.Values[column.ColumnIndex].ToString();
if (column.ColumnID == "tfNumber" && (row.FindControl("labNumber") as AspNet.Label) != null)
if (column.ColumnID != "Actions" && !column.Hidden)
{
html = (row.FindControl("labNumber") as AspNet.Label).Text;
}
if (column.ColumnID == "tfTeamType" && (row.FindControl("lbTeamType") as AspNet.Label) != null)
{
html = (row.FindControl("lbTeamType") as AspNet.Label).Text;
}
if (column.ColumnID == "tfI" && (row.FindControl("tfI") as AspNet.Label) != null)
{
html = (row.FindControl("lbI") as AspNet.Label).Text;
}
if (column.ColumnID == "tfCompileMan" && (row.FindControl("tfCompileMan") as AspNet.Label) != null)
{
html = (row.FindControl("lblCompileMan") as AspNet.Label).Text;
}
if (column.ColumnID == "tfSpecialEquipmentId")
{
html = (row.FindControl("lblSpecialEquipmentId") as AspNet.Label).Text;
}
// 处理CheckBox
if (html.Contains("f-grid-static-checkbox"))
{
if (!html.Contains("f-checked"))
string html = row.Values[column.ColumnIndex].ToString();
if (column.ColumnID == "tfNumber" && (row.FindControl("labNumber") as AspNet.Label) != null)
{
html = "×";
html = (row.FindControl("labNumber") as AspNet.Label).Text;
}
else
if (column.ColumnID == "tfNumber" && (row.FindControl("lblNumber") as AspNet.Label) != null)
{
html = "√";
html = (row.FindControl("lblNumber") as AspNet.Label).Text;
}
if (column.ColumnID == "tfTeamType" && (row.FindControl("lbTeamType") as AspNet.Label) != null)
{
html = (row.FindControl("lbTeamType") as AspNet.Label).Text;
}
if (column.ColumnID == "tfI" && (row.FindControl("lbI") as AspNet.Label) != null)
{
html = (row.FindControl("lbI") as AspNet.Label).Text;
}
if (column.ColumnID == "tfCompileMan" && (row.FindControl("lblCompileMan") as AspNet.Label) != null)
{
html = (row.FindControl("lblCompileMan") as AspNet.Label).Text;
}
if (column.ColumnID == "tfSpecialEquipmentId" && (row.FindControl("lblSpecialEquipmentId") as AspNet.Label) != null)
{
html = (row.FindControl("lblSpecialEquipmentId") as AspNet.Label).Text;
}
if (column.ColumnID == "tfSex" && (row.FindControl("lbSex") as AspNet.Label) != null)
{
html = (row.FindControl("lbSex") as AspNet.Label).Text;
}
if (column.ColumnID == "tfAge" && (row.FindControl("lbAge") as AspNet.Label) != null)
{
html = (row.FindControl("lbAge") as AspNet.Label).Text;
}
if (column.ColumnID == "tfIsPost" && (row.FindControl("lbIsPost") as AspNet.Label) != null)
{
html = (row.FindControl("lbIsPost") as AspNet.Label).Text;
}
// 处理CheckBox
if (html.Contains("f-grid-static-checkbox"))
{
if (!html.Contains("f-checked"))
{
html = "×";
}
else
{
html = "√";
}
}
sb.AppendFormat("<td style='vnd.ms-excel.numberformat:@;width:140px;'>{0}</td>", html);
// sb.AppendFormat("<td>{0}</td>", html);
}
sb.AppendFormat("<td style='vnd.ms-excel.numberformat:@;width:140px;'>{0}</td>", html);
// sb.AppendFormat("<td>{0}</td>", html);
}
sb.Append("</tr>");

1350
SGGL/Model/Model.cs
View File

File diff suppressed because it is too large Load Diff