项目计划添加报告号展示和筛选项

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

@@ -1327,6 +1327,7 @@
 		<include refid="projectRecordsColumns"/>
 		,
 		wci.name AS "workContractInfo.name",
+		prd.number AS "projectReportNumber",
 		wct.id AS "workContractInfo.client.id",
 		wct.name AS "workContractInfo.client.name",
 		o.top_company AS "office.name",
@@ -1338,6 +1339,7 @@
 			LEFT JOIN work_project_user w on a.id = w.project_id
 			LEFT JOIN sys_user su on w.user_id = su.id
 		</if>
+		LEFT JOIN project_report_data prd on a.id = prd.project_id
 		LEFT JOIN work_project_user w1 on a.id = w1.project_id
 		LEFT JOIN work_contract_info wci on a.contract_id = wci.id
 		LEFT JOIN work_client_info wct on wci.client_id = wct.id
@@ -1347,6 +1349,9 @@
 			<if test="projectId != null and projectId != ''">
 				AND a.project_id like concat('%',#{projectId},'%')
 			</if>
+			<if test="projectReportNumber != null and projectReportNumber != ''">
+				AND prd.number like concat('%',#{projectReportNumber},'%')
+			</if>
 			<if test="projectName != null and projectName != ''">
 				AND a.project_name like concat(concat('%',#{projectName}),'%')
 			</if>
@@ -1430,6 +1435,7 @@
 			LEFT JOIN work_project_user w on a.id = w.project_id
 			LEFT JOIN sys_user su on w.user_id = su.id
 		</if>
+		LEFT JOIN project_report_data prd on a.id = prd.project_id
 		LEFT JOIN work_project_user w1 on a.id = w1.project_id
 		<if test="workContractInfo !=null">
 			LEFT JOIN work_contract_info wci on a.contract_id = wci.id
@@ -1441,6 +1447,9 @@
 			<if test="projectId != null and projectId != ''">
 				AND a.project_id like concat('%',#{projectId},'%')
 			</if>
+			<if test="projectReportNumber != null and projectReportNumber != ''">
+				AND prd.number like concat('%',#{projectReportNumber},'%')
+			</if>
 			<if test="projectName != null and projectName != ''">
 				AND a.project_name like concat(concat('%',#{projectName}),'%')
 			</if>

src/main/webapp/WEB-INF/tags/sys/treeselectAccessoryNoParent.tag

@@ -27,7 +27,7 @@
 	<div class="input-group">
 		<input id="${id}Name" name="${labelName}" placeholder="${title}" ${allowInput?'':'readonly="true"'}  type="text" value="${labelValue}" data-msg-required="${dataMsgRequired}"
 		class="${cssClass}" style="background-color: #ffffff; ${cssStyle}"/>
-       		
+
     </div>
 	 <label id="${id}Name-error" class="error" for="${id}Name" style="display:none"></label>
 <script type="text/javascript">
@@ -36,9 +36,9 @@
 		if ($("#${id}Button").hasClass("disabled")){
 			return true;
 		}
-		// 正常打开	
+		// 正常打开
 		top.layer.open({
-		    type: 2, 
+		    type: 2,
 		    area: ['300px', '420px'],
 		    title:"选择${title}",
 		    ajaxData:{selectIds: $("#${id}Id").val()},
@@ -95,7 +95,7 @@
     	cancel: function(index){ //或者使用btn2
     	           //按钮【按钮二】的回调
     	       }
-		}); 
-	
+		});
+
 	});
-</script>
+</script>

src/main/webapp/webpage/modules/projectrecord/plan/projectPlanConsultingList.jsp

@@ -175,6 +175,12 @@
 					</div>
 					<div id="moresees" style="clear:both;display:none;" class="lw6">
 						<div class="layui-item query athird ">
+							<label class="layui-form-label">报告号：</label>
+							<div class="layui-input-block">
+								<form:input path="projectReportNumber" htmlEscape="false" maxlength="255"  class=" form-control layui-input"/>
+							</div>
+						</div>
+						<div class="layui-item query athird ">
 							<label class="layui-form-label">项目责任人：</label>
 							<div class="layui-input-block">
 								<form:input path="leaderNameStr" htmlEscape="false" maxlength="255"  class=" form-control layui-input"/>
@@ -247,6 +253,7 @@
 						}
 					<%--return "<a class=\"attention-info\" title=\"" + d.projName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目', '${ctx}/ruralProject/ruralProjectRecords/view?id=" + d.id +"','95%', '95%')\">" + d.projName + "</a>";--%>
 					}}
+				,{field:'projectReportNumber',align:'center', title: '报告号',minWidth:150}
 				,{field:'projId',align:'center', title: '项目编号',minWidth:150}
 				,{field:'contract', align:'center',title: '合同名称',minWidth:200,templet:function(d){
 						if(null == d.contract || '' == d.contract){
@@ -295,6 +302,7 @@
 					"index":"${index.index+1}"
 					,"id":"${projectRecords.id}"
 					,"projId":"${projectRecords.projectId}"
+					,"projectReportNumber":"${projectRecords.projectReportNumber}"
 					,"projName":"<c:out value="${projectRecords.projectName}" escapeXml="true"/>"
 					,"projMaster":"<c:forEach items="${projectRecords.projectLeaders}" var="leader" varStatus="status"><c:choose><c:when test="${status.last}">${leader.name}</c:when><c:otherwise>${leader.name},</c:otherwise></c:choose></c:forEach>"
 					,"contract":"${projectRecords.workContractInfo.name}"
@@ -341,4 +349,4 @@
 	});
 </script>
 </body>
-</html>
+</html>

src/main/webapp/webpage/modules/projectrecord/plan/projectPlanCostList.jsp

@@ -175,6 +175,12 @@
 					</div>
 					<div id="moresees" style="clear:both;display:none;" class="lw6">
 						<div class="layui-item query athird ">
+							<label class="layui-form-label">报告号：</label>
+							<div class="layui-input-block">
+								<form:input path="projectReportNumber" htmlEscape="false" maxlength="255"  class=" form-control layui-input"/>
+							</div>
+						</div>
+						<div class="layui-item query athird ">
 							<label class="layui-form-label">项目责任人：</label>
 							<div class="layui-input-block">
 								<form:input path="leaderNameStr" htmlEscape="false" maxlength="255"  class=" form-control layui-input"/>
@@ -247,6 +253,7 @@
 						}
 					<%--return "<a class=\"attention-info\" title=\"" + d.projName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目', '${ctx}/ruralProject/ruralProjectRecords/view?id=" + d.id +"','95%', '95%')\">" + d.projName + "</a>";--%>
 					}}
+				,{field:'projectReportNumber',align:'center', title: '报告号',minWidth:150}
 				,{field:'projId',align:'center', title: '项目编号',minWidth:150}
 				,{field:'contract', align:'center',title: '合同名称',minWidth:200,templet:function(d){
 						if(null == d.contract || '' == d.contract){
@@ -295,6 +302,7 @@
 					"index":"${index.index+1}"
 					,"id":"${projectRecords.id}"
 					,"projId":"${projectRecords.projectId}"
+					,"projectReportNumber":"${projectRecords.projectReportNumber}"
 					,"projName":"<c:out value="${projectRecords.projectName}" escapeXml="true"/>"
 					,"projMaster":"<c:forEach items="${projectRecords.projectLeaders}" var="leader" varStatus="status"><c:choose><c:when test="${status.last}">${leader.name}</c:when><c:otherwise>${leader.name},</c:otherwise></c:choose></c:forEach>"
 					,"contract":"${projectRecords.workContractInfo.name}"
@@ -341,4 +349,4 @@
 	});
 </script>
 </body>
-</html>
+</html>