实施前期和竣工阶段项目复核展示状态信息

src/main/java/com/jeeplus/modules/projectcontentinfo/entity/ProjectReportRecord.java

@@ -49,6 +49,7 @@ public class ProjectReportRecord extends ActEntity<ProjectReportRecord> {
 	private User signCostTwo;		// 签字造价师二
 	private String reportId;
 	private Date accomplishDate;  //归档完成时间
+	private String condition;    //判定条件
 
 	private Integer type;//(1：ProjectReportRecord  2：RuralProjectReportRecord)
 
@@ -321,4 +322,12 @@ public class ProjectReportRecord extends ActEntity<ProjectReportRecord> {
 	public void setAccomplishDate(Date accomplishDate) {
 		this.accomplishDate = accomplishDate;
 	}
+
+	public String getCondition() {
+		return condition;
+	}
+
+	public void setCondition(String condition) {
+		this.condition = condition;
+	}
 }

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

@@ -118,7 +118,7 @@ public class ProjectReportRecordController extends BaseController {
 	 */
 	@RequestMapping(value = "formData")
 	public String formData(ProjectReportRecord projectReportRecord, Model model) {
-		ProjectReportRecord ReportRecord = new ProjectReportRecord();
+		ProjectReportRecord reportRecord = new ProjectReportRecord();
 		ProjectReportData projectReportData = new ProjectReportData();
 		projectReportData.setFileStatus("1");
 		projectReportData.setId(projectReportRecord.getReport().getId());
@@ -132,11 +132,16 @@ public class ProjectReportRecordController extends BaseController {
 				logger.error("Exception e"+e);
 			}
 		}
-
-		ReportRecord.setReport(projectReportDatas);
-		ReportRecord.setCreateDate(new Date());
-		ReportRecord.setCreateBy(UserUtils.getUser());
-		model.addAttribute("projectReportRecord", ReportRecord);
+		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/projectReportRecordForm";
 	}
 
@@ -174,6 +179,9 @@ public class ProjectReportRecordController extends BaseController {
 		}catch (Exception e){
 			addMessage(redirectAttributes, "保存报告归档失败");
 		}
+		if("completionArchive".equals(projectReportRecord.getCondition())){
+			return "redirect:"+Global.getAdminPath()+"/project/projectCompletionPigeonhole/?repage";
+		}
 		return "redirect:"+Global.getAdminPath()+"/projectcontentinfo/projectReportRecord/?repage";
 	}
 	/**
@@ -181,7 +189,7 @@ public class ProjectReportRecordController extends BaseController {
 	 */
 	@RequestMapping(value = "store")
 	public String store(ProjectReportRecord projectReportRecord, Model model, RedirectAttributes redirectAttributes) throws Exception{
-		if (!beanValidator(model, projectReportRecord)){
+		/*if (!beanValidator(model, projectReportRecord)){
 			return form(projectReportRecord, model);
 		}
 		if(!projectReportRecord.getIsNewRecord()){//编辑表单保存
@@ -194,7 +202,7 @@ public class ProjectReportRecordController extends BaseController {
 			projectReportRecord.setOfficeId(user.getOffice().getId());
 			projectReportRecord.setStatus("1");
 			projectReportRecordService.save(projectReportRecord);//保存
-		}
+		}*/
 		addMessage(redirectAttributes, "保存报告归档成功");
 		return "redirect:"+Global.getAdminPath()+"/projectcontentinfo/projectReportRecord/?repage";
 	}

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

@@ -96,6 +96,8 @@
 			<form:hidden path="id"/>
 			<form:hidden path="numberCount"/>
 			<form:hidden id="reportId" path="report.id"/>
+			<%-- 全过程中竣工阶段进行归档则添加判定字符 方便调转 --%>
+			<input type="hidden" input="condition" name="condition" value="completionArchive">
 
 			<div class="form-group layui-row first lw12">
 				<div class="form-group-label"><h2>基本信息</h2></div>
@@ -108,7 +110,7 @@
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item">*</span>归档申请编号：</label>
 					<div class="layui-input-block">
-						<form:input id="reportRecordNum" path="report.recordNum" htmlEscape="false"   readonly="true" class="form-control layui-input required"/>
+						<form:input id="reportRecordNum" path="recordNum" htmlEscape="false"   readonly="true" class="form-control layui-input required"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
@@ -140,31 +142,31 @@
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item">*</span>合同编号：</label>
 					<div class="layui-input-block">
-						<form:input id="contractNum" path="report.contractNum" htmlEscape="false" readonly="true" class="form-control  layui-input required"/>
+						<form:input id="contractNum" path="contractNum" htmlEscape="false" readonly="true" class="form-control  layui-input required"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item">*</span>合同名称：</label>
 					<div class="layui-input-block">
-						<form:input id="contractName" path="report.contractName" htmlEscape="false" readonly="true" class="form-control  layui-input required"/>
+						<form:input id="contractName" path="contractName" htmlEscape="false" readonly="true" class="form-control  layui-input required"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item">*</span>主委托方：</label>
 					<div class="layui-input-block">
-						<form:input id="clientName" path="report.clientName" htmlEscape="false" readonly="true" class="form-control  layui-input required"/>
+						<form:input id="clientName" path="clientName" htmlEscape="false" readonly="true" class="form-control  layui-input required"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label">项目编号：</label>
 					<div class="layui-input-block">
-						<form:input id="projectNum" path="report.projectNum" htmlEscape="false" readonly="true" class="form-control  layui-input"/>
+						<form:input id="projectNum" path="projectNum" htmlEscape="false" readonly="true" class="form-control  layui-input"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item">*</span>项目名称：</label>
 					<div class="layui-input-block">
-						<form:input id="projectName" path="report.projectName" htmlEscape="false" readonly="true" class="form-control  layui-input required"/>
+						<form:input id="projectName" path="projectName" htmlEscape="false" readonly="true" class="form-control  layui-input required"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">