竣工审核撤回修改修复

src/main/java/com/jeeplus/modules/projectcontentinfo/service/ProjectcontentinfoService.java

@@ -460,7 +460,7 @@ public class ProjectcontentinfoService extends CrudService<ProjectcontentinfoDao
 				}
 			}*/
 			//添加工作内容和报告关系
-			if("according".equals(projectcontentinfo.getCondition())){
+			if("according".equals(projectcontentinfo.getCondition()) || "completion".equals(projectcontentinfo.getCondition())){
 				Integer contentAndReportCount = projectImplementEarlyService.getProjectContrntAndReport(projectReportData.getProjectContentDataList().get(0).getId(), projectReportData.getId());
 				if(contentAndReportCount==0){
 					projectImplementEarlyService.saveProjectContrntAndReport(projectReportData.getProjectContentDataList().get(0).getId(),projectReportData.getId());
@@ -501,7 +501,7 @@ public class ProjectcontentinfoService extends CrudService<ProjectcontentinfoDao
 				}
 			}
 			//保存tree数据
-			if(!"according".equals(projectcontentinfo.getCondition())){
+			if(!"according".equals(projectcontentinfo.getCondition()) && !"completion".equals(projectcontentinfo.getCondition())){
 				saveReportTree(projectcontentinfo,status,company,office,reportDataName,infoId,attachmentList,projectReportData.getReviewStandard(),1);
 			}
 		}

src/main/java/com/jeeplus/modules/projectrecord/web/completion/ProjectCompletionReviewController.java

@@ -247,9 +247,8 @@ public class ProjectCompletionReviewController extends BaseController {
             }
             return "modules/projectcontentinfo/reportInvalid";
         }else{
-            if (projectReportData != null && projectReportData.getCreateBy() != null && StringUtils.isNotBlank(projectReportData.getCreateBy().getId()) && projectReportData.getCreateBy().getId().equals(UserUtils.getUser().getId())) {
-                return "modules/projectrecord/workContentFromAndView/reportForm";
-            } else if (projectReportData == null || StringUtils.isBlank(projectReportData.getId())) {
+            if (projectReportData == null || StringUtils.isBlank(projectReportData.getId())) {
+                model.addAttribute("condition", projectcontentinfo.getCondition());
                 return "modules/projectrecord/workContentFromAndView/reportForm";
             } else {
                 return "modules/projectcontentinfo/reportView";

src/main/webapp/webpage/modules/projectrecord/implementCompletion/projectCompletionReviewList.jsp

@@ -403,7 +403,7 @@
 					].join('');
 				}else if(d.status == null || d.status == '' || d.status == 10){
 					return [
-						'<a href="javascript:void(0)" onclick="openDialogres(\'复核\', \'${ctx}/project/projectCompletionReview/reviewForm?view=report&dictType='+d.dictType+'&project.id='+d.pid+'&id='+d.contentPId+'&parentIds='+d.parentIds+'&infoId='+d.id+'\',\'95%\',\'95%\')" class="op-btn op-btn-edit" ><i class="fa fa-plus"></i> 复核</a>',
+						'<a href="javascript:void(0)" onclick="openDialogres(\'复核\', \'${ctx}/project/projectCompletionReview/reviewForm?condition=completion&view=report&dictType='+d.dictType+'&project.id='+d.pid+'&id='+d.contentPId+'&parentIds='+d.parentIds+'&infoId='+d.id+'\',\'95%\',\'95%\')" class="op-btn op-btn-edit" ><i class="fa fa-plus"></i> 复核</a>',
 					].join('');
 				}else{
 					return[''].join('');

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

@@ -429,12 +429,12 @@
 		<form:hidden path="edit"/>
 		<form:hidden path="projectReportData.id"/>
 		<form:hidden path="projectReportData.createBy.id"/>
+		<form:hidden id="projectReportDataTypeHidden" path="projectReportData.type"/>
 			<input type="hidden" id="projectId" value="${projectcontentinfo.project.projectId}">
 			<input type="hidden" id="achievementParentIdHidden" value="${achievementParentId}">
 			<input type="hidden" id="achievementIdHidden" value="${achievementId}">
 			<input type="hidden" id="reviewStandardHidden" value="${reviewStandard}">
-			<input type="hidden" id="condition" name="condition" value="according">
-			<input type="hidden" id="projectReportDataTypeHidden" name="projectReportData.type" value="">
+			<input type="hidden" id="condition" name="condition" value="${projectcontentinfo.condition}">
 		<sys:message content="${message}"/>
 		<div class="form-group layui-row first lw12">
 			<div class="form-group-label"><h2>基本信息</h2></div>