项目列表管理页面（全）添加签发流程状态

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

@@ -259,6 +259,12 @@ public class RuralProjectMessageAllService extends CrudService<RuralProjectMessa
         }
         //新增报告状态
         projectRecordTreeData.setProjectReportStatus(info.getProjectReportStatus());
+        //报告签发状态
+        projectRecordTreeData.setProjectReportStatusTwo(info.getProjectReportStatusTwo());
+        //报告签发流程2id
+        projectRecordTreeData.setPrdtId(info.getPrdtId());
+        //报告签发流程2流程id
+        projectRecordTreeData.setPrdtProcessinstanceId(info.getPrdtProcessinstanceId());
         //线上归档状态
         projectRecordTreeData.setProjectReportRecordStatus(info.getProjectReportRecordStatus());
         //线下归档状态

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

@@ -71,6 +71,9 @@
 		,ifnull(rprr.report_status,0) as "reportStatus"
 		,ifnull(rprr.sync_status,0) as "syncStatus"
 		,rprr.process_instance_id as "reportedProcessInstanceId"
+		,ifnull(prdt.status,0) as "projectReportStatusTwo"
+		,prdt.id as prdtId
+		,prdt.process_instance_id as prdtProcessinstanceId
         FROM rural_project_records a
 		LEFT JOIN sys_area area ON area.id = a.area_id
 		LEFT JOIN work_project_user w on a.id = w.project_id
@@ -79,6 +82,7 @@
 		LEFT JOIN work_client_info wct on wci.client_id = wct.id
 		LEFT JOIN sys_office o ON o.id = a.office_id
 		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 sys_user su on w.user_id = su.id
 		left join rural_project_report_record prr on prr.report_id = prd.id
 		left join rural_project_report_record_down prrd on prrd.report_id = prd.id
@@ -111,6 +115,9 @@
 		,ifnull(rprr.report_status,0) as "reportStatus"
 		,ifnull(rprr.sync_status,0) as "syncStatus"
 		,rprr.process_instance_id as "reportedProcessInstanceId"
+		,ifnull(prdt.status,0) as "projectReportStatusTwo"
+		,prdt.id as prdtId
+		,prdt.process_instance_id as prdtProcessinstanceId
 		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
@@ -125,6 +132,7 @@
 		LEFT JOIN work_client_info wct on wci.client_id = wct.id
         LEFT JOIN sys_office o ON o.id = a.office_id
 		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 rural_project_report_record_down prrd on prrd.report_id = prd.id
 		<where>

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

@@ -282,6 +282,40 @@
 
 		}
 
+		function openDialogReportTwoView(title,url,id,width,height){
+
+
+			if(navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)){//如果是移动端，就使用自适应大小弹窗
+				width='auto';
+				height='auto';
+			}else{//如果是PC端，根据用户设置的width和height显示。
+
+			}
+			$.ajax({
+				async: false,
+				url: "${ctx}/ruralProject/ruralProjectMessageNewTwo/getReportExist?id="+id,
+				dataType: "json",
+				success: function (data) {
+					if(data.success){
+						top.layer.open({
+							type: 2,
+							skin: 'one-btn',
+							area: [width, height],
+							title: title,
+							maxmin: true, //开启最大化最小化按钮
+							content: url ,
+							btn: ['关闭'],
+							cancel: function(index){
+							}
+						});
+					}else{
+						top.layer.msg("该项目报告信息已删除！", {icon: 0});
+						window.location.reload();
+					}
+				}
+			});
+
+		}
 
 
 		function openDialogreReport(title,url,id,width,height,target,buttons) {
@@ -717,7 +751,7 @@
 								return "<font>"+layui.util.toDateString(date,'yyyy-MM-dd')+"</font>";
 							}
 						}},
-					{align:'center', title: '报告状态',  width:70,templet:function(d){
+					{align:'center', title: '质量复核',  width:70,templet:function(d){
 							var st = getAuditState(""+d.projectReportStatus);
 							if(d.pid ==0){
 								if(st.action)
@@ -729,6 +763,18 @@
 								return '';
 							}
 						}},
+					{align:'center', title: '报告签发',  width:70,templet:function(d){
+							var st = getAuditState(""+d.projectReportStatusTwo);
+							if(d.pid ==0){
+								if(st.action)
+									var xml = "<span onclick=\"openDialogReportTwoView('流程追踪', '${ctx}/ruralProject/ruralProjectMessageNewTwo/getProcessOne?id=" + d.id + "&projectReportData.id=" + d.bid + "&type=2','"+d.id+"','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.projectReportRecordStatus);
 							if(d.pid ==0){
@@ -816,7 +862,7 @@
 				}
 				if ('0'!=d.projectReportStatus){
 					<shiro:hasPermission name="ruralProject:ruralCostProjectMessage:adminEdit">
-						xml+="<a href=\"#\" onclick=\"openDialogre('修改项目报告', '${ctx}/ruralProject/ruralProjectMessageAll/adminEditForm?projectId=" + d.id + "','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 修改报告</a>";
+						xml+="<a href=\"#\" onclick=\"openDialogre('修改复核信息', '${ctx}/ruralProject/ruralProjectMessageAll/adminEditForm?projectId=" + d.id + "','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 修改复核信息</a>";
 					</shiro:hasPermission>
 				}
 				xml+="</div>"