lpf
/
CNCEC_SUBQHSE_WUHUAN
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://47.104.102.122:3000/lpf/CNCEC_SUBQHSE_WUHUAN

This commit is contained in:
夏菊 2025-03-27 22:24:58 +08:00
parent 954c0a3a6a 022ab2d514
commit 61f0bbe0cb
12 changed files with 625 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
SGGL/BLL/ZHGL/RealName/SynchroSetService.cs
View File

@ -1444,10 +1444,10 @@ namespace BLL
string contenttype = "application/json;charset=unicode"; string contenttype = "application/json;charset=unicode";
var getData = (from x in Funs.DB.SitePerson_Person var getData = (from x in Funs.DB.SitePerson_Person
join y in Funs.DB.Base_Project on x.ProjectId equals y.ProjectId join y in Funs.DB.Base_Project on x.ProjectId equals y.ProjectId
join z in Funs.DB.RealName_Project on y.ContractNo equals z.ProCode join z in Funs.DB.RealName_Project on y.JTProjectCode equals z.ProCode
join v in Funs.DB.ProjectData_TeamGroup on x.TeamGroupId equals v.TeamGroupId join v in Funs.DB.ProjectData_TeamGroup on x.TeamGroupId equals v.TeamGroupId
join w in Funs.DB.Base_WorkPost on x.WorkPostId equals w.WorkPostId join w in Funs.DB.Base_WorkPost on x.WorkPostId equals w.WorkPostId
where x.IdentityCard == identityCard && y.ContractNo == proCode where x.IdentityCard == identityCard && y.JTProjectCode == proCode
&& v.TeamId.HasValue && z.JTproCode != null && v.TeamId.HasValue && z.JTproCode != null
&& ((type == Const.BtnAdd && x.HeadImage != null && x.HeadImage.Length > 0) || (type == Const.BtnModify && x.RealNameAddTime.HasValue)) && ((type == Const.BtnAdd && x.HeadImage != null && x.HeadImage.Length > 0) || (type == Const.BtnModify && x.RealNameAddTime.HasValue))
select new select new
@ -1507,7 +1507,7 @@ namespace BLL
pushContent = JsonConvert.SerializeObject(addlistObject); pushContent = JsonConvert.SerializeObject(addlistObject);
returndata = BLL.APIGetHttpService.OutsideHttp(Funs.RealNameApiUrl + "/foreignApi/accept/persons", "POST", contenttype, newToken, pushContent); returndata = BLL.APIGetHttpService.OutsideHttp(Funs.RealNameApiUrl + "/foreignApi/accept/persons", "POST", contenttype, newToken, pushContent);
} }
InsertRealNamePushLog(null, proCode, "推送人员数据", sucess, code, mess, returndata, pushContent);
if (!string.IsNullOrEmpty(returndata)) if (!string.IsNullOrEmpty(returndata))
{ {
JObject obj = JObject.Parse(returndata); JObject obj = JObject.Parse(returndata);
@ -1545,8 +1545,7 @@ namespace BLL
} }
} }
} }
//InsertRealNamePushLog(null, proCode, "推送人员数据", sucess, code, mess, data, pushContent);
InsertRealNamePushLog(null, proCode, "推送人员数据", sucess, code, mess, data, pushContent);
if (data.Contains("已存在") || mess.Contains("已存在")) if (data.Contains("已存在") || mess.Contains("已存在"))
{ {
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))

6
SGGL/FineUIPro.Web/DataShow/EduTrain.aspx.cs
View File

@ -91,7 +91,8 @@ namespace FineUIPro.Web.DataShow
TrainDepart as UnitName TrainDepart as UnitName
From Bo_Sheng_Train F From Bo_Sheng_Train F
LEFT JOIN Base_Project AS Project ON F.ProjectId=Project.ProjectId LEFT JOIN Base_Project AS Project ON F.ProjectId=Project.ProjectId
)f WHERE 1=1 and Project.ProjectState ='1' "; where Project.ProjectState ='1'
)f WHERE 1=1 ";
#region 总数 #region 总数
var strSqlSum = @"select Count(*)as allCount from( var strSqlSum = @"select Count(*)as allCount from(
@ -129,7 +130,8 @@ namespace FineUIPro.Web.DataShow
TrainDepart as UnitName TrainDepart as UnitName
From Bo_Sheng_Train F From Bo_Sheng_Train F
LEFT JOIN Base_Project AS Project ON F.ProjectId=Project.ProjectId LEFT JOIN Base_Project AS Project ON F.ProjectId=Project.ProjectId
)f WHERE 1=1 and Project.ProjectState ='1'" ; WHERE Project.ProjectState ='1'
)f WHERE 1=1 " ;
#endregion #endregion
if (this.drpProject.SelectedValue != Const._Null) if (this.drpProject.SelectedValue != Const._Null)

4
SGGL/FineUIPro.Web/DataShow/GJSX.aspx.cs
View File

@ -166,7 +166,7 @@ namespace FineUIPro.Web.DataShow
{ {
var datetime1 = Funs.GetNewDateTime(this.txtStartTime.Text); var datetime1 = Funs.GetNewDateTime(this.txtStartTime.Text);
var datetime2 = Funs.GetNewDateTime(this.txtStartTime.Text); var datetime2 = Funs.GetNewDateTime(this.txtStartTime.Text);
var getT = Funs.DB.GJSX.Where(x => x.ProjectId == projectId.ToString()); var getT = Funs.DB.GJSX.Where(x => x.ProjectId == projectId.ToString() && x.State != "1");
if (datetime1.HasValue) if (datetime1.HasValue)
{ {
getT = getT.Where(x => x.CreateDate >= datetime1); getT = getT.Where(x => x.CreateDate >= datetime1);
@ -210,7 +210,7 @@ namespace FineUIPro.Web.DataShow
{ {
var datetime1 = Funs.GetNewDateTime(this.txtStartTime.Text); var datetime1 = Funs.GetNewDateTime(this.txtStartTime.Text);
var datetime2 = Funs.GetNewDateTime(this.txtStartTime.Text); var datetime2 = Funs.GetNewDateTime(this.txtStartTime.Text);
var getT = Funs.DB.GJSX.Where(x => x.ProjectId == projectId.ToString() && x.State != "0"); var getT = Funs.DB.GJSX.Where(x => x.ProjectId == projectId.ToString() && x.State != "0" && x.State != "1");
if (datetime1.HasValue) if (datetime1.HasValue)
{ {
getT = getT.Where(x => x.CreateDate >= datetime1); getT = getT.Where(x => x.CreateDate >= datetime1);

2
SGGL/FineUIPro.Web/DataShow/GJSXItem.aspx.cs
View File

@ -39,7 +39,7 @@ namespace FineUIPro.Web.DataShow
/// </summary> /// </summary>
private void BindGrid() private void BindGrid()
{ {
string strSql = ""; string strSql = "and state <> '1'";
List<SqlParameter> listStr = new List<SqlParameter>(); List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@ProjectId", Request.Params["projectId"])); listStr.Add(new SqlParameter("@ProjectId", Request.Params["projectId"]));

148
SGGL/FineUIPro.Web/DataShow/JD.aspx
View File

@ -23,8 +23,8 @@
<f:PageManager ID="PageManager1" runat="server" AutoSizePanelID="TabStrip1" /> <f:PageManager ID="PageManager1" runat="server" AutoSizePanelID="TabStrip1" />
<f:Panel ID="Panel2" runat="server" ShowHeader="false" ShowBorder="false" ColumnWidth="100%" Margin="5px" BodyPadding="5px"> <f:Panel ID="Panel2" runat="server" ShowHeader="false" ShowBorder="false" ColumnWidth="100%" Margin="5px" BodyPadding="5px">
<Items> <Items>
<f:TabStrip ID="TabStrip1" CssClass="f-tabstrip-theme-simple" ShowBorder="true" AutoScroll="true" <f:TabStrip ID="TabStrip1" CssClass="f-tabstrip-theme-simple" ShowBorder="true" AutoScroll="true" AutoPostBack="true"
TabPosition="Top" MarginBottom="30px" EnableTabCloseMenu="false" runat="server" TabPosition="Top" MarginBottom="30px" EnableTabCloseMenu="false" runat="server" OnTabIndexChanged="TabStrip1_TabIndexChanged"
ActiveTabIndex="0"> ActiveTabIndex="0">
<Tabs> <Tabs>
<f:Tab ID="Tab1" Title="各项目基本情况" BodyPadding="5px" Layout="VBox" IconFont="Bookmark" runat="server"> <f:Tab ID="Tab1" Title="各项目基本情况" BodyPadding="5px" Layout="VBox" IconFont="Bookmark" runat="server">
@ -56,10 +56,16 @@
<f:RenderField Width="150px" ColumnID="ProjectCode" DataField="ProjectCode" FieldType="String" HeaderText="项目号" TextAlign="Left" <f:RenderField Width="150px" ColumnID="ProjectCode" DataField="ProjectCode" FieldType="String" HeaderText="项目号" TextAlign="Left"
HeaderTextAlign="Center"> HeaderTextAlign="Center">
</f:RenderField> </f:RenderField>
<f:RenderField Width="350px" ColumnID="ProjectName" DataField="ProjectName" FieldType="String" HeaderText="项目名称" TextAlign="Left" <f:RenderField Width="350px" ColumnID="ProjectName" ExpandUnusedSpace="true" DataField="ProjectName" FieldType="String" HeaderText="项目名称" TextAlign="Left"
HeaderTextAlign="Center"> HeaderTextAlign="Center">
</f:RenderField> </f:RenderField>
<f:RenderField Width="100px" ColumnID="RealNum" DataField="RealNum" FieldType="Float" HeaderText="项目进度" TextAlign="Right" <f:RenderField Width="100px" ColumnID="RealNum" DataField="RealNum" FieldType="Float" HeaderText="项目进度(%)" TextAlign="Right"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="MonthPlanRate" DataField="MonthPlanRate" FieldType="Float" HeaderText="月度计划准点率(%)" TextAlign="Right"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="WeekPlanRate" DataField="WeekPlanRate" FieldType="Float" HeaderText="周计划准点率(%)" TextAlign="Right"
HeaderTextAlign="Center"> HeaderTextAlign="Center">
</f:RenderField> </f:RenderField>
</Columns> </Columns>
@ -77,10 +83,144 @@
</f:Tab> </f:Tab>
<f:Tab ID="Tab2" Title="月度计划统计" BodyPadding="5px" Layout="VBox" IconFont="Bookmark" runat="server"> <f:Tab ID="Tab2" Title="月度计划统计" BodyPadding="5px" Layout="VBox" IconFont="Bookmark" runat="server">
<Items> <Items>
<f:Grid ID="Grid2" ShowBorder="true" ShowHeader="false" Title="各项目基本情况" EnableCollapse="true"
runat="server" BoxFlex="1" DataKeyNames="ProjectId" DataIDField="ProjectId" AllowSorting="true" MarginRight="15px"
SortField="ProjectName" SortDirection="ASC" OnSort="Grid2_Sort" EnableColumnLines="true" AllowPaging="true"
IsDatabasePaging="true" PageSize="20" OnPageIndexChange="Grid2_PageIndexChange" ForceFit="true"
EnableTextSelection="True">
<Toolbars>
<f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:DropDownList ID="drpProject2" runat="server" Label="项目" Width="400px" LabelWidth="80px" LabelAlign="Right"
EnableEdit="true" OnSelectedIndexChanged="TextBox2_TextChanged" AutoPostBack="true">
</f:DropDownList>
<f:ToolbarFill runat="server"></f:ToolbarFill>
<f:Button ID="Button1" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="closeNow();">
</f:Button>
</Items>
</f:Toolbar>
</Toolbars>
<Columns>
<f:TemplateField ColumnID="tfNumber" Width="55px" HeaderText="序号" HeaderTextAlign="Center"
TextAlign="Center">
<ItemTemplate>
<asp:Label ID="Label1" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:RenderField Width="150px" ColumnID="ProjectCode" DataField="ProjectCode" FieldType="String" HeaderText="项目号" TextAlign="Left"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="350px" ColumnID="ProjectName" ExpandUnusedSpace="true" DataField="ProjectName" FieldType="String" HeaderText="项目名称" TextAlign="Left"
HeaderTextAlign="Center">
</f:RenderField>
<f:GroupField HeaderText="上月完成情况" TextAlign="Center">
<Columns>
<f:RenderField Width="100px" ColumnID="PlanNum" DataField="PlanNum" FieldType="String" HeaderText="计划项" TextAlign="Right"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="CompletedNum" DataField="CompletedNum" FieldType="String" HeaderText="完成项" TextAlign="Right"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="Rate" DataField="Rate" FieldType="Float" HeaderText="完成比例(%)" TextAlign="Right"
HeaderTextAlign="Center">
</f:RenderField>
</Columns>
</f:GroupField>
<f:GroupField HeaderText="累计完成情况" TextAlign="Center">
<Columns>
<f:RenderField Width="100px" ColumnID="TotalPlanNum" DataField="TotalPlanNum" FieldType="String" HeaderText="计划项" TextAlign="Right"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="TotalCompletedNum" DataField="TotalCompletedNum" FieldType="String" HeaderText="完成项" TextAlign="Right"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="TotalRate" DataField="TotalRate" FieldType="Float" HeaderText="完成比例(%)" TextAlign="Right"
HeaderTextAlign="Center">
</f:RenderField>
</Columns>
</f:GroupField>
</Columns>
<PageItems>
<f:ToolbarSeparator ID="ToolbarSeparator2" runat="server">
</f:ToolbarSeparator>
<f:ToolbarText ID="ToolbarText2" runat="server" Text="每页记录数：">
</f:ToolbarText>
<f:DropDownList runat="server" ID="ddlPageSize2" Width="80px" AutoPostBack="true"
OnSelectedIndexChanged="ddlPageSize2_SelectedIndexChanged">
</f:DropDownList>
</PageItems>
</f:Grid>
</Items> </Items>
</f:Tab> </f:Tab>
<f:Tab ID="Tab3" Title="周度计划统计" BodyPadding="5px" Layout="Fit" IconFont="Bookmark" runat="server"> <f:Tab ID="Tab3" Title="周度计划统计" BodyPadding="5px" Layout="Fit" IconFont="Bookmark" runat="server">
<Items> <Items>
<f:Grid ID="Grid3" ShowBorder="true" ShowHeader="false" Title="各项目基本情况" EnableCollapse="true"
runat="server" BoxFlex="1" DataKeyNames="ProjectId" DataIDField="ProjectId" AllowSorting="true" MarginRight="15px"
SortField="ProjectName" SortDirection="ASC" OnSort="Grid3_Sort" EnableColumnLines="true" AllowPaging="true"
IsDatabasePaging="true" PageSize="20" OnPageIndexChange="Grid3_PageIndexChange" ForceFit="true"
EnableTextSelection="True">
<Toolbars>
<f:Toolbar ID="Toolbar3" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:DropDownList ID="drpProject3" runat="server" Label="项目" Width="400px" LabelWidth="80px" LabelAlign="Right"
EnableEdit="true" OnSelectedIndexChanged="TextBox3_TextChanged" AutoPostBack="true">
</f:DropDownList>
<f:ToolbarFill runat="server"></f:ToolbarFill>
<f:Button ID="Button2" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="closeNow();">
</f:Button>
</Items>
</f:Toolbar>
</Toolbars>
<Columns>
<f:TemplateField ColumnID="tfNumber" Width="55px" HeaderText="序号" HeaderTextAlign="Center"
TextAlign="Center">
<ItemTemplate>
<asp:Label ID="Label2" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:RenderField Width="150px" ColumnID="ProjectCode" DataField="ProjectCode" FieldType="String" HeaderText="项目号" TextAlign="Left"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="350px" ColumnID="ProjectName" ExpandUnusedSpace="true" DataField="ProjectName" FieldType="String" HeaderText="项目名称" TextAlign="Left"
HeaderTextAlign="Center">
</f:RenderField>
<f:GroupField HeaderText="上周完成情况" TextAlign="Center">
<Columns>
<f:RenderField Width="100px" ColumnID="PlanNum" DataField="PlanNum" FieldType="String" HeaderText="计划项" TextAlign="Right"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="CompletedNum" DataField="CompletedNum" FieldType="String" HeaderText="完成项" TextAlign="Right"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="Rate" DataField="Rate" FieldType="Float" HeaderText="完成比例(%)" TextAlign="Right"
HeaderTextAlign="Center">
</f:RenderField>
</Columns>
</f:GroupField>
<f:GroupField HeaderText="累计完成情况" TextAlign="Center">
<Columns>
<f:RenderField Width="100px" ColumnID="TotalPlanNum" DataField="TotalPlanNum" FieldType="String" HeaderText="计划项" TextAlign="Right"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="TotalCompletedNum" DataField="TotalCompletedNum" FieldType="String" HeaderText="完成项" TextAlign="Right"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="TotalRate" DataField="TotalRate" FieldType="Float" HeaderText="完成比例(%)" TextAlign="Right"
HeaderTextAlign="Center">
</f:RenderField>
</Columns>
</f:GroupField>
</Columns>
<PageItems>
<f:ToolbarSeparator ID="ToolbarSeparator3" runat="server">
</f:ToolbarSeparator>
<f:ToolbarText ID="ToolbarText3" runat="server" Text="每页记录数：">
</f:ToolbarText>
<f:DropDownList runat="server" ID="ddlPageSize3" Width="80px" AutoPostBack="true"
OnSelectedIndexChanged="ddlPageSize3_SelectedIndexChanged">
</f:DropDownList>
</PageItems>
</f:Grid>
</Items> </Items>
</f:Tab> </f:Tab>
<f:Tab ID="TabOnlineMenuSet" Title="个人完成情况统计" BodyPadding="5px" Layout="Fit" IconFont="Bookmark" runat="server" Hidden="True"> <f:Tab ID="TabOnlineMenuSet" Title="个人完成情况统计" BodyPadding="5px" Layout="Fit" IconFont="Bookmark" runat="server" Hidden="True">

261
SGGL/FineUIPro.Web/DataShow/JD.aspx.cs
View File

@ -14,16 +14,43 @@ namespace FineUIPro.Web.DataShow
if (!IsPostBack) if (!IsPostBack)
{ {
Funs.DropDownPageSize(this.ddlPageSize); Funs.DropDownPageSize(this.ddlPageSize);
Funs.DropDownPageSize(this.ddlPageSize2);
Funs.DropDownPageSize(this.ddlPageSize3);
ddlPageSize.SelectedValue = Grid1.PageSize.ToString(); ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
ddlPageSize2.SelectedValue = Grid2.PageSize.ToString();
ddlPageSize3.SelectedValue = Grid3.PageSize.ToString();
BLL.ProjectService.InitProjectDropDownList(this.drpProject, true); BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
BLL.ProjectService.InitProjectDropDownList(this.drpProject2, true);
BLL.ProjectService.InitProjectDropDownList(this.drpProject3, true);
BindGrid1(); BindGrid1();
} }
} }
private void BindGrid1() private void BindGrid1()
{ {
string strSql = @"select ProjectId,ProjectCode, ProjectName,(select sum(isnull(RealNum,0)) from JDGL_ProgressCompletion a where a.ProjectId=p.ProjectId) as RealNum string strSql = @"select p.ProjectId,ProjectCode, ProjectName,(select sum(isnull(RealNum,0)) from JDGL_ProgressCompletion a where a.ProjectId=p.ProjectId) as RealNum,
from Base_Project p where ProjectState =1 "; cast((case when isnull(MonthPlan.MonthPlanNum,0)=0 then 0 else isnull(MonthPlanOK.MonthPlanOKNum,0)/(1.0 *isnull(MonthPlan.MonthPlanNum,0))*100 end) as DECIMAL(19,2)) as MonthPlanRate,
cast((case when isnull(WeekPlan.WeekPlanNum,0)=0 then 0 else isnull(WeekPlanOK.WeekPlanOKNum,0)/(1.0 *isnull(WeekPlan.WeekPlanNum,0))*100 end) as DECIMAL(19,2)) as WeekPlanRate
from Base_Project p
left join (
SELECT COUNT(w.WeekPlanId) AS WeekPlanNum,w.ProjectId FROM JDGL_WeekPlan w
GROUP BY w.ProjectId
) AS WeekPlan ON WeekPlan.ProjectId=p.ProjectId
left join (
SELECT COUNT(w.WeekPlanId) AS WeekPlanOKNum,w.ProjectId FROM JDGL_WeekPlan w
where w.IsOK=1
GROUP BY w.ProjectId
) AS WeekPlanOK ON WeekPlanOK.ProjectId=p.ProjectId
left join (
SELECT COUNT(w.MonthPlanId) AS MonthPlanNum,w.ProjectId FROM JDGL_MonthPlan w
GROUP BY w.ProjectId
) AS MonthPlan ON MonthPlan.ProjectId=p.ProjectId
left join (
SELECT COUNT(w.MonthPlanId) AS MonthPlanOKNum,w.ProjectId FROM JDGL_MonthPlan w
where w.RealDate is not null and w.RealDate<=w.PlanDate
GROUP BY w.ProjectId
) AS MonthPlanOK ON MonthPlanOK.ProjectId=p.ProjectId
where ProjectState =1 ";
List<SqlParameter> listStr = new List<SqlParameter>(); List<SqlParameter> listStr = new List<SqlParameter>();
string cpara = string.Empty; string cpara = string.Empty;
if (this.drpProject.SelectedValue != Const._Null) if (this.drpProject.SelectedValue != Const._Null)
@ -39,6 +66,132 @@ namespace FineUIPro.Web.DataShow
Grid1.DataBind(); Grid1.DataBind();
} }
/// <summary>
/// 绑定数据
/// </summary>
private void BindGrid2()
{
DataTable tb = new DataTable();
tb.Columns.Add(new DataColumn("ProjectId", typeof(String)));
tb.Columns.Add(new DataColumn("ProjectCode", typeof(String)));
tb.Columns.Add(new DataColumn("ProjectName", typeof(String)));
tb.Columns.Add(new DataColumn("PlanNum", typeof(decimal)));
tb.Columns.Add(new DataColumn("CompletedNum", typeof(decimal)));
tb.Columns.Add(new DataColumn("Rate", typeof(decimal)));
tb.Columns.Add(new DataColumn("TotalPlanNum", typeof(decimal)));
tb.Columns.Add(new DataColumn("TotalCompletedNum", typeof(decimal)));
tb.Columns.Add(new DataColumn("TotalRate", typeof(decimal)));
Model.SGGLDB db = Funs.DB;
var projects = from x in db.Base_Project where x.ProjectState == "1" orderby x.ProjectName select x;
if (this.drpProject2.SelectedValue != BLL.Const._Null)
{
projects = projects.Where(x => x.ProjectId == this.drpProject2.SelectedValue).OrderBy(x => x.ProjectName);
}
//统计月份信息
DateTime months = Convert.ToDateTime(DateTime.Now.Year.ToString() + "-" + DateTime.Now.Month.ToString() + "-01");
if (DateTime.Now.Day < 26)
{
months = Convert.ToDateTime(DateTime.Now.Year.ToString() + "-" + DateTime.Now.AddMonths(-1).Month.ToString() + "-01");
}
//2、获取当前项目指定月所有计划
var allMonthPlans = from x in db.JDGL_MonthPlan
where x.Months == months
select x;
//3、获取当前项目所有月计划
var allPlans = from x in db.JDGL_MonthPlan
where x.Months <= months
select x;
foreach (var item in projects)
{
double planNum = allMonthPlans.Where(x => x.ProjectId == item.ProjectId).Count();
double completedNum = allMonthPlans.Where(x => x.ProjectId == item.ProjectId && x.RealDate != null).Count();
double rate = planNum > 0 ? Math.Round((completedNum / planNum) * 100, 2) : 0;
double totalPlanNum = allPlans.Where(x => x.ProjectId == item.ProjectId).Count();
double totalCompletedNum = allPlans.Where(x => x.ProjectId == item.ProjectId && x.RealDate != null).Count();
double totalRate = totalPlanNum > 0 ? Math.Round((totalCompletedNum / totalPlanNum) * 100, 2) : 0;
DataRow row;
row = tb.NewRow();
row[0] = item.ProjectId;
row[1] = item.ProjectCode;
row[2] = item.ProjectName;
row[3] = planNum;
row[4] = completedNum;
row[5] = rate;
row[6] = totalPlanNum;
row[7] = totalCompletedNum;
row[8] = totalRate;
tb.Rows.Add(row);
}
Grid2.RecordCount = tb.Rows.Count;
var table = this.GetPagedDataTable(Grid2, tb);
Grid2.DataSource = table;
Grid2.DataBind();
}
/// <summary>
/// 绑定数据
/// </summary>
private void BindGrid3()
{
DataTable tb = new DataTable();
tb.Columns.Add(new DataColumn("ProjectId", typeof(String)));
tb.Columns.Add(new DataColumn("ProjectCode", typeof(String)));
tb.Columns.Add(new DataColumn("ProjectName", typeof(String)));
tb.Columns.Add(new DataColumn("PlanNum", typeof(decimal)));
tb.Columns.Add(new DataColumn("CompletedNum", typeof(decimal)));
tb.Columns.Add(new DataColumn("Rate", typeof(decimal)));
tb.Columns.Add(new DataColumn("TotalPlanNum", typeof(decimal)));
tb.Columns.Add(new DataColumn("TotalCompletedNum", typeof(decimal)));
tb.Columns.Add(new DataColumn("TotalRate", typeof(decimal)));
Model.SGGLDB db = Funs.DB;
var projects = from x in db.Base_Project where x.ProjectState == "1" orderby x.ProjectName select x;
if (this.drpProject3.SelectedValue != BLL.Const._Null)
{
projects = projects.Where(x => x.ProjectId == this.drpProject3.SelectedValue).OrderBy(x => x.ProjectName);
}
//统计月份信息
DateTime months = Convert.ToDateTime(DateTime.Now.Year.ToString() + "-" + DateTime.Now.Month.ToString() + "-01");
if (DateTime.Now.Day < 26)
{
months = Convert.ToDateTime(DateTime.Now.Year.ToString() + "-" + DateTime.Now.AddMonths(-1).Month.ToString() + "-01");
}
//2、获取当前项目指定月所有计划
var allWeekPlans = from x in db.JDGL_WeekPlan
select x;
foreach (var item in projects)
{
var lastWeek = (from x in db.JDGL_WeekPlan where x.ProjectId == item.ProjectId && DateTime.Now > ((DateTime)x.EndDate).AddDays(1) orderby x.EndDate select x).FirstOrDefault();
double planNum = 0, completedNum = 0, rate = 0;
if (lastWeek != null)
{
planNum = allWeekPlans.Where(x => x.ProjectId == item.ProjectId && x.WeekNo == lastWeek.WeekNo).Count();
completedNum = allWeekPlans.Where(x => x.ProjectId == item.ProjectId && x.WeekNo == lastWeek.WeekNo && x.IsOK == true).Count();
rate = planNum > 0 ? Math.Round((completedNum / planNum) * 100, 2) : 0;
}
double totalPlanNum = allWeekPlans.Where(x => x.ProjectId == item.ProjectId).Count();
double totalCompletedNum = allWeekPlans.Where(x => x.ProjectId == item.ProjectId && x.IsOK == true).Count();
double totalRate = totalPlanNum > 0 ? Math.Round((totalCompletedNum / totalPlanNum) * 100, 2) : 0;
DataRow row;
row = tb.NewRow();
row[0] = item.ProjectId;
row[1] = item.ProjectCode;
row[2] = item.ProjectName;
row[3] = planNum;
row[4] = completedNum;
row[5] = rate;
row[6] = totalPlanNum;
row[7] = totalCompletedNum;
row[8] = totalRate;
tb.Rows.Add(row);
}
Grid3.RecordCount = tb.Rows.Count;
var table = this.GetPagedDataTable(Grid3, tb);
Grid3.DataSource = table;
Grid3.DataBind();
}
#region 查询 #region 查询
/// <summary> /// <summary>
/// 查询 /// 查询
@ -83,5 +236,109 @@ namespace FineUIPro.Web.DataShow
BindGrid1(); BindGrid1();
} }
#endregion #endregion
/// <summary>
/// 查询
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void TextBox2_TextChanged(object sender, EventArgs e)
{
this.BindGrid2();
}
#region 表排序、分页、关闭窗口
/// <summary>
/// 分页
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Grid2_PageIndexChange(object sender, GridPageEventArgs e)
{
BindGrid2();
}
/// <summary>
/// 排序
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Grid2_Sort(object sender, GridSortEventArgs e)
{
BindGrid2();
}
/// <summary>
/// 分页显示条数下拉框
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void ddlPageSize2_SelectedIndexChanged(object sender, EventArgs e)
{
Grid2.PageSize = Convert.ToInt32(ddlPageSize2.SelectedValue);
BindGrid2();
}
#endregion
/// <summary>
/// 查询
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void TextBox3_TextChanged(object sender, EventArgs e)
{
this.BindGrid3();
}
#region 表排序、分页、关闭窗口
/// <summary>
/// 分页
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Grid3_PageIndexChange(object sender, GridPageEventArgs e)
{
BindGrid3();
}
/// <summary>
/// 排序
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Grid3_Sort(object sender, GridSortEventArgs e)
{
BindGrid3();
}
/// <summary>
/// 分页显示条数下拉框
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void ddlPageSize3_SelectedIndexChanged(object sender, EventArgs e)
{
Grid3.PageSize = Convert.ToInt32(ddlPageSize3.SelectedValue);
BindGrid3();
}
#endregion
protected void TabStrip1_TabIndexChanged(object sender, EventArgs e)
{
if (TabStrip1.ActiveTabIndex == 1)
{
if (this.Grid2.Rows.Count == 0)
{
BindGrid2();
}
}
else if (TabStrip1.ActiveTabIndex == 2)
{
if (this.Grid3.Rows.Count == 0)
{
BindGrid3();
}
}
}
} }
} }

144
SGGL/FineUIPro.Web/DataShow/JD.aspx.designer.cs generated
View File

@ -138,6 +138,78 @@ namespace FineUIPro.Web.DataShow {
/// </remarks> /// </remarks>
protected global::FineUIPro.Tab Tab2; protected global::FineUIPro.Tab Tab2;
/// <summary>
/// Grid2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid Grid2;
/// <summary>
/// Toolbar1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar1;
/// <summary>
/// drpProject2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpProject2;
/// <summary>
/// Button1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button Button1;
/// <summary>
/// Label1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label1;
/// <summary>
/// ToolbarSeparator2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarSeparator ToolbarSeparator2;
/// <summary>
/// ToolbarText2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarText ToolbarText2;
/// <summary>
/// ddlPageSize2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList ddlPageSize2;
/// <summary> /// <summary>
/// Tab3 控件。 /// Tab3 控件。
/// </summary> /// </summary>
@ -147,6 +219,78 @@ namespace FineUIPro.Web.DataShow {
/// </remarks> /// </remarks>
protected global::FineUIPro.Tab Tab3; protected global::FineUIPro.Tab Tab3;
/// <summary>
/// Grid3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid Grid3;
/// <summary>
/// Toolbar3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar3;
/// <summary>
/// drpProject3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpProject3;
/// <summary>
/// Button2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button Button2;
/// <summary>
/// Label2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label2;
/// <summary>
/// ToolbarSeparator3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarSeparator ToolbarSeparator3;
/// <summary>
/// ToolbarText3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarText ToolbarText3;
/// <summary>
/// ddlPageSize3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList ddlPageSize3;
/// <summary> /// <summary>
/// TabOnlineMenuSet 控件。 /// TabOnlineMenuSet 控件。
/// </summary> /// </summary>

2
SGGL/FineUIPro.Web/FineUIPro.Web.csproj
View File

@ -19814,7 +19814,7 @@
</FlavorProperties> </FlavorProperties>
</VisualStudio> </VisualStudio>
</ProjectExtensions> </ProjectExtensions>
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v17.0\WebApplications\Microsoft.WebApplication.targets" /> <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v15.0\WebApplications\Microsoft.WebApplication.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it. <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets. Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild"> <Target Name="BeforeBuild">

4
SGGL/FineUIPro.Web/common/mainProject2.aspx
View File

@ -2139,8 +2139,8 @@
const list = [ const list = [
{ TypeName: "<%=majorRisk%>", ValueAmount: <%=riskData4%> }, { TypeName: "<%=majorRisk%>", ValueAmount: <%=riskData4%> },
{ TypeName: "<%=LowRisk%>", ValueAmount: <%=riskData1%> }, { TypeName: "<%=LowRisk%>", ValueAmount: <%=riskData1%> },
{ TypeName: "<%=GeneralRisk%>", ValueAmount: <%=riskData3%> }, { TypeName: "<%=GeneralRisk%>", ValueAmount: <%=riskData2%> },
{ TypeName: "<%=GreaterRisk%>", ValueAmount: <%=riskData2%> }, { TypeName: "<%=GreaterRisk%>", ValueAmount: <%=riskData3%> },
] ]

66
SGGL/FineUIPro.Web/common/mainProject2.aspx.cs
View File

@ -477,7 +477,7 @@ namespace FineUIPro.Web.common
{ {
return await Task.Run(() => return await Task.Run(() =>
{ {
var result = Project_HSSEData_HSSEService.GetFinishedNum(ProjectId); var result = Project_HSSEData_HSSEService.GetCompletedNum(ProjectId);
return result; return result;
}); });
} }
@ -555,7 +555,7 @@ namespace FineUIPro.Web.common
{ {
return await Task.Run(() => return await Task.Run(() =>
{ {
var result = Project_HSSEData_HSSEService.GetSuperFinishedNum(ProjectId); var result = Project_HSSEData_HSSEService.GetSuperCompletedNum(ProjectId);
return result; return result;
}); });
} }
@ -903,25 +903,62 @@ namespace FineUIPro.Web.common
List<double> listdata = new List<double>(); List<double> listdata = new List<double>();
double result = 0; double result = 0;
Model.SGGLDB db = Funs.DB; Model.SGGLDB db = Funs.DB;
// var ndtList =
// (from x in db.ProcessControl_NondestructiveTest_New
// where x.ProfessionalName == "工艺管道" && x.ProjectId == ProjectId
// orderby x.CreateDate descending
// select x).FirstOrDefault();
// decimal a = 0, b = 0;
// if (ndtList != null)
// {
// if (ndtList.TotalQuantity.HasValue)
// {
// a += Math.Floor(ndtList.TotalQuantity.Value * Funs.GetNewDecimalOrZero(ndtList.TotalRate) /
// 100);
// b += ndtList.TotalQuantity.Value;
// }
//
// if (!string.IsNullOrEmpty(ndtList.TotalRate))
// {
// result = Convert.ToDouble(ndtList.TotalRate);
// }
// }
// else
// {
// var hjglData =
// (from x in db.HJGL_FL_Data
// where x.ProjectId == ProjectId
// orderby x.CompileDate descending
// select x).FirstOrDefault();
// if (hjglData != null)
// {
// a = Funs.GetNewDecimalOrZero(hjglData.OneTimeFilmQualifiedAmount);
// b = Funs.GetNewDecimalOrZero(hjglData.OneTimeFilmAmount);
// if (a > 0 && b > 0)
// {
// result = Convert.ToDouble(Convert.ToDecimal(100.0) * b / a);
// }
// }
// }
var ndtList = var ndtList =
(from x in db.ProcessControl_NondestructiveTest_New (from x in db.ProcessControl_NondestructiveTest_New
where x.ProfessionalName == "工艺管道" && x.ProjectId == ProjectId where x.ProjectId == ProjectId
orderby x.CreateDate descending select x).ToList();
select x).FirstOrDefault();
decimal a = 0, b = 0; decimal a = 0, b = 0;
if (ndtList != null) if (ndtList.Count > 0)
{ {
if (ndtList.TotalQuantity.HasValue) foreach (var item in ndtList)
{ {
a += Math.Floor(ndtList.TotalQuantity.Value * Funs.GetNewDecimalOrZero(ndtList.TotalRate) / if (item.TotalQuantity.HasValue)
{
a += Math.Floor(item.TotalQuantity.Value * Funs.GetNewDecimalOrZero(item.TotalRate) /
100); 100);
b += ndtList.TotalQuantity.Value; b += item.TotalQuantity.Value;
} }
if (!string.IsNullOrEmpty(ndtList.TotalRate))
{
result = Convert.ToDouble(ndtList.TotalRate);
} }
result = Convert.ToDouble(Convert.ToDecimal(100.0) * b / a);
} }
else else
{ {
@ -941,6 +978,7 @@ namespace FineUIPro.Web.common
} }
} }
if (b > 0) if (b > 0)
{ {
hjallNumber = b.ToString(); hjallNumber = b.ToString();
@ -1619,7 +1657,7 @@ where qc.QuantityCompletionId=(select top 1 QuantityCompletionId from[JDGL_Quant
SqlParameter[] Staticparameter = listStaticListStr.ToArray(); SqlParameter[] Staticparameter = listStaticListStr.ToArray();
DataTable statcitbDataTable = SQLHelper.GetDataTableRunProc("Sp_GJSXStatistic", Staticparameter); DataTable statcitbDataTable = SQLHelper.GetDataTableRunProc("Sp_GJSXStatistic", Staticparameter);
var list = from x in Funs.DB.GJSX where x.ProjectId == this.CurrUser.LoginProjectId select x; var list = from x in Funs.DB.GJSX where x.ProjectId == this.CurrUser.LoginProjectId && x.State!="1" select x;
var allcount = list.Count(x => x.State == "0") + list.Count(x => x.State != "0" && x.CompleteDate < DateTime.Now); var allcount = list.Count(x => x.State == "0") + list.Count(x => x.State != "0" && x.CompleteDate < DateTime.Now);
var closecount = list.Count(x => x.State == "0"); var closecount = list.Count(x => x.State == "0");
gjsxRate = String.Format("{0:N2}", 100.0 * closecount / allcount); gjsxRate = String.Format("{0:N2}", 100.0 * closecount / allcount);
@ -1709,7 +1747,7 @@ where qc.QuantityCompletionId=(select top 1 QuantityCompletionId from[JDGL_Quant
} }
//设备材料 //设备材料
var SbclList = Funs.DB.CLGL_ContractListSum.Where(x => x.C1 == "设备" && x.ProjectId == pid); var SbclList = Funs.DB.CLGL_ContractListSum.Where(x => x.C1 == "管道" && x.ProjectId == pid);
foreach (var item in SbclList) foreach (var item in SbclList)
{ {
sbclHtml += "<div class=\"row\">"; sbclHtml += "<div class=\"row\">";

12
SGGL/FineUIPro.Web/common/main_new.aspx.cs
View File

@ -847,17 +847,17 @@ namespace FineUIPro.Web.common
{ {
if (pids == null) if (pids == null)
{ {
var znum = (from x in Funs.DB.GJSX select x).Count(); var znum = (from x in Funs.DB.GJSX where x.State != "1" select x).Count();
divGjsxzj.InnerHtml = znum.ToString(); divGjsxzj.InnerHtml = znum.ToString();
var dqnum = (from x in Funs.DB.GJSX var dqnum = (from x in Funs.DB.GJSX
where x.CompleteDate <= DateTime.Now where x.CompleteDate <= DateTime.Now && x.State != "1"
select x).Count().ToString(); select x).Count().ToString();
divGjsxdq.InnerHtml = dqnum; divGjsxdq.InnerHtml = dqnum;
var wzdnum = (from x in Funs.DB.GJSX var wzdnum = (from x in Funs.DB.GJSX
where x.CompleteDate <= DateTime.Now where x.CompleteDate <= DateTime.Now
&& x.State != "0" && x.State != "0" && x.State != "1"
select x).Count().ToString(); select x).Count().ToString();
divGjsxwzd.InnerHtml = wzdnum; divGjsxwzd.InnerHtml = wzdnum;
@ -870,18 +870,18 @@ namespace FineUIPro.Web.common
else else
{ {
var znum = (from x in Funs.DB.GJSX var znum = (from x in Funs.DB.GJSX
where pids.Contains(x.ProjectId) where pids.Contains(x.ProjectId) && x.State != "1"
select x).Count(); select x).Count();
divGjsxzj.InnerHtml = znum.ToString(); divGjsxzj.InnerHtml = znum.ToString();
var dqnum = (from x in Funs.DB.GJSX var dqnum = (from x in Funs.DB.GJSX
where x.CompleteDate <= DateTime.Now && pids.Contains(x.ProjectId) where x.CompleteDate <= DateTime.Now && pids.Contains(x.ProjectId) && x.State != "1"
select x).Count().ToString(); select x).Count().ToString();
divGjsxdq.InnerHtml = dqnum; divGjsxdq.InnerHtml = dqnum;
var wzdnum = (from x in Funs.DB.GJSX var wzdnum = (from x in Funs.DB.GJSX
where x.CompleteDate <= DateTime.Now where x.CompleteDate <= DateTime.Now
&& x.State != "0" && pids.Contains(x.ProjectId) && x.State != "0" && pids.Contains(x.ProjectId) && x.State != "1"
select x).Count().ToString(); select x).Count().ToString();
divGjsxwzd.InnerHtml = wzdnum; divGjsxwzd.InnerHtml = wzdnum;

2
SGGL/WebAPI/WebAPI.csproj.user
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig> <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress> <UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress /> <Use64BitIISExpress />
<IISExpressSSLPort /> <IISExpressSSLPort />