|  | @@ -11,6 +11,7 @@ import com.jeeplus.common.utils.*;
 | 
												
													
														
															|  |  import com.jeeplus.common.utils.excel.ExportExcel;
 |  |  import com.jeeplus.common.utils.excel.ExportExcel;
 | 
												
													
														
															|  |  import com.jeeplus.common.utils.excel.ImportExcel;
 |  |  import com.jeeplus.common.utils.excel.ImportExcel;
 | 
												
													
														
															|  |  import com.jeeplus.common.web.BaseController;
 |  |  import com.jeeplus.common.web.BaseController;
 | 
												
													
														
															|  | 
 |  | +import com.jeeplus.modules.projectType.service.ProjectResultsFileTemplateService;
 | 
												
													
														
															|  |  import com.jeeplus.modules.projectcontentinfo.dao.ProjectReportDataDao;
 |  |  import com.jeeplus.modules.projectcontentinfo.dao.ProjectReportDataDao;
 | 
												
													
														
															|  |  import com.jeeplus.modules.projectcontentinfo.entity.ProjectContentTreeData;
 |  |  import com.jeeplus.modules.projectcontentinfo.entity.ProjectContentTreeData;
 | 
												
													
														
															|  |  import com.jeeplus.modules.projectcontentinfo.entity.ProjectReportData;
 |  |  import com.jeeplus.modules.projectcontentinfo.entity.ProjectReportData;
 | 
												
											
												
													
														
															|  | @@ -24,6 +25,7 @@ import com.jeeplus.modules.sys.entity.MainDict;
 | 
												
													
														
															|  |  import com.jeeplus.modules.sys.entity.MainDictDetail;
 |  |  import com.jeeplus.modules.sys.entity.MainDictDetail;
 | 
												
													
														
															|  |  import com.jeeplus.modules.sys.utils.UserUtils;
 |  |  import com.jeeplus.modules.sys.utils.UserUtils;
 | 
												
													
														
															|  |  import com.jeeplus.modules.tools.utils.TwoDimensionCode;
 |  |  import com.jeeplus.modules.tools.utils.TwoDimensionCode;
 | 
												
													
														
															|  | 
 |  | +import com.jeeplus.modules.workclientinfo.entity.WorkClientAttachment;
 | 
												
													
														
															|  |  import com.jeeplus.modules.workcontent.entity.WorkContentType;
 |  |  import com.jeeplus.modules.workcontent.entity.WorkContentType;
 | 
												
													
														
															|  |  import freemarker.template.Configuration;
 |  |  import freemarker.template.Configuration;
 | 
												
													
														
															|  |  import freemarker.template.Template;
 |  |  import freemarker.template.Template;
 | 
												
											
												
													
														
															|  | @@ -54,6 +56,8 @@ public class ProjectReportNumController extends BaseController {
 | 
												
													
														
															|  |  	private ProjectReportDataDao projectReportDataDao;
 |  |  	private ProjectReportDataDao projectReportDataDao;
 | 
												
													
														
															|  |  	@Autowired
 |  |  	@Autowired
 | 
												
													
														
															|  |      private ProjectRecordsService projectRecordsService;
 |  |      private ProjectRecordsService projectRecordsService;
 | 
												
													
														
															|  | 
 |  | +	@Autowired
 | 
												
													
														
															|  | 
 |  | +    private ProjectResultsFileTemplateService projectResultsFileTemplateService;
 | 
												
													
														
															|  |  
 |  |  
 | 
												
													
														
															|  |  
 |  |  
 | 
												
													
														
															|  |  	@RequestMapping(value = "skipMethod")
 |  |  	@RequestMapping(value = "skipMethod")
 | 
												
											
												
													
														
															|  | @@ -105,6 +109,15 @@ public class ProjectReportNumController extends BaseController {
 | 
												
													
														
															|  |  					if(treeData.getPid().equals("0")){
 |  |  					if(treeData.getPid().equals("0")){
 | 
												
													
														
															|  |  						listNum.add(treeData);
 |  |  						listNum.add(treeData);
 | 
												
													
														
															|  |  					}else{
 |  |  					}else{
 | 
												
													
														
															|  | 
 |  | +						String typeId = treeData.getNum().split("-")[1];
 | 
												
													
														
															|  | 
 |  | +						List<WorkClientAttachment> workClientAttachmentList = projectResultsFileTemplateService.getWorkClientAttachmentList(typeId);
 | 
												
													
														
															|  | 
 |  | +						if(null != workClientAttachmentList){
 | 
												
													
														
															|  | 
 |  | +							for (WorkClientAttachment workClientAttachment: workClientAttachmentList) {
 | 
												
													
														
															|  | 
 |  | +								treeData.setUrl(workClientAttachment.getUrl());
 | 
												
													
														
															|  | 
 |  | +							}
 | 
												
													
														
															|  | 
 |  | +							treeData.setCount(workClientAttachmentList.size());
 | 
												
													
														
															|  | 
 |  | +							treeData.setType(typeId);
 | 
												
													
														
															|  | 
 |  | +						}
 | 
												
													
														
															|  |  						listNum.add(treeData);
 |  |  						listNum.add(treeData);
 | 
												
													
														
															|  |  					}
 |  |  					}
 | 
												
													
														
															|  |  				}
 |  |  				}
 | 
												
											
												
													
														
															|  | @@ -239,6 +252,18 @@ public class ProjectReportNumController extends BaseController {
 | 
												
													
														
															|  |  		return view;
 |  |  		return view;
 | 
												
													
														
															|  |  	}
 |  |  	}
 | 
												
													
														
															|  |  
 |  |  
 | 
												
													
														
															|  | 
 |  | +	/**
 | 
												
													
														
															|  | 
 |  | +	 * 跳转到选择下载页面
 | 
												
													
														
															|  | 
 |  | +	 */
 | 
												
													
														
															|  | 
 |  | +	@RequestMapping(value = "skipTemplateForm")
 | 
												
													
														
															|  | 
 |  | +	public String skipTemplateForm(ProjectContentTreeData treeData,Model model, HttpServletRequest request) {
 | 
												
													
														
															|  | 
 |  | +		List<ProjectContentTreeData> projectContentTreeDataList = projectResultsFileTemplateService.getTemplateForm(treeData.getType());
 | 
												
													
														
															|  | 
 |  | +		model.addAttribute("contentName",projectContentTreeDataList.get(0).getContentName());
 | 
												
													
														
															|  | 
 |  | +		model.addAttribute("num",treeData.getNum());
 | 
												
													
														
															|  | 
 |  | +		model.addAttribute("projectContentTreeData",projectContentTreeDataList);
 | 
												
													
														
															|  | 
 |  | +		return "modules/projectreportnum/projectTemplateFileForm";
 | 
												
													
														
															|  | 
 |  | +	}
 | 
												
													
														
															|  | 
 |  | +
 | 
												
													
														
															|  |  
 |  |  
 | 
												
													
														
															|  |  	/**
 |  |  	/**
 | 
												
													
														
															|  |  	 * 保存记录
 |  |  	 * 保存记录
 |