报表类型修改控制

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

@@ -21,6 +21,7 @@ import com.jeeplus.modules.projectcontroltable.service.ProjectControlTableServic
 import com.jeeplus.modules.projectrecord.entity.ProjectRecords;
 import com.jeeplus.modules.projectrecord.enums.ProjectStatusEnum;
 import com.jeeplus.modules.projectrecord.service.ProjectRecordsService;
+import com.jeeplus.modules.projectrecord.service.early.ProjectEarlyReviewService;
 import com.jeeplus.modules.sys.entity.MainDictDetail;
 import com.jeeplus.modules.sys.entity.User;
 import com.jeeplus.modules.sys.service.DictService;
@@ -85,7 +86,8 @@ public class ProjectcontentinfoController extends BaseController {
 	private ProjectTypeService projectTypeService;
 	@Autowired
 	private DictService dictService;
-
+	@Autowired
+	private ProjectEarlyReviewService projectEarlyReviewService;
 	@ModelAttribute("projectcontentinfo")
 	public Projectcontentinfo get(@RequestParam(required=false) String id) {
 		Projectcontentinfo entity = null;
@@ -580,11 +582,17 @@ public class ProjectcontentinfoController extends BaseController {
 	}
 
 	@RequestMapping(value = {"form"})
-	public String form(Projectcontentinfo projectcontentinfo, HttpServletRequest request, HttpServletResponse response, Model model,RedirectAttributes attr) {
+	public String form(Projectcontentinfo projectcontentinfo, HttpServletRequest request, HttpServletResponse response, Model model,RedirectAttributes attr,String projectId) {
+		//ProjectRecordTreeData中的项目编号（根据类型名称）获取项目类型表的type_id
+		if(StringUtils.isNotEmpty(projectId)){
+			String projectTypeId=projectEarlyReviewService.getTypeId(projectId);
+			model.addAttribute("projectTypeId",projectTypeId);
+		}
 		if("modify".equals(projectcontentinfo.getFlag())){
 			model.addAttribute("modify",projectcontentinfo.getFlag());
 		}
 		String dictType = projectcontentinfo.getDictType();
+		//根据项目id获取项目对象
 		ProjectRecords records = projectRecordsService.getQueryProjectUsers(projectcontentinfo.getProject().getId());
 		projectcontentinfo.setProject(records);
 		if (projectcontentinfo.getView().contains("basedData")){

src/main/java/com/jeeplus/modules/projectrecord/dao/early/ProjectEarlyReviewDao.java

@@ -30,4 +30,7 @@ public interface ProjectEarlyReviewDao extends CrudDao<ProjectImplementEarly> {
      * @return
      */
     Integer saveProjectContrntAndReport(@Param("contentId") String contentId, @Param("reportId") String reportId);
+
+    //ProjectRecordTreeData中的项目编号（根据类型名称）获取项目类型表的type_id(project_type数据库表)
+    String getTypeId(@Param("projectId") String projectId);
 }

src/main/java/com/jeeplus/modules/projectrecord/service/early/ProjectEarlyReviewService.java

@@ -37,6 +37,8 @@ public class ProjectEarlyReviewService extends CrudService<ProjectEarlyReviewDao
     private ProjectTypeDao projectTypeDao;
     @Autowired
     private WorkProjectUserDao workProjectUserDao;
+    @Autowired
+    private ProjectEarlyReviewDao projectEarlyReviewDao;
 
     public ProjectImplementEarly get(String id) {
         return super.get(id);
@@ -115,4 +117,9 @@ public class ProjectEarlyReviewService extends CrudService<ProjectEarlyReviewDao
     public Integer saveProjectContrntAndReport (String contentId,String reportId){
         return dao.saveProjectContrntAndReport(contentId,reportId);
     }
+
+    //ProjectRecordTreeData中的项目编号（根据类型名称）获取项目类型表的type_id
+    public String getTypeId(String projectId) {
+        return projectEarlyReviewDao.getTypeId(projectId);
+    }
 }

src/main/java/com/jeeplus/modules/projectrecord/web/Early/ProjectEarlyReviewController.java

@@ -174,7 +174,14 @@ public class ProjectEarlyReviewController extends BaseController {
     }
 
     @RequestMapping(value = {"reviewForm"})
-    public String form(Projectcontentinfo projectcontentinfo, HttpServletRequest request, HttpServletResponse response, Model model, RedirectAttributes attr) {
+    public String form(Projectcontentinfo projectcontentinfo, HttpServletRequest request, HttpServletResponse response, Model model, RedirectAttributes attr,String projectId) {
+
+        //ProjectRecordTreeData中的项目编号（根据类型名称）获取项目类型表的type_id
+        if(StringUtils.isNotEmpty(projectId)){
+            String projectTypeId=projectEarlyReviewService.getTypeId(projectId);
+            model.addAttribute("projectTypeId",projectTypeId);
+        }
+
         String dictType = projectcontentinfo.getDictType();
         ProjectRecords records = projectRecordsService.getQueryProjectUsers(projectcontentinfo.getProject().getId());
         projectcontentinfo.setProject(records);

src/main/java/com/jeeplus/modules/projectrecord/web/completion/ProjectCompletionReviewController.java

@@ -174,7 +174,13 @@ public class ProjectCompletionReviewController extends BaseController {
     }
 
     @RequestMapping(value = {"reviewForm"})
-    public String form(Projectcontentinfo projectcontentinfo, HttpServletRequest request, HttpServletResponse response, Model model, RedirectAttributes attr) {
+    public String form(Projectcontentinfo projectcontentinfo, HttpServletRequest request, HttpServletResponse response, Model model, RedirectAttributes attr,String projectId) {
+
+        //ProjectRecordTreeData中的项目编号（根据类型名称）获取项目类型表的type_id
+        if(StringUtils.isNotEmpty(projectId)){
+            String projectTypeId=projectEarlyReviewService.getTypeId(projectId);
+            model.addAttribute("projectTypeId",projectTypeId);
+        }
         String dictType = projectcontentinfo.getDictType();
         ProjectRecords records = projectRecordsService.getQueryProjectUsers(projectcontentinfo.getProject().getId());
         projectcontentinfo.setProject(records);

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

@@ -80,21 +80,41 @@ public class ProjectReportNumController extends BaseController {
 
 	@RequestMapping(value = "getReportNumList")
 	@ResponseBody
-	public Map<String,List> getReportNumList(ReportNum reportNum) {
+	public Map<String,List> getReportNumList(ReportNum reportNum,String projectTypeId) {
 		String userId = UserUtils.getUser().getId();
 		reportNum.setUserId(userId);
+		List<ProjectContentTreeData> listNum=new LinkedList();
 		Map<String,List> map = new HashMap<>();
 		List<ProjectContentTreeData> projectContentTreeDataList = projectReportNumService.getReportNumList(reportNum);
-		map.put("data",projectContentTreeDataList);
+		if(StringUtils.isNotEmpty(projectTypeId)){
+			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);
 		return map;
 	}
 
 
 	@RequestMapping(value = "select")
-	public String select(ReportNum reportNum, HttpServletRequest request, HttpServletResponse response, Model model) {
+	public String select(ReportNum reportNum, HttpServletRequest request, HttpServletResponse response, Model model,String projectTypeId) {
+
 		String userId = UserUtils.getUser().getId();
 		reportNum.setUserId(userId);
 		Page<ReportNum> page = projectReportNumService.findPage(new Page<ReportNum>(request, response), reportNum);
+
+		if(StringUtils.isNotEmpty(projectTypeId)){
+			model.addAttribute("projectTypeId",projectTypeId);
+		}
 		model.addAttribute("page", page);
 		return "modules/projectreportnum/projectReportNumSel";
 	}

src/main/resources/mappings/modules/projectrecord/early/ProjectEarlyPigeonholeDao.xml

@@ -223,4 +223,5 @@
 		values
   		(#{contentId}, #{reportId})
 	</insert>
+
 </mapper>

src/main/resources/mappings/modules/projectrecord/early/ProjectEarlyReviewDao.xml

@@ -223,4 +223,9 @@
 		values
   		(#{contentId}, #{reportId})
 	</insert>
+
+	<!--ProjectRecordTreeData中的项目编号（根据类型名称）获取项目类型表的type_id-->
+	<select id="getTypeId" resultType="java.lang.String">
+		SELECT type_id FROM project_type where type_name=#{projectId}
+	</select>
 </mapper>

src/main/webapp/webpage/modules/projectrecord/implementCompletion/projectCompletionReviewList.jsp

@@ -389,12 +389,12 @@
 					].join('');
 				}else if(d.status == 3){
 					return [
-						'<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改报告\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=report&condition=completion&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="openDialogreAudit(\'修改报告\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=report&condition=completion&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="${ctx}/projectcontentinfo/projectcontentinfo/delete?infoId='+d.reportId+'&condition=accocompletionrding&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=completion&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="openDialogreAudit(\'修改报告\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=reportModify&flag=edit&condition=completion&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="${ctx}/projectcontentinfo/projectcontentinfo/delete?infoId='+d.reportId+'&condition=completion&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){
@@ -403,7 +403,7 @@
 					].join('');
 				}else if(d.status == null || d.status == '' || d.status == 10){
 					return [
-						'<a href="javascript:void(0)" onclick="openDialogres(\'复核\', \'${ctx}/project/projectCompletionReview/reviewForm?condition=completion&view=report&dictType='+d.dictType+'&project.id='+d.pid+'&id='+d.contentPId+'&parentIds='+d.parentIds+'&infoId='+d.id+'\',\'95%\',\'95%\')" class="op-btn op-btn-edit" ><i class="fa fa-plus"></i> 复核</a>',
+						'<a href="javascript:void(0)" onclick="openDialogres(\'复核\', \'${ctx}/project/projectCompletionReview/reviewForm?condition=completion&view=report&dictType='+d.dictType+'&project.id='+d.pid+'&id='+d.contentPId+'&parentIds='+d.parentIds+'&infoId='+d.id+'&projectId='+d.projectId+ '\',\'95%\',\'95%\')" class="op-btn op-btn-edit" ><i class="fa fa-plus"></i> 复核</a>',
 					].join('');
 				}else{
 					return[''].join('');

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

@@ -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+'\',\'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}&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+'\',\'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}&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){
@@ -424,7 +424,7 @@
 					].join('');
 				}else if(d.status == null || d.status == '' || d.status == 10){
 					return [
-						'<a href="javascript:void(0)" onclick="openDialogres(\'复核\', \'${ctx}/project/projectEarlyReview/reviewForm?view=report&condition=according&dictType='+d.dictType+'&project.id='+d.pid+'&id='+d.contentPId+'&parentIds='+d.parentIds+'&infoId='+d.id+'\',\'95%\',\'95%\')" class="op-btn op-btn-edit" ><i class="fa fa-plus"></i> 复核</a>',
+						'<a href="javascript:void(0)" onclick="openDialogres(\'复核\', \'${ctx}/project/projectEarlyReview/reviewForm?view=report&condition=according&dictType='+d.dictType+'&project.id='+d.pid+'&id='+d.contentPId+'&parentIds='+d.parentIds+'&infoId='+d.id+'&projectId='+d.projectId+ '\',\'95%\',\'95%\')" class="op-btn op-btn-edit" ><i class="fa fa-plus"></i> 复核</a>',
 					].join('');
 				}else{
 					return[''].join('');

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

@@ -225,7 +225,7 @@
 				type: 2,
 				area: ['50%','95%'],
 				title:'选择报告号',
-				content: '${ctx}/projectreportnum/projectReportNum/select',
+				content: '${ctx}/projectreportnum/projectReportNum/select?projectTypeId='+${projectTypeId},
 				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',
+				url: '${ctx}/projectreportnum/projectReportNum/getReportNumList?projectTypeId='+${projectTypeId},
 				page: false,
 				cols: [[
 					{checkbox: true,width:80},

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

@@ -73,7 +73,7 @@
 				<div class="layui-item layui-col-sm6" style="width:50%">
 					<label class="layui-form-label double-line"><span class="require-item">*</span>选择阶段信息：</label>
 					<div class="layui-input-block">
-						<form:select id="stageId" path="stageId"  htmlEscape="false" class="form-control simple-select required">
+						<%--<form:select id="stageId" path="stageId"  htmlEscape="false" class="form-control simple-select required">
 							<form:option value=""></form:option>
 							<optgroup label="项目实施前期"/>
 							<form:options items="${fns:getContentTypeByProjectType('2')}" itemLabel="typeName" itemValue="typeId"></form:options>
@@ -81,8 +81,8 @@
 							<form:options items="${fns:getContentTypeByProjectType('3')}" itemLabel="typeName" itemValue="typeId"></form:options>
 							<optgroup label="项目竣工阶段"/>
 							<form:options items="${fns:getContentTypeByProjectType('5')}" itemLabel="typeName" itemValue="typeId"></form:options>
-						</form:select>
-						<%--<form:select id="stageId" path="stageId"  htmlEscape="false" class="form-control simple-select required">
+						</form:select>--%>
+						<form:select id="stageId" path="stageId"  htmlEscape="false" class="form-control simple-select required">
 							<form:option value=""></form:option>
 							<optgroup label="决策阶段"/>
 							<form:options items="${fns:getContentTypeList('1')}" itemLabel="typeName" itemValue="typeId"></form:options>
@@ -96,7 +96,7 @@
 							<form:options items="${fns:getContentTypeList('5')}" itemLabel="typeName" itemValue="typeId"></form:options>
 							<optgroup label="运营阶段"/>
 							<form:options items="${fns:getContentTypeList('6')}" itemLabel="typeName" itemValue="typeId"></form:options>
-						</form:select>--%>
+						</form:select>
 					</div>
 				</div>
 				<%--<div class="layui-item layui-col-sm6" style="width:50%">