Merge remote-tracking branch 'origin/master'

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

@@ -580,4 +580,67 @@ public class RuralProjectViewController extends BaseController {
         model.addAttribute("project", projectReportRecord.getReport().getProject());
         return "modules/ruralprojectrecords/view/projectReportRecordView";
     }
+    /**
+     * 项目选查
+     * 传参：项目id
+     * @param projectRecords
+     * @param model
+     * @return
+     */
+//    @RequiresPermissions(value={"ruralProject:ruralProjectView:view"})
+    @RequestMapping(value = "searchview")
+    public String searchview(RuralProjectRecords projectRecords, Model model) {
+        if (projectRecords!=null&& StringUtils.isNotBlank(projectRecords.getId())) {
+            projectRecords = projectRecordsService.get(projectRecords.getId());
+            projectRecordsService.queryProjectDetail(projectRecords);
+            ProjectPlanInfo projectPlanInfo = new ProjectPlanInfo();
+            projectPlanInfo.setProjectId(projectRecords.getId());
+            if(null != projectRecords.getWorkContractInfo()){
+                if(null != projectRecords.getWorkContractInfo().getContractTypeDoc()){
+                    projectRecords.getWorkContractInfo().setContractType(DictUtils.getMainDictLabel(String.valueOf(projectRecords.getWorkContractInfo().getContractTypeDoc()),"contract_info_type",""));
+                }
+            }
+            //获取项目计划信息
+            List<ProjectPlanInfo> projectPlanList = projectPlanService.getProjectPlanList(projectPlanInfo);
+            projectRecords.setProjectPlanList(projectPlanList);
+            List<MainDictDetail> mainDictList = Lists.newArrayList();
+            //工程咨询
+            if("1".equals(projectRecords.getProjectType())){
+                mainDictList = DictUtils.getMainDictList("attachment_project_sort");
+                //造价审核
+            } else if("2".equals(projectRecords.getProjectType())){
+                mainDictList = DictUtils.getMainDictList("attachment_project_sort_cost");
+            }
+            if(StringUtils.isNotBlank(projectRecords.getAttachmentProjectSort())){
+                //处理项目类别
+                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", "");
+                }
+            }
+
+            model.addAttribute("flagProjectReportData",projectReportData);
+
+        }
+        model.addAttribute("projectRecords", projectRecords);
+        RuralProjectRecordsReported reported = ruralProjectMessageService.getRuralProjectRecordsReported(projectRecords.getId());
+        if (null!=reported){
+            model.addAttribute("reportedId",reported.getId());
+        }
+        return "modules/ruralprojectrecords/view/selectiveSearchView";
+    }
 }

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

@@ -61,6 +61,8 @@
 	<select id="get" resultType="RuralProjectRecords" >
 		SELECT
 			<include refid="projectRecordsColumns"/>
+		,a.file_num AS "fileNum"
+	    ,a.check_process_instance_id AS "checkProcessInstanceId"
         ,su.name AS "createBy.name"
         ,o.top_company AS "office.name"
 		,prd.number AS "projectReportNumber"

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

@@ -864,9 +864,9 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm12 lw7 with-textarea">
-					<label class="layui-form-label double-line">专业咨询员审核意见：</label>
+					<label class="layui-form-label double-line"><span class="require-item">*</span>专业咨询员审核意见：</label>
 					<div class="layui-input-block">
-						<form:textarea placeholder="请输入审核意见" path="projectReportData.consultantRemarks" htmlEscape="false" rows="4"  maxlength="255"  class="form-control "/>
+						<form:textarea placeholder="请输入审核意见" path="projectReportData.consultantRemarks" htmlEscape="false" rows="4"  maxlength="255"  class="form-control re "/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6 lw7">

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

@@ -64,6 +64,14 @@
             $("#other_btn").click(function () {
                 $("#other_file").click();
             });
+			$(".tabMove").mouseover(function(){
+				//tips层-下
+				var td=$(this)
+				var tdval=$(this).find("input").val();
+				layer.tips(tdval, td, {
+					tips: 3
+				});
+			})
         });
         function hasInArr(id,idArr) {
             for(var i=0;i<idArr.length;i++){
@@ -414,7 +422,7 @@
 						<thead>
 						<tr>
 								<%-- <th>序号</th>--%>
-							<th width="55%">文件类型</th>
+							<th width="30%">文件类型</th>
 							<th width="">文件名</th>
 							<th width="100px">操作</th>
 						</tr>
@@ -424,12 +432,12 @@
 							<tr id="${fileAttachment.id}" pid="${fileAttachment.parent.id}">
 								<c:choose>
 									<c:when test="${fileAttachment.mustFlag == 1}">
-										<td><span style="color: red">* </span>${fileAttachment.attachName}</td>
+										<td class="tabMove" style="text-align:left;"><span style="color: red">* </span>${fileAttachment.attachName}<input type="hidden" value="${fileAttachment.attachName}"/></td>
 									</c:when>
 									<c:otherwise>
 										<c:choose>
 											<c:when test="${fileAttachment.flag == 0}">
-												<td>${fileAttachment.attachName}</td>
+												<td class="tabMove"  style="text-align:left;">${fileAttachment.attachName}<input type="hidden" value="${fileAttachment.attachName}"/></td>
 											</c:when>
 											<c:otherwise>
 												<td></td>
@@ -497,7 +505,7 @@
 
 
 			<div class="form-group layui-row">
-				<div class="form-group-label"><h2>依据性资料</h2></div>
+				<div class="form-group-label"><h2>依据性文件</h2></div>
 <%--				<div class="layui-item nav-btns">--%>
 <%--					&lt;%&ndash;<a id="gistdata_btn" class="nav-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i>&nbsp;添加附件</a>&ndash;%&gt;--%>
 <%--					<a href="javascript:void(0)"  onclick="formAttachment('添加类型', '${ctx}/projectAccessoryRelation/projectAccessoryRelation/formAttachment?parentId=12&projectType=1&projectId=${projectRecords.id}&reviewFee='+$('#reviewFee').val(),'500px','350px',false,'inputForm','file_gistdata')" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 添加类型</a>--%>
@@ -518,7 +526,7 @@
 						<thead>
 						<tr>
 								<%-- <th>序号</th>--%>
-							<th width="55%">文件类型</th>
+							<th width="30%">文件类型</th>
 							<th width="">文件名</th>
 							<th width="100px">操作</th>
 						</tr>
@@ -529,12 +537,12 @@
 									<%-- <td>${status.index + 1}</td>--%>
 										<c:choose>
 											<c:when test="${fileGistdata.mustFlag == 1}">
-												<td><span style="color: red">* </span>${fileGistdata.attachName}</td>
+												<td class="tabMove" style="text-align:left;"><span style="color: red">* </span>${fileGistdata.attachName}<input type="hidden" value="${fileGistdata.attachName}"/></td>
 											</c:when>
 											<c:otherwise>
 												<c:choose>
 													<c:when test="${fileGistdata.flag == 0}">
-														<td>${fileGistdata.attachName}</td>
+														<td class="tabMove" style="text-align:left;">${fileGistdata.attachName}<input type="hidden" value="${fileGistdata.attachName}"/></td>
 													</c:when>
 													<c:otherwise>
 														<td></td>
@@ -622,7 +630,7 @@
 						<thead>
 						<tr>
 								<%-- <th>序号</th>--%>
-							<th width="55%">文件类型</th>
+							<th width="30%">文件类型</th>
 							<th width="">文件名</th>
 							<th width="100px">操作</th>
 						</tr>
@@ -633,12 +641,12 @@
 									<%-- <td>${status.index + 1}</td>--%>
 										<c:choose>
 											<c:when test="${fileOther.mustFlag == 1}">
-												<td><span style="color: red">* </span>${fileOther.attachName}</td>
+												<td class="tabMove" style="text-align:left;"><span style="color: red">* </span>${fileOther.attachName}<input type="hidden" value="${fileOther.attachName}"/></td>
 											</c:when>
 											<c:otherwise>
 												<c:choose>
 													<c:when test="${fileOther.flag == 0}">
-														<td>${fileOther.attachName}</td>
+														<td class="tabMove" style="text-align:left;">${fileOther.attachName}<input type="hidden" value="${fileOther.attachName}"/></td>
 													</c:when>
 													<c:otherwise>
 														<td></td>

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

@@ -232,6 +232,8 @@
 <%--			</c:if>--%>
 			<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>
+
 		</ul>
 <%--		<ul class="list-tabs" >--%>
 <%--			<li><a href="${ctx}/ruralProject/ruralProjectView/view?id=${projectRecords.id}">项目详情</a></li>--%>

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

@@ -48,7 +48,15 @@
                     }
                 }
             });
-        });
+            $(".tabMove").mouseover(function(){
+				//tips层-下
+				var td=$(this)
+				var tdval=$(this).find("input").val();
+				layer.tips(tdval, td, {
+					tips: 3
+				});
+			})
+		});
 	</script>
 </head>
 <body>
@@ -70,6 +78,8 @@
 <%--			</c:if>--%>
 			<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>
+
 		</ul>
 <%--		<ul class="list-tabs" >--%>
 <%--			<li><a href="${ctx}/ruralProject/ruralProjectView/view?id=${projectRecords.id}">项目详情</a></li>--%>
@@ -123,12 +133,12 @@
 							<tr id="${fileAttachment.id}" pid="${fileAttachment.parent.id}">
 								<c:choose>
 									<c:when test="${fileAttachment.mustFlag == 1}">
-										<td style="text-align:left;"><span style="color: red">* </span>${fileAttachment.attachName}</td>
+										<td class="tabMove" style="text-align:left;"><span style="color: red">* </span>${fileAttachment.attachName}<input type="hidden" value="${fileAttachment.attachName}"/></td>
 									</c:when>
 									<c:otherwise>
 										<c:choose>
 											<c:when test="${fileAttachment.flag == 0}">
-												<td style="text-align:left;">${fileAttachment.attachName}</td>
+												<td class="tabMove"  style="text-align:left;">${fileAttachment.attachName}<input type="hidden" value="${fileAttachment.attachName}"</td>
 											</c:when>
 											<c:otherwise>
 												<td></td>
@@ -167,7 +177,7 @@
 
 
 			<div class="form-group layui-row">
-				<div class="form-group-label"><h2>依据性资料</h2></div>
+				<div class="form-group-label"><h2>依据性文件</h2></div>
 				<div id="addFile_gistdata" style="display: none" class="upload-progress">
 					<span id="fileName_gistdata" ></span>
 					<span id="_gistdata" ></span>
@@ -195,12 +205,12 @@
 									<%-- <td>${status.index + 1}</td>--%>
 										<c:choose>
 											<c:when test="${fileGistdata.mustFlag == 1}">
-												<td style="text-align:left;"><span style="color: red">* </span>${fileGistdata.attachName}</td>
+												<td class="tabMove"  style="text-align:left;"><span style="color: red">* </span>${fileGistdata.attachName}<input type="hidden" value="${fileGistdata.attachName}"/></td>
 											</c:when>
 											<c:otherwise>
 												<c:choose>
 													<c:when test="${fileGistdata.flag == 0}">
-														<td style="text-align:left;">${fileGistdata.attachName}</td>
+														<td class="tabMove"  style="text-align:left;">${fileGistdata.attachName}<input type="hidden" value="${fileGistdata.attachName}"/></td>
 													</c:when>
 													<c:otherwise>
 														<td></td>
@@ -266,12 +276,12 @@
 									<%-- <td>${status.index + 1}</td>--%>
 										<c:choose>
 											<c:when test="${fileOther.mustFlag == 1}">
-												<td style="text-align:left;"><span style="color: red">* </span>${fileOther.attachName}</td>
+												<td class="tabMove"  style="text-align:left;"><span style="color: red">* </span>${fileOther.attachName}<input type="hidden" value="${fileOther.attachName}"/></td>
 											</c:when>
 											<c:otherwise>
 												<c:choose>
 													<c:when test="${fileOther.flag == 0}">
-														<td style="text-align:left;">${fileOther.attachName}</td>
+														<td class="tabMove"  style="text-align:left;">${fileOther.attachName}<input type="hidden" value="${fileOther.attachName}"/></td>
 													</c:when>
 													<c:otherwise>
 														<td></td>

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

@@ -156,6 +156,8 @@
 <%--            </c:if>--%>
             <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>
+
         </ul>
 <%--        <ul class="list-tabs" >--%>
 <%--            <li><a href="${ctx}/ruralProject/ruralProjectView/view?id=${projectRecords.id}">项目详情</a></li>--%>

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

@@ -202,6 +202,8 @@
 				<%--            </c:if>--%>
 				<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>
+
 			</ul>
 		</div>
 	</div>

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

@@ -126,6 +126,8 @@
 				<%--				</c:if>--%>
 				<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>
+
 			</ul>
 <%--			<ul class="list-tabs" >--%>
 <%--				<li><a href="${ctx}/ruralProject/ruralProjectView/view?id=${projectRecords.id}">项目详情</a></li>--%>

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

@@ -94,6 +94,8 @@
 <%--            </c:if>--%>
             <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>
+
         </ul>
 <%--        <ul class="list-tabs" >--%>
 <%--            <li><a href="${ctx}/ruralProject/ruralProjectView/view?id=${projectRecords.id}">项目详情</a></li>--%>

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

@@ -42,6 +42,8 @@
 			<%--			</c:if>--%>
 			<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>
+
 		</ul>
 	</div>
 	</div>

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

@@ -0,0 +1,234 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/webpage/include/taglib.jsp"%>
+<html>
+<head>
+	<title>选查查看</title>
+	<meta name="decorator" content="default"/>
+	<script>
+		$(document).ready(function () {
+			var tt = $("#contractNum").val();
+			if (tt == null || tt === "") {
+				$("#divv").hide();
+				$("#divv2").show();
+				$("#divv3").hide();
+				setTimeout(function () {
+					var tt = $("#workClientLinkmanList").find("tr").eq(0).find("td").eq(1).text().trim();
+					$("#clientName").val(tt);
+				},100);
+			}else{
+				$("#divv2").hide();
+			}
+
+		})
+	</script>
+</head>
+<body>
+<div class="single-form">
+	<div class="tapfixed">
+	<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>
+<%--			<c:if test="${projectRecords.workContractInfo!=null and projectRecords.workContractInfo.id!=''}">--%>
+				<li><a href="${ctx}/ruralProject/ruralProjectView/workContractView?id=${projectRecords.workContractInfo.id}&projectId=${projectRecords.id}">客户合同详情</a></li>
+<%--			</c:if>--%>
+			<li><a href="${ctx}/ruralProject/ruralProjectView/planView?id=${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>--%>
+			<%--			<c:if test="${flagProjectReportData.id!=null}">--%>
+			<li><a href="${ctx}/ruralProject/ruralProjectView/modify?projectId=${projectRecords.id}">报告信息</a></li>
+			<%--			</c:if>--%>
+			<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>
+		</ul>
+	</div>
+	</div>
+	<c:if test="${ null ==projectRecords.fileNum}">
+		<div class="topMar">
+			<h2>暂无选查信息</h2>
+		</div>
+	</c:if>
+	<c:if test="${null != projectRecords.fileNum}">
+	<div class="container view-form" style="margin-top: 50px;">
+		<form:form id="inputForm" modelAttribute="projectRecords" method="post" class="form-horizontal">
+			<div class="form-group layui-row first">
+				<div class="form-group-label"><h2>选查项目合同信息</h2></div>
+               <div id="divv">
+				   <div class="layui-item layui-col-sm12 lw6">
+					   <label class="layui-form-label">合同编号：</label>
+					   <div class="layui-input-block">
+						   <input htmlEscape="false" style="background-color: #f1f1f1" id="contractNum" readonly="true" class="form-control layui-input" value="${projectRecords.workContractInfo.contractNum}"/>
+					   </div>
+				   </div>
+				   <div class="layui-item layui-col-sm6 lw6">
+					   <label class="layui-form-label">合同名称：</label>
+					   <div class="layui-input-block">
+						   <input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${projectRecords.workContractInfo.name}"/>
+					   </div>
+				   </div>
+				   <div class="layui-item layui-col-sm6 lw6">
+					   <label class="layui-form-label double-line">合同金额(元)：</label>
+					   <div class="layui-input-block">
+						   <input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="<fmt:formatNumber value="${projectRecords.workContractInfo.contractPrice}" pattern="#,##0.00#"/>"/>
+					   </div>
+				   </div>
+				   <div class="layui-item layui-col-sm6 lw6">
+					   <label class="layui-form-label">委托方：</label>
+					   <div class="layui-input-block">
+						   <input htmlEscape="false" style="background-color: #f1f1f1" id="clientName" readonly="true" class="form-control layui-input" value="${projectRecords.workContractInfo.client.name}"/>
+					   </div>
+				   </div>
+			   </div>
+				<div id="divv2">
+					<div class="layui-item layui-col-sm6 lw6">
+						<label class="layui-form-label">无合同</label>
+					</div>
+				</div>
+				<div id="divv3">
+					<div class="layui-item layui-col-sm6 lw6">
+						<label class="layui-form-label">合同类型：</label>
+						<div class="layui-input-block">
+							<input htmlEscape="false"  readonly="true" style="background-color: #f1f1f1" class="form-control layui-input" value="${projectRecords.workContractInfo.contractType}"/>
+						</div>
+					</div>
+				</div>
+			</div>
+
+			<div class="form-group layui-row first">
+				<div class="form-group-label"><h2>选查项目信息</h2></div>
+                <div class="layui-item layui-col-sm6 lw6">
+                    <label class="layui-form-label">项目名称：</label>
+                    <div class="layui-input-block">
+                        <input htmlEscape="false"  readonly="true" class="form-control layui-input" style="background-color: #f1f1f1" value="${projectRecords.projectName}"/>
+                    </div>
+                </div>
+				<div class="layui-item layui-col-sm6 lw6">
+					<label class="layui-form-label">项目编号：</label>
+					<div class="layui-input-block">
+                        <div class="input-group">
+                            <form:input path="projectId" htmlEscape="false"  readonly="true" class="form-control layui-input" cssStyle="background-color: #f1f1f1"/>
+                            <span class="input-group-btn">
+                                <label class="form-status"><c:choose><c:when test="${not empty projectRecords.projectStatus}">${fns:getDictLabel(projectRecords.projectStatus, 'rural_project_audit_state', '')}</c:when><c:otherwise>新添</c:otherwise></c:choose></label>
+                             </span>
+                        </div>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6 lw6">
+					<label class="layui-form-label">项目所在地：</label>
+					<div class="layui-input-block">
+						<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${projectRecords.area.name}"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6 lw6">
+					<label class="layui-form-label">所在省份：</label>
+					<div class="layui-input-block">
+						<form:input path="province" cssStyle="background-color: #f1f1f1" htmlEscape="false" id="province" class="form-control layui-input" readonly="true"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6 lw6">
+					<label class="layui-form-label">所在地级市：</label>
+					<div class="layui-input-block">
+						<form:input path="city" cssStyle="background-color: #f1f1f1" htmlEscape="false" id="city" class="form-control layui-input" readonly="true"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6 lw6">
+					<label class="layui-form-label">所在区县：</label>
+					<div class="layui-input-block">
+						<form:input path="county" cssStyle="background-color: #f1f1f1" htmlEscape="false" id="areaName1" class="form-control layui-input" readonly="true"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6 lw6">
+					<label class="layui-form-label">建设地点：</label>
+					<div class="layui-input-block">
+						<input htmlEscape="false" style="background-color: #f1f1f1"  readonly="true" class="form-control layui-input" value="${projectRecords.projectSite}"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6 lw6">
+					<label class="layui-form-label">创建人：</label>
+					<div class="layui-input-block">
+						<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${projectRecords.createBy.name}"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6 lw6">
+					<label class="layui-form-label">项目负责人：</label>
+					<div class="layui-input-block">
+						<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${projectRecords.leaderNameStr}"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6 lw6">
+					<label class="layui-form-label">所属部门：</label>
+					<div class="layui-input-block">
+						<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" id="officeName" class="form-control layui-input" value="${projectRecords.officeName}"/>
+					</div>
+				</div>
+<%--				<div class="layui-item layui-col-sm6 lw6">--%>
+<%--					<label class="layui-form-label double-line">工作开始日期：</label>--%>
+<%--					<div class="layui-input-block">--%>
+<%--						<input class="laydate-icondate form-control layui-input layer-date ash"  style="background-color: #f1f1f1" readonly="true" id="startDate" name="startDate" value="<fmt:formatDate value="${ruralProjectRecords.startDate}" pattern="yyyy-MM-dd"/>">--%>
+<%--					</div>--%>
+<%--				</div>--%>
+<%--				<div class="layui-item layui-col-sm6 lw6">--%>
+<%--					<label class="layui-form-label double-line">工作结束日期：</label>--%>
+<%--					<div class="layui-input-block">--%>
+<%--						<input class="laydate-icondate form-control layui-input layer-date "  style="background-color: #f1f1f1" readonly="true" id="endingDate" name="endingDate" value="<fmt:formatDate value="${ruralProjectRecords.endingDate}" pattern="yyyy-MM-dd"/>">--%>
+<%--					</div>--%>
+<%--				</div>--%>
+				<div class="layui-item layui-col-sm6 lw6">
+					<label class="layui-form-label">创建日期：</label>
+					<div class="layui-input-block">
+						<input htmlEscape="false"  style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="<fmt:formatDate value="${projectRecords.createDate}" pattern="yyyy-MM-dd"/>"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6 lw7">
+					<label class="layui-form-label">项目类别：</label>
+					<div class="layui-input-block">
+						<input htmlEscape="false" readonly="true"  style="background-color: #f1f1f1" class="form-control layui-input" value="${projectRecords.attachmentProjectSort}"/>
+					</div>
+				</div>
+<%--				<div class="layui-item layui-col-sm6 lw6 with-textarea">--%>
+<%--					<label class="layui-form-label">工程概况：</label>--%>
+<%--					<div class="layui-input-block">--%>
+<%--						<textarea htmlEscape="false" rows="4" readonly="true"  style="background-color: #f1f1f1" maxlength="1000" class="form-control" >${projectRecords.projectDesc}</textarea>--%>
+<%--					</div>--%>
+<%--				</div>--%>
+<%--				<div class="layui-item layui-col-sm6 lw6 with-textarea">--%>
+<%--					<label class="layui-form-label">备注：</label>--%>
+<%--					<div class="layui-input-block">--%>
+<%--						<textarea htmlEscape="false" rows="4" readonly="true" maxlength="1000"  style="background-color: #f1f1f1" class="form-control" >${projectRecords.remarks}</textarea>--%>
+<%--					</div>--%>
+<%--				</div>--%>
+			</div>
+
+			<div class="form-group layui-row first">
+				<div class="form-group-label"><h2>选查信息</h2></div>
+					<div class="layui-item layui-col-sm6 lw6">
+						<label class="layui-form-label double-line">案卷号：</label>
+						<div class="layui-input-block">
+							<input class="form-control layui-input"  style="background-color: #f1f1f1" readonly="true"  value="${projectRecords.fileNum}" />
+						</div>
+					</div>
+					<div class="layui-item layui-col-sm12 lw6 with-textarea">
+						<label class="layui-form-label">选查要求：</label>
+						<div class="layui-input-block">
+							<textarea htmlEscape="false" style="background-color: #f1f1f1" rows="4" readonly="true" class="form-control" >${projectRecords.checkRemarks}</textarea>
+						</div>
+					</div>
+			</div>
+			<div class="form-group layui-row">
+				<div class="form-group-label"><h2>审批流程</h2></div>
+				<div class="layui-item layui-col-xs12 form-table-container" >
+					<act:flowChart procInsId="${projectRecords.checkProcessInstanceId}"/>
+					<act:histoicFlow procInsId="${projectRecords.checkProcessInstanceId}"/>
+				</div>
+			</div>
+			<div class="form-group layui-row page-end"></div>
+		</form:form>
+	</div>
+	</c:if>
+
+</div>
+</body>
+</html>

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

@@ -35,6 +35,8 @@
             <%--            </c:if>--%>
             <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>
+
         </ul>
 <%--        <ul class="list-tabs" >--%>
 <%--            <li><a href="${ctx}/ruralProject/ruralProjectView/view?id=${projectRecords.id}">项目详情</a></li>--%>

src/main/webapp/webpage/modules/workstaff/workStaffBasicInfoForm.jsp

@@ -1150,7 +1150,7 @@
                                 <td>
                                     <select name="certificateList[${varStatus.index}].name" id="certificateList${varStatus.index}_name" class="form-control required">
                                         <c:forEach items="${fns:getMainDictList('certificate_type')}" var="var">
-                                            <option value="${var.value}" <c:if test="${certificate.name eq var.label}">selected</c:if>>${var.label}</option>
+                                            <option value="${var.value}" <c:if test="${certificate.name eq var.value}">selected</c:if>>${var.label}</option>
                                         </c:forEach>
                                     </select>
                                 </td>