修改进度报表及试车管理

SGGL/FineUIPro.Web/DataShow/HJGLDefect.aspx.cs

@@ -36,7 +36,7 @@ namespace FineUIPro.Web.DataShow
         /// </summary>
         private void BindGrid()
         {
-            string strSql = @"SELECT Project.ProjectId,Project.ProjectName,Defects_Definition,COUNT(Item.CHT_CheckItemID) AS Counts
+            string strSql = @"SELECT Project.ProjectId,Project.ProjectName,Project.ProjectCode,Defects_Definition,COUNT(Item.CHT_CheckItemID) AS Counts
                         FROM CH_CheckItem AS Item 
                         LEFT JOIN CH_Check AS Checks ON Item.CHT_CheckID =Checks.CHT_CheckID
                         LEFT JOIN Base_Project AS Project ON Checks.ProjectId =Project.ProjectId 
@@ -59,7 +59,7 @@ namespace FineUIPro.Web.DataShow
             //    strSql += " AND h.RegisterDate <=@EndTime";
             //    listStr.Add(new SqlParameter("@EndTime", this.txtEndTime.Text));
             //}
-            strSql += " GROUP BY Project.ProjectId,Project.ProjectName,Defects_Definition";
+            strSql += " GROUP BY Project.ProjectId,Project.ProjectName,Project.ProjectCode,Defects_Definition";
             SqlParameter[] parameter = listStr.ToArray();
             DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
             Grid1.RecordCount = tb.Rows.Count;

SGGL/FineUIPro.Web/DataShow/License.aspx.cs

@@ -37,7 +37,7 @@ namespace FineUIPro.Web.DataShow
             string strSql = string.Empty;
             List<SqlParameter> listStr = new List<SqlParameter>();
 
-            strSql = @"SELECT V.LicenseManagerId,V.ProjectId,V.ProjectCode,V.ProjectName,V.LicenseTypeName,V.UnitName,V.UnitTypeName
+            strSql = @"SELECT V.LicenseManagerId,V.ProjectId,V.ProjectCode,V.ProjectName,V.LicenseTypeName,V.UnitName,V.UnitTypeName,V.IsHighRisk
                         ,V.WorkAreaName,V.CompileDate,V.StartDate,V.EndDate,V.WorkStatesStr,V.LicenseTypeId,V.UnitId,V.LicenseManageContents
                         ,V.CompileMan,V.CompileDate,V.States,V.UserName
                         FROM View_License_LicenseManager AS V