报告编号修改为项目组共同使用

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

@@ -770,6 +770,7 @@ public class ProjectcontentinfoController extends BaseController {
 			model.addAttribute("achievementParentId", projectReportData.getType());
 			model.addAttribute("achievementId", projectReportData.getAchievementType());
 			model.addAttribute("reviewStandard", projectReportData.getReviewStandard());
+			model.addAttribute("projectId", records.getId());
 			if("according".equals(projectcontentinfo.getCondition()) || "completion".equals(projectcontentinfo.getCondition())){
 				if ("edit".equals(projectcontentinfo.getFlag())) {
 					return "modules/projectrecord/workContentFromAndView/reportForm";

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

@@ -58,6 +58,7 @@ public class ProjectReportNumController extends BaseController {
 
 	@RequestMapping(value = "skipMethod")
 	public String skipMethod(ReportNum reportNum, HttpServletRequest request, HttpServletResponse response, Model model) {
+		model.addAttribute("projectId",reportNum.getProjectId());
 		return "modules/projectreportnum/projectReportNumList";
 	}
 	
@@ -98,6 +99,19 @@ public class ProjectReportNumController extends BaseController {
 				}
 			}
 
+		}else{
+			if(null != projectContentTreeDataList){
+				for(ProjectContentTreeData treeData:projectContentTreeDataList){
+					if(treeData.getPid().equals("0")){
+						listNum.add(treeData);
+					}else{
+						String n=treeData.getNum().split("-")[1];
+						if(n.equals(projectTypeId)){
+							listNum.add(treeData);
+						}
+					}
+				}
+			}
 		}
 
 		map.put("data",listNum);
@@ -115,6 +129,7 @@ public class ProjectReportNumController extends BaseController {
 		if(StringUtils.isNotEmpty(projectTypeId)){
 			model.addAttribute("projectTypeId",projectTypeId);
 		}
+		model.addAttribute("projectId",reportNum.getProjectId());
 		model.addAttribute("page", page);
 		return "modules/projectreportnum/projectReportNumSel";
 	}

src/main/resources/mappings/modules/projectreportnum/ProjectReportNumDao.xml

@@ -122,7 +122,7 @@
 		a.parent_id as "pid"
 		from report_num a,(select @row_number:=0) as t
 		<where>
-			a.del_flag = #{DEL_FLAG_NORMAL} and a.state = '0' and a.create_by = #{userId}
+			a.del_flag = #{DEL_FLAG_NORMAL} and a.state = '0' and a.project_id = #{projectId}
 		</where>
 		ORDER BY a.parent_id
 	</select>

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

@@ -394,7 +394,7 @@
         function complain(d){//操作中显示的内容
 			if(1 == d.operationSign) {
 					return [
-						'<a href="javascript:void(0)" onclick="openDialogWork1(\'领取报告号\', \'${ctx}/projectreportnum/projectReportNum/skipMethod\',\'60%\',\'95%\',false,\'inputForm\')" style=\"color: white;background: darkseagreen\" class="op-btn op-btn-add" ><i class="fa fa-plus"></i> 领取报告号</a>',
+						'<a href="javascript:void(0)" onclick="openDialogWork1(\'领取报告号\', \'${ctx}/projectreportnum/projectReportNum/skipMethod?projectId='+d.id+'\',\'60%\',\'95%\',false,\'inputForm\')" style=\"color: white;background: darkseagreen\" class="op-btn op-btn-add" ><i class="fa fa-plus"></i> 领取报告号</a>',
 					].join('');
 			} else if (d.pid!="0"){
 

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},
+				content: '${ctx}/projectreportnum/projectReportNum/select?projectTypeId=${projectTypeId}&projectId=${projectId}',
 				btn: ['确定','关闭'],
 				btn1: function(index, layero){
 					var iframeWin = layero.find('iframe')[0].contentWindow; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();

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

@@ -108,7 +108,7 @@
 				treeDefaultClose: true,//是否默认折叠
 				treeLinkage: true,//父级展开时是否自动展开所有子级
 				elem: '#permissionTable',
-				url: '${ctx}/projectreportnum/projectReportNum/getReportNumList',
+				url: '${ctx}/projectreportnum/projectReportNum/getReportNumList?projectId=${projectId}',
 				page: false,
 				cols: [[
 					{field:'index',align:'center',width:120, title: '序号'},

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},
+				url: '${ctx}/projectreportnum/projectReportNum/getReportNumList?projectTypeId=${projectTypeId}&projectId=${projectId}',
 				page: false,
 				cols: [[
 					{checkbox: true,width:80},