This commit is contained in:
geh
parent
aff5d8e4d1
commit
f19a09ab98
|
|
@ -0,0 +1,75 @@
|
||||||
|
--关键事项
|
||||||
|
|
||||||
|
CREATE 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(max)
|
||||||
|
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
|
||||||
|
--,a.state
|
||||||
|
--,case a.state when 2 then '正在进行' when 3 then '正在进行' when 0 then '已关闭' when 1 then '编辑中' end as stateStr
|
||||||
|
,case a.state when 2 then (case when GETDATE()>a.CompleteDate then 4 else a.state end) when 3 then (case when GETDATE()>a.CompleteDate then 4 else a.state end) when 0 then a.state when 1 then a.state end as state
|
||||||
|
,case a.state when 2 then (case when GETDATE()>a.CompleteDate then '已超期' else '正在进行' end) when 3 then (case when GETDATE()>a.CompleteDate then '已超期' else '正在进行' end) when 0 then '已关闭' when 1 then '编辑中' end as stateStr
|
||||||
|
,QuestionTypeName=STUFF(( SELECT ',' + Base_QuestionType.QuestionTypeName FROM dbo.Base_QuestionType where PATINDEX('%,' + RTRIM(Base_QuestionType.QuestionTypeID) + ',%',',' +a.QuestionTypeID + ',') >0 FOR XML PATH('')), 1, 1,'')
|
||||||
|
,GJSXTypeName = STUFF((SELECT ',' + Base_GJSXType.GJSXTypeName FROM dbo.Base_GJSXType where PATINDEX('%,' + RTRIM(Base_GJSXType.GJSXTypeID) + ',%', ',' + a.GJSXTypeID + ',') > 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,'')
|
||||||
|
,(select top 1 ProgressStatus+'：'+Progress_detail from GJSX_detail where GJSXID=a.GJSXID order by Date desc) as LastProgress
|
||||||
|
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
|
||||||
|
--left join[dbo].[Base_GJSXType] on a.GJSXTypeID = Base_GJSXType.GJSXTypeID
|
||||||
|
where a.ProjectId=@ProjectId
|
||||||
|
) as a
|
||||||
|
|
||||||
|
set @Sql ='select * from #GJSX_List where 1=1 ' +@sql_where +' order by state desc,GJSXID asc'
|
||||||
|
|
||||||
|
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 3 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,'')
|
||||||
|
--,GJSXTypeName = STUFF((SELECT ',' + Base_GJSXType.GJSXTypeName FROM dbo.Base_GJSXType where PATINDEX('%,' + RTRIM(Base_GJSXType.GJSXTypeID) + ',%', ',' + a.GJSXTypeID + ',') > 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
|
||||||
|
----left join[dbo].[Base_GJSXType] on a.GJSXTypeID = Base_GJSXType.GJSXTypeID
|
||||||
|
--where a.ProjectId=@ProjectId
|
||||||
|
END
|
||||||
|
|
@ -21,7 +21,8 @@ namespace BLL
|
||||||
foreach (var project in projects)
|
foreach (var project in projects)
|
||||||
{
|
{
|
||||||
// 检查管理人员到期未到岗情况
|
// 检查管理人员到期未到岗情况
|
||||||
var items1 = CheckManagerNotArrived(project.ProjectId);
|
// var items1 = CheckManagerNotArrived(project.ProjectId);
|
||||||
|
var items1 = CheckHistoricalContinuousShortage(project.ProjectId);
|
||||||
|
|
||||||
// 检查作业人员人力偏差情况
|
// 检查作业人员人力偏差情况
|
||||||
var items2 = CheckWorkerDeviation(project.ProjectId);
|
var items2 = CheckWorkerDeviation(project.ProjectId);
|
||||||
|
|
@ -48,7 +49,7 @@ namespace BLL
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/// <summary>
|
/*/// <summary>
|
||||||
/// 检查管理人员到期未到岗情况（超过一周发出预警）
|
/// 检查管理人员到期未到岗情况（超过一周发出预警）
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="projectId">项目ID</param>
|
/// <param name="projectId">项目ID</param>
|
||||||
|
|
@ -85,9 +86,9 @@ namespace BLL
|
||||||
}
|
}
|
||||||
|
|
||||||
return lItems;
|
return lItems;
|
||||||
}
|
}*/
|
||||||
|
|
||||||
//获取实际考勤人员数
|
/*//获取实际考勤人员数
|
||||||
private static int getInOutRecordNum(JDGL_SGManPower sgManPower)
|
private static int getInOutRecordNum(JDGL_SGManPower sgManPower)
|
||||||
{
|
{
|
||||||
string strSql = @"
|
string strSql = @"
|
||||||
|
|
@ -155,7 +156,7 @@ namespace BLL
|
||||||
}
|
}
|
||||||
|
|
||||||
return dataSource.Count();
|
return dataSource.Count();
|
||||||
}
|
}*/
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 发送管理人员预警
|
/// 发送管理人员预警
|
||||||
|
|
@ -163,7 +164,7 @@ namespace BLL
|
||||||
/// <param name="projectId">项目ID</param>
|
/// <param name="projectId">项目ID</param>
|
||||||
/// <param name="unitId">单位id</param>
|
/// <param name="unitId">单位id</param>
|
||||||
private static List<ToDoItem> SendManagerWarning(string unitId, string projectId, string workPostId,
|
private static List<ToDoItem> SendManagerWarning(string unitId, string projectId, string workPostId,
|
||||||
string unitWorkId, DateTime? planDate, int? quantity, int num)
|
string unitWorkId, DateTime? startDate, DateTime? endDate, int? quantity, int num)
|
||||||
{
|
{
|
||||||
// 发送预警信息
|
// 发送预警信息
|
||||||
var toDoItems = new List<ToDoItem>();
|
var toDoItems = new List<ToDoItem>();
|
||||||
|
|
@ -250,15 +251,15 @@ namespace BLL
|
||||||
if (unitWorks != null)
|
if (unitWorks != null)
|
||||||
{
|
{
|
||||||
warningContent =
|
warningContent =
|
||||||
$"{projectUnits.UnitName}单位{unitWorks.UnitWorkName}装置计划{string.Format("{0:yyyy-MM-dd}", planDate)}投入人力{quantity}人，实际考勤为{num}人。";
|
$"{projectUnits.UnitName}单位{unitWorks.UnitWorkName}装置计划{string.Format("{0:yyyy-MM-dd}", startDate)}~{string.Format("{0:yyyy-MM-dd}", endDate)}投入人力{quantity}人，实际考勤为{num}人。";
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
warningContent =
|
warningContent =
|
||||||
$"{projectUnits.UnitName}单位计划{string.Format("{0:yyyy-MM-dd}", planDate)}投入人力{quantity}人，实际考勤为{num}人。";
|
$"{projectUnits.UnitName}单位计划{string.Format("{0:yyyy-MM-dd}", startDate)}~{string.Format("{0:yyyy-MM-dd}", endDate)}投入人力{quantity}人，实际考勤为{num}人。";
|
||||||
}
|
}
|
||||||
|
|
||||||
string urlParams = "JDGL/SGManPower/SGWarningDetails.aspx?projectId=" + projectId;
|
string urlParams = "JDGL/SGManPower/SGWarningDetailsEdit.aspx?projectId=" + projectId;
|
||||||
// 添加单位参数（如果已选择）
|
// 添加单位参数（如果已选择）
|
||||||
if (!string.IsNullOrEmpty(unitId))
|
if (!string.IsNullOrEmpty(unitId))
|
||||||
{
|
{
|
||||||
|
|
@ -278,26 +279,32 @@ namespace BLL
|
||||||
}
|
}
|
||||||
|
|
||||||
// 添加时间参数
|
// 添加时间参数
|
||||||
if (planDate.HasValue)
|
if (startDate.HasValue)
|
||||||
{
|
{
|
||||||
urlParams += "&planDate=" + string.Format("{0:yyyy-MM-dd}", planDate);
|
urlParams += "&startTime=" + string.Format("{0:yyyy-MM-dd}", startDate);
|
||||||
|
}
|
||||||
|
|
||||||
|
// 添加时间参数
|
||||||
|
if (endDate.HasValue)
|
||||||
|
{
|
||||||
|
urlParams += "&endTime=" + string.Format("{0:yyyy-MM-dd}", endDate);
|
||||||
}
|
}
|
||||||
|
|
||||||
// 添加岗位参数（如果已选择）
|
// // 添加岗位参数（如果已选择）
|
||||||
if (quantity.HasValue)
|
// if (quantity.HasValue)
|
||||||
{
|
// {
|
||||||
urlParams += "&quantity=" + quantity.Value;
|
// urlParams += "&quantity=" + quantity.Value;
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
// 添加岗位参数（如果已选择）
|
// // 添加岗位参数（如果已选择）
|
||||||
if (num >= 0)
|
// if (num >= 0)
|
||||||
{
|
// {
|
||||||
urlParams += "&num=" + num;
|
// urlParams += "&num=" + num;
|
||||||
}
|
// }
|
||||||
else
|
// else
|
||||||
{
|
// {
|
||||||
urlParams += "&num=0";
|
// urlParams += "&num=0";
|
||||||
}
|
// }
|
||||||
|
|
||||||
|
|
||||||
foreach (var userId in toUserIds)
|
foreach (var userId in toUserIds)
|
||||||
|
|
@ -589,5 +596,101 @@ namespace BLL
|
||||||
|
|
||||||
return toDoItems;
|
return toDoItems;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 检查所有历史数据中连续一周以上人力不足的情况
|
||||||
|
/// </summary>
|
||||||
|
private static IEnumerable<ToDoItem> CheckHistoricalContinuousShortage(string projectId)
|
||||||
|
{
|
||||||
|
string strSql = @"
|
||||||
|
WITH LatestVersions AS (
|
||||||
|
SELECT ProjectId, MAX(Version) AS MaxVersion
|
||||||
|
FROM JDGL_SGManPower
|
||||||
|
WHERE ProjectId = @ProjectId
|
||||||
|
GROUP BY ProjectId
|
||||||
|
),
|
||||||
|
PlanVsActual AS (
|
||||||
|
SELECT
|
||||||
|
p.ProjectId,
|
||||||
|
p.UnitId,
|
||||||
|
p.UnitWorkId,
|
||||||
|
p.WorkPostId,
|
||||||
|
p.PlanDate,
|
||||||
|
p.Quantity AS PlanQuantity,
|
||||||
|
ISNULL(a.ActualQuantity, 0) AS ActualQuantity,
|
||||||
|
CASE WHEN ISNULL(a.ActualQuantity, 0) < p.Quantity THEN 1 ELSE 0 END AS IsShortage,
|
||||||
|
lv.MaxVersion
|
||||||
|
FROM JDGL_SGManPower p
|
||||||
|
INNER JOIN LatestVersions lv ON p.ProjectId = lv.ProjectId AND p.Version = lv.MaxVersion
|
||||||
|
LEFT JOIN (
|
||||||
|
SELECT
|
||||||
|
* FROM View_EmployInOutRecord
|
||||||
|
) a ON p.ProjectId = a.ProjectId
|
||||||
|
AND p.UnitId = a.UnitId
|
||||||
|
AND p.WorkPostId = a.PostId
|
||||||
|
AND p.PlanDate = a.RecordDate
|
||||||
|
AND ISNULL(p.UnitWorkId, '') = ISNULL(a.UnitWorkId, '')
|
||||||
|
WHERE p.ProjectId = @ProjectId AND p.PlanDate <= GETDATE()
|
||||||
|
),
|
||||||
|
ShortageWithRowNum AS (
|
||||||
|
SELECT *,
|
||||||
|
ROW_NUMBER() OVER (
|
||||||
|
PARTITION BY ProjectId, UnitId, UnitWorkId, WorkPostId
|
||||||
|
ORDER BY PlanDate
|
||||||
|
) AS RowNum
|
||||||
|
FROM PlanVsActual
|
||||||
|
WHERE IsShortage = 1
|
||||||
|
),
|
||||||
|
ContinuousGroups AS (
|
||||||
|
SELECT *,
|
||||||
|
DATEADD(DAY, -RowNum, PlanDate) AS GroupId
|
||||||
|
FROM ShortageWithRowNum
|
||||||
|
),
|
||||||
|
ContinuousCounts AS (
|
||||||
|
SELECT
|
||||||
|
ProjectId,
|
||||||
|
UnitId,
|
||||||
|
UnitWorkId,
|
||||||
|
WorkPostId,
|
||||||
|
GroupId,
|
||||||
|
COUNT(*) AS ContinuousDays,
|
||||||
|
MIN(PlanDate) AS StartDate,
|
||||||
|
MAX(PlanDate) AS EndDate,
|
||||||
|
SUM(PlanQuantity) as PlanQuantity,
|
||||||
|
SUM(ActualQuantity) as ActualQuantity,
|
||||||
|
MaxVersion
|
||||||
|
FROM ContinuousGroups
|
||||||
|
GROUP BY ProjectId, UnitId, UnitWorkId, WorkPostId, GroupId,MaxVersion
|
||||||
|
)
|
||||||
|
SELECT
|
||||||
|
ProjectId,
|
||||||
|
UnitId,
|
||||||
|
UnitWorkId,
|
||||||
|
WorkPostId,
|
||||||
|
ContinuousDays,
|
||||||
|
MaxVersion,
|
||||||
|
StartDate,
|
||||||
|
EndDate,PlanQuantity,ActualQuantity
|
||||||
|
FROM ContinuousCounts
|
||||||
|
WHERE ContinuousDays >= 7";
|
||||||
|
|
||||||
|
var parameters = new List<System.Data.SqlClient.SqlParameter>
|
||||||
|
{
|
||||||
|
new System.Data.SqlClient.SqlParameter("@ProjectId", projectId)
|
||||||
|
};
|
||||||
|
var warningItems = new List<ToDoItem>();
|
||||||
|
var dt = SQLHelper.GetDataTableRunText(strSql, parameters.ToArray());
|
||||||
|
|
||||||
|
|
||||||
|
foreach (DataRow row in dt.Rows)
|
||||||
|
{
|
||||||
|
warningItems.AddRange(SendManagerWarning(row["UnitId"].ToString(),row["ProjectId"].ToString(),row["WorkPostId"].ToString(),row["UnitWorkId"].ToString(),
|
||||||
|
Convert.ToDateTime(row["StartDate"]), Convert.ToDateTime(row["EndDate"]), Convert.ToInt32(row["PlanQuantity"]), Convert.ToInt32(row["ActualQuantity"])));
|
||||||
|
}
|
||||||
|
return warningItems;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -1553,6 +1553,7 @@
|
||||||
<Content Include="JDGL\SGManPower\ManPowerWorkChart.aspx" />
|
<Content Include="JDGL\SGManPower\ManPowerWorkChart.aspx" />
|
||||||
<Content Include="JDGL\SGManPower\ManPowerWorkGrid.aspx" />
|
<Content Include="JDGL\SGManPower\ManPowerWorkGrid.aspx" />
|
||||||
<Content Include="JDGL\SGManPower\SGWarningDetails.aspx" />
|
<Content Include="JDGL\SGManPower\SGWarningDetails.aspx" />
|
||||||
|
<Content Include="JDGL\SGManPower\SGWarningDetailsEdit.aspx" />
|
||||||
<Content Include="JDGL\WBSCompleteAndReal\WBSCompleteAudit.aspx" />
|
<Content Include="JDGL\WBSCompleteAndReal\WBSCompleteAudit.aspx" />
|
||||||
<Content Include="JDGL\WBSCompleteAndReal\WBSReport.aspx" />
|
<Content Include="JDGL\WBSCompleteAndReal\WBSReport.aspx" />
|
||||||
<Content Include="JDGL\WBSPlan\SeeDetailHistory.aspx" />
|
<Content Include="JDGL\WBSPlan\SeeDetailHistory.aspx" />
|
||||||
|
|
@ -15055,6 +15056,13 @@
|
||||||
<Compile Include="JDGL\SGManPower\SGWarningDetails.aspx.designer.cs">
|
<Compile Include="JDGL\SGManPower\SGWarningDetails.aspx.designer.cs">
|
||||||
<DependentUpon>SGWarningDetails.aspx</DependentUpon>
|
<DependentUpon>SGWarningDetails.aspx</DependentUpon>
|
||||||
</Compile>
|
</Compile>
|
||||||
|
<Compile Include="JDGL\SGManPower\SGWarningDetailsEdit.aspx.cs">
|
||||||
|
<SubType>ASPXCodeBehind</SubType>
|
||||||
|
<DependentUpon>SGWarningDetailsEdit.aspx</DependentUpon>
|
||||||
|
</Compile>
|
||||||
|
<Compile Include="JDGL\SGManPower\SGWarningDetailsEdit.aspx.designer.cs">
|
||||||
|
<DependentUpon>SGWarningDetailsEdit.aspx</DependentUpon>
|
||||||
|
</Compile>
|
||||||
<Compile Include="JDGL\WBSCompleteAndReal\WBSCompleteAudit.aspx.cs">
|
<Compile Include="JDGL\WBSCompleteAndReal\WBSCompleteAudit.aspx.cs">
|
||||||
<DependentUpon>WBSCompleteAudit.aspx</DependentUpon>
|
<DependentUpon>WBSCompleteAudit.aspx</DependentUpon>
|
||||||
<SubType>ASPXCodeBehind</SubType>
|
<SubType>ASPXCodeBehind</SubType>
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,102 @@
|
||||||
|
<%@ Page Language="C#" CodeBehind="SGWarningDetailsEdit.aspx.cs" Inherits="FineUIPro.Web.JDGL.SGManPower.SGWarningDetailsEdit" %>
|
||||||
|
|
||||||
|
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
||||||
|
|
||||||
|
|
||||||
|
<html xmlns="http://www.w3.org/1999/xhtml">
|
||||||
|
<head runat="server">
|
||||||
|
<title>Title</title>
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
<form id="form1" runat="server">
|
||||||
|
<f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server"/>
|
||||||
|
<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="人力预警" EnableCollapse="true"
|
||||||
|
runat="server" BoxFlex="1" DataKeyNames="Id" EnableColumnLines="true" DataIDField="Id"
|
||||||
|
AllowSorting="true" SortDirection="DESC" OnSort="Grid1_Sort" AllowPaging="true"
|
||||||
|
IsDatabasePaging="true" PageSize="15" OnPageIndexChange="Grid1_PageIndexChange" ForceFit="true"
|
||||||
|
EnableRowDoubleClickEvent="true" EnableTextSelection="True">
|
||||||
|
<Toolbars>
|
||||||
|
<f:Toolbar ID="Toolbar1" Position="Top" runat="server">
|
||||||
|
<Items>
|
||||||
|
<f:DropDownList ID="drpUnit" runat="server" Label="单位" AutoPostBack="true" AutoSelectFirstItem="True" LabelAlign="Right" EnableAjax="True"
|
||||||
|
LabelWidth="140px">
|
||||||
|
</f:DropDownList>
|
||||||
|
<f:DatePicker ID="txtStartTime" runat="server" Label="开始日期" LabelWidth="80px" Width="220px" DateFormatString="yyyy-MM-dd">
|
||||||
|
</f:DatePicker>
|
||||||
|
<f:DatePicker ID="txtEndTime" runat="server" Label="结束日期" LabelWidth="80px" Width="220px" DateFormatString="yyyy-MM-dd">
|
||||||
|
</f:DatePicker>
|
||||||
|
<f:DropDownList runat="server" ID="drpUnitWork" Label="装置"></f:DropDownList>
|
||||||
|
<f:DropDownList runat="server" ID="drpWorkPost" Label="岗位"></f:DropDownList>
|
||||||
|
<f:ToolbarFill ID="ToolbarFill1" runat="server">
|
||||||
|
</f:ToolbarFill>
|
||||||
|
<f:Button ID="btnQuery" ToolTip="查询" Text="查询" Icon="SystemSearch" runat="server" EnablePostBack="true"
|
||||||
|
OnClick="btnQuery_OnClick">
|
||||||
|
</f:Button>
|
||||||
|
</Items>
|
||||||
|
</f:Toolbar>
|
||||||
|
</Toolbars>
|
||||||
|
<Columns>
|
||||||
|
<f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center"
|
||||||
|
TextAlign="Center"/>
|
||||||
|
<f:TemplateField Width="260px" HeaderText="单位" HeaderTextAlign="Center" TextAlign="Left" ColumnID="tfUnitName">
|
||||||
|
<ItemTemplate>
|
||||||
|
<asp:Label ID="lbUnitName" runat="server" Text='<%#ConvertUnitName(Eval("UnitId")) %>'></asp:Label>
|
||||||
|
</ItemTemplate>
|
||||||
|
</f:TemplateField>
|
||||||
|
<f:TemplateField Width="150px" HeaderText="装置" HeaderTextAlign="Center" TextAlign="Left" ColumnID="tfUnitWorkName">
|
||||||
|
<ItemTemplate>
|
||||||
|
<asp:Label ID="lbUnitWorkName" runat="server" Text='<%#ConvertUnitWorkName(Eval("UnitWorkId")) %>'></asp:Label>
|
||||||
|
</ItemTemplate>
|
||||||
|
</f:TemplateField>
|
||||||
|
<f:TemplateField Width="150px" HeaderText="岗位" HeaderTextAlign="Center" TextAlign="Left" ColumnID="tfWorkPostName">
|
||||||
|
<ItemTemplate>
|
||||||
|
<asp:Label ID="lbtfWorkPostName" runat="server" Text='<%#ConvertWorkPostName(Eval("WorkPostId")) %>'></asp:Label>
|
||||||
|
</ItemTemplate>
|
||||||
|
</f:TemplateField>
|
||||||
|
|
||||||
|
<f:RenderField Width="120px" ColumnID="PlanDate" DataField="PlanDate" SortField="PlanDate"
|
||||||
|
FieldType="Date" Renderer="Date" HeaderText="时间" HeaderTextAlign="Center" TextAlign="Left">
|
||||||
|
</f:RenderField>
|
||||||
|
<f:RenderField Width="100px" ColumnID="Quantity" DataField="Quantity"
|
||||||
|
HeaderText="计划人力" HeaderTextAlign="Center" TextAlign="Left">
|
||||||
|
</f:RenderField>
|
||||||
|
<f:RenderField Width="100px" ColumnID="ActualQuantity" DataField="ActualQuantity"
|
||||||
|
HeaderText="实际考勤" HeaderTextAlign="Center" TextAlign="Left">
|
||||||
|
</f:RenderField>
|
||||||
|
</Columns>
|
||||||
|
<Listeners>
|
||||||
|
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu"/>
|
||||||
|
</Listeners>
|
||||||
|
<PageItems>
|
||||||
|
<f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
|
||||||
|
</f:ToolbarSeparator>
|
||||||
|
<f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
|
||||||
|
</f:ToolbarText>
|
||||||
|
<f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
|
||||||
|
OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
|
||||||
|
</f:DropDownList>
|
||||||
|
</PageItems>
|
||||||
|
</f:Grid>
|
||||||
|
</Items>
|
||||||
|
</f:Panel>
|
||||||
|
<f:Menu ID="Menu1" runat="server">
|
||||||
|
|
||||||
|
</f:Menu>
|
||||||
|
|
||||||
|
</form>
|
||||||
|
<script type="text/javascript">
|
||||||
|
var menuID = '<%= Menu1.ClientID %>';
|
||||||
|
// 返回false，来阻止浏览器右键菜单
|
||||||
|
function onRowContextMenu(event, rowId) {
|
||||||
|
F(menuID).show(); //showAt(event.pageX, event.pageY);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
function reloadGrid() {
|
||||||
|
__doPostBack(null, 'reloadGrid');
|
||||||
|
}
|
||||||
|
</script>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
|
|
@ -0,0 +1,314 @@
|
||||||
|
using BLL;
|
||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Data;
|
||||||
|
using System.Data.SqlClient;
|
||||||
|
using System.Linq;
|
||||||
|
|
||||||
|
|
||||||
|
namespace FineUIPro.Web.JDGL.SGManPower
|
||||||
|
{
|
||||||
|
public partial class SGWarningDetailsEdit : PageBase
|
||||||
|
{
|
||||||
|
#region 定义项
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 项目主键
|
||||||
|
/// </summary>
|
||||||
|
public string ProjectId
|
||||||
|
{
|
||||||
|
get { return (string)ViewState["ProjectId"]; }
|
||||||
|
set { ViewState["ProjectId"] = value; }
|
||||||
|
}
|
||||||
|
|
||||||
|
public string UnitId
|
||||||
|
{
|
||||||
|
get => (string)ViewState["UnitId"];
|
||||||
|
set => ViewState["UnitId"] = value;
|
||||||
|
}
|
||||||
|
|
||||||
|
public string UnitWorkId
|
||||||
|
{
|
||||||
|
get => (string)ViewState["UnitWorkId"];
|
||||||
|
set => ViewState["UnitWorkId"] = value;
|
||||||
|
}
|
||||||
|
|
||||||
|
public string WorkPostId
|
||||||
|
{
|
||||||
|
get => (string)ViewState["WorkPostId"];
|
||||||
|
set => ViewState["WorkPostId"] = value;
|
||||||
|
}
|
||||||
|
public string StartTime
|
||||||
|
{
|
||||||
|
get => (string)ViewState["StartTime"];
|
||||||
|
set => ViewState["StartTime"] = value;
|
||||||
|
}
|
||||||
|
|
||||||
|
public string EndTime
|
||||||
|
{
|
||||||
|
get => (string)ViewState["EndTime"];
|
||||||
|
set => ViewState["EndTime"] = value;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static string Version = "1";
|
||||||
|
|
||||||
|
#endregion
|
||||||
|
|
||||||
|
#region 加载页面
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 加载页面
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="sender"></param>
|
||||||
|
/// <param name="e"></param>
|
||||||
|
protected void Page_Load(object sender, EventArgs e)
|
||||||
|
{
|
||||||
|
if (!IsPostBack)
|
||||||
|
{
|
||||||
|
this.ProjectId = this.CurrUser.LoginProjectId;
|
||||||
|
// 判断projectId参数是否为空
|
||||||
|
if (!string.IsNullOrEmpty(Request.Params["projectId"]))
|
||||||
|
{
|
||||||
|
this.ProjectId = Request.Params["projectId"];
|
||||||
|
}
|
||||||
|
Funs.DropDownPageSize(this.ddlPageSize);
|
||||||
|
ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
|
||||||
|
BLL.UnitService.GetUnit(this.drpUnit, this.ProjectId, true);//单位
|
||||||
|
this.txtStartTime.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now.AddDays(-30));
|
||||||
|
this.txtEndTime.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now.AddDays(30));
|
||||||
|
WorkPostService.InitWorkPostDropDownList(this.drpWorkPost, true); //岗位
|
||||||
|
UnitWorkService.InitUnitWorkDownList(drpUnitWork, this.ProjectId, true); //单位工程(装置)
|
||||||
|
this.UnitId = Request.Params["unitId"];
|
||||||
|
this.UnitWorkId = Request.Params["unitWorkId"];
|
||||||
|
this.WorkPostId = Request.Params["workPostId"];
|
||||||
|
this.StartTime = Request.Params["startTime"];
|
||||||
|
this.EndTime = Request.Params["endTime"];
|
||||||
|
|
||||||
|
if (!string.IsNullOrEmpty(this.UnitId))
|
||||||
|
{
|
||||||
|
this.drpUnit.SelectedValue = UnitId;
|
||||||
|
}
|
||||||
|
if (!string.IsNullOrEmpty(this.UnitWorkId))
|
||||||
|
{
|
||||||
|
this.drpUnitWork.SelectedValue = UnitWorkId;
|
||||||
|
}
|
||||||
|
if (!string.IsNullOrEmpty(this.WorkPostId))
|
||||||
|
{
|
||||||
|
this.drpWorkPost.SelectedValue = WorkPostId;
|
||||||
|
}
|
||||||
|
if (!string.IsNullOrEmpty(this.StartTime))
|
||||||
|
{
|
||||||
|
this.txtStartTime.Text = StartTime;
|
||||||
|
}
|
||||||
|
if (!string.IsNullOrEmpty(this.EndTime))
|
||||||
|
{
|
||||||
|
this.txtEndTime.Text = EndTime;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
var sgMan = Funs.DB.JDGL_SGManPower.Where(x => x.ProjectId == this.ProjectId).OrderByDescending(x => x.Version)
|
||||||
|
.FirstOrDefault();
|
||||||
|
if (sgMan != null)
|
||||||
|
{
|
||||||
|
Version = sgMan.Version;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 绑定表格
|
||||||
|
BindGrid();
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 绑定数据
|
||||||
|
/// </summary>
|
||||||
|
private void BindGrid()
|
||||||
|
{
|
||||||
|
string strSql =
|
||||||
|
@"SELECT
|
||||||
|
p.Id,
|
||||||
|
p.ProjectId,
|
||||||
|
p.UnitId,
|
||||||
|
p.UnitWorkId,
|
||||||
|
p.WorkPostId,
|
||||||
|
p.Version,
|
||||||
|
p.Quantity,
|
||||||
|
p.PlanDate,
|
||||||
|
ISNULL(a.ActualQuantity, 0) AS ActualQuantity
|
||||||
|
FROM JDGL_SGManPower p
|
||||||
|
LEFT JOIN (
|
||||||
|
SELECT * from View_EmployInOutRecord
|
||||||
|
) a ON p.ProjectId = a.ProjectId
|
||||||
|
AND p.UnitId = a.UnitId
|
||||||
|
AND p.WorkPostId = a.PostId
|
||||||
|
AND p.PlanDate = a.RecordDate
|
||||||
|
AND ISNULL(p.UnitWorkId, '') = ISNULL(a.UnitWorkId, '') where p.Version = '" + Version + "'";
|
||||||
|
List<SqlParameter> listStr = new List<SqlParameter>();
|
||||||
|
|
||||||
|
if (!string.IsNullOrEmpty(this.ProjectId))
|
||||||
|
{
|
||||||
|
strSql += " AND p.ProjectId = @ProjectId ";
|
||||||
|
listStr.Add(new SqlParameter("@ProjectId", this.ProjectId));
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!string.IsNullOrEmpty(this.drpUnit.SelectedValue) && this.drpUnit.SelectedValue != "null")
|
||||||
|
{
|
||||||
|
strSql += " AND p.UnitId = @UnitId ";
|
||||||
|
listStr.Add(new SqlParameter("@UnitId", this.drpUnit.SelectedValue));
|
||||||
|
}
|
||||||
|
if (!string.IsNullOrEmpty(this.drpUnitWork.SelectedValue) && this.drpUnitWork.SelectedValue != "null")
|
||||||
|
{
|
||||||
|
strSql += " AND p.UnitWorkId = @UnitWorkId ";
|
||||||
|
listStr.Add(new SqlParameter("@UnitWorkId", this.drpUnitWork.SelectedValue));
|
||||||
|
}
|
||||||
|
if (!string.IsNullOrEmpty(this.drpWorkPost.SelectedValue) && this.drpWorkPost.SelectedValue != "null")
|
||||||
|
{
|
||||||
|
strSql += " AND p.WorkPostId = @WorkPostId ";
|
||||||
|
listStr.Add(new SqlParameter("@WorkPostId", this.drpWorkPost.SelectedValue));
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!string.IsNullOrEmpty(this.txtStartTime.Text))
|
||||||
|
{
|
||||||
|
strSql += " AND p.PlanDate >= @StartTime ";
|
||||||
|
listStr.Add(new SqlParameter("@StartTime", Convert.ToDateTime(this.txtStartTime.Text)));
|
||||||
|
}
|
||||||
|
if (!string.IsNullOrEmpty(this.txtEndTime.Text))
|
||||||
|
{
|
||||||
|
strSql += " AND p.PlanDate <= @EndTime ";
|
||||||
|
listStr.Add(new SqlParameter("@EndTime", Convert.ToDateTime(this.txtEndTime.Text)));
|
||||||
|
}
|
||||||
|
|
||||||
|
strSql += " ORDER BY p.PlanDate, p.UnitId, p.UnitWorkId, p.WorkPostId";
|
||||||
|
|
||||||
|
SqlParameter[] parameter = listStr.ToArray();
|
||||||
|
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
|
||||||
|
Grid1.RecordCount = tb.Rows.Count;
|
||||||
|
var table = this.GetPagedDataTable(Grid1, tb);
|
||||||
|
Grid1.DataSource = table;
|
||||||
|
Grid1.DataBind();
|
||||||
|
}
|
||||||
|
|
||||||
|
#endregion
|
||||||
|
|
||||||
|
#region 分页、关闭窗口
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 分页
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="sender"></param>
|
||||||
|
/// <param name="e"></param>
|
||||||
|
protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
|
||||||
|
{
|
||||||
|
Grid1.PageIndex = e.NewPageIndex;
|
||||||
|
BindGrid();
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 分页显示条数下拉框
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="sender"></param>
|
||||||
|
/// <param name="e"></param>
|
||||||
|
protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
|
||||||
|
{
|
||||||
|
Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue);
|
||||||
|
BindGrid();
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 排序
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="sender"></param>
|
||||||
|
/// <param name="e"></param>
|
||||||
|
protected void Grid1_Sort(object sender, FineUIPro.GridSortEventArgs e)
|
||||||
|
{
|
||||||
|
BindGrid();
|
||||||
|
}
|
||||||
|
|
||||||
|
#endregion
|
||||||
|
|
||||||
|
#region 格式化字符串
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 格式化受伤情况
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="injury"></param>
|
||||||
|
/// <returns></returns>
|
||||||
|
protected string ConvertWorkPostName(object workPostId)
|
||||||
|
{
|
||||||
|
string name = string.Empty;
|
||||||
|
if (workPostId != null)
|
||||||
|
{
|
||||||
|
name = BLL.WorkPostService.getWorkPostNameById(workPostId.ToString());
|
||||||
|
}
|
||||||
|
|
||||||
|
return name;
|
||||||
|
}
|
||||||
|
|
||||||
|
protected string ConvertUnitName(object unitId)
|
||||||
|
{
|
||||||
|
string name = string.Empty;
|
||||||
|
if (unitId != null)
|
||||||
|
{
|
||||||
|
name = UnitService.GetUnitNameByUnitId(unitId);
|
||||||
|
}
|
||||||
|
|
||||||
|
return name;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 格式化受伤情况
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="injury"></param>
|
||||||
|
/// <returns></returns>
|
||||||
|
protected string ConvertUnitWorkName(object unitWorkId)
|
||||||
|
{
|
||||||
|
string name = string.Empty;
|
||||||
|
if (unitWorkId != null)
|
||||||
|
{
|
||||||
|
name = BLL.UnitWorkService.GetNameById(unitWorkId.ToString());
|
||||||
|
}
|
||||||
|
|
||||||
|
return name;
|
||||||
|
}
|
||||||
|
|
||||||
|
#endregion
|
||||||
|
|
||||||
|
#region 查询事件
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 查询
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="sender"></param>
|
||||||
|
/// <param name="e"></param>
|
||||||
|
protected void btnQuery_OnClick(object sender, EventArgs e)
|
||||||
|
{
|
||||||
|
if (drpUnit.SelectedValue != Const._Null && !string.IsNullOrEmpty(drpUnit.SelectedValue))
|
||||||
|
{
|
||||||
|
UnitId = drpUnit.SelectedValue;
|
||||||
|
}
|
||||||
|
if (drpUnitWork.SelectedValue != Const._Null && !string.IsNullOrEmpty(drpUnitWork.SelectedValue))
|
||||||
|
{
|
||||||
|
UnitWorkId = drpUnitWork.SelectedValue;
|
||||||
|
}
|
||||||
|
if (drpWorkPost.SelectedValue != Const._Null && !string.IsNullOrEmpty(drpWorkPost.SelectedValue))
|
||||||
|
{
|
||||||
|
WorkPostId = drpWorkPost.SelectedValue;
|
||||||
|
}
|
||||||
|
if ( !string.IsNullOrEmpty(this.txtStartTime.Text))
|
||||||
|
{
|
||||||
|
StartTime = this.txtStartTime.Text;
|
||||||
|
}
|
||||||
|
if ( !string.IsNullOrEmpty(this.txtStartTime.Text))
|
||||||
|
{
|
||||||
|
EndTime = this.txtEndTime.Text;
|
||||||
|
}
|
||||||
|
|
||||||
|
this.BindGrid();
|
||||||
|
}
|
||||||
|
|
||||||
|
#endregion
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,188 @@
|
||||||
|
//------------------------------------------------------------------------------
|
||||||
|
// <auto-generated>
|
||||||
|
// This code was generated by a tool.
|
||||||
|
//
|
||||||
|
// Changes to this file may cause incorrect behavior and will be lost if
|
||||||
|
// the code is regenerated.
|
||||||
|
// </auto-generated>
|
||||||
|
//------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
namespace FineUIPro.Web.JDGL.SGManPower
|
||||||
|
{
|
||||||
|
|
||||||
|
|
||||||
|
public partial class SGWarningDetailsEdit
|
||||||
|
{
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// form1 control.
|
||||||
|
/// </summary>
|
||||||
|
/// <remarks>
|
||||||
|
/// Auto-generated field.
|
||||||
|
/// To modify move field declaration from designer file to code-behind file.
|
||||||
|
/// </remarks>
|
||||||
|
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// PageManager1 control.
|
||||||
|
/// </summary>
|
||||||
|
/// <remarks>
|
||||||
|
/// Auto-generated field.
|
||||||
|
/// To modify move field declaration from designer file to code-behind file.
|
||||||
|
/// </remarks>
|
||||||
|
protected global::FineUIPro.PageManager PageManager1;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Panel1 control.
|
||||||
|
/// </summary>
|
||||||
|
/// <remarks>
|
||||||
|
/// Auto-generated field.
|
||||||
|
/// To modify move field declaration from designer file to code-behind file.
|
||||||
|
/// </remarks>
|
||||||
|
protected global::FineUIPro.Panel Panel1;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Grid1 control.
|
||||||
|
/// </summary>
|
||||||
|
/// <remarks>
|
||||||
|
/// Auto-generated field.
|
||||||
|
/// To modify move field declaration from designer file to code-behind file.
|
||||||
|
/// </remarks>
|
||||||
|
protected global::FineUIPro.Grid Grid1;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Toolbar1 control.
|
||||||
|
/// </summary>
|
||||||
|
/// <remarks>
|
||||||
|
/// Auto-generated field.
|
||||||
|
/// To modify move field declaration from designer file to code-behind file.
|
||||||
|
/// </remarks>
|
||||||
|
protected global::FineUIPro.Toolbar Toolbar1;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// drpUnit control.
|
||||||
|
/// </summary>
|
||||||
|
/// <remarks>
|
||||||
|
/// Auto-generated field.
|
||||||
|
/// To modify move field declaration from designer file to code-behind file.
|
||||||
|
/// </remarks>
|
||||||
|
protected global::FineUIPro.DropDownList drpUnit;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// txtStartTime control.
|
||||||
|
/// </summary>
|
||||||
|
/// <remarks>
|
||||||
|
/// Auto-generated field.
|
||||||
|
/// To modify move field declaration from designer file to code-behind file.
|
||||||
|
/// </remarks>
|
||||||
|
protected global::FineUIPro.DatePicker txtStartTime;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// txtEndTime control.
|
||||||
|
/// </summary>
|
||||||
|
/// <remarks>
|
||||||
|
/// Auto-generated field.
|
||||||
|
/// To modify move field declaration from designer file to code-behind file.
|
||||||
|
/// </remarks>
|
||||||
|
protected global::FineUIPro.DatePicker txtEndTime;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// drpUnitWork control.
|
||||||
|
/// </summary>
|
||||||
|
/// <remarks>
|
||||||
|
/// Auto-generated field.
|
||||||
|
/// To modify move field declaration from designer file to code-behind file.
|
||||||
|
/// </remarks>
|
||||||
|
protected global::FineUIPro.DropDownList drpUnitWork;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// drpWorkPost control.
|
||||||
|
/// </summary>
|
||||||
|
/// <remarks>
|
||||||
|
/// Auto-generated field.
|
||||||
|
/// To modify move field declaration from designer file to code-behind file.
|
||||||
|
/// </remarks>
|
||||||
|
protected global::FineUIPro.DropDownList drpWorkPost;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// ToolbarFill1 control.
|
||||||
|
/// </summary>
|
||||||
|
/// <remarks>
|
||||||
|
/// Auto-generated field.
|
||||||
|
/// To modify move field declaration from designer file to code-behind file.
|
||||||
|
/// </remarks>
|
||||||
|
protected global::FineUIPro.ToolbarFill ToolbarFill1;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// btnQuery control.
|
||||||
|
/// </summary>
|
||||||
|
/// <remarks>
|
||||||
|
/// Auto-generated field.
|
||||||
|
/// To modify move field declaration from designer file to code-behind file.
|
||||||
|
/// </remarks>
|
||||||
|
protected global::FineUIPro.Button btnQuery;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// lbUnitName control.
|
||||||
|
/// </summary>
|
||||||
|
/// <remarks>
|
||||||
|
/// Auto-generated field.
|
||||||
|
/// To modify move field declaration from designer file to code-behind file.
|
||||||
|
/// </remarks>
|
||||||
|
protected global::System.Web.UI.WebControls.Label lbUnitName;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// lbUnitWorkName control.
|
||||||
|
/// </summary>
|
||||||
|
/// <remarks>
|
||||||
|
/// Auto-generated field.
|
||||||
|
/// To modify move field declaration from designer file to code-behind file.
|
||||||
|
/// </remarks>
|
||||||
|
protected global::System.Web.UI.WebControls.Label lbUnitWorkName;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// lbtfWorkPostName control.
|
||||||
|
/// </summary>
|
||||||
|
/// <remarks>
|
||||||
|
/// Auto-generated field.
|
||||||
|
/// To modify move field declaration from designer file to code-behind file.
|
||||||
|
/// </remarks>
|
||||||
|
protected global::System.Web.UI.WebControls.Label lbtfWorkPostName;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// ToolbarSeparator1 control.
|
||||||
|
/// </summary>
|
||||||
|
/// <remarks>
|
||||||
|
/// Auto-generated field.
|
||||||
|
/// To modify move field declaration from designer file to code-behind file.
|
||||||
|
/// </remarks>
|
||||||
|
protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// ToolbarText1 control.
|
||||||
|
/// </summary>
|
||||||
|
/// <remarks>
|
||||||
|
/// Auto-generated field.
|
||||||
|
/// To modify move field declaration from designer file to code-behind file.
|
||||||
|
/// </remarks>
|
||||||
|
protected global::FineUIPro.ToolbarText ToolbarText1;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// ddlPageSize control.
|
||||||
|
/// </summary>
|
||||||
|
/// <remarks>
|
||||||
|
/// Auto-generated field.
|
||||||
|
/// To modify move field declaration from designer file to code-behind file.
|
||||||
|
/// </remarks>
|
||||||
|
protected global::FineUIPro.DropDownList ddlPageSize;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Menu1 control.
|
||||||
|
/// </summary>
|
||||||
|
/// <remarks>
|
||||||
|
/// Auto-generated field.
|
||||||
|
/// To modify move field declaration from designer file to code-behind file.
|
||||||
|
/// </remarks>
|
||||||
|
protected global::FineUIPro.Menu Menu1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -115,6 +115,9 @@
|
||||||
<f:RenderField Width="80px" ColumnID="StateStr" DataField="StateStr" SortField="StateStr"
|
<f:RenderField Width="80px" ColumnID="StateStr" DataField="StateStr" SortField="StateStr"
|
||||||
FieldType="String" HeaderText="状态" HeaderTextAlign="Center" TextAlign="Center">
|
FieldType="String" HeaderText="状态" HeaderTextAlign="Center" TextAlign="Center">
|
||||||
</f:RenderField>
|
</f:RenderField>
|
||||||
|
<f:RenderField Width="150px" ColumnID="LastProgress" DataField="LastProgress"
|
||||||
|
FieldType="String" HeaderText="最新进展" HeaderTextAlign="Center" TextAlign="Center">
|
||||||
|
</f:RenderField>
|
||||||
<f:RenderField Width="120px" ColumnID="CreateDate" DataField="CreateDate" SortField="CreateDate"
|
<f:RenderField Width="120px" ColumnID="CreateDate" DataField="CreateDate" SortField="CreateDate"
|
||||||
HeaderText="提出日期" HeaderTextAlign="Center" TextAlign="Center" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd">
|
HeaderText="提出日期" HeaderTextAlign="Center" TextAlign="Center" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd">
|
||||||
</f:RenderField>
|
</f:RenderField>
|
||||||
|
|
|
||||||
|
|
@ -144,17 +144,17 @@ namespace FineUIPro.Web
|
||||||
string returnDbHtml = "";
|
string returnDbHtml = "";
|
||||||
var getDataList = Funs.DB.Sp_WorkBench_GetToDoItems(userId, sType).ToList();
|
var getDataList = Funs.DB.Sp_WorkBench_GetToDoItems(userId, sType).ToList();
|
||||||
//调人力预警接口
|
//调人力预警接口
|
||||||
if (sType != "2")
|
// if (sType != "2")
|
||||||
{
|
// {
|
||||||
var sgList = SGManPowerService.CheckAndSendPersonWarning(userId);
|
// var sgList = SGManPowerService.CheckAndSendPersonWarning(userId);
|
||||||
if (sgList != null)
|
// if (sgList != null)
|
||||||
{
|
// {
|
||||||
foreach (var item in sgList)
|
// foreach (var item in sgList)
|
||||||
{
|
// {
|
||||||
getDataList.Add(item);
|
// getDataList.Add(item);
|
||||||
}
|
// }
|
||||||
}
|
// }
|
||||||
}
|
// }
|
||||||
//把getDataList和sgList的数据合并
|
//把getDataList和sgList的数据合并
|
||||||
foreach (var item in getDataList)
|
foreach (var item in getDataList)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
1098
SGGL/Model/Model.cs
1098
SGGL/Model/Model.cs
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue