zhanghj/ChengDa_English
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

作业票

Browse Source
This commit is contained in:
李超
2023-06-12 10:49:20 +08:00
parent c4bcf04d74
commit 9d94a295ce
23 changed files with 2718 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/HSSE/EduTrain/TestStatistics.aspx
+1 -1
View File
@@ -51,7 +51,7 @@
HeaderText="参加次数" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="120px" ColumnID="TestQualifyCount" DataField="TestQualifyCount" SortField="TestQualifyCount"
HeaderText="60分以上" HeaderTextAlign="Center" TextAlign="Left">
HeaderText="70分以上" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
</Columns>
<Listeners>
SGGL/FineUIPro.Web/HSSE/EduTrain/TestStatistics.aspx.cs
+1 -1
View File
@@ -45,7 +45,7 @@ namespace FineUIPro.Web.HSSE.EduTrain
+ @" LEFT JOIN Base_Depart AS Depart ON person.DepartId=Depart.DepartId"
+ @" LEFT JOIN (SELECT COUNT(TestRecordId) AS TestCount,TestManId FROM Training_TestRecord GROUP BY TestManId) AS TestCount"
+ @" ON person.PersonId=TestCount.TestManId"
+ @" LEFT JOIN (SELECT COUNT(TestRecordId) AS TestQualifyCount,TestManId FROM Training_TestRecord WHERE TestScores>= 60 GROUP BY TestManId) AS TestQualifyCount"
+ @" LEFT JOIN (SELECT COUNT(TestRecordId) AS TestQualifyCount,TestManId FROM Training_TestRecord WHERE TestScores>= 70 GROUP BY TestManId) AS TestQualifyCount"
+ @" ON person.PersonId=TestQualifyCount.TestManId"
+ @" WHERE PersonId <> '" + BLL.Const.sysglyId + "' and person.projectid='" + this.CurrUser.LoginProjectId + "'";
List<SqlParameter> listStr = new List<SqlParameter>();
SGGL/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationList.aspx.cs
+5 -3
View File
@@ -144,8 +144,9 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
}
if (!string.IsNullOrEmpty(this.txtEndTime.Text.Trim()))
{
strSql += " AND CheckTime <= @EndTime";
listStr.Add(new SqlParameter("@EndTime", this.txtEndTime.Text.Trim()));
strSql += " AND CheckTime < @EndTime";
DateTime endTime = DateTime.Parse(this.txtEndTime.Text).AddDays(1);
listStr.Add(new SqlParameter("@EndTime", endTime.ToString("yyyy-MM-dd")));
}
if (!string.IsNullOrEmpty(txtStartRectificationTime.Text.Trim()))
{
@@ -155,7 +156,8 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
if (!string.IsNullOrEmpty(this.txtEndRectificationTime.Text.Trim()))
{
strSql += " AND RectificationTime <= @EndRectificationTime";
listStr.Add(new SqlParameter("@EndRectificationTime", this.txtEndRectificationTime.Text.Trim()));
DateTime endTime = DateTime.Parse(this.txtEndRectificationTime.Text).AddDays(1);
listStr.Add(new SqlParameter("@EndRectificationTime", endTime.ToString("yyyy-MM-dd")));
}
if (this.drpProblemTypes.SelectedValue != BLL.Const._Null)
{