实施前期归档

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

@@ -146,11 +146,11 @@ public class ProjectReportRecordController extends BaseController {
 	}
 
 	/**
-	 * 竣工归档查看，增加，编辑报告归档表单页面
+	 * 施工前期归档查看，增加，编辑报告归档表单页面
 	 */
 	@RequestMapping(value = "formEarly")
 	public String formEarly(ProjectReportRecord projectReportRecord, Model model) {
-		ProjectReportRecord ReportRecord = new ProjectReportRecord();
+		/*ProjectReportRecord ReportRecord = new ProjectReportRecord();
 		ProjectReportData projectReportData = new ProjectReportData();
 		projectReportData.setFileStatus("1");
 		projectReportData.setId(projectReportRecord.getReport().getId());
@@ -168,7 +168,31 @@ public class ProjectReportRecordController extends BaseController {
 		ReportRecord.setReport(projectReportDatas);
 		ReportRecord.setCreateDate(new Date());
 		ReportRecord.setCreateBy(UserUtils.getUser());
-		model.addAttribute("projectReportRecord", ReportRecord);
+		model.addAttribute("projectReportRecord", ReportRecord);*/
+		ProjectReportRecord reportRecord = new ProjectReportRecord();
+		ProjectReportData projectReportData = new ProjectReportData();
+		projectReportData.setFileStatus("1");
+		projectReportData.setId(projectReportRecord.getReport().getId());
+		ProjectReportData projectReportDatas = projectReportDataService.findInfoByStatus(projectReportData);
+		//添加归档申请编号
+		if(null != projectReportDatas){
+			try {
+				int count = projectReportRecordService.getNumber(projectReportDatas.getId());
+				projectReportDatas.setRecordNum(count>9?projectReportDatas.getNumber()+"-"+count+"":projectReportDatas.getNumber()+"-0"+count);
+			}catch (Exception e){
+				logger.error("Exception e"+e);
+			}
+		}
+		reportRecord.setRecordNum(projectReportDatas.getRecordNum());
+		reportRecord.setReport(projectReportDatas);
+		reportRecord.setContractNum(projectReportDatas.getContractNum());
+		reportRecord.setContractName(projectReportDatas.getContractName());
+		reportRecord.setClientName(projectReportDatas.getClientName());
+		reportRecord.setProjectNum(projectReportDatas.getProjectNum());
+		reportRecord.setProjectName(projectReportDatas.getProjectName());
+		reportRecord.setCreateDate(new Date());
+		reportRecord.setCreateBy(UserUtils.getUser());
+		model.addAttribute("projectReportRecord", reportRecord);
 		return "modules/projectrecord/workContentFromAndView/projectEarlyForm";
 	}