项目上报数据修改

src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralCostProjectMessageController.java

@@ -514,32 +514,33 @@ public class RuralCostProjectMessageController extends BaseController {
                 consultant.setRole("咨询员");
                 consultant.setZixunyuanName(user.getName());
                 if(consultant.getZixunyuan().equals(projectReportData.getBzshbUserId())){
-                    User chenHongXing=UserUtils.getByLoginName("陈红星");
+                    User chenHongXing=UserUtils.get(projectReportData.getBzshbUserId());
                     List<WorkStaffCertificate> chenHongXingCertificateList = ruralProjectMessageService.getCertificateByUser(chenHongXing.getId());
-                    //获取陈红星的造价师信息
-                    WorkStaffCertificate chenHongXingStaffCertificate = chenHongXingCertificateList.get(0);
-
-                    //根据用户查询技能信息
-                    List<WorkStaffCertificate> certificateBList = ruralProjectMessageService.getCertificateByUser(consultant.getZixunyuan());
-                    for (WorkStaffCertificate certificateInfo: certificateBList) {
-                        for (MainDictDetail type : certificateMajor) {
-                            if(certificateInfo.getMajor().equals(type.getValue())){
-                                bzshbConsultant.setMajor(type.getLabel());
+                    if(chenHongXingCertificateList.size()>0){
+                        //获取陈红星的造价师信息
+                        WorkStaffCertificate chenHongXingStaffCertificate = chenHongXingCertificateList.get(0);
+
+                        //根据用户查询技能信息
+                        List<WorkStaffCertificate> certificateBList = ruralProjectMessageService.getCertificateByUser(consultant.getZixunyuan());
+                        for (WorkStaffCertificate certificateInfo: certificateBList) {
+                            for (MainDictDetail type : certificateMajor) {
+                                if(certificateInfo.getMajor().equals(type.getValue())){
+                                    consultant.setMajor(type.getLabel());
+                                }
                             }
                         }
-                    }
 
-                    bzshbConsultant = consultant;
-                    bzshbConsultant.setZhucezigezhID(chenHongXingStaffCertificate.getNum());
-                    bzshbConsultant.setZixunyuanName(""+consultant.getZixunyuanName()+"");
-                    bzshbConsultant.setRole("技术负责人");
-                    it.remove();
+                        consultant.setZhucezigezhID(chenHongXingStaffCertificate.getNum());
+                    }
+                    consultant.setZixunyuanName(""+consultant.getZixunyuanName()+"");
+                    consultant.setRole("技术负责人");
+                    //it.remove();
                 }
             }
         }
         consultants.addAll(consultantList);
 
-        if(StringUtils.isNotBlank(bzshbConsultant.getZixunyuan())){
+        /*if(StringUtils.isNotBlank(bzshbConsultant.getZixunyuan())){
             consultants.add(bzshbConsultant);
         }else{
             //查询总审人员信息
@@ -597,7 +598,7 @@ public class RuralCostProjectMessageController extends BaseController {
                 bzshbConsultant.setRole("技术负责人");
                 consultants.add(bzshbConsultant);
             }
-        }
+        }*/
 
         //查询上报信息表中是否含有数据，没有则进行获取基础数据
         RuralProjectRecordsReported reported = ruralProjectMessageService.getRuralProjectRecordsReported(projectRecords.getId());

src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralProjectMessageController.java

@@ -528,32 +528,34 @@ public class RuralProjectMessageController extends BaseController {
                 consultant.setZixunyuanName(user.getName());
                 if(consultant.getZixunyuan().equals(projectReportData.getBzshbUserId())){
 
-                    User chenHongXing=UserUtils.getByLoginName("陈红星");
+                    User chenHongXing=UserUtils.get(projectReportData.getBzshbUserId());
                     List<WorkStaffCertificate> chenHongXingCertificateList = ruralProjectMessageService.getCertificateByUser(chenHongXing.getId());
-                    //获取陈红星的造价师信息
-                    WorkStaffCertificate chenHongXingStaffCertificate = chenHongXingCertificateList.get(0);
-
-                    //根据用户查询技能信息
-                    List<WorkStaffCertificate> certificateBList = ruralProjectMessageService.getCertificateByUser(consultant.getZixunyuan());
-                    for (WorkStaffCertificate certificateInfo: certificateBList) {
-                        for (MainDictDetail type : certificateMajor) {
-                            if(certificateInfo.getMajor().equals(type.getValue())){
-                                bzshbConsultant.setMajor(type.getLabel());
+                    if(chenHongXingCertificateList.size() >0){
+                        //获取陈红星的造价师信息
+                        WorkStaffCertificate chenHongXingStaffCertificate = chenHongXingCertificateList.get(0);
+
+                        //根据用户查询技能信息
+                        List<WorkStaffCertificate> certificateBList = ruralProjectMessageService.getCertificateByUser(consultant.getZixunyuan());
+                        for (WorkStaffCertificate certificateInfo: certificateBList) {
+                            for (MainDictDetail type : certificateMajor) {
+                                if(certificateInfo.getMajor().equals(type.getValue())){
+                                    consultant.setMajor(type.getLabel());
+                                }
                             }
                         }
+
+                        consultant.setZhucezigezhID(chenHongXingStaffCertificate.getNum());
                     }
 
-                    bzshbConsultant = consultant;
-                    bzshbConsultant.setZhucezigezhID(chenHongXingStaffCertificate.getNum());
-                    bzshbConsultant.setZixunyuanName(""+consultant.getZixunyuanName()+"");
-                    bzshbConsultant.setRole("技术负责人");
-                    it.remove();
+                    consultant.setZixunyuanName(""+consultant.getZixunyuanName()+"");
+                    consultant.setRole("技术负责人");
+                    //it.remove();
                 }
             }
         }
         consultants.addAll(consultantList);
 
-        if(StringUtils.isNotBlank(bzshbConsultant.getZixunyuan())){
+        /*if(StringUtils.isNotBlank(bzshbConsultant.getZixunyuan())){
             consultants.add(bzshbConsultant);
         }else{
             //查询总审人员信息
@@ -611,7 +613,7 @@ public class RuralProjectMessageController extends BaseController {
                 bzshbConsultant.setRole("技术负责人");
                 consultants.add(bzshbConsultant);
             }
-        }
+        }*/
         //查询总审人员信息
         List<User> auditUserList = userService.getAuditUserList();
         ruralProjectRecords.setBzshbUserList(auditUserList);

src/main/java/com/jeeplus/modules/workcalendar/service/WorkCalendarTaskService.java

@@ -113,7 +113,7 @@ public class WorkCalendarTaskService  {
      * 获取项目即将超期还未上报并进行通知
      */
     //设置每日凌晨10分调用通知方法
-    //@Scheduled(cron= "0 10 0 * * ?")
+    @Scheduled(cron= "0 10 0 * * ?")
     @Transactional(readOnly = false)
     public void getProjectReportedListByAdvent() {
         logger.info("-----------项目超期未上报定时任务开始------------------");

src/main/resources/mappings/modules/sealApplyFor/SealApplyForDao.xml

@@ -173,6 +173,8 @@
 	<select id="queryCount" resultType="int" >
 		SELECT count(DISTINCT a.id)
 		FROM seal_apply_for_info a
+		<include refid="sealApplyForJoin"/>
+		<include refid="projectJoin"/>
 		<where>
 			and a.del_flag = 0
 			<if test="projectRecords != null and projectRecords.id != null and projectRecords.id != ''">

src/main/webapp/webpage/modules/ruralprojectrecords/cost/projectcontentinfo/adminReportEditForm.jsp

@@ -1566,7 +1566,7 @@
 			<ul class="list-tabs">
 				<li class="active"><a>质量复核信息</a><span style="display: none">info</span></li>
 				<li><a>档案信息</a><span style="display: none">archives</span></li>
-				<li><a>上报信息</a><span style="display: none">recordsReported</span></li>
+				<%--<li><a>上报信息</a><span style="display: none">recordsReported</span></li>--%>
 			</ul>
 		</div>
 	</div>

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

@@ -819,7 +819,7 @@
 					}
 				}
 				/*上报相关按钮*/
-				if(d.projectReportStatusTwo == 0){
+				/*if(d.projectReportStatusTwo == 0){
 					if(d.projectReportStatus == 5){
 							if(d.syncStatus == 0){
 								if(d.reportStatus == 0){
@@ -833,11 +833,11 @@
 									if(d.reportedState == 2){
 										xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectMessage/cancelInvalidateByReported?companyType=${companyType}&id=" + d.id + "&processInstanceId=" + d.reportedProcessInstanceId + "\" onclick=\"return confirmx('确认要撤回该上报审批吗？', this.href)\" class=\"layui-btn layui-btn-xs  layui-bg-red\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 撤回上报</a>";
 									}
-									/*撤回修改*/
+									/!*撤回修改*!/
 									if(d.reportedState == 3){
 										xml+="<a href=\"#\" onclick=\"openDialogreReportSwitch('上报管理', '${ctx}/ruralProject/ruralCostProjectMessageNew/updateReported?companyType=${companyType}&id=" +  d.id + " ','95%', '95%','','上报,关闭')\"  class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 修改上报</a>";
 									}
-									/*驳回修改*/
+									/!*驳回修改*!/
 									if(d.reportedState == 4){
 										//驳回操作
 										xml+="<a href=\"#\" onclick=\"openDialogreReportSwitch('上报管理', '${ctx}/ruralProject/ruralCostProjectMessageNew/reportedModify?companyType=${companyType}&id=" +  d.id + " ','95%', '95%','','上报,关闭')\"  class=\"layui-btn layui-btn-xs layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 修改上报</a>";
@@ -859,11 +859,11 @@
 								if(d.reportedState == 2){
 									xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectMessage/cancelInvalidateByReported?companyType=${companyType}&id=" + d.id + "&processInstanceId=" + d.reportedProcessInstanceId + "\" onclick=\"return confirmx('确认要撤回该上报审批吗？', this.href)\" class=\"layui-btn layui-btn-xs  layui-bg-red\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 撤回上报</a>";
 								}
-								/*撤回修改*/
+								/!*撤回修改*!/
 								if(d.reportedState == 3){
 									xml+="<a href=\"#\" onclick=\"openDialogreReportSwitch('上报管理', '${ctx}/ruralProject/ruralCostProjectMessageNew/updateReported?companyType=${companyType}&id=" +  d.id + " ','95%', '95%','','上报,关闭')\"  class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 修改上报</a>";
 								}
-								/*驳回修改*/
+								/!*驳回修改*!/
 								if(d.reportedState == 4){
 									//驳回操作
 									xml+="<a href=\"#\" onclick=\"openDialogreReportSwitch('上报管理', '${ctx}/ruralProject/ruralCostProjectMessageNew/reportedModify?companyType=${companyType}&id=" +  d.id + " ','95%', '95%','','上报,关闭')\"  class=\"layui-btn layui-btn-xs layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 修改上报</a>";
@@ -871,7 +871,7 @@
 							}
 						}
 					}
-				}
+				}*/
 				/*纸质归档*/
 				/*if(d.projectReportStatusTwo == 5){
 					if(d.submitMoney == "2"){
@@ -916,17 +916,17 @@
 				}
 			}
 			//项目升级按钮
-			if (d.submitMoney==1){
+			/*if (d.submitMoney==1){
 				if (d.projectReportRecordStatus==0 || d.projectReportRecordStatus==1 || d.projectReportRecordStatus==2 || d.projectReportRecordStatus==3 || d.projectReportRecordStatus==6){
 					xml+="<a href=\"#\" onclick=\"projectUpgrade('"+d.id+"','"+d.projectReportRecordStatus+"','"+d.filingProjectStatus+"','"+d.projectReportStatus+"','"+d.projectReportStatusTwo+"')\" class=\"layui-btn layui-btn-xs layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 项目升级</a>";
 				}
-			}
+			}*/
 			</shiro:hasPermission>
-			<shiro:hasPermission name="ruralProject:ruralCostProjectMessage:reportedProvincialStanding">
+			<%--<shiro:hasPermission name="ruralProject:ruralCostProjectMessage:reportedProvincialStanding">
 			if(d.reportedState == 5 || d.reportedState == 7){
 				xml+="<a href=\"#\" onclick=\"openDialogreReportSwitch('上报管理', '${ctx}/ruralProject/ruralCostProjectMessageNew/submitReportedProvincialStanding?companyType=${companyType}&id=" +  d.id + " ','95%', '95%','','上报,关闭')\"  class=\"layui-btn layui-btn-xs layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 提交省站</a>";
 			}
-			</shiro:hasPermission>
+			</shiro:hasPermission>--%>
 
 
 
@@ -1074,7 +1074,7 @@
 								</form:select>
 							</div>
 						</div>--%>
-						<div class="layui-item query athird ">
+						<%--<div class="layui-item query athird ">
 							<label class="layui-form-label">上报状态：</label>
 							<div class="layui-input-block readOnlyFFF">
 								<form:select path="reportedState" class="form-control simple-select">
@@ -1082,7 +1082,7 @@
 									<form:options items="${fns:getDictList('reported_state')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
 								</form:select>
 							</div>
-						</div>
+						</div>--%>
 						<%--<div class="layui-item query athird ">
 							<label class="layui-form-label double-line">项目等级：</label>
 							<div class="layui-input-block readOnlyFFF">
@@ -1288,14 +1288,14 @@
 						}
 						return xml;
 					}}*/
-				,{align:'center', title: '上报',  width:110,templet:function(d){
+				/*,{align:'center', title: '上报',  width:110,templet:function(d){
 						var st = getReportedState(d.reportedState);
 						if(st.action)
 							var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralCostProjectMessage/getReportedProcess?companyType=${companyType}&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:150,templet:function(d){
 						var st = getCaseBaseAuditState(d.caseStatus);
 						if(st.action)

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

@@ -835,11 +835,11 @@
 				}
 			}
 			//项目升级按钮
-			if (d.submitMoney==1){
+			/*if (d.submitMoney==1){
 				if (d.projectReportRecordStatus==0 || d.projectReportRecordStatus==1 || d.projectReportRecordStatus==2 || d.projectReportRecordStatus==3 || d.projectReportRecordStatus==6){
 					xml+="<a href=\"#\" onclick=\"projectUpgrade('"+d.id+"','"+d.projectReportRecordStatus+"','"+d.filingProjectStatus+"','"+d.projectReportStatus+"','"+d.projectReportStatusTwo+"')\" class=\"layui-btn layui-btn-xs layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 项目升级</a>";
 				}
-			}
+			}*/
 			</shiro:hasPermission>
 			<shiro:hasPermission name="ruralProject:ruralCostProjectMessage:reportedProvincialStanding">
 			if(d.reportedState == 5 || d.reportedState == 7){

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

@@ -115,7 +115,7 @@
 	<div class="list-form-tab contentShadow shadowLTR" id="tabDiv">
 		<ul class="list-tabs" >
 			<li class="active"><a href="${ctx}/ruralProject/ruralProjectView/view?id=${projectRecords.id}">项目详情</a></li>
-			<li><a href="${ctx}/ruralProject/ruralProjectView/list?parentProId=${projectRecords.id}&projectType=${projectRecords.projectType}">子项目列表</a></li>
+			<%--<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/modify?projectId=${projectRecords.id}">质量复核信息</a></li>
@@ -124,7 +124,7 @@
 			<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>
+			<%--<li><a href="${ctx}/ruralProject/ruralProjectView/getReportedView?projectId=${projectRecords.id}&id=${reportedId}">上报信息</a></li>--%>
 		</ul>
 	</div>
 	</div>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/all/ruralProjectMessageAllList.jsp

@@ -1038,11 +1038,11 @@
 								xml+="<a href=\"#\" onclick=\"openDialogre('修改纸质归档案卷号', '${ctx}/paperFiling/paperFiling/adminPaperFiling?id=" + d.ppfId + "&projectId=" + d.id +"&view=allfiling ','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 修改纸质归档</a>";
 							}
 							//项目升级按钮
-							if (d.submitMoney==1){
+							/*if (d.submitMoney==1){
 								if (d.projectReportRecordStatus==0 || d.projectReportRecordStatus==1 || d.projectReportRecordStatus==2 || d.projectReportRecordStatus==3 || d.projectReportRecordStatus==6){
 									xml+="<a href=\"#\" onclick=\"projectUpgrade('"+d.id+"','"+d.projectReportRecordStatus+"','"+d.filingProjectStatus+"','"+d.projectReportStatus+"','"+d.projectReportStatusTwo+"')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 项目升级</a>";
 								}
-							}
+							}*/
 						</shiro:hasPermission>
 
 

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/adminReportEditForms.jsp

@@ -1556,7 +1556,7 @@
 			<ul class="list-tabs">
 				<li class="active"><a>质量复核信息</a><span style="display: none">info</span></li>
 				<li><a>档案信息</a><span style="display: none">archives</span></li>
-				<li><a>上报信息</a><span style="display: none">recordsReported</span></li>
+				<%--<li><a>上报信息</a><span style="display: none">recordsReported</span></li>--%>
 			</ul>
 		</div>
 	</div>

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

@@ -758,13 +758,13 @@
 					}
 				}
 				/*上报相关按钮*/
-				if(d.projectReportStatusTwo == 0){
+				/*if(d.projectReportStatusTwo == 0){
 					if(d.projectReportStatus == 5){
 							if(d.syncStatus == 0){
 								if(d.reportStatus == 0){
 									if(d.reportedState == 0 || d.reportedState == 6){
 										xml+="<a href=\"#\" onclick=\"openDialogreReportSwitch('上报管理', '${ctx}/ruralProject/ruralProjectMessageNew/updateReported?companyType=${companyType}&id=" +  d.id + " ','95%', '95%','','上报,暂存,关闭')\" style='background-color: #5FB878;height: 32px;margin-top: 5px;margin-bottom: 5px;' class=\"layui-btn layui-btn-xs layui-bg-blue\" > 上报</a>";
-										/*xml+="<a href=\"#\" onclick=\"openDialogre('上报管理', '${ctx}/ruralProject/ruralProjectMessage/updateReportedByPerson?id=" +  d.id + " ','95%', '95%','','上报,关闭')\" style='background-color: #5FB878' class=\"layui-btn layui-btn-xs  layui-bg-blue\" > 个人上报</a>";*/
+										/!*xml+="<a href=\"#\" onclick=\"openDialogre('上报管理', '${ctx}/ruralProject/ruralProjectMessage/updateReportedByPerson?id=" +  d.id + " ','95%', '95%','','上报,关闭')\" style='background-color: #5FB878' class=\"layui-btn layui-btn-xs  layui-bg-blue\" > 个人上报</a>";*!/
 									}
 								}else{
 									if(d.reportedState == 1){
@@ -773,11 +773,11 @@
 									if(d.reportedState == 2){
 										xml+="<a href=\"${ctx}/ruralProject/ruralProjectMessage/cancelInvalidateByReported?companyType=${companyType}&id=" + d.id + "&processInstanceId=" + d.reportedProcessInstanceId + "\" onclick=\"return confirmx('确认要撤回该上报审批吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 撤回上报</a>";
 									}
-									/*撤回修改*/
+									/!*撤回修改*!/
 									if(d.reportedState == 3){
 										xml+="<a href=\"#\" onclick=\"openDialogreReportSwitch('上报管理', '${ctx}/ruralProject/ruralProjectMessageNew/updateReported?companyType=${companyType}&id=" +  d.id + " ','95%', '95%','','上报,关闭')\" style='background-color: #1E9FFF;height: 32px;margin-top: 5px;margin-bottom: 5px;' class=\"layui-btn layui-btn-xs  layui-bg-green\" > 修改上报</a>";
 									}
-									/*驳回修改*/
+									/!*驳回修改*!/
 									if(d.reportedState == 4){
 										//驳回操作
 										// if(d.newReportedNotifyFlag == 1){
@@ -796,7 +796,7 @@
 							if(d.reportStatus == 0){
 								if(d.reportedState == 0 || d.reportedState == 6){
 									xml+="<a href=\"#\" onclick=\"openDialogreReportSwitch('上报管理', '${ctx}/ruralProject/ruralProjectMessageNew/updateReported?companyType=${companyType}&id=" +  d.id + " ','95%', '95%','','上报,暂存,关闭')\" style='background-color: #5FB878' class=\"layui-btn layui-btn-xs layui-bg-blue\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 上报</a>";
-									/*xml+="<a href=\"#\" onclick=\"openDialogre('上报管理', '${ctx}/ruralProject/ruralProjectMessage/updateReportedByPerson?id=" +  d.id + " ','95%', '95%','','上报,关闭')\" style='background-color: #5FB878' class=\"layui-btn layui-btn-xs  layui-bg-blue\" > 个人上报</a>";*/
+									/!*xml+="<a href=\"#\" onclick=\"openDialogre('上报管理', '${ctx}/ruralProject/ruralProjectMessage/updateReportedByPerson?id=" +  d.id + " ','95%', '95%','','上报,关闭')\" style='background-color: #5FB878' class=\"layui-btn layui-btn-xs  layui-bg-blue\" > 个人上报</a>";*!/
 								}
 							}else{
 								if(d.reportedState == 1){
@@ -805,11 +805,11 @@
 								if(d.reportedState == 2){
 									xml+="<a href=\"${ctx}/ruralProject/ruralProjectMessage/cancelInvalidateByReported?companyType=${companyType}&id=" + d.id + "&processInstanceId=" + d.reportedProcessInstanceId + "\" onclick=\"return confirmx('确认要撤回该上报审批吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 撤回上报</a>";
 								}
-								/*撤回修改*/
+								/!*撤回修改*!/
 								if(d.reportedState == 3){
 									xml+="<a href=\"#\" onclick=\"openDialogreReportSwitch('上报管理', '${ctx}/ruralProject/ruralProjectMessageNew/updateReported?companyType=${companyType}&id=" +  d.id + " ','95%', '95%','','上报,关闭')\" style='background-color: #1E9FFF' class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 修改上报</a>";
 								}
-								/*驳回修改*/
+								/!*驳回修改*!/
 								if(d.reportedState == 4){
 									//驳回操作
 									// if(d.newReportedNotifyFlag == 1){
@@ -823,7 +823,7 @@
 						}
 
 					}
-				}
+				}*/
 				/*纸质归档*/
 				/*if(d.projectReportStatusTwo == 5){
 					if(d.submitMoney == "2"){
@@ -864,11 +864,11 @@
 				xml+="<a href=\"#\" onclick=\"openDialogre('修改纸质归档案卷号', '${ctx}/paperFiling/paperFiling/adminPaperFiling?companyType=${companyType}&id=" + d.ppfId + "&projectId=" + d.id +"&view=filing ','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 修改纸质归档</a>";
 			}
 			//项目升级按钮
-			if (d.submitMoney==1){
+			/*if (d.submitMoney==1){
 				if (d.projectReportRecordStatus==0 || d.projectReportRecordStatus==1 || d.projectReportRecordStatus==2 || d.projectReportRecordStatus==3 || d.projectReportRecordStatus==6){
 					xml+="<a href=\"#\" onclick=\"projectUpgrade('"+d.id+"','"+d.projectReportRecordStatus+"','"+d.filingProjectStatus+"','"+d.projectReportStatus+"','"+d.projectReportStatusTwo+"')\" class=\"layui-btn layui-btn-xs layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 项目升级</a>";
 				}
-			}
+			}*/
 			if(d.projectReportStatus == 5){
 				if (d.projectReportStatusTwo != 5 && d.projectReportStatusTwo != 2){
 					xml+="<a href=\"#\" onclick=\"openDialogre('修改报告质量复核信息', '${ctx}/ruralProject/ruralProjectMessageNew/reviewForm?companyType=${companyType}&projectId=" + d.id +"&view=reloadReport&edit=reviewAgain','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 重新复核</a>";
@@ -876,11 +876,11 @@
 			}
 			</shiro:hasPermission>
 
-			<shiro:hasPermission name="ruralProject:ruralCostProjectMessage:reportedProvincialStanding">
+			<%--<shiro:hasPermission name="ruralProject:ruralCostProjectMessage:reportedProvincialStanding">
 			if(d.reportedState == 5 || d.reportedState == 7){
 				xml+="<a href=\"#\" onclick=\"openDialogreReportSwitch('上报管理', '${ctx}/ruralProject/ruralCostProjectMessageNew/submitReportedProvincialStanding?companyType=${companyType}&id=" +  d.id + " ','95%', '95%','','上报,关闭')\" style='background-color: #1E9FFF' class=\"layui-btn layui-btn-xs layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 提交省站</a>";
 			}
-			</shiro:hasPermission>
+			</shiro:hasPermission>--%>
 
 
 			xml+="</div>";
@@ -1024,7 +1024,7 @@
 								</form:select>
 							</div>
 						</div>--%>
-						<div class="layui-item query athird ">
+						<%--<div class="layui-item query athird ">
 							<label class="layui-form-label">上报状态：</label>
 							<div class="layui-input-block readOnlyFFF">
 								<form:select path="reportedState" class=" form-control  simple-select">
@@ -1032,7 +1032,7 @@
 									<form:options items="${fns:getDictList('reported_state')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
 								</form:select>
 							</div>
-						</div>
+						</div>--%>
 						<%--<div class="layui-item query athird ">
 							<label class="layui-form-label double-line">项目等级：</label>
 							<div class="layui-input-block readOnlyFFF">
@@ -1238,14 +1238,14 @@
 						}
                         return xml;
                     }}*/
-                ,{align:'center', title: '上报',  width:90,templet:function(d){
+                /*,{align:'center', title: '上报',  width:90,templet:function(d){
                         var st = getReportedState(d.reportedState);
                         if(st.action)
                             var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralProjectMessage/getReportedProcess?companyType=${companyType}&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:150,templet:function(d){
 						var st = getCaseBaseAuditState(d.caseStatus);
 						if(st.action)

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

@@ -249,7 +249,7 @@
 	<div class="list-form-tab contentShadow shadowLTR" id="tabDiv">
 		<ul class="list-tabs" >
 			<li><a href="${ctx}/ruralProject/ruralProjectView/view?id=${projectRecords.id}">项目详情</a></li>
-			<li class="active"><a href="${ctx}/ruralProject/ruralProjectView/list?parentProId=${projectRecords.id}&projectType=${projectRecords.projectType}">子项目列表</a></li>
+			<%--<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/modify?projectId=${projectRecords.id}">质量复核信息</a></li>
@@ -258,7 +258,7 @@
 			<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>
+			<%--<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

@@ -73,7 +73,7 @@
 	<div class="list-form-tab contentShadow shadowLTR" id="tabDiv">
 		<ul class="list-tabs">
 			<li><a href="${ctx}/ruralProject/ruralProjectView/view?id=${projectRecords.id}">项目详情</a></li>
-			<li><a href="${ctx}/ruralProject/ruralProjectView/list?parentProId=${projectRecords.id}&projectType=${projectRecords.projectType}">子项目列表</a></li>
+			<%--<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/modify?projectId=${projectRecords.id}">质量复核信息</a></li>
@@ -82,7 +82,7 @@
 			<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>
+			<%--<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

@@ -210,7 +210,7 @@
     <div class="list-form-tab contentShadow shadowLTR" id="tabDiv">
         <ul class="list-tabs" >
             <li><a href="${ctx}/ruralProject/ruralProjectView/view?id=${projectRecords.id}">项目详情</a></li>
-            <li><a href="${ctx}/ruralProject/ruralProjectView/list?parentProId=${projectRecords.id}&projectType=${projectRecords.projectType}">子项目列表</a></li>
+            <%--<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/modify?projectId=${projectRecords.id}">质量复核信息</a></li>
@@ -218,7 +218,7 @@
             <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>
+            <%--<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

@@ -97,7 +97,7 @@
 	<div class="list-form-tab contentShadow shadowLTR" id="tabDiv">
 		<ul class="list-tabs" >
 			<li><a href="${ctx}/ruralProject/ruralProjectView/view?id=${projectRecords.id}">项目详情</a></li>
-			<li><a href="${ctx}/ruralProject/ruralProjectView/list?parentProId=${projectRecords.id}&projectType=${projectRecords.projectType}">子项目列表</a></li>
+			<%--<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/modify?projectId=${projectRecords.id}">质量复核信息</a></li>
@@ -105,7 +105,7 @@
 			<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>
+			<%--<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

@@ -143,7 +143,7 @@
     <div class="list-form-tab contentShadow shadowLTR" id="tabDiv">
         <ul class="list-tabs" >
             <li><a href="${ctx}/ruralProject/ruralProjectView/view?id=${projectRecords.id}">项目详情</a></li>
-            <li><a href="${ctx}/ruralProject/ruralProjectView/list?parentProId=${projectRecords.id}&projectType=${projectRecords.projectType}">子项目列表</a></li>
+            <%--<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/modify?projectId=${projectRecords.id}">质量复核信息</a></li>
@@ -152,7 +152,7 @@
             <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>
+            <%--<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

@@ -189,7 +189,7 @@
 		<div class="list-form-tab contentShadow shadowLTR" id="tabDiv">
 			<ul class="list-tabs" >
 				<li><a href="${ctx}/ruralProject/ruralProjectView/view?id=${projectRecords.id}">项目详情</a></li>
-				<li><a href="${ctx}/ruralProject/ruralProjectView/list?parentProId=${projectRecords.id}&projectType=${projectRecords.projectType}">子项目列表</a></li>
+				<%--<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/modify?projectId=${projectRecords.id}">质量复核信息</a></li>
@@ -198,7 +198,7 @@
 				<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>
+				<%--<li><a href="${ctx}/ruralProject/ruralProjectView/getReportedView?projectId=${projectRecords.id}&id=${reportedId}">上报信息</a></li>--%>
 
 			</ul>
 		</div>

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

@@ -165,7 +165,7 @@
 		<div class="list-form-tab contentShadow shadowLTR" id="tabDiv">
 			<ul class="list-tabs" >
 				<li><a href="${ctx}/ruralProject/ruralProjectView/view?id=${projectRecords.id}">项目详情</a></li>
-				<li><a href="${ctx}/ruralProject/ruralProjectView/list?parentProId=${projectRecords.id}&projectType=${projectRecords.projectType}">子项目列表</a></li>
+				<%--<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/modify?projectId=${projectRecords.id}">质量复核信息</a></li>
@@ -174,7 +174,7 @@
 				<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>
+				<%--<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

@@ -299,7 +299,7 @@
 		<div class="list-form-tab contentShadow shadowLTR" id="tabDiv">
 			<ul class="list-tabs" >
 				<li><a href="${ctx}/ruralProject/ruralProjectView/view?id=${projectRecords.id}">项目详情</a></li>
-				<li><a href="${ctx}/ruralProject/ruralProjectView/list?parentProId=${projectRecords.id}&projectType=${projectRecords.projectType}">子项目列表</a></li>
+				<%--<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/modify?projectId=${projectRecords.id}">质量复核信息</a></li>
@@ -308,7 +308,7 @@
 				<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>
+				<%--<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

@@ -115,7 +115,7 @@
     <div class="list-form-tab contentShadow shadowLTR" id="tabDiv">
         <ul class="list-tabs" >
             <li><a href="${ctx}/ruralProject/ruralProjectView/view?id=${projectRecords.id}">项目详情</a></li>
-            <li><a href="${ctx}/ruralProject/ruralProjectView/list?parentProId=${projectRecords.id}&projectType=${projectRecords.projectType}">子项目列表</a></li>
+            <%--<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/modify?projectId=${projectRecords.id}">质量复核信息</a></li>
@@ -124,7 +124,7 @@
             <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>
+            <%--<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

@@ -91,7 +91,7 @@
 	<div class="list-form-tab contentShadow shadowLTR" id="tabDiv">
 		<ul class="list-tabs" >
 			<li class="active"><a href="${ctx}/ruralProject/ruralProjectView/view?id=${projectRecords.id}">项目详情</a></li>
-			<li><a href="${ctx}/ruralProject/ruralProjectView/list?parentProId=${projectRecords.id}&projectType=${projectRecords.projectType}">子项目列表</a></li>
+			<%--<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/modify?projectId=${projectRecords.id}">质量复核信息</a></li>
@@ -100,7 +100,7 @@
 			<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>
+			<%--<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

@@ -28,7 +28,7 @@
 	<div class="list-form-tab contentShadow shadowLTR" id="tabDiv">
 		<ul class="list-tabs" >
 			<li><a href="${ctx}/ruralProject/ruralProjectView/view?id=${projectRecords.id}">项目详情</a></li>
-			<li><a href="${ctx}/ruralProject/ruralProjectView/list?parentProId=${projectRecords.id}&projectType=${projectRecords.projectType}">子项目列表</a></li>
+			<%--<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/modify?projectId=${projectRecords.id}">质量复核信息</a></li>
@@ -37,7 +37,7 @@
 			<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>
+			<%--<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

@@ -22,7 +22,7 @@
     <div class="list-form-tab contentShadow shadowLTR" id="tabDiv">
         <ul class="list-tabs" >
             <li><a href="${ctx}/ruralProject/ruralProjectView/view?id=${projectRecords.id}">项目详情</a></li>
-            <li><a href="${ctx}/ruralProject/ruralProjectView/list?parentProId=${projectRecords.id}&projectType=${projectRecords.projectType}">子项目列表</a></li>
+            <%--<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/modify?projectId=${projectRecords.id}">质量复核信息</a></li>
@@ -31,7 +31,7 @@
             <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>
+            <%--<li><a href="${ctx}/ruralProject/ruralProjectView/getReportedView?projectId=${projectRecords.id}&id=${reportedId}">上报信息</a></li>--%>
         </ul>
     </div>
     </div>

src/main/webapp/webpage/modules/sealApplyFor/sealApplyForList.jsp

@@ -215,7 +215,7 @@
 					</div>
 					<div id="moresees" style="clear:both;display:none;" class="lw6">
 
-						<div class="layui-item query athird ">
+						<div class="layui-item query athird "  style="width: 25%">
 							<label class="layui-form-label">状态：</label>
 							<div class="layui-input-block">
 								<form:select path="status" class=" form-control  simple-select">
@@ -283,7 +283,7 @@
 						}
 
 					}}
-                ,{field:'createBy',align:'center', title: '创建人',  width:100}
+                ,{field:'createBy',align:'center', title: '登记人',  width:100}
                 ,{field:'createDate',align:'center', title: '创建日期',  width:100}
                 ,{align:'center', title: '状态',  width:90,templet:function(d){
                         var st = getruralProjectState(d.status);

src/main/webapp/webpage/modules/statement/companyDataView.jsp

@@ -764,11 +764,11 @@
 				}
 			}
 			//项目升级按钮
-			if (d.submitMoney==1){
+			/*if (d.submitMoney==1){
 				if (d.projectReportRecordStatus==0 || d.projectReportRecordStatus==1 || d.projectReportRecordStatus==2 || d.projectReportRecordStatus==3 || d.projectReportRecordStatus==6){
 					xml+="<a href=\"#\" onclick=\"projectUpgrade('"+d.id+"','"+d.projectReportRecordStatus+"','"+d.filingProjectStatus+"','"+d.projectReportStatus+"','"+d.projectReportStatusTwo+"')\" class=\"layui-btn layui-btn-xs layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 项目升级</a>";
 				}
-			}
+			}*/
 			</shiro:hasPermission>
 			<shiro:hasPermission name="ruralProject:ruralCostProjectMessage:reportedProvincialStanding">
 			if(d.reportedState == 5 || d.reportedState == 7){

src/main/webapp/webpage/modules/statement/departmentCompanyDataView.jsp

@@ -764,11 +764,11 @@
 				}
 			}
 			//项目升级按钮
-			if (d.submitMoney==1){
+			/*if (d.submitMoney==1){
 				if (d.projectReportRecordStatus==0 || d.projectReportRecordStatus==1 || d.projectReportRecordStatus==2 || d.projectReportRecordStatus==3 || d.projectReportRecordStatus==6){
 					xml+="<a href=\"#\" onclick=\"projectUpgrade('"+d.id+"','"+d.projectReportRecordStatus+"','"+d.filingProjectStatus+"','"+d.projectReportStatus+"','"+d.projectReportStatusTwo+"')\" class=\"layui-btn layui-btn-xs layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 项目升级</a>";
 				}
-			}
+			}*/
 			</shiro:hasPermission>
 			<shiro:hasPermission name="ruralProject:ruralCostProjectMessage:reportedProvincialStanding">
 			if(d.reportedState == 5 || d.reportedState == 7){