管理员项目列表（修改）

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

@@ -140,7 +140,9 @@ public class RuralProjectMessageAllService extends CrudService<RuralProjectMessa
         workProjectNotify.setType("95");
         //查询所有需要当前登录人进行处理的项目信息
         List<WorkProjectNotify> reportedNotifyList = workProjectNotifyService.findList(workProjectNotify);
-
+        workProjectNotify.setType("99");
+        //查询所有需要当前登录人进行处理的项目信息
+        List<WorkProjectNotify> materialDefectRecord = workProjectNotifyService.findList(workProjectNotify);
         //添加查询类型(工程咨询)
         Page<RuralProjectRecords> page = this.findPage(new Page<RuralProjectRecords>(request, response), projectRecords);
         //无合同状态下，获取委托方的名称
@@ -273,6 +275,12 @@ public class RuralProjectMessageAllService extends CrudService<RuralProjectMessa
         projectRecordTreeData.setPrdtId(info.getPrdtId());
         //报告签发流程2流程id
         projectRecordTreeData.setPrdtProcessinstanceId(info.getPrdtProcessinstanceId());
+        //归档资料缺失说明状态
+        projectRecordTreeData.setDefectRecordStatus(info.getDefectRecordStatus());
+        //归档资料缺失说明流程id
+        projectRecordTreeData.setPmdrProcessInstanceId(info.getPmdrProcessInstanceId());
+        //归档资料缺失说明id
+        projectRecordTreeData.setPmdrId(info.getPmdrId());
         //线上归档状态
         projectRecordTreeData.setProjectReportRecordStatus(info.getProjectReportRecordStatus());
         //线下归档状态

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

@@ -118,6 +118,9 @@
 		,ifnull(prdt.status,0) as "projectReportStatusTwo"
 		,prdt.id as prdtId
 		,prdt.process_instance_id as prdtProcessinstanceId
+		,ifnull(pmdr.status,0) as "defectRecordStatus"
+		,pmdr.process_instance_id as "pmdrProcessInstanceId"
+		,pmdr.id as pmdrId
 		FROM rural_project_records a
 		LEFT JOIN sys_area area ON area.id = a.area_id
 		left join rural_project_records_reported rprr on rprr.id = a.id
@@ -134,6 +137,7 @@
 		left join project_report_data prd on prd.project_id = a.id
 		left join project_report_data_two prdt on prdt.project_id = a.id
 		left join rural_project_report_record prr on prr.report_id = prd.id
+		LEFT JOIN project_material_defect_record pmdr on prd.id = pmdr.report_id
 		left join rural_project_report_record_down prrd on prrd.report_id = prd.id
 		<where>
 			a.status = 5
@@ -295,6 +299,7 @@
 		left join project_report_data prd on prd.project_id = a.id
 		left join project_report_data_two prdt on prdt.project_id = a.id
 		left join rural_project_report_record prr on prr.report_id = prd.id
+		LEFT JOIN project_material_defect_record pmdr on prd.id = pmdr.report_id
 		left join rural_project_report_record_down prrd on prrd.report_id = prd.id
 		LEFT JOIN project_flingbatch_relation pfp on pfp.project_id= a.id
 

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

@@ -350,6 +350,7 @@
 
             return false;
         }
+		}
         $(document).ready(function() {
 			$("#upTable").treeTable({expandLevel : 5},{ expandable: true });
 			$("#gistdata_upTable").treeTable({expandLevel : 5},{ expandable: true });
@@ -1172,13 +1173,13 @@
 				$("#GCGMValueParameter").removeClass("number");
 				$("#GCGMValueParameter").addClass("number");
 			}
-
-			var contents=${projectcontentinfo.recordsReported.contentsIncludeList}
-			for(var i=0;i<contents.length;i++){
-				var con=contents[i];
-				$(".contents_"+con+"").prop("checked",true)
+			var contents=${fns:toJson(projectcontentinfo.recordsReported.contentsIncludeList)}
+			if(null!=contents){
+				for(var i=0;i<contents.length;i++){
+					var con=contents[i];
+					$(".contents_"+con+"").prop("checked",true)
+				}
 			}
-
 		});
 
 		function ZiXunBDEChange(){
@@ -2420,7 +2421,7 @@
 					<script type="text/javascript">
 						var workClientBankRowIdx1 = 0,
 								workClientBankTpl1 = $("#workClientBankTpl1").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g, "");
-						workClientBankTplFirst = $("#workClientBankTplFirst").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g, "");
+						// workClientBankTplFirst = $("#workClientBankTplFirst").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g, "");
 						$(document).ready(function () {
 							var dataBank = ${fns:toJson(consultantInfo1)};
 							for (var i = 0; i < dataBank.length; i++) {
@@ -2731,7 +2732,7 @@
 	var workClientBankRowIdx = $("#reportedConsultantList").find("tr:last").find("td").eq(1).find("input").val(),
 			workClientBankTpl = $("#workClientBankTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g, "");
 	workClientBankTplFirst = $("#workClientBankTplFirst").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g, "");
-	$(document).ready(function () {
+	// $(document).ready(function () {
 		<%--var dataBank = ${fns:toJson(info)};--%>
 		<%--for (var i = 0; i < dataBank.length; i++) {--%>
 		<%--	if(i == 0){--%>
@@ -2741,7 +2742,7 @@
 		<%--	}--%>
 		<%--	workClientBankRowIdx = workClientBankRowIdx + 1;--%>
 		<%--}--%>
-	});
+	// });
 	function consultants(id, workClientBankRowIdx, workClientBankTpl) {
 		//根据id查询咨询员列表现有数据量
 		var length =$("#reportedConsultantList").find("tr:last").find("td").eq(1).find("input").val();
@@ -2886,83 +2887,83 @@
 	}
 
 
-	//新增行方法
-	var fileAttachmentTpl = $("#fileAttachmentTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
-	var gistdataTpl = $("#gistdataTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
-	var otherTpl = $("#otherTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
-
-	function formAttachment(title,url,width,height,target,formId,divId){
-		var rows = $(this).parent().prevAll().length + 1;
-		var frameIndex = parent.layer.getFrameIndex(window.name);
-		var urls = url;
-		if(navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)){//如果是移动端，就使用自适应大小弹窗
-			width='auto';
-			height='auto';
-		}else{//如果是PC端，根据用户设置的width和height显示。
-
-		}
-		top.layer.open({
-			type: 2,
-			area: [width, height],
-			title: title,
-			skin:"two-btns",
-			maxmin: false, //开启最大化最小化按钮
-			content: urls ,
-			btn: ['确定','关闭'],
-			yes: function(index, layero){
-				var body = top.layer.getChildFrame('body', index);
-				var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
-				var inputForm = body.find('#inputForm');
-				var top_iframe;
-				inputForm.attr("action","${ctx}/projectTemplate/projectTemplate/getProjectTemplateInfo");//表单提交成功后，从服务器返回的url在当前tab中展示
-				var $document = iframeWin.contentWindow.document;
-				formSubmitAjax($document,formId,index,divId);
-
-			},
-			cancel: function(index){
-			}
-		});
-	}
-	function formSubmitAjax($document,inputForm,index,divId){
-		var validateForm = $($document.getElementById(inputForm)).validate({
-			submitHandler: function(form){
-				loading('正在提交，请稍等...');
-				form.submit();
-			},
-			errorContainer: "#messageBox",
-			errorPlacement: function(error, element) {
-				$($document.getElementById("#messageBox")).text("输入有误，请先更正。");
-				if (element.is(":checkbox")||element.is(":radio")||element.parent().is(".input-append")){
-					error.appendTo(element.parent().parent());
-				} else {
-					error.insertAfter(element);
-				}
-			}
-		});
-		if(validateForm.form()){
-			$($document.getElementById(inputForm)).ajaxSubmit({
-				success:function(data) {
-					if(!data.success){
-						top.layer.msg("保存依据资料信息异常!",{icon:2});
-						return false;
-					}
-					var idx = ''
-					if(divId == 'file_attachment'){
-						idx = $("#file_attachment tr").length;
-						addRowBaseData("#file_attachment",idx,fileAttachmentTpl,data.body.projectAccessoryInfo);
-					}else if(divId == 'file_gistdata'){
-						idx = $("#file_gistdata tr").length;
-						addRowBaseData("#file_gistdata",idx,gistdataTpl,data.body.projectAccessoryInfo);
-					}else if(divId == 'file_other'){
-						idx = $("#file_other tr").length;
-						addRowBaseData("#file_other",idx,otherTpl,data.body.projectAccessoryInfo);
-					}
-					parent.layer.msg(data.msg,{icon:1});
-					top.layer.close(index)
-				}
-			});
-		}
-	}
+	<%--//新增行方法--%>
+	<%--var fileAttachmentTpl = $("#fileAttachmentTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");--%>
+	<%--var gistdataTpl = $("#gistdataTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");--%>
+	<%--var otherTpl = $("#otherTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");--%>
+
+	<%--function formAttachment(title,url,width,height,target,formId,divId){--%>
+	<%--	var rows = $(this).parent().prevAll().length + 1;--%>
+	<%--	var frameIndex = parent.layer.getFrameIndex(window.name);--%>
+	<%--	var urls = url;--%>
+	<%--	if(navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)){//如果是移动端，就使用自适应大小弹窗--%>
+	<%--		width='auto';--%>
+	<%--		height='auto';--%>
+	<%--	}else{//如果是PC端，根据用户设置的width和height显示。--%>
+
+	<%--	}--%>
+	<%--	top.layer.open({--%>
+	<%--		type: 2,--%>
+	<%--		area: [width, height],--%>
+	<%--		title: title,--%>
+	<%--		skin:"two-btns",--%>
+	<%--		maxmin: false, //开启最大化最小化按钮--%>
+	<%--		content: urls ,--%>
+	<%--		btn: ['确定','关闭'],--%>
+	<%--		yes: function(index, layero){--%>
+	<%--			var body = top.layer.getChildFrame('body', index);--%>
+	<%--			var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();--%>
+	<%--			var inputForm = body.find('#inputForm');--%>
+	<%--			var top_iframe;--%>
+	<%--			inputForm.attr("action","${ctx}/projectTemplate/projectTemplate/getProjectTemplateInfo");//表单提交成功后，从服务器返回的url在当前tab中展示--%>
+	<%--			var $document = iframeWin.contentWindow.document;--%>
+	<%--			formSubmitAjax($document,formId,index,divId);--%>
+
+	<%--		},--%>
+	<%--		cancel: function(index){--%>
+	<%--		}--%>
+	<%--	});--%>
+	<%--}--%>
+	<%--function formSubmitAjax($document,inputForm,index,divId){--%>
+	<%--	var validateForm = $($document.getElementById(inputForm)).validate({--%>
+	<%--		submitHandler: function(form){--%>
+	<%--			loading('正在提交，请稍等...');--%>
+	<%--			form.submit();--%>
+	<%--		},--%>
+	<%--		errorContainer: "#messageBox",--%>
+	<%--		errorPlacement: function(error, element) {--%>
+	<%--			$($document.getElementById("#messageBox")).text("输入有误，请先更正。");--%>
+	<%--			if (element.is(":checkbox")||element.is(":radio")||element.parent().is(".input-append")){--%>
+	<%--				error.appendTo(element.parent().parent());--%>
+	<%--			} else {--%>
+	<%--				error.insertAfter(element);--%>
+	<%--			}--%>
+	<%--		}--%>
+	<%--	});--%>
+	<%--	if(validateForm.form()){--%>
+	<%--		$($document.getElementById(inputForm)).ajaxSubmit({--%>
+	<%--			success:function(data) {--%>
+	<%--				if(!data.success){--%>
+	<%--					top.layer.msg("保存依据资料信息异常!",{icon:2});--%>
+	<%--					return false;--%>
+	<%--				}--%>
+	<%--				var idx = ''--%>
+	<%--				if(divId == 'file_attachment'){--%>
+	<%--					idx = $("#file_attachment tr").length;--%>
+	<%--					addRowBaseData("#file_attachment",idx,fileAttachmentTpl,data.body.projectAccessoryInfo);--%>
+	<%--				}else if(divId == 'file_gistdata'){--%>
+	<%--					idx = $("#file_gistdata tr").length;--%>
+	<%--					addRowBaseData("#file_gistdata",idx,gistdataTpl,data.body.projectAccessoryInfo);--%>
+	<%--				}else if(divId == 'file_other'){--%>
+	<%--					idx = $("#file_other tr").length;--%>
+	<%--					addRowBaseData("#file_other",idx,otherTpl,data.body.projectAccessoryInfo);--%>
+	<%--				}--%>
+	<%--				parent.layer.msg(data.msg,{icon:1});--%>
+	<%--				top.layer.close(index)--%>
+	<%--			}--%>
+	<%--		});--%>
+	<%--	}--%>
+	<%--}--%>
 
 
 	function hasInArr(id,idArr) {

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

@@ -583,19 +583,25 @@
 					<input id="toflag" name="toflag" type="hidden" value="1"/>
 					<table:sortColumn id="orderBy" name="orderBy" value="${page.orderBy}" callback="sortOrRefresh();"/><!-- 支持排序 -->
 					<div class="commonQuery 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:input id="reportDataNumber" path="reportData.number" htmlEscape="false" maxlength="255"  class=" form-control layui-input"/>
 							</div>
 						</div>
-						<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:input path="projectName" htmlEscape="false" maxlength="64"  class=" form-control  layui-input"/>
 							</div>
 						</div>
-												<div class="layui-item athird">
+						<div class="layui-item query athird" style="width: 25%">
+							<label class="layui-form-label">项目编号：</label>
+							<div class="layui-input-block with-icon">
+								<form:input path="projectId" htmlEscape="false" maxlength="64"  class=" form-control  layui-input"/>
+							</div>
+						</div>
+						<div class="layui-item athird" style="width: 25%">
 							<div class="input-group">
 								<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>
 								<div class="layui-btn-group search-spacing">
@@ -610,12 +616,7 @@
 						<div style="    clear:both;"></div>
 					</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 with-icon">
-								<form:input path="projectId" htmlEscape="false" maxlength="64"  class=" form-control  layui-input"/>
-							</div>
-						</div>
+
 						<div class="layui-item query athird ">
 							<label class="layui-form-label">登记人：</label>
 							<div class="layui-input-block with-icon">

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

@@ -463,20 +463,25 @@
 					<input id="toflag" name="toflag" type="hidden" value="1"/>
 					<table:sortColumn id="orderBy" name="orderBy" value="${page.orderBy}" callback="sortOrRefresh();"/><!-- 支持排序 -->
 					<div class="commonQuery 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 with-icon">
 								<form:input path="projectId" htmlEscape="false" maxlength="64"  class=" form-control  layui-input"/>
 							</div>
 						</div>
-						<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:input path="projectName" htmlEscape="false" maxlength="64"  class=" form-control  layui-input"/>
 							</div>
 						</div>
-
-						<div class="layui-item athird">
+						<div class="layui-item query athird " style="width: 25%">
+							<label class="layui-form-label">报告号：</label>
+							<div class="layui-input-block">
+								<form:input id="reportDataNumber" path="reportData.number" htmlEscape="false" maxlength="255"  class=" form-control layui-input"/>
+							</div>
+						</div>
+						<div class="layui-item athird" style="width: 25%">
 							<div class="input-group">
 								<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>
 								<div class="layui-btn-group search-spacing">
@@ -563,12 +568,6 @@
 							</div>
 						</div>
 						<div class="layui-item query athird ">
-							<label class="layui-form-label">报告号：</label>
-							<div class="layui-input-block">
-								<form:input id="reportDataNumber" path="reportData.number" 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:select id="projectReportRecordStatus" path="projectReportRecordStatus" class=" form-control  simple-select">
@@ -785,7 +784,7 @@
 								return '';
 							}
 						}},
-					{align:'center', title: '线上归档状态',  width:70,templet:function(d){
+					{align:'center', title: '电子',  width:70,templet:function(d){
 							var st = getRuralProjectArchiveState(""+d.projectReportRecordStatus);
 							if(d.pid ==0){
 								if(st.action)
@@ -797,7 +796,19 @@
 								return '';
 							}
 						}},
-					{align:'center', title: '线下归档状态',  width:70,templet:function(d){
+					{align:'center', title: '资料缺失',  width:90,templet:function(d){
+							var st = getdefectRecordState(""+d.defectRecordStatus);
+							if(d.pid ==0){
+								if(st.action)
+									var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralCostProjectMessage/getReportRecordProcessOne?processInstanceId=" + d.pmdrProcessInstanceId + "','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+								else
+									var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+								return xml;
+							}else{
+								return '';
+							}
+						}},
+					{align:'center', title: '批量',  width:70,templet:function(d){
 							var st = getRuralProjectArchiveState(""+d.filingProjectStatus);
 							if(d.pid ==0){
 								if(st.action)
@@ -809,7 +820,7 @@
 								return '';
 							}
 						}},
-					{align:'center', title: '上报状态',  width:90,templet:function(d){
+					{align:'center', title: '上报',  width:90,templet:function(d){
 							var st = getReportedState(""+d.reportedState);
 							if(d.pid ==0){
 								if(st.action)

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

@@ -581,20 +581,25 @@
 					<input id="toflag" name="toflag" type="hidden" value="1"/>
 					<table:sortColumn id="orderBy" name="orderBy" value="${page.orderBy}" callback="sortOrRefresh();"/><!-- 支持排序 -->
 					<div class="commonQuery 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:input id="reportDataNumber" path="reportData.number" htmlEscape="false" maxlength="255"  class=" form-control layui-input"/>
 							</div>
 						</div>
-						<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:input path="projectName" htmlEscape="false" maxlength="64"  class=" form-control  layui-input"/>
 							</div>
 						</div>
-
-						<div class="layui-item athird">
+						<div class="layui-item query athird" style="width: 25%">
+							<label class="layui-form-label">项目编号：</label>
+							<div class="layui-input-block with-icon">
+								<form:input path="projectId" htmlEscape="false" maxlength="64"  class=" form-control  layui-input"/>
+							</div>
+						</div>
+						<div class="layui-item athird" style="width: 25%">
 							<div class="input-group">
 								<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>
 								<div class="layui-btn-group search-spacing">
@@ -607,12 +612,6 @@
 						<div style="    clear:both;"></div>
 					</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 with-icon">
-								<form:input path="projectId" htmlEscape="false" maxlength="64"  class=" form-control  layui-input"/>
-							</div>
-						</div>
 						<div class="layui-item query athird ">
 							<label class="layui-form-label">登记人：</label>
 							<div class="layui-input-block with-icon">