线上归档状态跟资料缺少说明状态合并

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

@@ -127,10 +127,16 @@
 		,ifnull(pmdr.status,0) as "defectRecordStatus"
 		,pmdr.process_instance_id as "pmdrProcessInstanceId"
 		,pmdr.id as pmdrId
+		,ifnull(ppf.status,0) as "paperFilingStatus"
+		,ppf.process_instance_id as "ppfProcessInstanceId"
+		,ppf.id as "ppfId"
+		,pfb.process_instance_id AS "filingProcessinstanceId"
+		,ifnull(pfp.status,0) as "filingProjectStatus"
 		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
 		LEFT JOIN project_flingbatch_relation pfp on pfp.project_id=a.id
+		LEFT JOIN project_filingbatch pfb on pfb.id=pfp.filing_batch
 		LEFT JOIN sys_user sua on a.create_by = sua.id
 		<if test="leaderNameStr !=null and leaderNameStr !=''">
 			LEFT JOIN work_project_user w on a.id = w.project_id
@@ -146,6 +152,7 @@
 		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_paper_filing ppf on ppf.project_id = a.id
 		<where>
 			a.status = 5
 			<if test="bzshbUserId!=null and bzshbUserId!=''">
@@ -333,7 +340,6 @@
 		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
 		LEFT JOIN sys_user sua on a.create_by = sua.id
-
 		<where>
 			a.status = 5
 			<if test="bzshbUserId!=null and bzshbUserId!=''">

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

@@ -704,22 +704,27 @@
 							var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
 						return xml;
 					}}
-                ,{align:'center', title: '电子',  width:70,templet:function(d){
+                ,{align:'center', title: '电子',  width:120,templet:function(d){
                         var st = getRuralProjectArchiveState(d.projectReportRecordStatus);
-                        if(st.action)
-                            var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralCostProjectMessage/getReportRecordProcessOne?id="+d.prrId+"&processInstanceId=" + d.prrProcessInstanceId + "','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>";
+						var de = getdefectRecordState(""+d.defectRecordStatus);
+						if(st.action){
+							var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralCostProjectMessage/getReportRecordProcessOne?id="+d.prrId+"&processInstanceId=" + d.prrProcessInstanceId + "','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>";
+						}
+						if (d.defectRecordStatus>0){
+							xml+="<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralCostProjectMessage/getReportedProcess?processInstanceId=" + d.pmdrProcessInstanceId + "','95%','95%')\"  style='margin-left: 5px;' class=\"layui-badge layui-bg-orange\">缺</span>";
+						}
                         return xml;
                     }}
-				,{align:'center', title: '资料缺失',  width:90,templet:function(d){
-						var st = getdefectRecordState(""+d.defectRecordStatus);
-						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;
-					}}
+				<%--,{align:'center', title: '资料缺失',  width:90,templet:function(d){--%>
+				<%--		var st = getdefectRecordState(""+d.defectRecordStatus);--%>
+				<%--		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;--%>
+				<%--	}}--%>
 				,{align:'center', title: '线下',  width:70,templet:function(d){
 						if (d.submitMoney=="1"){
 							var st = getRuralProjectArchiveState(d.downProjectReportRecordStatus);

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

@@ -813,23 +813,44 @@
 							var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
 						return xml;
 					}}
-                ,{align:'center', title: '电子',  width:70,templet:function(d){
+                ,{align:'center', title: '电子',  width:120,templet:function(d){
                         var st = getRuralProjectArchiveState(d.projectReportRecordStatus);
-                        if(st.action)
-                            var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralCostProjectMessage/getReportRecordProcessOne?processInstanceId=" + d.prrProcessInstanceId + "','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;
+                        if(st.action){
+							var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralCostProjectMessage/getReportRecordProcessOne?processInstanceId=" + d.prrProcessInstanceId + "','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>";
+						}
+						var de = getdefectRecordState(""+d.defectRecordStatus);
+						if (d.defectRecordStatus>0){
+							xml+="<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralCostProjectMessage/getReportedProcess?processInstanceId=" + d.pmdrProcessInstanceId + "','95%','95%')\"  style='margin-left: 5px;' class=\"layui-badge layui-bg-orange\">缺</span>";
+						}
+						return xml;
                     }}
-				,{align:'center', title: '资料缺失',  width:90,templet:function(d){
-						var st = getdefectRecordState(""+d.defectRecordStatus);
-						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
+				<%--,{align:'center', title: '资料缺失',  width:90,templet:function(d){--%>
+				<%--		var st = getdefectRecordState(""+d.defectRecordStatus);--%>
+				<%--		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;--%>
+				<%--	}}--%>
+				,{align:'center', title: '线下',  width:70,templet:function(d){
+						if (d.submitMoney=="1"){
+							var st = getRuralProjectArchiveState(d.downProjectReportRecordStatus);
+						}else if (d.submitMoney=="2"){
+							var st = getRuralProjectArchiveState(d.paperFilingStatus);
+						}
+						if(st.action){
+							if (d.submitMoney=="1"){
+								var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralProjectMessage/getReportedProcess?processInstanceId=" + d.prrdProcessInstanceId + "','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+							}else if (d.submitMoney=="2"){
+								var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralProjectMessage/getReportedProcess?processInstanceId=" + d.ppfProcessInstanceId + "','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;
-					}}
-				,{align:'center', title: '批量',  width:70,templet:function(d){
+
 						var st = getRuralProjectArchiveState(d.downProjectReportRecordStatus);
 						if(st.action)
 							var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralProjectMessage/getReportRecordProcessOne?processInstanceId=" + d.prrdProcessInstanceId + "','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
@@ -920,8 +941,8 @@
 					,"view":"${projectRecords.view}"
 					,"reportStatus":"${projectRecords.reportStatus}"
 					,"syncStatus":"${projectRecords.syncStatus}"
-					,"downProjectReportRecordStatus":"${projectRecords.downProjectReportRecordStatus}"
-					,"prrdProcessInstanceId":"${projectRecords.prrdProcessInstanceId}"
+					,"downProjectReportRecordStatus":"${projectRecords.filingProjectStatus}"
+					,"prrdProcessInstanceId":"${projectRecords.filingProcessinstanceId}"
 					,"prrdId":"${projectRecords.prrdId}"
 					,"emergencyProject":"${projectRecords.emergencyProject}"
 					,"bid":"${projectRecords.prdId}"
@@ -935,6 +956,10 @@
 					,"newReportAuditNotifyFlag":"${projectRecords.newReportAuditNotifyFlag}"
 					,"newRecordAuditNotifyFlag":"${projectRecords.newRecordAuditNotifyFlag}"
 					,"reportNotifyId":"${projectRecords.reportNotifyId}"
+					,"paperFilingStatus":"${projectRecords.paperFilingStatus}"
+					,"ppfId":"${projectRecords.ppfId}"
+					,"ppfProcessInstanceId":"${projectRecords.ppfProcessInstanceId}"
+					,"submitMoney":"${projectRecords.submitMoney}"
 					,"falg":
 					<c:choose>
 						<c:when test="${fns:getUser().id == projectRecords.leaderIds || fns:getUser().id eq projectRecords.createBy.id}">

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

@@ -702,22 +702,27 @@
 							var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
 						return xml;
 					}}
-                ,{align:'center', title: '电子',  width:70,templet:function(d){
+                ,{align:'center', title: '电子',  width:120,templet:function(d){
                         var st = getRuralProjectArchiveState(d.projectReportRecordStatus);
-                        if(st.action)
-                            var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralProjectMessage/getReportRecordProcessOne?id="+d.prrId+"&processInstanceId=" + d.prrProcessInstanceId + "','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>";
+						var de = getdefectRecordState(""+d.defectRecordStatus);
+						if(st.action){
+							var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralProjectMessage/getReportRecordProcessOne?id="+d.prrId+"&processInstanceId=" + d.prrProcessInstanceId + "','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>";
+						}
+						if (d.defectRecordStatus>0){
+							xml+="<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralCostProjectMessage/getReportedProcess?processInstanceId=" + d.pmdrProcessInstanceId + "','95%','95%')\"  style='margin-left: 5px;' class=\"layui-badge layui-bg-orange\">缺</span>";
+						}
                         return xml;
                     }}
-				,{align:'center', title: '资料缺失',  width:90,templet:function(d){
-						var st = getdefectRecordState(""+d.defectRecordStatus);
-						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;
-					}}
+				<%--,{align:'center', title: '资料缺失',  width:90,templet:function(d){--%>
+				<%--		var st = getdefectRecordState(""+d.defectRecordStatus);--%>
+				<%--		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;--%>
+				<%--	}}--%>
                 ,{align:'center', title: '线下',  width:70,templet:function(d){
 						if (d.submitMoney=="1"){
 							var st = getRuralProjectArchiveState(d.downProjectReportRecordStatus);