批量归档状态与纸质归档状态合并

src/main/resources/freemarker/batchFilingList.ftl

@@ -2,14 +2,14 @@
 <?mso-application progid="Excel.Sheet"?>
 <Workbook xmlns="urn:schemas-microsoft-com:office:spreadsheet" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:x="urn:schemas-microsoft-com:office:excel" xmlns:ss="urn:schemas-microsoft-com:office:spreadsheet" xmlns:html="http://www.w3.org/TR/REC-html40" xmlns:dt="uuid:C2F41010-65B3-11d1-A29F-00AA00C14882">
 	<DocumentProperties xmlns="urn:schemas-microsoft-com:office:office">
-		<Author>Admin</Author>
-		<LastAuthor>enford</LastAuthor>
-		<Created>2021-07-28T01:37:00Z</Created>
-		<LastSaved>2021-07-28T02:13:27Z</LastSaved>
+		<Author>DM</Author>
+		<LastAuthor>大猫～</LastAuthor>
+		<Created>2021-07-30T07:25:58Z</Created>
+		<LastSaved>2021-07-30T07:27:32Z</LastSaved>
 	</DocumentProperties>
 	<CustomDocumentProperties xmlns="urn:schemas-microsoft-com:office:office">
+		<ICV dt:dt="string">62B06D7C6F9F41468A9E16D37DF016D0</ICV>
 		<KSOProductBuildVer dt:dt="string">2052-11.1.0.10667</KSOProductBuildVer>
-		<ICV dt:dt="string">25F8FAA23C8546179E6DFC1480405460</ICV>
 	</CustomDocumentProperties>
 	<ExcelWorkbook xmlns="urn:schemas-microsoft-com:office:excel">
 		<WindowWidth>23040</WindowWidth>
@@ -20,177 +20,69 @@
 	<Styles>
 		<Style ss:ID="Default" ss:Name="Normal">
 			<Alignment ss:Vertical="Center"/>
-			<Borders/>
-			<Font ss:FontName="宋体" x:CharSet="134" ss:Size="11" ss:Color="#000000"/>
-			<Interior/>
-			<NumberFormat/>
-			<Protection/>
+											<Borders/>
+													 <Font ss:FontName="宋体" x:CharSet="134" ss:Size="11" ss:Color="#000000"/>
+																															<Interior/>
+																																	  <NumberFormat/>
+																																					<Protection/>
 		</Style>
 		<Style ss:ID="s49"/>
 		<Style ss:ID="s50">
 			<Alignment ss:Horizontal="Center" ss:Vertical="Center"/>
 		</Style>
 		<Style ss:ID="s51">
-			<Alignment ss:Horizontal="Center" ss:Vertical="Center" ss:WrapText="1"/>
-			<Borders>
-				<Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="2" ss:Color="#DDDDDD"/>
-				<Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="2" ss:Color="#EBEBEB"/>
-				<Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="2" ss:Color="#E7E7E7"/>
-				<Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="2" ss:Color="#EBEBEB"/>
-			</Borders>
-			<Font ss:FontName="宋体" x:CharSet="134" ss:Size="10.5" ss:Color="#333333" ss:Bold="1"/>
-			<Interior ss:Color="#F5F5F6" ss:Pattern="Solid"/>
-		</Style>
-		<Style ss:ID="s52">
-			<Alignment ss:Horizontal="Center" ss:Vertical="Center" ss:WrapText="1"/>
-			<Borders>
-				<Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="2" ss:Color="#DDDDDD"/>
-				<Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="2"/>
-				<Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="2" ss:Color="#E7E7E7"/>
-				<Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="2" ss:Color="#EBEBEB"/>
-			</Borders>
-			<Font ss:FontName="宋体" x:CharSet="134" ss:Size="10.5" ss:Color="#333333" ss:Bold="1"/>
-			<Interior ss:Color="#F5F5F6" ss:Pattern="Solid"/>
-		</Style>
-		<Style ss:ID="s53">
-			<Alignment ss:Horizontal="Center" ss:Vertical="Center" ss:WrapText="1"/>
-			<Borders>
-				<Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="2" ss:Color="#DDDDDD"/>
-				<Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="2" ss:Color="#E7E7E7"/>
-				<Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="2" ss:Color="#E7E7E7"/>
-				<Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="2" ss:Color="#EBEBEB"/>
-			</Borders>
-			<Font ss:FontName="宋体" x:CharSet="134" ss:Size="10.5" ss:Color="#333333" ss:Bold="1"/>
-			<Interior ss:Color="#F5F5F6" ss:Pattern="Solid"/>
-		</Style>
-		<Style ss:ID="s54">
-			<Alignment ss:Horizontal="Center" ss:Vertical="Center"/>
-			<Borders>
-				<Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="2" ss:Color="#E7E7E7"/>
-				<Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="2" ss:Color="#EBEBEB"/>
-				<Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="2" ss:Color="#E7E7E7"/>
-				<Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="2" ss:Color="#E7EAEC"/>
-			</Borders>
-			<Font ss:FontName="Helvetica" x:CharSet="134" ss:Size="10.5" ss:Color="#333333"/>
-			<Interior ss:Color="#FFFFFF" ss:Pattern="Solid"/>
-		</Style>
-		<Style ss:ID="s55">
 			<Alignment ss:Horizontal="Center" ss:Vertical="Center"/>
-			<Borders>
-				<Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="2" ss:Color="#E7E7E7"/>
-				<Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="2" ss:Color="#E7E7E7"/>
-				<Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="2" ss:Color="#E7E7E7"/>
-				<Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="2" ss:Color="#E7EAEC"/>
-			</Borders>
-			<Font ss:FontName="Helvetica" x:CharSet="134" ss:Size="10.5" ss:Color="#333333"/>
-			<Interior ss:Color="#FFFFFF" ss:Pattern="Solid"/>
+																   <Font ss:FontName="宋体" x:CharSet="134" ss:Size="11" ss:Color="#000000" ss:Bold="1"/>
+																																					  <Interior ss:Color="#D0CECE" ss:Pattern="Solid"/>
 		</Style>
-		<Style ss:ID="s56">
-			<Alignment ss:Horizontal="Center" ss:Vertical="Center"/>
-			<Borders>
-				<Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="2" ss:Color="#E7E7E7"/>
-				<Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="2" ss:Color="#E7E7E7"/>
-				<Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="2" ss:Color="#E7E7E7"/>
-				<Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="2" ss:Color="#E7EAEC"/>
-			</Borders>
-			<Font ss:FontName="宋体" x:CharSet="134" ss:Size="10.5" ss:Color="#333333"/>
-			<Interior ss:Color="#FFFFFF" ss:Pattern="Solid"/>
-		</Style>
-		<Style ss:ID="s57">
-			<Alignment ss:Horizontal="Center" ss:Vertical="Center"/>
-			<Borders>
-				<Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="2" ss:Color="#E7E7E7"/>
-				<Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="2" ss:Color="#EBEBEB"/>
-				<Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="2" ss:Color="#E7E7E7"/>
-				<Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="2" ss:Color="#E7EAEC"/>
-			</Borders>
-			<Font ss:FontName="宋体" x:CharSet="134" ss:Size="10.5" ss:Color="#333333"/>
-			<Interior ss:Color="#FFFFFF" ss:Pattern="Solid"/>
-		</Style>
-		<Style ss:ID="s58">
+		<Style ss:ID="s52">
 			<Alignment ss:Horizontal="Center" ss:Vertical="Center"/>
 		</Style>
 	</Styles>
 	<Worksheet ss:Name="Sheet1">
-		<Table ss:ExpandedColumnCount="5" ss:ExpandedRowCount="6" x:FullColumns="1" x:FullRows="1" ss:DefaultColumnWidth="48.6" ss:DefaultRowHeight="14.4">
-			<Column ss:Index="1" ss:StyleID="Default" ss:AutoFitWidth="0" ss:Width="116.8"/>
-			<Column ss:Index="2" ss:StyleID="Default" ss:AutoFitWidth="0" ss:Width="126.25"/>
-			<Column ss:StyleID="Default" ss:AutoFitWidth="0" ss:Width="292.3"/>
-			<Column ss:StyleID="Default" ss:AutoFitWidth="0" ss:Width="314.55"/>
-			<Column ss:StyleID="Default" ss:AutoFitWidth="0" ss:Width="113.4"/>
-			<Row ss:Height="15.15">
-				<Cell ss:StyleID="s58" ss:MergeAcross="4">
-					<Data ss:Type="String">${filingBatch}+${batchName}+${batchUser}</Data>
+		<Table ss:ExpandedColumnCount="5" ss:ExpandedRowCount="5" x:FullColumns="1" x:FullRows="1" ss:DefaultColumnWidth="48" ss:DefaultRowHeight="14.4">
+			<Column ss:Index="1" ss:StyleID="Default" ss:AutoFitWidth="0" ss:Width="90" ss:Span="4"/>
+			<Row>
+				<Cell ss:StyleID="s52" ss:MergeAcross="4">
+					<Data ss:Type="String">批次号+归档名称+归档人</Data>
 				</Cell>
 			</Row>
-			<Row ss:Height="15.15">
+			<Row>
 				<Cell ss:StyleID="s51">
 					<Data ss:Type="String">项目编号</Data>
 				</Cell>
-				<Cell ss:StyleID="s52">
+				<Cell ss:StyleID="s51">
 					<Data ss:Type="String">报告号</Data>
 				</Cell>
-				<Cell ss:StyleID="s52">
+				<Cell ss:StyleID="s51">
 					<Data ss:Type="String">项目名称</Data>
 				</Cell>
-				<Cell ss:StyleID="s53">
+				<Cell ss:StyleID="s51">
 					<Data ss:Type="String">归档文件类型</Data>
 				</Cell>
-				<Cell ss:StyleID="s53">
+				<Cell ss:StyleID="s51">
 					<Data ss:Type="String">归档文件描述</Data>
 				</Cell>
 			</Row>
 			<#list list as list>
-				<Row ss:Height="15.15">
-					<Cell ss:StyleID="s54">
+				<Row>
+					<Cell>
 						<Data ss:Type="String">${list.projectId}</Data>
 					</Cell>
-					<Cell ss:StyleID="s55">
+					<Cell>
 						<Data ss:Type="String">${list.number}</Data>
 					</Cell>
-					<Cell ss:StyleID="s55">
+					<Cell>
 						<Data ss:Type="String">${list.projectName}</Data>
 					</Cell>
-					<Cell ss:StyleID="s56">
+					<Cell>
 						<Data ss:Type="String">${list.batchFileType}</Data>
 					</Cell>
-					<Cell ss:StyleID="s56">
+					<Cell>
 						<Data ss:Type="String">${list.batchFileMiao}</Data>
 					</Cell>
 				</Row>
 			</#list>
-				<Cell ss:StyleID="s57">
-					<ss:Data ss:Type="String" xmlns="http://www.w3.org/TR/REC-html40">
-						<Font html:Color="#333333"/>
-						<Font html:Color="#333333">苏兴审核</Font>
-						<Font html:Face="Helvetica" html:Color="#333333">-2021-0154</Font>
-					</ss:Data>
-				</Cell>
-				<Cell ss:StyleID="s56">
-					<ss:Data ss:Type="String" xmlns="http://www.w3.org/TR/REC-html40">
-						<Font html:Color="#333333"/>
-						<Font html:Color="#333333">苏兴造字【</Font>
-						<Font html:Face="Helvetica" html:Color="#333333">2021</Font>
-						<Font html:Color="#333333">】</Font>
-						<Font html:Face="Helvetica" html:Color="#333333">1551</Font>
-					</ss:Data>
-				</Cell>
-				<Cell ss:StyleID="s55">
-					<ss:Data ss:Type="String" xmlns="http://www.w3.org/TR/REC-html40">
-						<Font html:Color="#333333"/>
-						<Font html:Color="#333333">2020</Font>
-						<Font html:Face="宋体" html:Color="#333333">年南京江宁</Font>
-						<Font html:Color="#333333">10kv</Font>
-						<Font html:Face="宋体" html:Color="#333333">及以下</Font>
-					</ss:Data>
-				</Cell>
-				<Cell ss:StyleID="s56">
-					<Data ss:Type="String">报告</Data>
-				</Cell>
-				<Cell ss:StyleID="s56">
-					<Data ss:Type="String">报告正文</Data>
-				</Cell>
-			</Row>
 		</Table>
 		<WorksheetOptions xmlns="urn:schemas-microsoft-com:office:excel">
 			<PageSetup>
@@ -204,9 +96,9 @@
 			<Panes>
 				<Pane>
 					<Number>3</Number>
-					<ActiveRow>8</ActiveRow>
-					<ActiveCol>2</ActiveCol>
-					<RangeSelection>R9C3</RangeSelection>
+					<ActiveRow>5</ActiveRow>
+					<ActiveCol>3</ActiveCol>
+					<RangeSelection>R6C4</RangeSelection>
 				</Pane>
 			</Panes>
 			<ProtectObjects>False</ProtectObjects>

src/main/resources/mappings/modules/ruralprojectrecords/RuralProjectMessageDao.xml

@@ -357,10 +357,13 @@
 		,ifnull(ppf.status,0) as "paperFilingStatus"
 		,ppf.process_instance_id as "ppfProcessInstanceId"
 		,ppf.id as "ppfId"
+		,pfb.process_instance_id AS "filingProcessinstanceId"
+		,ifnull(pfp.status,0) as "filingProjectStatus"
 		FROM rural_project_records a
 		LEFT JOIN sys_area area ON area.id = a.area_id
 		left join rural_project_records_reported rprr on rprr.id = a.id
 		LEFT JOIN project_flingbatch_relation pfp on pfp.project_id=a.id
+		LEFT JOIN project_filingbatch pfb on pfb.id=pfp.filing_batch
 		LEFT JOIN sys_user sua on a.create_by = sua.id
         <if test="leaderNameStr !=null and leaderNameStr !=''">
             LEFT JOIN work_project_user w on a.id = w.project_id

src/main/webapp/webpage/modules/ruralprojectrecords/cost/ruralCostProjectMessageList.jsp

@@ -720,30 +720,39 @@
 							var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
 						return xml;
 					}}
-				,{align:'center', title: '批量',  width:70,templet:function(d){
-						var st = getRuralProjectArchiveState(d.downProjectReportRecordStatus);
-						if(st.action)
-							var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralProjectMessage/getReportRecordProcessOne?processInstanceId=" + d.prrdProcessInstanceId + "','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
-						else
+				,{align:'center', title: '线下',  width:70,templet:function(d){
+						if (d.submitMoney=="1"){
+							var st = getRuralProjectArchiveState(d.downProjectReportRecordStatus);
+						}else if (d.submitMoney=="2"){
+							var st = getRuralProjectArchiveState(d.paperFilingStatus);
+						}
+						if(st.action){
+							if (d.submitMoney=="1"){
+								var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralCostProjectMessage/getReportedProcess?processInstanceId=" + d.prrdProcessInstanceId + "','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+							}else if (d.submitMoney=="2"){
+								var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralCostProjectMessage/getReportedProcess?processInstanceId=" + d.ppfProcessInstanceId + "','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+							}
+						}else{
 							var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+						}
 						return xml;
 					}}
 				,{align:'center', title: '上报',  width:90,templet:function(d){
 						var st = getReportedState(d.reportedState);
 						if(st.action)
-							var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralCostProjectMessage/getReportedProcess?processInstanceId=" + d.reportedProcessInstanceId + "','95%','95%')\" class=\"new-status-label status-label-" + st.label + "\" >" + st.status + "</span>";
-						else
-							var xml = "<span style=\"cursor:default;\" class=\"new-status-label status-label-" + st.label + "\" >" + st.status + "</span>";
-						return xml;
-					}}
-				,{align:'center', title: '纸质',  width:90,templet:function(d){
-						var st = getRuralProjectArchiveState(d.paperFilingStatus);
-						if(st.action)
-							var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralCostProjectMessage/getReportRecordProcessOne?processInstanceId=" + d.ppfProcessInstanceId + "','95%','95%')\" class=\"new-status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+							var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralCostProjectMessage/getReportedProcess?processInstanceId=" + d.reportedProcessInstanceId + "','95%','95%')\" class=\"new-status-label status-label-" + st.label + "\" >" + st.status+ "</span>";
 						else
 							var xml = "<span style=\"cursor:default;\" class=\"new-status-label status-label-" + st.label + "\" >" + st.status + "</span>";
 						return xml;
 					}}
+				<%--,{align:'center', title: '纸质',  width:90,templet:function(d){--%>
+				<%--		var st = getRuralProjectArchiveState(d.paperFilingStatus);--%>
+				<%--		if(st.action)--%>
+				<%--			var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralCostProjectMessage/getReportedProcess?processInstanceId=" + d.ppfProcessInstanceId + "','95%','95%')\" class=\"new-status-label status-label-" + st.label + "\" >" + st.status + "</span>";--%>
+				<%--		else--%>
+				<%--			var xml = "<span style=\"cursor:default;\" class=\"new-status-label status-label-" + st.label + "\" >" + st.status + "</span>";--%>
+				<%--		return xml;--%>
+				<%--	}}--%>
                 ,{field:'op',align:'center',title:"操作",width:350,templet:function(d) {
 						////对操作进行初始化
 						var xml = '<div class=\"layui-btn-group\">';
@@ -1052,8 +1061,8 @@
 					,"view":"${projectRecords.view}"
 					,"reportStatus":"${projectRecords.reportStatus}"
 					,"syncStatus":"${projectRecords.syncStatus}"
-					,"downProjectReportRecordStatus":"${projectRecords.downProjectReportRecordStatus}"
-					,"prrdProcessInstanceId":"${projectRecords.prrdProcessInstanceId}"
+					,"downProjectReportRecordStatus":"${projectRecords.filingProjectStatus}"
+					,"prrdProcessInstanceId":"${projectRecords.filingProcessinstanceId}"
 					,"prrdId":"${projectRecords.prrdId}"
 					,"emergencyProject":"${projectRecords.emergencyProject}"
 					,"bid":"${projectRecords.prdId}"

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/ruralProjectMessageList.jsp

@@ -718,12 +718,21 @@
 							var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
 						return xml;
 					}}
-                ,{align:'center', title: '批量',  width:70,templet:function(d){
-                        var st = getRuralProjectArchiveState(d.downProjectReportRecordStatus);
-                        if(st.action)
-                            var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralProjectMessage/getReportRecordProcessOne?processInstanceId=" + d.prrdProcessInstanceId + "','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
-                        else
-                            var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+                ,{align:'center', title: '线下',  width:70,templet:function(d){
+						if (d.submitMoney=="1"){
+							var st = getRuralProjectArchiveState(d.downProjectReportRecordStatus);
+						}else if (d.submitMoney=="2"){
+							var st = getRuralProjectArchiveState(d.paperFilingStatus);
+						}
+                        if(st.action){
+                        	if (d.submitMoney=="1"){
+								var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralProjectMessage/getReportedProcess?processInstanceId=" + d.prrdProcessInstanceId + "','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "1</span>";
+							}else if (d.submitMoney=="2"){
+								var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralProjectMessage/getReportedProcess?processInstanceId=" + d.ppfProcessInstanceId + "','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "2</span>";
+							}
+						}else{
+							var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+						}
                         return xml;
                     }}
                 ,{align:'center', title: '上报',  width:90,templet:function(d){
@@ -734,14 +743,14 @@
                             var xml = "<span style=\"cursor:default;\" class=\"new-status-label status-label-" + st.label + "\" >" + st.status + "</span>";
                         return xml;
                     }}
-				,{align:'center', title: '纸质',  width:90,templet:function(d){
-						var st = getRuralProjectArchiveState(d.paperFilingStatus);
-						if(st.action)
-							var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralCostProjectMessage/getReportRecordProcessOne?processInstanceId=" + d.ppfProcessInstanceId + "','95%','95%')\" class=\"new-status-label status-label-" + st.label + "\" >" + st.status + "</span>";
-						else
-							var xml = "<span style=\"cursor:default;\" class=\"new-status-label status-label-" + st.label + "\" >" + st.status + "</span>";
-						return xml;
-					}}
+				<%--,{align:'center', title: '纸质',  width:90,templet:function(d){--%>
+				<%--		var st = getRuralProjectArchiveState(d.paperFilingStatus);--%>
+				<%--		if(st.action)--%>
+				<%--			var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralCostProjectMessage/getReportRecordProcessOne?processInstanceId=" + d.ppfProcessInstanceId + "','95%','95%')\" class=\"new-status-label status-label-" + st.label + "\" >" + st.status + "</span>";--%>
+				<%--		else--%>
+				<%--			var xml = "<span style=\"cursor:default;\" class=\"new-status-label status-label-" + st.label + "\" >" + st.status + "</span>";--%>
+				<%--		return xml;--%>
+				<%--	}}--%>
 				,{field:'op',align:'center',title:"操作",width:350,templet:function(d) {
 
 							////对操作进行初始化
@@ -1042,9 +1051,9 @@
                     ,"createDate":"<fmt:formatDate value="${projectRecords.createDate}" pattern="yyyy-MM-dd"/>"
                     ,"projectReportStatus":"${projectRecords.projectReportStatus}"
                     ,"projectReportRecordStatus":"${projectRecords.projectReportRecordStatus}"
-                    ,"downProjectReportRecordStatus":"${projectRecords.downProjectReportRecordStatus}"
+                    ,"downProjectReportRecordStatus":"${projectRecords.filingProjectStatus}"
                     ,"prrProcessInstanceId":"${projectRecords.prrProcessInstanceId}"
-                    ,"prrdProcessInstanceId":"${projectRecords.prrdProcessInstanceId}"
+                    ,"prrdProcessInstanceId":"${projectRecords.filingProcessinstanceId}"
                     ,"reportedProcessInstanceId":"${projectRecords.reportedProcessInstanceId}"
                     ,"prrId":"${projectRecords.prrId}"
                     ,"prrdId":"${projectRecords.prrdId}"