关键事项补充最新进展

SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXList.aspx

@@ -103,6 +103,9 @@
                         <f:RenderField Width="80px" ColumnID="stateStr" DataField="stateStr" SortField="StateStr"
                             FieldType="String" HeaderText="状态" HeaderTextAlign="Center" TextAlign="Center">
                         </f:RenderField>
+                        <f:RenderField Width="150px" ColumnID="LastProgress" DataField="LastProgress" 
+                            FieldType="String" HeaderText="最新进展" HeaderTextAlign="Center" TextAlign="Center">
+                        </f:RenderField>
                         <f:RenderField Width="120px" ColumnID="CreateDate" DataField="CreateDate" SortField="CreateDate"
                             HeaderText="提出日期" HeaderTextAlign="Center" TextAlign="Center" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd">
                         </f:RenderField>

SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXList.aspx.cs

@@ -71,6 +71,7 @@ namespace FineUIPro.Web.PZHGL.GJSX
                                 ,GJSXTypeName = STUFF((SELECT ',' + Base_GJSXType.GJSXTypeName FROM dbo.Base_GJSXType where PATINDEX('%,' + RTRIM(Base_GJSXType.GJSXTypeID) + ',%', ',' + a.GJSXTypeID + ',') > 0 FOR XML PATH('')), 1, 1,'')
                                 ,a.IsManypeople,a.CompleteDate,a.AttachUrl
                                 ,user_Acceptance = STUFF((SELECT ',' + p2.UserName FROM dbo.Sys_User as p2 where PATINDEX('%,' + RTRIM(p2.UserId) + ',%', ',' + a.user_Acceptance + ',') > 0 FOR XML PATH('')), 1, 1,'') 
+                                ,(select top 1 ProgressStatus+'：'+Progress_detail from GJSX_detail where GJSXID=a.GJSXID order by Date desc) as LastProgress 
                                 from GJSX as a 
                                 left join Sys_User as b on a.UserId = b.UserId
                                 left join[dbo].[Base_Project] on a.ProjectId = Base_Project.ProjectId