工作内容修改领取报告号展示问题

src/main/java/com/jeeplus/modules/projectcontentinfo/entity/Projectcontentinfo.java

@@ -41,6 +41,8 @@ public class Projectcontentinfo extends TreeEntity<Projectcontentinfo> {
 	private String flag;  //条件
 	private String projectContentId;  //工作内容id
 
+	private String reportType; //阶段id
+
 	public RuralProjectRecords getProjectOnRural() {
 		return projectOnRural;
 	}
@@ -222,4 +224,12 @@ public class Projectcontentinfo extends TreeEntity<Projectcontentinfo> {
 	public void setProjectContentId(String projectContentId) {
 		this.projectContentId = projectContentId;
 	}
+
+	public String getReportType() {
+		return reportType;
+	}
+
+	public void setReportType(String reportType) {
+		this.reportType = reportType;
+	}
 }

src/main/java/com/jeeplus/modules/projectcontentinfo/web/ProjectcontentinfoController.java

@@ -693,6 +693,7 @@ public class ProjectcontentinfoController extends BaseController {
 				}
 			}
 		}else if (projectcontentinfo.getView().contains("report")){
+			model.addAttribute("reportType",projectcontentinfo.getReportType());
 			ProjectReportData projectReportData = new ProjectReportData();
 			projectReportData.setType(dictType);
 			if (projectcontentinfo.getView().equals("reportChangeForm")){

src/main/java/com/jeeplus/modules/projectreportnum/entity/ReportNum.java

@@ -19,6 +19,7 @@ public class ReportNum extends DataEntity<ReportNum> {
 	private String parentId;  //父节点
 	private String stageId;   //阶段id
 	private String projectId;   //项目id
+	private String reportType;
 
 
 
@@ -70,7 +71,11 @@ public class ReportNum extends DataEntity<ReportNum> {
 		this.projectId = projectId;
 	}
 
+	public String getReportType() {
+		return reportType;
+	}
 
-
-
+	public void setReportType(String reportType) {
+		this.reportType = reportType;
+	}
 }

src/main/java/com/jeeplus/modules/projectreportnum/web/ProjectReportNumController.java

@@ -165,6 +165,7 @@ public class ProjectReportNumController extends BaseController {
 			model.addAttribute("projectTypeId",projectTypeId);
 		}
 		model.addAttribute("projectId",reportNum.getProjectId());
+		model.addAttribute("reportType",reportNum.getReportType());
 		model.addAttribute("page", page);
 		return "modules/projectreportnum/projectReportNumSel";
 	}

src/main/webapp/webpage/modules/projectrecord/implementEarly/projectEarlyReviewList.jsp

@@ -401,7 +401,7 @@
 
 				if(d.status == 1){
 					return [
-						'<a href="javascript:void(0)" onclick="openDialogres(\'修改报告\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=report&condition=according&flag=edit&dictType=${dictType}&id='+d.contentPId+'&parentIds=${parentIds}&projectReportData.id='+d.reportId+'\',\'95%\',\'95%\')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 修改</a>',
+						'<a href="javascript:void(0)" onclick="openDialogres(\'修改报告\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=report&condition=according&flag=edit&dictType=${dictType}&reportType=${reportType}&id='+d.contentPId+'&parentIds=${parentIds}&projectReportData.id='+d.reportId+'\',\'95%\',\'95%\')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 修改</a>',
 						'<a href="${ctx}/projectcontentinfo/projectcontentinfo/delete?infoId='+d.reportId+'&condition=according&id='+d.contentPId+'&type=8" onclick="return confirmxRefresh(\'确认要删除该工作内容报告吗？\', this.href)"   class="op-btn op-btn-delete"><i class="fa fa-trash"></i> 删除</a>',
 					].join('');
 				}else if(d.status == 2){
@@ -410,12 +410,12 @@
 					].join('');
 				}else if(d.status == 3){
 					return [
-						'<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改报告\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=report&condition=according&flag=edit&dictType=${dictType}&id='+d.contentPId+'&parentIds=${parentIds}&projectReportData.id='+d.reportId+'&projectId='+d.projectId+ '\',\'95%\',\'95%\')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 修改</a>',
+						'<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改报告\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=report&condition=according&flag=edit&dictType=${dictType}&reportType=${reportType}&id='+d.contentPId+'&parentIds=${parentIds}&projectReportData.id='+d.reportId+'&projectId='+d.projectId+ '\',\'95%\',\'95%\')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 修改</a>',
 						'<a href="${ctx}/projectcontentinfo/projectcontentinfo/delete?infoId='+d.reportId+'&condition=according&id='+d.contentPId+'&type=8" onclick="return confirmxRefresh(\'确认要删除该工作内容报告吗？\', this.href)"   class="op-btn op-btn-delete"><i class="fa fa-trash"></i> 删除</a>',
 					].join('');
 				}else if(d.status == 4){
 					return [
-						'<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改报告\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=reportModify&flag=edit&condition=according&dictType=${dictType}&id='+d.contentPId+'&parentIds=${parentIds}&projectReportData.id='+d.reportId+'&projectId='+d.projectId+ '\',\'95%\',\'95%\')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 修改</a>',
+						'<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改报告\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=reportModify&flag=edit&condition=according&dictType=${dictType}&reportType=${reportType}&id='+d.contentPId+'&parentIds=${parentIds}&projectReportData.id='+d.reportId+'&projectId='+d.projectId+ '\',\'95%\',\'95%\')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 修改</a>',
 						'<a href="${ctx}/projectcontentinfo/projectcontentinfo/delete?infoId='+d.reportId+'&condition=according&id='+d.contentPId+'&type=8" onclick="return confirmxRefresh(\'确认要删除该工作内容报告吗？\', this.href)"   class="op-btn op-btn-delete"><i class="fa fa-trash"></i> 删除</a>',
 					].join('');
 				}else if(d.status == 5){

src/main/webapp/webpage/modules/projectrecord/workContentFromAndView/reportForm.jsp

@@ -225,7 +225,7 @@
 				type: 2,
 				area: ['50%','95%'],
 				title:'选择报告号',
-				content: '${ctx}/projectreportnum/projectReportNum/select?projectTypeId=${projectTypeId}&projectId=${projectId}',
+				content: '${ctx}/projectreportnum/projectReportNum/select?projectTypeId=${projectTypeId}&projectId=${projectId}&reportType=${reportType}',
 				btn: ['确定','关闭'],
 				btn1: function(index, layero){
 					var iframeWin = layero.find('iframe')[0].contentWindow; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();

src/main/webapp/webpage/modules/projectreportnum/projectReportNumSel.jsp

@@ -102,7 +102,7 @@
 				treeDefaultClose: false,//是否默认折叠
 				treeLinkage: true,//父级展开时是否自动展开所有子级
 				elem: '#contentTable',
-				url: '${ctx}/projectreportnum/projectReportNum/getReportNumList?projectTypeId=${projectTypeId}&projectId=${projectId}',
+				url: '${ctx}/projectreportnum/projectReportNum/getReportNumList?projectTypeId=${projectTypeId}&projectId=${projectId}&reportType=${reportType}',
 				page: false,
 				cols: [[
 					{checkbox: true,width:80},