gaofei
/
HJGL_DS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

20260428 项目工作量统计

This commit is contained in:
毕文静 2026-04-28 09:58:51 +08:00
parent cab2bb840a
commit 1f7e8e551d
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
DataBase/版本日志/HJGLDB_DS_2026-04-28_bwj.sql
View File

@ -97,18 +97,13 @@ FROM
(SELECT ISO_ID,COUNT(jot.JOT_ID) AS total_fjot (SELECT ISO_ID,COUNT(jot.JOT_ID) AS total_fjot
FROM dbo.HJGL_PW_JointInfo jot FROM dbo.HJGL_PW_JointInfo jot
LEFT join HJGL_BO_WeldReportMain AS weldreport on weldreport.DReportID=jot.DReportID LEFT join HJGL_BO_WeldReportMain AS weldreport on weldreport.DReportID=jot.DReportID
WHERE (weldreport.JOT_WeldDate>=@StartDate or @StartDate is null) and (weldreport.JOT_WeldDate<=@EndDate or @EndDate is null) WHERE jot.WLO_Code='F'
AND jot.DReportID is not NULL
AND jot.WLO_Code='F'
GROUP BY ISO_ID) v6 ON v6.ISO_ID=v.ISO_ID GROUP BY ISO_ID) v6 ON v6.ISO_ID=v.ISO_ID
--Ô¤Öƺ¸¿Ú --Ô¤Öƺ¸¿Ú
LEFT JOIN LEFT JOIN
(SELECT ISO_ID,COUNT(jot.JOT_ID) AS total_sjot (SELECT ISO_ID,COUNT(jot.JOT_ID) AS total_sjot
FROM dbo.HJGL_PW_JointInfo jot FROM dbo.HJGL_PW_JointInfo jot
LEFT join HJGL_BO_WeldReportMain AS weldreport on weldreport.DReportID=jot.DReportID WHERE jot.WLO_Code='S'
WHERE (weldreport.JOT_WeldDate>=@StartDate or @StartDate is null) and (weldreport.JOT_WeldDate<=@EndDate or @EndDate is null)
AND jot.DReportID is not NULL
AND jot.WLO_Code='S'
GROUP BY ISO_ID) v7 ON v7.ISO_ID=v.ISO_ID GROUP BY ISO_ID) v7 ON v7.ISO_ID=v.ISO_ID
LEFT JOIN dbo.HJGL_PW_IsoInfo iso ON iso.ISO_ID = v.ISO_ID LEFT JOIN dbo.HJGL_PW_IsoInfo iso ON iso.ISO_ID = v.ISO_ID

9
HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/IsoCmprehensive.aspx.cs
View File

@ -76,6 +76,9 @@
int check_total_jot = 0; int check_total_jot = 0;
int total_repairjot = 0; int total_repairjot = 0;
int total_sjot = 0;
int total_fjot = 0;
foreach (DataRow row in tb.Rows) foreach (DataRow row in tb.Rows)
{ {
total_din += Convert.ToDouble(row["total_din"]); total_din += Convert.ToDouble(row["total_din"]);
@ -95,6 +98,8 @@
trust_total_jot += Convert.ToInt32(row["trust_total_jot"]); trust_total_jot += Convert.ToInt32(row["trust_total_jot"]);
check_total_jot += Convert.ToInt32(row["check_total_jot"]); check_total_jot += Convert.ToInt32(row["check_total_jot"]);
total_repairjot += Convert.ToInt32(row["total_repairjot"]); total_repairjot += Convert.ToInt32(row["total_repairjot"]);
total_sjot += Convert.ToInt32(row["total_sjot"]);
total_fjot += Convert.ToInt32(row["total_fjot"]);
} }
todo_total_din = total_din - finished_total_din; todo_total_din = total_din - finished_total_din;
@ -126,6 +131,8 @@
summary.Add("trust_total_jot", trust_total_jot.ToString()); summary.Add("trust_total_jot", trust_total_jot.ToString());
summary.Add("check_total_jot", check_total_jot.ToString()); summary.Add("check_total_jot", check_total_jot.ToString());
summary.Add("total_repairjot", total_repairjot.ToString()); summary.Add("total_repairjot", total_repairjot.ToString());
summary.Add("total_sjot", total_sjot.ToString());
summary.Add("total_fjot", total_fjot.ToString());
Grid1.SummaryData = summary; Grid1.SummaryData = summary;
} }
@ -196,7 +203,7 @@
//} //}
this.Grid1.RecordCount = tb.Rows.Count; this.Grid1.RecordCount = tb.Rows.Count;
tb = GetFilteredTable(Grid1.FilteredData, tb); //tb = GetFilteredTable(Grid1.FilteredData, tb);
var table = this.GetPagedDataTable(Grid1, tb); var table = this.GetPagedDataTable(Grid1, tb);
Grid1.DataSource = table; Grid1.DataSource = table;
Grid1.DataBind(); Grid1.DataBind();