Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/projectrecord/web/contractMaterial/MaterialController.java

@@ -89,7 +89,6 @@ public class MaterialController extends BaseController {
         model.addAttribute("page", page);
         return "modules/projectrecord/contractMaterial/materialList";
     }
-
     //获取树状图
     @RequestMapping(value = "getProjectList")
     @ResponseBody
@@ -140,7 +139,6 @@ public class MaterialController extends BaseController {
                         visaTreeData.setNumber("");
                         visaTreeData.setPid(record.getId());
                         visaTreeData.setCnumber(contract.getCnumber());
-
                         //将项目设置为第二级数据
                         visaTreeData.setCondition(2);
                         //遍历项目负责人信息
@@ -165,7 +163,6 @@ public class MaterialController extends BaseController {
                         //将项目信息放入
                         treeList.add(visaTreeData);
 
-
                         //根据获取的合同的id去查找汇总表获取汇总表信息
                         List<ProjectContentData> contentDataList=materialService.getMaterialList(contract.getId());
                         for (int j=0;j<contentDataList.size();j++){
@@ -198,7 +195,6 @@ public class MaterialController extends BaseController {
         map.put("data",treeList);
         return map;
     }
-
     //添加暂定材料页面
     @RequestMapping(value = "form")
     public String form(MaterialProjectInfo materialProjectInfo, Model model) {
@@ -225,11 +221,8 @@ public class MaterialController extends BaseController {
         return "modules/projectrecord/contractMaterial/workMaterialForm";
     }
 
-
     /**
      * 保存暂定材料
-
-     * @return
      * @throws Exception
      */
     @RequestMapping(value = {"save"})

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

@@ -20,6 +20,7 @@ import com.jeeplus.modules.projectcontentinfo.entity.ProjectReportData;
 import com.jeeplus.modules.projectcontentinfo.service.ProjectReportDataService;
 import com.jeeplus.modules.projectrecord.entity.ProjectRecords;
 import com.jeeplus.modules.projectrecord.service.ProjectRecordsService;
+import com.jeeplus.modules.projectrecord.service.early.ProjectEarlyReviewService;
 import com.jeeplus.modules.projectreportnum.entity.ReportNum;
 import com.jeeplus.modules.projectreportnum.service.ProjectReportNumService;
 import com.jeeplus.modules.serialnum.service.SerialNumTplService;
@@ -62,10 +63,17 @@ public class ProjectReportNumController extends BaseController {
     private ProjectResultsFileTemplateService projectResultsFileTemplateService;
 	@Autowired
 	private ProjectTypeService projectTypeService;
+	@Autowired
+	private ProjectEarlyReviewService projectEarlyReviewService;
 
 
 	@RequestMapping(value = "skipMethod")
 	public String skipMethod(ReportNum reportNum, HttpServletRequest request, HttpServletResponse response, Model model,String reportType) {
+
+		/*if(StringUtils.isNotEmpty(reportNum.getProjectId())){
+			String projectTypeId=projectEarlyReviewService.getTypeId(reportNum.getProjectId());
+			model.addAttribute("projectTypeId",projectTypeId);
+		}*/
 		model.addAttribute("projectId",reportNum.getProjectId());
 		model.addAttribute("reportType",reportType);
 		return "modules/projectreportnum/projectReportNumList";
@@ -142,16 +150,26 @@ public class ProjectReportNumController extends BaseController {
 					if(treeData.getPid().equals("0")){
 						listNum.add(treeData);
 					}else{
+
+
+
+
 						String typeId = treeData.getNum().split("-")[1];
-						List<WorkClientAttachment> workClientAttachmentList = projectResultsFileTemplateService.getWorkClientAttachmentList(typeId);
-						if(null != workClientAttachmentList){
-							for (WorkClientAttachment workClientAttachment: workClientAttachmentList) {
-								treeData.setUrl(workClientAttachment.getUrl());
+						//截取获取
+						String typeStage=typeId.split("")[0];
+						if(reportType.equals(typeStage)){
+							List<WorkClientAttachment> workClientAttachmentList = projectResultsFileTemplateService.getWorkClientAttachmentList(typeId);
+							if(null != workClientAttachmentList){
+								for (WorkClientAttachment workClientAttachment: workClientAttachmentList) {
+									treeData.setUrl(workClientAttachment.getUrl());
+								}
+								treeData.setCount(workClientAttachmentList.size());
+								treeData.setType(typeId);
 							}
-							treeData.setCount(workClientAttachmentList.size());
-							treeData.setType(typeId);
+							listNum.add(treeData);
 						}
-						listNum.add(treeData);
+
+
 					}
 				}
 			}

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

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