纸质归档(管理员修改/项目查看)

src/main/java/com/jeeplus/modules/projectcontentinfo/entity/ProjectReportData.java

@@ -63,6 +63,7 @@ public class ProjectReportData extends ActEntity<ProjectReportData> {
 	private String tempType;    //模板类型
 	private String bzshbUserId; //总审用户id
 	private String ZiXunShouRu;	//造价咨询营业收入（万元）
+	private String ziXunShou;	//造价咨询营业收入
 
 	public String getNumberPath() {
 		return numberPath;
@@ -790,4 +791,12 @@ public class ProjectReportData extends ActEntity<ProjectReportData> {
 	public void setExaminScore(String examinScore) {
 		this.examinScore = examinScore;
 	}
+
+	public String getZiXunShou() {
+		return ziXunShou;
+	}
+
+	public void setZiXunShou(String ziXunShou) {
+		this.ziXunShou = ziXunShou;
+	}
 }

src/main/java/com/jeeplus/modules/ruralprojectrecords/dao/ProjectPaperFilingDao.java

@@ -11,4 +11,7 @@ import com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectRecords;
 @MyBatisDao
 public interface ProjectPaperFilingDao extends CrudDao<ProjectPaperFiling> {
     void updateProcessIdAndStatus(ProjectPaperFiling paperFiling);
+    void updatefileNum(ProjectPaperFiling paperFiling);
+
+    ProjectPaperFiling findByProjectId(String projectId);
 }

src/main/java/com/jeeplus/modules/ruralprojectrecords/service/ProjectPaperFilingService.java

@@ -576,5 +576,13 @@ public class ProjectPaperFilingService extends CrudService<ProjectPaperFilingDao
         int i=dao.update(paperFiling);
         return "保存审核意见成功！";
     }
+    @Transactional(readOnly = false)
+    public void update(ProjectPaperFiling paperFiling){
+        paperFiling.preUpdate();
+        dao.updatefileNum(paperFiling);
+    }
+    public ProjectPaperFiling findByProjectId(String projectId){
+        return dao.findByProjectId(projectId);
+    }
 
 }

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

@@ -325,5 +325,70 @@ public class ProjectPaperFilingController extends BaseController {
         }
         return  act;
     }
+    /**
+     * 查看，增加，编辑项目表单页面
+     */
+    @RequestMapping(value = "adminPaperFiling")
+    public String adminPaperFiling(ProjectPaperFiling paperFiling, Model model) {
+        String view = paperFiling.getView();
+        RuralProjectRecords projectRecords=new RuralProjectRecords();
+        projectRecords=ruralProjectRecordsService.get(paperFiling.getProjectId());
+        paperFiling=service.get(paperFiling.getId());
+        if (projectRecords!=null&& StringUtils.isNotBlank(projectRecords.getId())) {
+            ruralProjectRecordsService.queryProjectDetail(projectRecords);
+            if(null != projectRecords.getWorkContractInfo()){
+                if(null != projectRecords.getWorkContractInfo().getContractTypeDoc()){
+                    projectRecords.getWorkContractInfo().setContractType(DictUtils.getMainDictLabel(String.valueOf(projectRecords.getWorkContractInfo().getContractTypeDoc()),"contract_info_type",""));
+                }
+            }
+            ProjectPlanInfo projectPlanInfo = new ProjectPlanInfo();
+            projectPlanInfo.setProjectId(projectRecords.getId());
+            //获取项目计划信息
+            List<ProjectPlanInfo> projectPlanList = projectPlanService.getProjectPlanList(projectPlanInfo);
+            //项目计划附件信息
+            List<WorkClientAttachment> projectPlanAttachment = projectPlanService.getWorkAttachment(projectRecords.getId());
+            projectRecords.setProjectPlanList(projectPlanList);
+            projectRecords.setWorkAttachments(projectPlanAttachment);
+            projectRecords.setUploadMode(uploadMode);
+            if(StringUtils.isNotBlank(projectRecords.getAttachmentProjectSort())){
+                //处理项目类别
+                List<MainDictDetail> mainDictList = DictUtils.getMainDictList("attachment_project_sort");
+                for (MainDictDetail info: mainDictList) {
+                    if(projectRecords.getAttachmentProjectSort().equals(info.getValue())){
+                        projectRecords.setAttachmentProjectSort(info.getLabel());
+                        break;
+                    }
+                }
+            }
 
+            //查询项目报告信息
+            ProjectReportData projectReportData = projectReportDataService.getReportDataByProjectId(projectRecords.getId());
+            //如果项目报告不为空，则查询项目线上归档信息
+            if(null != projectReportData){
+                ProjectReportRecord projectReportRecord = ruralProjectMessageService.getProjectReportRecord(projectReportData.getId());
+                if(null != projectReportRecord){
+                    model.addAttribute("projectId", projectRecords.getId());
+                }else{
+                    model.addAttribute("projectId", "");
+                }
+            }
+        }
+        //查询所有的工程类型
+        List<ProjectEngineeringInfo> engineeringInfos=engineeringService.findList(new ProjectEngineeringInfo());
+        model.addAttribute("engineeringInfo",engineeringInfos);
+        model.addAttribute("projectRecords", projectRecords);
+        paperFiling.setView(view);
+        model.addAttribute("projectPaperFiling", paperFiling);
+        return "modules/projectPaperFiling/projectPaperFilingAdmingModify";
+    }
+    @RequestMapping(value = "update")
+    public String update(ProjectPaperFiling paperFiling, Model model) {
+        service.update(paperFiling);
+        if (StringUtils.isNotBlank(paperFiling.getView()) && paperFiling.getView().equals("filing")){
+            return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralProjectMessage/?repage";
+        }else if (StringUtils.isNotBlank(paperFiling.getView()) && paperFiling.getView().equals("allfiling")){
+            return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralProjectMessageAll/?repage";
+        }
+        return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage";
+    }
 }

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

@@ -24,6 +24,7 @@ import com.jeeplus.modules.projectcontentinfo.service.*;
 import com.jeeplus.modules.projectrecord.entity.ProjectPlanInfo;
 import com.jeeplus.modules.projectrecord.service.ProjectPlanService;
 import com.jeeplus.modules.ruralprojectrecords.entity.*;
+import com.jeeplus.modules.ruralprojectrecords.service.ProjectPaperFilingService;
 import com.jeeplus.modules.ruralprojectrecords.service.RuralProjectMessageService;
 import com.jeeplus.modules.ruralprojectrecords.service.RuralProjectRecordsService;
 import com.jeeplus.modules.ruralprojectrecords.service.SubProjectInfoService;
@@ -96,6 +97,8 @@ public class RuralProjectViewController extends BaseController {
     @Autowired
     private RuralProjectRecordsService ruralProjectRecordsService;
     @Autowired
+    private ProjectPaperFilingService projectPaperFilingService;
+    @Autowired
     private SubProjectInfoService subProjectInfoService;
     @Autowired
     private ProjectReportRecordService projectReportRecordService;
@@ -1037,5 +1040,55 @@ public class RuralProjectViewController extends BaseController {
         model.addAttribute("bzshbUserName",user.getName());
         return "modules/ruralprojectrecords/view/reportIssueView";
     }
+    @RequestMapping(value = "paperView")
+    public String paperView(String projectId, Model model) {
+        RuralProjectRecords projectRecords=new RuralProjectRecords();
+        projectRecords=ruralProjectRecordsService.get(projectId);
+        ProjectPaperFiling paperFiling=projectPaperFilingService.findByProjectId(projectId);
+        if (projectRecords!=null&& StringUtils.isNotBlank(projectRecords.getId())) {
+            ruralProjectRecordsService.queryProjectDetail(projectRecords);
+            if(null != projectRecords.getWorkContractInfo()){
+                if(null != projectRecords.getWorkContractInfo().getContractTypeDoc()){
+                    projectRecords.getWorkContractInfo().setContractType(DictUtils.getMainDictLabel(String.valueOf(projectRecords.getWorkContractInfo().getContractTypeDoc()),"contract_info_type",""));
+                }
+            }
+            ProjectPlanInfo projectPlanInfo = new ProjectPlanInfo();
+            projectPlanInfo.setProjectId(projectRecords.getId());
+            //获取项目计划信息
+            List<ProjectPlanInfo> projectPlanList = projectPlanService.getProjectPlanList(projectPlanInfo);
+            //项目计划附件信息
+            List<WorkClientAttachment> projectPlanAttachment = projectPlanService.getWorkAttachment(projectRecords.getId());
+            projectRecords.setProjectPlanList(projectPlanList);
+            projectRecords.setWorkAttachments(projectPlanAttachment);
+            projectRecords.setUploadMode(uploadMode);
+            if(StringUtils.isNotBlank(projectRecords.getAttachmentProjectSort())){
+                //处理项目类别
+                List<MainDictDetail> mainDictList = DictUtils.getMainDictList("attachment_project_sort");
+                for (MainDictDetail info: mainDictList) {
+                    if(projectRecords.getAttachmentProjectSort().equals(info.getValue())){
+                        projectRecords.setAttachmentProjectSort(info.getLabel());
+                        break;
+                    }
+                }
+            }
 
+            //查询项目报告信息
+            ProjectReportData projectReportData = projectReportDataService.getReportDataByProjectId(projectRecords.getId());
+            //如果项目报告不为空，则查询项目线上归档信息
+            if(null != projectReportData){
+                ProjectReportRecord projectReportRecord = ruralProjectMessageService.getProjectReportRecord(projectReportData.getId());
+                if(null != projectReportRecord){
+                    model.addAttribute("projectId", projectRecords.getId());
+                }else{
+                    model.addAttribute("projectId", "");
+                }
+            }
+        }
+        //查询所有的工程类型
+        List<ProjectEngineeringInfo> engineeringInfos=engineeringService.findList(new ProjectEngineeringInfo());
+        model.addAttribute("engineeringInfo",engineeringInfos);
+        model.addAttribute("projectRecords", projectRecords);
+        model.addAttribute("projectPaperFiling", paperFiling);
+        return "modules/ruralprojectrecords/view/projectPaperFilingView";
+    }
 }

src/main/java/com/jeeplus/modules/workprojectnotify/web/WorkProjectNotifyController.java

@@ -1552,6 +1552,7 @@ public class WorkProjectNotifyController extends BaseController {
 					}
 
 				} else if (workProjectNotify.getType().equals("110")) {    //项目纸质归档
+					String engineeringId = engineeringService.getEngineeringId("202");
 					boolean flag = false;
 					//通过通知信息id获取项目登记对象
 					ProjectPaperFiling projectPaperFiling = projectPaperFilingService.get(workProjectNotify.getNotifyId());
@@ -1581,20 +1582,110 @@ public class WorkProjectNotifyController extends BaseController {
 							ruralProjectRecords.getWorkContractInfo().setContractType(DictUtils.getMainDictLabel(String.valueOf(ruralProjectRecords.getWorkContractInfo().getContractTypeDoc()),"contract_info_type",""));
 						}
 					}
+					//获取项目基础信息
+					ruralProjectRecordsService.queryProjectDetail(ruralProjectRecords);
+					//工程咨询
+					List<MainDictDetail> mainDictList = Lists.newArrayList();
+					if("1".equals(ruralProjectRecords.getProjectType())){
+						mainDictList = DictUtils.getMainDictList("attachment_project_sort");
+						//造价审核
+					} else if("2".equals(ruralProjectRecords.getProjectType())){
+						mainDictList = DictUtils.getMainDictList("attachment_project_sort_cost");
+					}
+					if(StringUtils.isNotBlank(ruralProjectRecords.getAttachmentProjectSort())){
+						//处理项目类别
+						for (MainDictDetail info: mainDictList) {
+							if(ruralProjectRecords.getAttachmentProjectSort().equals(info.getValue())){
+								ruralProjectRecords.setAttachmentProjectSort(info.getLabel());
+								break;
+							}
+						}
+					}
 					//查询所有的工程类型
 					List<ProjectEngineeringInfo> engineeringInfos=engineeringService.findList(new ProjectEngineeringInfo());
 					model.addAttribute("engineeringInfo",engineeringInfos);
 					model.addAttribute("processInstanceId", projectPaperFiling.getProcessInstanceId());
 					model.addAttribute("projectRecords", ruralProjectRecords);
 					model.addAttribute("projectPaperFiling", projectPaperFiling);
-					//处理项目类别
-					List<MainDictDetail> mainDictList = DictUtils.getMainDictList("attachment_project_sort");
-					for (MainDictDetail info: mainDictList) {
-						if(ruralProjectRecords.getAttachmentProjectSort().equals(info.getValue())){
-							ruralProjectRecords.setAttachmentProjectSort(info.getLabel());
-							break;
+
+					//tap页
+					//查询所有的工程类型
+					List<ProjectEngineeringInfo> projectEngineeringInfo=engineeringService.findList(new ProjectEngineeringInfo());
+					model.addAttribute("projectEngineeringInfo",projectEngineeringInfo);
+					//项目计划
+					RuralProjectRecords projectRecordPlans = this.planView(ruralProjectRecords.getId());
+					model.addAttribute("projectRecordPlans", projectRecordPlans);
+					//获取子项目列表信息
+					List<SubProjectInfo> subProjectInfos=this.queryReportDetails(ruralProjectRecords.getId());
+					model.addAttribute("subProjectInfos", subProjectInfos);
+					//线上归档
+					ProjectReportData projectReportData = projectReportDataService.getReportDataByProjectId(ruralProjectRecords.getId());
+					ProjectReportRecord projectReportRecord = projectReportRecordService.getprojectReportRecord(projectReportData.getId());
+					if (null==projectReportRecord){
+						projectReportRecord=new ProjectReportRecord();
+					}
+					projectReportRecord.setProjectReportData(projectReportData);
+					projectReportRecord.setReport(projectReportData);
+					projectReportData.setZiXunShou(projectReportData.getZiXunShouRu());
+					Projectcontentinfo projectcontentinfo = projectcontentinfoService.getByInfoId(projectReportData.getId());
+					projectcontentinfo.setProjectReportData(projectReportData);
+					//获取合同信息
+					WorkContractInfo workContractInfo=this.queryWorkContract(ruralProjectRecords.getId());
+					if(null != workContractInfo){
+						WorkClientInfo clientInfo = workClientInfoService.get(workContractInfo.getClient().getId());
+						model.addAttribute("workClientInfo", clientInfo);
+						if(StringUtils.isNotBlank(workContractInfo.getChargeCriterion())){
+							//收费标准
+							String [] biao=workContractInfo.getChargeCriterion().split(",");
+							List<String> chargeCriterionList=new ArrayList<>();
+							for (int i=0;i<biao.length;i++){
+								chargeCriterionList.add(biao[i]);
+							}
+							projectReportRecord.setChargeCriterionList(chargeCriterionList);
+						}
+					}
+					WorkContractInfo projectContractInfo = ruralProjectMessageService.getProjectContractInfo(ruralProjectRecords.getWorkContractInfo().getId());
+					ruralProjectRecords.setWorkContractInfo(projectContractInfo);
+					MyBeanUtils.copyBeanNotNull2Bean(ruralProjectRecords,projectReportRecord.getReport().getProject());//将编辑表单中的非NULL值覆盖数据库记录中的值
+					if(null != projectContractInfo){
+						if(projectContractInfo.getWorkClientInfoList().size()>0){
+							model.addAttribute("workClientInfoName", projectContractInfo.getWorkClientInfoList().get(0).getName());
 						}
 					}
+					RuralProjectcontentinfo ruralProjectcontentinfo = ruralProjectRecordsService.formAccessory(ruralProjectRecords);
+					ruralProjectRecordsService.disposeData(ruralProjectcontentinfo);
+					model.addAttribute("projectcontentinfo", ruralProjectcontentinfo);
+					model.addAttribute("projectReportData", projectReportData);
+					model.addAttribute("workContractInfo", workContractInfo);
+					model.addAttribute("projectReportRecord", projectReportRecord);
+					//获取质量复核项目组成员
+					List<RuralReportConsultant> consultantinfo =this.qualityView(ruralProjectRecords,projectReportData);
+					model.addAttribute("consultantinfo", consultantinfo);
+					//获取总审人员
+					User user=UserUtils.get(projectReportData.getBzshbUserId());
+					model.addAttribute("bzshbUserName",user.getName());
+					//质量复核标准展示
+					String review="";
+					if ("2".equals(ruralProjectRecords.getSubmitMoney())){
+						review="1";
+					};
+					List<WorkReviewAudit> workReviewAuditList = projectContentDataService.findListReview(review,"质量复核");
+					WorkReviewAudit revAudit = new WorkReviewAudit();
+					String type = "4";
+					revAudit.setCompanyId(UserUtils.getSelectCompany().getId());
+					revAudit.setType(type);
+					revAudit.setReportId(projectReportData.getId());
+					List<WorkReviewAudit> reaudits = workReviewStandardService.findAuditList(revAudit);
+					for(WorkReviewAudit reAudit:workReviewAuditList){
+						for (WorkReviewAudit audit:reaudits){
+							if (reAudit.getId().equals(audit.getStandardId())){
+								reAudit.setDeductOption(audit.getDeductOption());
+								break;
+							}
+						}
+					}
+					model.addAttribute("datalist", workReviewAuditList);
+					
 					//查询总审人员信息
 					List<User> auditUserList = userService.getAuditUserList();
 					ruralProjectRecords.setBzshbUserList(auditUserList);

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

@@ -41,6 +41,13 @@
 		<include refid="projectPaperFilingJions"/>
 		WHERE a.id = #{id}
 	</select>
+	<select id="findByProjectId"
+			resultType="com.jeeplus.modules.ruralprojectrecords.entity.ProjectPaperFiling">
+		SELECT
+		<include refid="projectPaperFilingColumns"/>
+		FROM project_paper_filing a
+		WHERE a.project_id = #{projectId}
+	</select>
 	<insert id="insert">
 		INSERT INTO project_paper_filing(
 			id,
@@ -86,4 +93,12 @@
 			   process_instance_id = #{processInstanceId}
 		WHERE id = #{id}
 	</update>
+	<update id="updatefileNum">
+		UPDATE project_paper_filing SET
+			update_by = #{updateBy.id},
+			update_date = #{updateDate},
+			file_num = #{fileNum},
+			file_num_tow = #{fileNumTow}
+		WHERE id = #{id}
+	</update>
 </mapper>

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

@@ -1020,6 +1020,9 @@
 						if ('0'!=d.projectReportStatus && '1'!=d.projectReportStatus){
 							xml+="<a href=\"#\" onclick=\"openDialogre('修改质量复核', '${ctx}/ruralProject/ruralCostProjectMessage/adminEditForm?projectId=" + d.id + "','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 修改质量复核</a>";
 						}
+						if(d.paperFilingStatus == 5){
+							xml+="<a href=\"#\" onclick=\"openDialogre('修改纸质归档案卷号', '${ctx}/paperFiling/paperFiling/adminPaperFiling?id=" + d.ppfId + "&projectId=" + d.id +" ','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 修改纸质归档</a>";
+						}
 						if(d.projectReportStatus == 5){
 							if (d.projectReportStatusTwo != 5 && d.projectReportStatusTwo != 2){
 								xml+="<a href=\"#\" onclick=\"openDialogre('修改报告信息', '${ctx}/ruralProject/ruralCostProjectMessageNew/reviewForm?projectId=" + d.id +"&view=reloadReport&edit=reviewAgain','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 重新复核</a>";

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

@@ -898,6 +898,9 @@
 							if ('0'!=d.projectReportStatus && '1'!=d.projectReportStatus ){
 								xml+="<a href=\"#\" onclick=\"openDialogre('修改复核信息', '${ctx}/ruralProject/ruralProjectMessageAll/adminEditForm?projectId=" + d.id + "','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 修改复核信息</a>";
 							}
+							if(d.paperFilingStatus == 5){
+								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>";
+							}
 						</shiro:hasPermission>
 						xml+="</div>";
 						return[xml].join('');

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

@@ -1020,6 +1020,9 @@
 						if ('0'!=d.projectReportStatus && '1'!=d.projectReportStatus){
 							xml+="<a href=\"#\" onclick=\"openDialogre('修改质量复核', '${ctx}/ruralProject/ruralProjectMessage/adminEditForm?projectId=" + d.id + "','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 修改质量复核</a>";
 						}
+						if(d.paperFilingStatus == 5){
+							xml+="<a href=\"#\" onclick=\"openDialogre('修改纸质归档案卷号', '${ctx}/paperFiling/paperFiling/adminPaperFiling?id=" + d.ppfId + "&projectId=" + d.id +"&view=filing ','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 修改纸质归档</a>";
+						}
 						if(d.projectReportStatus == 5){
 							if (d.projectReportStatusTwo != 5 && d.projectReportStatusTwo != 2){
 								xml+="<a href=\"#\" onclick=\"openDialogre('修改报告质量复核信息', '${ctx}/ruralProject/ruralProjectMessageNew/reviewForm?projectId=" + d.id +"&view=reloadReport&edit=reviewAgain','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 重新复核</a>";

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

@@ -73,7 +73,8 @@
 			<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/searchview?id=${projectRecords.id}">选查信息详情</a></li>--%>
+			<li><a href="${ctx}/ruralProject/ruralProjectView/paperView?projectId=${projectRecords.id}">纸质归档信息</a></li>
 
 		</ul>
 	</div>

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

@@ -151,20 +151,9 @@
             <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/searchview?id=${projectRecords.id}">选查信息详情</a></li>--%>
+            <li><a href="${ctx}/ruralProject/ruralProjectView/paperView?projectId=${projectRecords.id}">纸质归档信息</a></li>
         </ul>
-<%--        <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/workContractView?id=${projectRecords.workContractInfo.id}&projectId=${projectRecords.id}">合同详情</a></li>--%>
-<%--            <li><a href="${ctx}/ruralProject/ruralProjectView/modify?projectId=${projectRecords.id}">报告信息</a></li>--%>
-<%--            <c:if test="${reportedId!=null}">--%>
-<%--            <li><a href="${ctx}/ruralProject/ruralProjectView/getReportedView?projectId=${projectRecords.id}&id=${reportedId}">上报信息</a></li>--%>
-<%--            </c:if>--%>
-<%--            <li class="active"><a href="${ctx}/ruralProject/ruralProjectView/planView?id=${projectRecords.id}">项目计划信息</a></li>--%>
-<%--            <li><a href="${ctx}/ruralProject/ruralProjectView/getAccessoryView?id=${projectRecords.id}">附件信息</a></li>--%>
-<%--        </ul>--%>
     </div>
     </div>
     <div class="container" style="margin-top: 50px;">

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

@@ -197,7 +197,8 @@
 				<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/searchview?id=${projectRecords.id}">选查信息详情</a></li>--%>
+				<li><a href="${ctx}/ruralProject/ruralProjectView/paperView?projectId=${projectRecords.id}">纸质归档信息</a></li>
 
 			</ul>
 		</div>

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

@@ -173,20 +173,10 @@
 				<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/searchview?id=${projectRecords.id}">选查信息详情</a></li>--%>
+				<li><a href="${ctx}/ruralProject/ruralProjectView/paperView?projectId=${projectRecords.id}">纸质归档信息</a></li>
 
 			</ul>
-<%--			<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/workContractView?id=${projectRecords.workContractInfo.id}&projectId=${projectRecords.id}">合同详情</a></li>--%>
-<%--				<li class="active"><a href="${ctx}/ruralProject/ruralProjectView/modify?projectId=${projectRecords.id}&projectId=${projectRecords.id}">报告信息</a></li>--%>
-<%--				<c:if test="${reportedId!=null}">--%>
-<%--					<li><a href="${ctx}/ruralProject/ruralProjectView/getReportedView?projectId=${projectRecords.id}&id=${projectcontentinfo.id}">上报信息</a></li>--%>
-<%--				</c:if>--%>
-<%--				<li><a href="${ctx}/ruralProject/ruralProjectView/planView?id=${projectRecords.id}">项目计划信息</a></li>--%>
-<%--				<li><a href="${ctx}/ruralProject/ruralProjectView/getAccessoryView?id=${projectRecords.id}">附件信息</a></li>--%>
-<%--			</ul>--%>
 		</div>
 	</div>
 <%--	</c:if>--%>

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

@@ -173,20 +173,10 @@
 				<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/searchview?id=${projectRecords.id}">选查信息详情</a></li>--%>
+				<li><a href="${ctx}/ruralProject/ruralProjectView/paperView?projectId=${projectRecords.id}">纸质归档信息</a></li>
 
 			</ul>
-<%--			<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/workContractView?id=${projectRecords.workContractInfo.id}&projectId=${projectRecords.id}">合同详情</a></li>--%>
-<%--				<li class="active"><a href="${ctx}/ruralProject/ruralProjectView/modify?projectId=${projectRecords.id}&projectId=${projectRecords.id}">报告信息</a></li>--%>
-<%--				<c:if test="${reportedId!=null}">--%>
-<%--					<li><a href="${ctx}/ruralProject/ruralProjectView/getReportedView?projectId=${projectRecords.id}&id=${projectcontentinfo.id}">上报信息</a></li>--%>
-<%--				</c:if>--%>
-<%--				<li><a href="${ctx}/ruralProject/ruralProjectView/planView?id=${projectRecords.id}">项目计划信息</a></li>--%>
-<%--				<li><a href="${ctx}/ruralProject/ruralProjectView/getAccessoryView?id=${projectRecords.id}">附件信息</a></li>--%>
-<%--			</ul>--%>
 		</div>
 	</div>
 <%--	</c:if>--%>

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

@@ -123,7 +123,8 @@
             <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/searchview?id=${projectRecords.id}">选查信息详情</a></li>--%>
+            <li><a href="${ctx}/ruralProject/ruralProjectView/paperView?projectId=${projectRecords.id}">纸质归档信息</a></li>
 
         </ul>
 <%--        <ul class="list-tabs" >--%>

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

@@ -81,8 +81,8 @@
 			<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/searchview?id=${projectRecords.id}">选查信息详情</a></li>--%>
+			<li><a href="${ctx}/ruralProject/ruralProjectView/paperView?projectId=${projectRecords.id}">纸质归档信息</a></li>
 		</ul>
 	</div>
 	</div>

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

@@ -36,7 +36,8 @@
 			<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 class="active"><a href="${ctx}/ruralProject/ruralProjectView/searchview?id=${projectRecords.id}">选查信息详情</a></li>--%>
+			<li><a href="${ctx}/ruralProject/ruralProjectView/paperView?projectId=${projectRecords.id}">纸质归档信息</a></li>
 		</ul>
 	</div>
 	</div>

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

@@ -30,7 +30,8 @@
             <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/searchview?id=${projectRecords.id}">选查信息详情</a></li>--%>
+            <li><a href="${ctx}/ruralProject/ruralProjectView/paperView?projectId=${projectRecords.id}">纸质归档信息</a></li>
         </ul>
     </div>
     </div>