页面排序样式调整以及项目查询调整

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

@@ -489,11 +489,36 @@
 			</if>
 			<choose>
 				<when test="downProjectReportRecordStatus == 0">
-					AND( pfp.status is null or ppf.status is null )
+					<choose>
+						<when test="submitMoney !=null and submitMoney !=''">
+							<if test="submitMoney == 1">
+								AND( pfp.status is null)
+							</if>
+							<if test="submitMoney == 2">
+								AND( /*pfp.status is null or*/ ppf.status is null )
+							</if>
+						</when>
+						<otherwise>
+							AND( (a.submit_money = 2 and pfp.status is null) or (a.submit_money = 1 and ppf.status is null) )
+						</otherwise>
+					</choose>
 				</when>
 				<otherwise>
 					<if test="downProjectReportRecordStatus!=null and downProjectReportRecordStatus !=''">
-						AND  ppf.status = #{downProjectReportRecordStatus}
+						<choose>
+							<when test="submitMoney !=null and submitMoney !=''">
+								<if test="submitMoney == 1">
+									and pfp.status = #{downProjectReportRecordStatus}
+								</if>
+								<if test="submitMoney == 2">
+									and ppf.status = #{downProjectReportRecordStatus}
+								</if>
+							</when>
+							<otherwise>
+								and ppf.status = #{downProjectReportRecordStatus}
+							</otherwise>
+						</choose>
+
 					</if>
 				</otherwise>
 			</choose>
@@ -691,11 +716,36 @@
 
 			<choose>
 				<when test="downProjectReportRecordStatus == 0">
-					AND( pfp.status is null or ppf.status is null )
+					<choose>
+						<when test="submitMoney !=null and submitMoney !=''">
+							<if test="submitMoney == 1">
+								AND( pfp.status is null)
+							</if>
+							<if test="submitMoney == 2">
+								AND( /*pfp.status is null or*/ ppf.status is null )
+							</if>
+						</when>
+						<otherwise>
+							AND( (a.submit_money = 2 and pfp.status is null) or (a.submit_money = 1 and ppf.status is null) )
+						</otherwise>
+					</choose>
 				</when>
 				<otherwise>
 					<if test="downProjectReportRecordStatus!=null and downProjectReportRecordStatus !=''">
-						AND ppf.status = #{downProjectReportRecordStatus}
+						<choose>
+							<when test="submitMoney !=null and submitMoney !=''">
+								<if test="submitMoney == 1">
+									and pfp.status = #{downProjectReportRecordStatus}
+								</if>
+								<if test="submitMoney == 2">
+									and ppf.status = #{downProjectReportRecordStatus}
+								</if>
+							</when>
+							<otherwise>
+								and ppf.status = #{downProjectReportRecordStatus}
+							</otherwise>
+						</choose>
+
 					</if>
 				</otherwise>
 			</choose>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralProjectRecordsCaseView.jsp

@@ -118,13 +118,13 @@
 			<li><a href="${ctx}/ruralProject/ruralProjectView/list?parentProId=${projectRecords.id}&projectType=${projectRecords.projectType}">子项目列表</a></li>
 			<li><a href="${ctx}/ruralProject/ruralProjectView/workContractView?id=${projectRecords.workContractInfo.id}&projectId=${projectRecords.id}">客户合同详情</a></li>
 			<li><a href="${ctx}/ruralProject/ruralProjectView/planView?id=${projectRecords.id}">项目计划信息</a></li>
-			<li><a href="${ctx}/ruralProject/ruralProjectView/getReportedView?projectId=${projectRecords.id}&id=${reportedId}">上报信息</a></li>
 			<li><a href="${ctx}/ruralProject/ruralProjectView/modify?projectId=${projectRecords.id}">质量复核信息</a></li>
 			<li><a href="${ctx}/ruralProject/ruralProjectView/reportIssue?projectId=${projectRecords.id}">报告签发信息</a></li>
 			<li><a href="${ctx}/ruralProject/ruralProjectView/getAccessoryView?id=${projectRecords.id}">档案信息</a></li>
 			<li><a href="${ctx}/ruralProject/ruralProjectView/formRecordModify?id=${projectRecords.id}">线上归档信息</a></li>
 <%--			<li><a href="${ctx}/ruralProject/ruralProjectView/searchview?id=${projectRecords.id}">选查信息详情</a></li>--%>
 			<li><a href="${ctx}/ruralProject/ruralProjectView/paperView?projectId=${projectRecords.id}">纸质归档信息</a></li>
+			<li><a href="${ctx}/ruralProject/ruralProjectView/getReportedView?projectId=${projectRecords.id}&id=${reportedId}">上报信息</a></li>
 		</ul>
 	</div>
 	</div>

src/main/webapp/webpage/modules/ruralprojectrecords/subProjectInfo/subProjectInfoList.jsp

@@ -252,13 +252,13 @@
 			<li class="active"><a href="${ctx}/ruralProject/ruralProjectView/list?parentProId=${projectRecords.id}&projectType=${projectRecords.projectType}">子项目列表</a></li>
 			<li ><a href="${ctx}/ruralProject/ruralProjectView/workContractView?id=${projectRecords.workContractInfo.id}&projectId=${projectRecords.id}">客户合同详情</a></li>
 			<li><a href="${ctx}/ruralProject/ruralProjectView/planView?id=${projectRecords.id}">项目计划信息</a></li>
-			<li><a href="${ctx}/ruralProject/ruralProjectView/getReportedView?projectId=${projectRecords.id}&id=${reportedId}">上报信息</a></li>
 			<li><a href="${ctx}/ruralProject/ruralProjectView/modify?projectId=${projectRecords.id}">质量复核信息</a></li>
             <li><a href="${ctx}/ruralProject/ruralProjectView/reportIssue?projectId=${projectRecords.id}">报告签发信息</a></li>
 			<li><a href="${ctx}/ruralProject/ruralProjectView/getAccessoryView?id=${projectRecords.id}">档案信息</a></li>
 			<li><a href="${ctx}/ruralProject/ruralProjectView/formRecordModify?id=${projectRecords.id}">线上归档信息</a></li>
 			<%--<li><a href="${ctx}/ruralProject/ruralProjectView/searchview?id=${projectRecords.id}">选查信息详情</a></li>--%>
 			<li><a href="${ctx}/ruralProject/ruralProjectView/paperView?projectId=${projectRecords.id}&submitMoney=${projectRecords.submitMoney}">纸质归档信息</a></li>
+			<li><a href="${ctx}/ruralProject/ruralProjectView/getReportedView?projectId=${projectRecords.id}&id=${reportedId}">上报信息</a></li>
 
 		</ul>
 <%--		<ul class="list-tabs" >--%>

src/main/webapp/webpage/modules/ruralprojectrecords/view/projectAccessoryView.jsp

@@ -76,13 +76,13 @@
 			<li><a href="${ctx}/ruralProject/ruralProjectView/list?parentProId=${projectRecords.id}&projectType=${projectRecords.projectType}">子项目列表</a></li>
 			<li ><a href="${ctx}/ruralProject/ruralProjectView/workContractView?id=${projectRecords.workContractInfo.id}&projectId=${projectRecords.id}">客户合同详情</a></li>
 			<li><a href="${ctx}/ruralProject/ruralProjectView/planView?id=${projectRecords.id}">项目计划信息</a></li>
-			<li><a href="${ctx}/ruralProject/ruralProjectView/getReportedView?projectId=${projectRecords.id}&id=${reportedId}">上报信息</a></li>
 			<li><a href="${ctx}/ruralProject/ruralProjectView/modify?projectId=${projectRecords.id}">质量复核信息</a></li>
 			<li><a href="${ctx}/ruralProject/ruralProjectView/reportIssue?projectId=${projectRecords.id}">报告签发信息</a></li>
 			<li class="active"><a href="${ctx}/ruralProject/ruralProjectView/getAccessoryView?id=${projectRecords.id}">档案信息</a></li>
 			<li><a href="${ctx}/ruralProject/ruralProjectView/formRecordModify?id=${projectRecords.id}">线上归档信息</a></li>
 <%--			<li><a href="${ctx}/ruralProject/ruralProjectView/searchview?id=${projectRecords.id}">选查信息详情</a></li>--%>
 			<li><a href="${ctx}/ruralProject/ruralProjectView/paperView?projectId=${projectRecords.id}&submitMoney=${projectRecords.submitMoney}">纸质归档信息</a></li>
+			<li><a href="${ctx}/ruralProject/ruralProjectView/getReportedView?projectId=${projectRecords.id}&id=${reportedId}">上报信息</a></li>
 
 		</ul>
 	</div>

src/main/webapp/webpage/modules/ruralprojectrecords/view/projectFilingBatchView.jsp

@@ -213,12 +213,12 @@
             <li><a href="${ctx}/ruralProject/ruralProjectView/list?parentProId=${projectRecords.id}&projectType=${projectRecords.projectType}">子项目列表</a></li>
             <li ><a href="${ctx}/ruralProject/ruralProjectView/workContractView?id=${projectRecords.workContractInfo.id}&projectId=${projectRecords.id}">客户合同详情</a></li>
             <li><a href="${ctx}/ruralProject/ruralProjectView/planView?id=${projectRecords.id}">项目计划信息</a></li>
-            <li><a href="${ctx}/ruralProject/ruralProjectView/getReportedView?projectId=${projectRecords.id}&id=${reportedId}">上报信息</a></li>
             <li><a href="${ctx}/ruralProject/ruralProjectView/modify?projectId=${projectRecords.id}">质量复核信息</a></li>
             <li><a href="${ctx}/ruralProject/ruralProjectView/reportIssue?projectId=${projectRecords.id}">报告签发信息</a></li>
             <li><a href="${ctx}/ruralProject/ruralProjectView/getAccessoryView?id=${projectRecords.id}">档案信息</a></li>
             <li><a href="${ctx}/ruralProject/ruralProjectView/formRecordModify?id=${projectRecords.id}">线上归档信息</a></li>
             <li class="active"><a href="${ctx}/ruralProject/ruralProjectView/paperView?projectId=${projectRecords.id}&submitMoney=${projectRecords.submitMoney}">纸质归档信息</a></li>
+            <li><a href="${ctx}/ruralProject/ruralProjectView/getReportedView?projectId=${projectRecords.id}&id=${reportedId}">上报信息</a></li>
         </ul>
     </div>
 </div>

src/main/webapp/webpage/modules/ruralprojectrecords/view/projectPaperFilingView.jsp

@@ -100,12 +100,12 @@
 			<li><a href="${ctx}/ruralProject/ruralProjectView/list?parentProId=${projectRecords.id}&projectType=${projectRecords.projectType}">子项目列表</a></li>
 			<li ><a href="${ctx}/ruralProject/ruralProjectView/workContractView?id=${projectRecords.workContractInfo.id}&projectId=${projectRecords.id}">客户合同详情</a></li>
 			<li><a href="${ctx}/ruralProject/ruralProjectView/planView?id=${projectRecords.id}">项目计划信息</a></li>
-			<li><a href="${ctx}/ruralProject/ruralProjectView/getReportedView?projectId=${projectRecords.id}&id=${reportedId}">上报信息</a></li>
 			<li><a href="${ctx}/ruralProject/ruralProjectView/modify?projectId=${projectRecords.id}">质量复核信息</a></li>
 			<li><a href="${ctx}/ruralProject/ruralProjectView/reportIssue?projectId=${projectRecords.id}">报告签发信息</a></li>
 			<li><a href="${ctx}/ruralProject/ruralProjectView/getAccessoryView?id=${projectRecords.id}">档案信息</a></li>
 			<li><a href="${ctx}/ruralProject/ruralProjectView/formRecordModify?id=${projectRecords.id}">线上归档信息</a></li>
 			<li class="active"><a href="${ctx}/ruralProject/ruralProjectView/paperView?projectId=${projectRecords.id}&submitMoney=${projectRecords.submitMoney}">纸质归档信息</a></li>
+			<li><a href="${ctx}/ruralProject/ruralProjectView/getReportedView?projectId=${projectRecords.id}&id=${reportedId}">上报信息</a></li>
 		</ul>
 	</div>
 </div>

src/main/webapp/webpage/modules/ruralprojectrecords/view/projectPlanView.jsp

@@ -146,13 +146,13 @@
             <li><a href="${ctx}/ruralProject/ruralProjectView/list?parentProId=${projectRecords.id}&projectType=${projectRecords.projectType}">子项目列表</a></li>
             <li ><a href="${ctx}/ruralProject/ruralProjectView/workContractView?id=${projectRecords.workContractInfo.id}&projectId=${projectRecords.id}">客户合同详情</a></li>
             <li class="active"><a href="${ctx}/ruralProject/ruralProjectView/planView?id=${projectRecords.id}">项目计划信息</a></li>
-            <li><a href="${ctx}/ruralProject/ruralProjectView/getReportedView?projectId=${projectRecords.id}&id=${reportedId}">上报信息</a></li>
             <li><a href="${ctx}/ruralProject/ruralProjectView/modify?projectId=${projectRecords.id}">质量复核信息</a></li>
             <li><a href="${ctx}/ruralProject/ruralProjectView/reportIssue?projectId=${projectRecords.id}">报告签发信息</a></li>
             <li><a href="${ctx}/ruralProject/ruralProjectView/getAccessoryView?id=${projectRecords.id}">档案信息</a></li>
             <li><a href="${ctx}/ruralProject/ruralProjectView/formRecordModify?id=${projectRecords.id}">线上归档信息</a></li>
 <%--            <li><a href="${ctx}/ruralProject/ruralProjectView/searchview?id=${projectRecords.id}">选查信息详情</a></li>--%>
             <li><a href="${ctx}/ruralProject/ruralProjectView/paperView?projectId=${projectRecords.id}&submitMoney=${projectRecords.submitMoney}">纸质归档信息</a></li>
+            <li><a href="${ctx}/ruralProject/ruralProjectView/getReportedView?projectId=${projectRecords.id}&id=${reportedId}">上报信息</a></li>
         </ul>
     </div>
     </div>

src/main/webapp/webpage/modules/ruralprojectrecords/view/projectReportRecordView.jsp

@@ -192,13 +192,13 @@
 				<li><a href="${ctx}/ruralProject/ruralProjectView/list?parentProId=${projectRecords.id}&projectType=${projectRecords.projectType}">子项目列表</a></li>
 				<li ><a href="${ctx}/ruralProject/ruralProjectView/workContractView?id=${projectRecords.workContractInfo.id}&projectId=${projectRecords.id}">客户合同详情</a></li>
 				<li><a href="${ctx}/ruralProject/ruralProjectView/planView?id=${projectRecords.id}">项目计划信息</a></li>
-				<li><a href="${ctx}/ruralProject/ruralProjectView/getReportedView?projectId=${projectRecords.id}&id=${reportedId}">上报信息</a></li>
 				<li><a href="${ctx}/ruralProject/ruralProjectView/modify?projectId=${projectRecords.id}">质量复核信息</a></li>
 				<li><a href="${ctx}/ruralProject/ruralProjectView/reportIssue?projectId=${projectRecords.id}">报告签发信息</a></li>
 				<li><a href="${ctx}/ruralProject/ruralProjectView/getAccessoryView?id=${projectRecords.id}">档案信息</a></li>
 				<li class="active"><a href="${ctx}/ruralProject/ruralProjectView/formRecordModify?id=${projectRecords.id}">线上归档信息</a></li>
 <%--				<li><a href="${ctx}/ruralProject/ruralProjectView/searchview?id=${projectRecords.id}">选查信息详情</a></li>--%>
 				<li><a href="${ctx}/ruralProject/ruralProjectView/paperView?projectId=${projectRecords.id}&submitMoney=${projectRecords.submitMoney}">纸质归档信息</a></li>
+				<li><a href="${ctx}/ruralProject/ruralProjectView/getReportedView?projectId=${projectRecords.id}&id=${reportedId}">上报信息</a></li>
 
 			</ul>
 		</div>
@@ -341,7 +341,7 @@
 			</div>
 			<div>
 				<div class="form-group-label">
-					<h2>质量复核内容</h2>
+					<h2>电子归档复核内容</h2>
 				</div>
 				<div>
 					<div class="layui-item layui-col-xs12" >

src/main/webapp/webpage/modules/ruralprojectrecords/view/reportIssueView.jsp

@@ -168,13 +168,13 @@
 				<li><a href="${ctx}/ruralProject/ruralProjectView/list?parentProId=${projectRecords.id}&projectType=${projectRecords.projectType}">子项目列表</a></li>
 				<li><a href="${ctx}/ruralProject/ruralProjectView/workContractView?id=${projectRecords.workContractInfo.id}&projectId=${projectRecords.id}">客户合同详情</a></li>
 				<li><a href="${ctx}/ruralProject/ruralProjectView/planView?id=${projectRecords.id}">项目计划信息</a></li>
-				<li><a href="${ctx}/ruralProject/ruralProjectView/getReportedView?projectId=${projectRecords.id}&id=${reportedId}">上报信息</a></li>
 				<li><a href="${ctx}/ruralProject/ruralProjectView/modify?projectId=${projectRecords.id}">质量复核信息</a></li>
 				<li class="active"><a href="${ctx}/ruralProject/ruralProjectView/reportIssue?projectId=${projectRecords.id}">报告签发信息</a></li>
 				<li><a href="${ctx}/ruralProject/ruralProjectView/getAccessoryView?id=${projectRecords.id}">档案信息</a></li>
 				<li><a href="${ctx}/ruralProject/ruralProjectView/formRecordModify?id=${projectRecords.id}">线上归档信息</a></li>
 <%--				<li><a href="${ctx}/ruralProject/ruralProjectView/searchview?id=${projectRecords.id}">选查信息详情</a></li>--%>
 				<li><a href="${ctx}/ruralProject/ruralProjectView/paperView?projectId=${projectRecords.id}&submitMoney=${projectRecords.submitMoney}">纸质归档信息</a></li>
+				<li><a href="${ctx}/ruralProject/ruralProjectView/getReportedView?projectId=${projectRecords.id}&id=${reportedId}">上报信息</a></li>
 
 			</ul>
 		</div>

src/main/webapp/webpage/modules/ruralprojectrecords/view/reportView.jsp

@@ -302,13 +302,13 @@
 				<li><a href="${ctx}/ruralProject/ruralProjectView/list?parentProId=${projectRecords.id}&projectType=${projectRecords.projectType}">子项目列表</a></li>
 				<li><a href="${ctx}/ruralProject/ruralProjectView/workContractView?id=${projectRecords.workContractInfo.id}&projectId=${projectRecords.id}">客户合同详情</a></li>
 				<li><a href="${ctx}/ruralProject/ruralProjectView/planView?id=${projectRecords.id}">项目计划信息</a></li>
-				<li><a href="${ctx}/ruralProject/ruralProjectView/getReportedView?projectId=${projectRecords.id}&id=${reportedId}">上报信息</a></li>
 				<li class="active"><a href="${ctx}/ruralProject/ruralProjectView/modify?projectId=${projectRecords.id}">质量复核信息</a></li>
 				<li><a href="${ctx}/ruralProject/ruralProjectView/reportIssue?projectId=${projectRecords.id}">报告签发信息</a></li>
 				<li><a href="${ctx}/ruralProject/ruralProjectView/getAccessoryView?id=${projectRecords.id}">档案信息</a></li>
 				<li><a href="${ctx}/ruralProject/ruralProjectView/formRecordModify?id=${projectRecords.id}">线上归档信息</a></li>
 <%--				<li><a href="${ctx}/ruralProject/ruralProjectView/searchview?id=${projectRecords.id}">选查信息详情</a></li>--%>
 				<li><a href="${ctx}/ruralProject/ruralProjectView/paperView?projectId=${projectRecords.id}&submitMoney=${projectRecords.submitMoney}">纸质归档信息</a></li>
+				<li><a href="${ctx}/ruralProject/ruralProjectView/getReportedView?projectId=${projectRecords.id}&id=${reportedId}">上报信息</a></li>
 
 			</ul>
 		</div>

src/main/webapp/webpage/modules/ruralprojectrecords/view/reportedView.jsp

@@ -118,13 +118,13 @@
             <li><a href="${ctx}/ruralProject/ruralProjectView/list?parentProId=${projectRecords.id}&projectType=${projectRecords.projectType}">子项目列表</a></li>
             <li ><a href="${ctx}/ruralProject/ruralProjectView/workContractView?id=${projectRecords.workContractInfo.id}&projectId=${projectRecords.id}">客户合同详情</a></li>
             <li><a href="${ctx}/ruralProject/ruralProjectView/planView?id=${projectRecords.id}">项目计划信息</a></li>
-            <li class="active"><a href="${ctx}/ruralProject/ruralProjectView/getReportedView?projectId=${projectRecords.id}&id=${reportedId}">上报信息</a></li>
             <li><a href="${ctx}/ruralProject/ruralProjectView/modify?projectId=${projectRecords.id}">质量复核信息</a></li>
             <li><a href="${ctx}/ruralProject/ruralProjectView/reportIssue?projectId=${projectRecords.id}">报告签发信息</a></li>
             <li><a href="${ctx}/ruralProject/ruralProjectView/getAccessoryView?id=${projectRecords.id}">档案信息</a></li>
             <li><a href="${ctx}/ruralProject/ruralProjectView/formRecordModify?id=${projectRecords.id}">线上归档信息</a></li>
 <%--            <li><a href="${ctx}/ruralProject/ruralProjectView/searchview?id=${projectRecords.id}">选查信息详情</a></li>--%>
             <li><a href="${ctx}/ruralProject/ruralProjectView/paperView?projectId=${projectRecords.id}&submitMoney=${projectRecords.submitMoney}">纸质归档信息</a></li>
+            <li class="active"><a href="${ctx}/ruralProject/ruralProjectView/getReportedView?projectId=${projectRecords.id}&id=${reportedId}">上报信息</a></li>
 
         </ul>
 <%--        <ul class="list-tabs" >--%>

src/main/webapp/webpage/modules/ruralprojectrecords/view/ruralProjectRecordsView.jsp

@@ -94,13 +94,13 @@
 			<li><a href="${ctx}/ruralProject/ruralProjectView/list?parentProId=${projectRecords.id}&projectType=${projectRecords.projectType}">子项目列表</a></li>
 			<li><a href="${ctx}/ruralProject/ruralProjectView/workContractView?id=${projectRecords.workContractInfo.id}&projectId=${projectRecords.id}">客户合同详情</a></li>
 			<li><a href="${ctx}/ruralProject/ruralProjectView/planView?id=${projectRecords.id}">项目计划信息</a></li>
-			<li><a href="${ctx}/ruralProject/ruralProjectView/getReportedView?projectId=${projectRecords.id}&id=${reportedId}">上报信息</a></li>
 			<li><a href="${ctx}/ruralProject/ruralProjectView/modify?projectId=${projectRecords.id}">质量复核信息</a></li>
 			<li><a href="${ctx}/ruralProject/ruralProjectView/reportIssue?projectId=${projectRecords.id}">报告签发信息</a></li>
 			<li><a href="${ctx}/ruralProject/ruralProjectView/getAccessoryView?id=${projectRecords.id}">档案信息</a></li>
 			<li><a href="${ctx}/ruralProject/ruralProjectView/formRecordModify?id=${projectRecords.id}">线上归档信息</a></li>
 <%--			<li><a href="${ctx}/ruralProject/ruralProjectView/searchview?id=${projectRecords.id}">选查信息详情</a></li>--%>
 			<li><a href="${ctx}/ruralProject/ruralProjectView/paperView?projectId=${projectRecords.id}&submitMoney=${projectRecords.submitMoney}">纸质归档信息</a></li>
+			<li><a href="${ctx}/ruralProject/ruralProjectView/getReportedView?projectId=${projectRecords.id}&id=${reportedId}">上报信息</a></li>
 		</ul>
 	</div>
 	</div>

src/main/webapp/webpage/modules/ruralprojectrecords/view/selectiveSearchView.jsp

@@ -31,13 +31,13 @@
 			<li><a href="${ctx}/ruralProject/ruralProjectView/list?parentProId=${projectRecords.id}&projectType=${projectRecords.projectType}">子项目列表</a></li>
 			<li><a href="${ctx}/ruralProject/ruralProjectView/workContractView?id=${projectRecords.workContractInfo.id}&projectId=${projectRecords.id}">客户合同详情</a></li>
 			<li><a href="${ctx}/ruralProject/ruralProjectView/planView?id=${projectRecords.id}">项目计划信息</a></li>
-			<li><a href="${ctx}/ruralProject/ruralProjectView/getReportedView?projectId=${projectRecords.id}&id=${reportedId}">上报信息</a></li>
 			<li><a href="${ctx}/ruralProject/ruralProjectView/modify?projectId=${projectRecords.id}">质量复核信息</a></li>
 			<li><a href="${ctx}/ruralProject/ruralProjectView/reportIssue?projectId=${projectRecords.id}">报告签发信息</a></li>
 			<li><a href="${ctx}/ruralProject/ruralProjectView/getAccessoryView?id=${projectRecords.id}">档案信息</a></li>
 			<li><a href="${ctx}/ruralProject/ruralProjectView/formRecordModify?id=${projectRecords.id}">线上归档信息</a></li>
 <%--			<li class="active"><a href="${ctx}/ruralProject/ruralProjectView/searchview?id=${projectRecords.id}">选查信息详情</a></li>--%>
 			<li><a href="${ctx}/ruralProject/ruralProjectView/paperView?projectId=${projectRecords.id}&submitMoney=${projectRecords.submitMoney}">纸质归档信息</a></li>
+			<li><a href="${ctx}/ruralProject/ruralProjectView/getReportedView?projectId=${projectRecords.id}&id=${reportedId}">上报信息</a></li>
 		</ul>
 	</div>
 	</div>

src/main/webapp/webpage/modules/ruralprojectrecords/view/workClientAndContractView.jsp

@@ -25,13 +25,13 @@
             <li><a href="${ctx}/ruralProject/ruralProjectView/list?parentProId=${projectRecords.id}&projectType=${projectRecords.projectType}">子项目列表</a></li>
             <li  class="active"><a href="${ctx}/ruralProject/ruralProjectView/workContractView?id=${projectRecords.workContractInfo.id}&projectId=${projectRecords.id}">客户合同详情</a></li>
             <li><a href="${ctx}/ruralProject/ruralProjectView/planView?id=${projectRecords.id}">项目计划信息</a></li>
-            <li><a href="${ctx}/ruralProject/ruralProjectView/getReportedView?projectId=${projectRecords.id}&id=${reportedId}">上报信息</a></li>
             <li><a href="${ctx}/ruralProject/ruralProjectView/modify?projectId=${projectRecords.id}">质量复核信息</a></li>
             <li><a href="${ctx}/ruralProject/ruralProjectView/reportIssue?projectId=${projectRecords.id}">报告签发信息</a></li>
             <li><a href="${ctx}/ruralProject/ruralProjectView/getAccessoryView?id=${projectRecords.id}">档案信息</a></li>
             <li><a href="${ctx}/ruralProject/ruralProjectView/formRecordModify?id=${projectRecords.id}">线上归档信息</a></li>
 <%--            <li><a href="${ctx}/ruralProject/ruralProjectView/searchview?id=${projectRecords.id}">选查信息详情</a></li>--%>
             <li><a href="${ctx}/ruralProject/ruralProjectView/paperView?projectId=${projectRecords.id}&submitMoney=${projectRecords.submitMoney}">纸质归档信息</a></li>
+            <li><a href="${ctx}/ruralProject/ruralProjectView/getReportedView?projectId=${projectRecords.id}&id=${reportedId}">上报信息</a></li>
         </ul>
     </div>
     </div>