11

2024-06-11 17:27:06 +08:00
parent 9dd993f28e
commit a3ca2594e3
30 changed files with 695 additions and 118 deletions
@@ -41,10 +41,12 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
        /// </summary>
        private void BindGrid()
        {
-            string strSql = @"SELECT daily.DailyReportCompleteId,unit.UnitCode,team.TeamGroupName,daily.DailyReportDate,daily.IsComplete
+            string strSql = @"SELECT daily.DailyReportCompleteId,unit.UnitCode,team.TeamGroupName,
+                                     daily.DailyReportDate,daily.IsComplete,u.UserName AS ReportMan
                               FROM dbo.Pipeline_DailyReportComplete daily
                               LEFT JOIN dbo.Welder_TeamGroup team ON team.TeamGroupId = daily.TeamGroupId
                               LEFT JOIN dbo.Base_Unit unit ON unit.UnitId = daily.UnitId
+							   LEFT JOIN dbo.Sys_User u ON u.UserId=daily.ReportMan
                               WHERE 1=1";
            List<SqlParameter> parms = new List<SqlParameter>();
            if (this.drpTeamGroup.SelectedValue != "" && this.drpTeamGroup.SelectedValue!=Const._Null)