103质量复核审核提交失败处理

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

@@ -560,7 +560,15 @@ public class ProjectReportRecordController extends BaseController {
 				//判断流程是否是老的流程，如果是老的流程则走老审核信息
 				if (workActivityMenu.getProcessType().equals("newReportRecord")) {
 					str = projectReportRecordService.newAuditSave(projectReportRecord,users);
-				}else {
+				}else if(workActivityMenu.getProcessType().equals("newReportRecordTwo")){
+					Office office = UserUtils.getSelectOffice();
+					if(1 == projectReportRecord.getRecordAuditType()){
+						users = UserUtils.getByProssType(projectReportRecord.getProcessInstanceId(),1);
+					}else{
+						users = UserUtils.getByRoleActivityEnname("bggdgly",3,office.getId(),"10",projectReportRecord.getCreateBy());
+					}
+					str = projectReportRecordService.newAuditSaveTwo(projectReportRecord,users);
+				}else{
 					str = projectReportRecordService.auditSave(projectReportRecord,users);
 				}
 

src/main/webapp/webpage/modules/ruralprojectrecords/record/cost/recordTwo/projectReportRecordAudit.jsp

@@ -339,6 +339,13 @@
 									</div>
 								</div>
 							</c:if>
+							<div  class="form-group layui-row">
+								<div class="form-group-label">
+									<div style="float: right"> <a href="javascript:void(0)" style='background-color: #FFB800' onclick="openDialogre('个人模板列表', '${ctx}/auditTemplate/auditTemplate/templateList?identification=${identification}&name=${identificationName}','80%', '70%','','关闭')" class="nav-btn layui-btn layui-btn-sm" ><i class="fa fa-file-excel-o"></i> 审核意见模板列表</a></div>
+									<h2>审批意见</h2>
+								</div>
+								<iframe id="iframe" src="${ctx}/auditTemplate/auditTemplate/iframeView?identification=${identification}" name="listresult" frameborder="0" align="left" width="100%" height="300" scrolling="value"></iframe>
+							</div>
 				</div>
 				<div class="form-group layui-row first hide" id="subProjectInfo">
 					<table class="oa-table layui-table" id="contentTable1">
@@ -1131,13 +1138,6 @@
 							</div>
 						</div>
 					</c:if>
-					<div>
-						<div class="form-group-label">
-							<div style="float: right"> <a href="javascript:void(0)" style='background-color: #FFB800' onclick="openDialogre('个人模板列表', '${ctx}/auditTemplate/auditTemplate/templateList?identification=${identification}&name=${identificationName}','80%', '70%','','关闭')" class="nav-btn layui-btn layui-btn-sm" ><i class="fa fa-file-excel-o"></i> 审核意见模板列表</a></div>
-							<h2>审批意见</h2>
-						</div>
-						<iframe id="iframe" src="${ctx}/auditTemplate/auditTemplate/iframeView?identification=${identification}" name="listresult" frameborder="0" align="left" width="100%" height="300" scrolling="value"></iframe>
-					</div>
 				</div>
 				<div class="form-group layui-row first hide" id="issueView">
 					<c:if test="${projectRecords.submitMoney=='1'}">