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

提交代码

Browse Source
This commit is contained in:
高飞
2024-04-28 14:14:52 +08:00
parent fbc54e00b2
commit 176ae6433b
10 changed files with 96 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/DataShow/GJSX.aspx
+11 -1
View File
@@ -53,11 +53,21 @@
<f:RenderField Width="350px" ColumnID="ProjectName" DataField="ProjectName" FieldType="String" HeaderText="项目名称" TextAlign="Left"
HeaderTextAlign="Center">
</f:RenderField>
<f:TemplateField ColumnID="Count1" Width="120px" HeaderText="数量" HeaderTextAlign="Center" TextAlign="Right">
<f:TemplateField ColumnID="Count1" Width="120px" HeaderText="总数" HeaderTextAlign="Center" TextAlign="Right">
<ItemTemplate>
<asp:Label ID="Label2" runat="server" Text='<%# Count1(Eval("ProjectId")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:TemplateField ColumnID="Count2" Width="120px" HeaderText="已完成数量" HeaderTextAlign="Center" TextAlign="Right">
<ItemTemplate>
<asp:Label ID="Label1" runat="server" Text='<%# Count2(Eval("ProjectId")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:TemplateField ColumnID="Count3" Width="120px" HeaderText="未完成数量" HeaderTextAlign="Center" TextAlign="Right">
<ItemTemplate>
<asp:Label ID="Label4" runat="server" Text='<%# Count3(Eval("ProjectId")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
</Columns>
<Listeners>
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
SGGL/FineUIPro.Web/DataShow/GJSX.aspx.cs
+11 -17
View File
@@ -188,14 +188,14 @@ namespace FineUIPro.Web.DataShow
{
var datetime1 = Funs.GetNewDateTime(this.txtStartTime.Text);
var datetime2 = Funs.GetNewDateTime(this.txtStartTime.Text);
var getT = Funs.DB.ProcessControl_InspectionManagement.Where(x => x.ProjectId == projectId.ToString() && x.IsOnceQualified == true);
var getT = Funs.DB.GJSX.Where(x => x.ProjectId == projectId.ToString() && x.State == "0");
if (datetime1.HasValue)
{
getT = getT.Where(x => x.InspectionDate >= datetime1);
getT = getT.Where(x => x.CreateDate >= datetime1);
}
if (datetime2.HasValue)
{
getT = getT.Where(x => x.InspectionDate <= datetime2);
getT = getT.Where(x => x.CreateDate <= datetime2);
}
cout1 = getT.Count();
@@ -203,32 +203,26 @@ namespace FineUIPro.Web.DataShow
return cout1;
}
protected string Count4(object projectId)
protected int Count3(object projectId)
{
string rate = string.Empty;
int cout1 = 0;
if (projectId != null)
{
var datetime1 = Funs.GetNewDateTime(this.txtStartTime.Text);
var datetime2 = Funs.GetNewDateTime(this.txtStartTime.Text);
var getALL = Funs.DB.ProcessControl_InspectionManagement.Where(x => x.ProjectId == projectId.ToString());
var getT = Funs.DB.GJSX.Where(x => x.ProjectId == projectId.ToString() && x.State != "0");
if (datetime1.HasValue)
{
getALL = getALL.Where(x => x.CheckDate >= datetime1);
getT = getT.Where(x => x.CreateDate >= datetime1);
}
if (datetime2.HasValue)
{
getALL = getALL.Where(x => x.CheckDate >= datetime1);
}
var getT = getALL.Where(x => x.ProjectId == projectId.ToString() && x.IsOnceQualified == true);
int coutall = getALL.Count();
int cout0 = getT.Count();
if (coutall > 0)
{
rate = Math.Round(cout0 * 1.0 / coutall * 100, 2).ToString();
getT = getT.Where(x => x.CreateDate <= datetime2);
}
cout1 = getT.Count();
}
return rate;
return cout1;
}
}
}
SGGL/FineUIPro.Web/DataShow/GJSX.aspx.designer.cs
Generated
+18
View File
@@ -120,6 +120,24 @@ namespace FineUIPro.Web.DataShow {
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label2;
/// <summary>
/// Label1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label1;
/// <summary>
/// Label4 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label4;
/// <summary>
/// ToolbarSeparator1 控件。
/// </summary>
SGGL/FineUIPro.Web/DataShow/QualityPerson.aspx.cs
+2 -2
View File
@@ -42,7 +42,7 @@ namespace FineUIPro.Web.DataShow
,Person.IdentityCard,WorkPost.WorkPostName,Person.Telephone,Person.IsOnJob,Person.Remark, '' as ProjectName "
+ @" FROM Person_CompanyBranchPerson AS Person "
+ @" LEFT JOIN Base_Unit AS Unit ON Unit.UnitId=Person.UnitId "
+ @" LEFT JOIN Base_WorkPost AS WorkPost ON Person.WorkPostId=WorkPost.WorkPostId WHERE WorkPost.IsCQMS=1 ";
+ @" LEFT JOIN Base_WorkPost AS WorkPost ON Person.WorkPostId=WorkPost.WorkPostId WHERE Person.IsOnJob=1 and WorkPost.IsCQMS=1 ";
string UnitId = BLL.Const.UnitId_CWCEC;
if (this.rbCom.SelectedValue == "1")
{
@@ -61,7 +61,7 @@ namespace FineUIPro.Web.DataShow
FROM SitePerson_Person AS Person
LEFT JOIN Base_Project AS Project ON Project.ProjectId=Person.ProjectId
LEFT JOIN Base_Unit AS Unit ON Unit.UnitId=Person.UnitId
LEFT JOIN Base_WorkPost AS WorkPost ON Person.WorkPostId=WorkPost.WorkPostId WHERE WorkPost.IsCQMS=1 ";
LEFT JOIN Base_WorkPost AS WorkPost ON Person.WorkPostId=WorkPost.WorkPostId WHERE Person.IsUsed=1 and WorkPost.IsCQMS=1 ";
if (this.drpProject.SelectedValue != Const._Null)
{
strSql += " AND Person.ProjectId = @ProjectId";