电子归档问题调整

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

@@ -941,15 +941,6 @@ public class ProjectReportRecordService extends CrudService<ProjectReportRecordD
 			saveWorkattachments(reportRecord);
 			flag = "yes";
 		}
-		if (flag.equals("yes")){
-			//只有B级紧急项目可以修改质量复核信息
-			RuralProjectRecords ruralProjectRecords=ruralProjectRecordsService.get(reportRecord.getReport().getProject().getId());
-			if ("1".equals(ruralProjectRecords.getSubmitMoney()) && "1".equals(ruralProjectRecords.getEmergencyProject()) ){
-				uploadBReport(reportRecord);
-			}
-		}
-
-
 
 		projectReportRecord.setReferenceRemarks(reportRecord.getReferenceRemarks());
 		projectReportRecord.setFileNum(reportRecord.getFileNum());
@@ -966,6 +957,13 @@ public class ProjectReportRecordService extends CrudService<ProjectReportRecordD
 		String comment = "";
 		if (projectReportRecord.getStatus().equals("4")){
 			comment = ("yes".equals(flag)?"[重新申请] ":"[已撤销] ");
+			if (flag.equals("yes")){
+				//只有B级紧急项目可以修改质量复核信息
+				RuralProjectRecords ruralProjectRecords=ruralProjectRecordsService.get(reportRecord.getReport().getProject().getId());
+				if ("1".equals(ruralProjectRecords.getSubmitMoney()) && "1".equals(ruralProjectRecords.getEmergencyProject()) ){
+					uploadBReport(reportRecord);
+				}
+			}
 		}else {
 			comment = ("yes".equals(flag)?"[同意] ":"[驳回] ")+act.getComment();
 		}
@@ -1650,13 +1648,7 @@ public class ProjectReportRecordService extends CrudService<ProjectReportRecordD
 			saveWorkattachments(reportRecord);
 			flag = "yes";
 		}
-		if (flag.equals("yes")){
-			//只有B级紧急项目可以修改质量复核信息
-			RuralProjectRecords ruralProjectRecords=ruralProjectRecordsService.get(reportRecord.getReport().getProject().getId());
-			if ("1".equals(ruralProjectRecords.getSubmitMoney()) && "1".equals(ruralProjectRecords.getEmergencyProject()) ){
-				uploadBReport(reportRecord);
-			}
-		}
+
 
 
 		projectReportRecord.setReferenceRemarks(reportRecord.getReferenceRemarks());
@@ -1674,6 +1666,13 @@ public class ProjectReportRecordService extends CrudService<ProjectReportRecordD
 		String comment = "";
 		if (projectReportRecord.getStatus().equals("4")){
 			comment = ("yes".equals(flag)?"[重新申请] ":"[已撤销] ");
+			if (flag.equals("yes")){
+				//只有B级紧急项目可以修改质量复核信息
+				RuralProjectRecords ruralProjectRecords=ruralProjectRecordsService.get(reportRecord.getReport().getProject().getId());
+				if ("1".equals(ruralProjectRecords.getSubmitMoney()) && "1".equals(ruralProjectRecords.getEmergencyProject()) ){
+					uploadBReport(reportRecord);
+				}
+			}
 		}else {
 			comment = ("yes".equals(flag)?"[同意] ":"[驳回] ")+act.getComment();
 		}